[GNUnet-SVN] r4867 - GNUnet/src/applications/pingpong

[gnunet]

Author: grothoff
Date: 2007-05-29 21:41:11 -0600 (Tue, 29 May 2007)
New Revision: 4867

Modified:
   GNUnet/src/applications/pingpong/pingpong.c
Log:
cleanup

Modified: GNUnet/src/applications/pingpong/pingpong.c
===================================================================
--- GNUnet/src/applications/pingpong/pingpong.c 2007-05-30 02:07:24 UTC (rev 
4866)
+++ GNUnet/src/applications/pingpong/pingpong.c 2007-05-30 03:41:11 UTC (rev 
4867)
@@ -233,7 +233,7 @@
 #if DEBUG_PINGPONG
   EncName enc;
 #endif
-
+  
   pmsg = (P2P_pingpong_MESSAGE *) msg;
   if ( (ntohs(msg->size) != sizeof(P2P_pingpong_MESSAGE)) ||
        (0 != memcmp(sender,
@@ -248,9 +248,10 @@
 #if DEBUG_PINGPONG
   hash2enc(&sender->hashPubKey,
           &enc);
-  GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
-      "Received PONG from `%s'.\n",
-      &enc);
+  GE_LOG(ectx,
+        GE_DEBUG | GE_REQUEST | GE_USER,
+        "Received PONG from `%s'.\n",
+        &enc);
 #endif
   matched = 0;
   if (stats != NULL)
@@ -405,9 +406,7 @@
   pmsg = MALLOC(sizeof(P2P_pingpong_MESSAGE));
   pmsg->header.size = htons(sizeof(P2P_pingpong_MESSAGE));
   pmsg->header.type = htons(p2p_PROTO_PING);
-  memcpy(&pmsg->receiver,
-        receiver,
-        sizeof(PeerIdentity));
+  pmsg->receiver = *receiver;
   entry->challenge = challenge;
   pmsg->challenge = htonl(challenge);
   MUTEX_UNLOCK(pingPongLock);
@@ -430,22 +429,23 @@
                        void * data,
                        int usePlaintext,
                        int challenge) {
-  P2P_pingpong_MESSAGE * pmsg;
+  MESSAGE_HEADER * pmsg;
 
-  pmsg = (P2P_pingpong_MESSAGE*) createPing(receiver,
-                                           method,
-                                           data,
-                                           usePlaintext,
-                                           challenge);
+  pmsg = createPing(receiver,
+                   method,
+                   data,
+                   usePlaintext,
+                   challenge);
   if (pmsg == NULL)
     return SYSERR;
   if (usePlaintext == YES) {
-    sendPlaintext(receiver, pmsg);
+    sendPlaintext(receiver, 
+                 (const P2P_pingpong_MESSAGE*) pmsg);
     if (stats != NULL)
       stats->change(stat_plaintextPingSent, 1);
   } else {
     coreAPI->unicast(receiver,
-                    &pmsg->header,
+                    pmsg,
                     EXTREME_PRIORITY,
                     0);
     if (stats != NULL)