[GNUnet-SVN] r5546 - in GNUnet/src: applications/dht/module applications/session include

[gnunet]

Author: grothoff
Date: 2007-08-25 17:37:40 -0600 (Sat, 25 Aug 2007)
New Revision: 5546

Modified:
   GNUnet/src/applications/dht/module/routing.c
   GNUnet/src/applications/session/connect.c
   GNUnet/src/include/platform.h
Log:
From: 
Heikki Lindholm <address@hidden>
  To: 
Christian Grothoff <address@hidden>
  Date: 
Today 02:35:08 pm
   
Hi,

sparc alignemtn seems to be broken by rev 4952. The memmove *is* 
intentional. Also, dht introduced one alignment issue. Fix attached.

hl


Modified: GNUnet/src/applications/dht/module/routing.c
===================================================================
--- GNUnet/src/applications/dht/module/routing.c        2007-08-25 23:31:25 UTC 
(rev 5545)
+++ GNUnet/src/applications/dht/module/routing.c        2007-08-25 23:37:40 UTC 
(rev 5546)
@@ -550,7 +550,7 @@
 #endif
       dht_store_put (ntohl (put->type),
                      &put->key,
-                     ntohll (put->timeout) + now,
+                     ntohll (MAKE_UNALIGNED (put->timeout)) + now,
                      ntohs (put->header.size) - sizeof (DHT_PUT_MESSAGE),
                      (const char *) &put[1]);
     }

Modified: GNUnet/src/applications/session/connect.c
===================================================================
--- GNUnet/src/applications/session/connect.c   2007-08-25 23:31:25 UTC (rev 
5545)
+++ GNUnet/src/applications/session/connect.c   2007-08-25 23:37:40 UTC (rev 
5546)
@@ -491,7 +491,7 @@
               GE_ERROR | GE_USER | GE_IMMEDIATE,
               _("Could not create any HELLO for myself!\n"));
     }
-#if DEBUG_SESSION || 1
+#if DEBUG_SESSION 
   GE_LOG (ectx,
           GE_DEBUG | GE_USER | GE_REQUEST,
           "Sending session key  to peer `%s'.\n", &enc);

Modified: GNUnet/src/include/platform.h
===================================================================
--- GNUnet/src/include/platform.h       2007-08-25 23:31:25 UTC (rev 5545)
+++ GNUnet/src/include/platform.h       2007-08-25 23:37:40 UTC (rev 5546)
@@ -205,7 +205,7 @@
 #endif
 
 #if defined(__sparc__)
-#define MAKE_UNALIGNED(val) ({ __typeof__((val)) __tmp; memcpy(&__tmp, &(val), 
sizeof((val))); __tmp; })
+#define MAKE_UNALIGNED(val) ({ __typeof__((val)) __tmp; memmove(&__tmp, 
&(val), sizeof((val))); __tmp; })
 #else
 #define MAKE_UNALIGNED(val) val
 #endif