[GNUnet-SVN] r38209 - gnunet/src/cadet

[gnunet]

Author: bartpolot
Date: 2016-10-26 06:20:53 +0200 (Wed, 26 Oct 2016)
New Revision: 38209

Modified:
   gnunet/src/cadet/gnunet-service-cadet_connection.c
Log:
- fix AX/KX CID initialization

Modified: gnunet/src/cadet/gnunet-service-cadet_connection.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_connection.c  2016-10-26 04:20:52 UTC 
(rev 38208)
+++ gnunet/src/cadet/gnunet-service-cadet_connection.c  2016-10-26 04:20:53 UTC 
(rev 38209)
@@ -3389,13 +3389,13 @@
     struct GNUNET_MessageHeader *copy;
     unsigned char cbuf[size];
 
-    copy = (struct GNUNET_MessageHeader *)cbuf;
+    copy = (struct GNUNET_MessageHeader *) cbuf;
     GNUNET_memcpy (copy, message, size);
     if (GNUNET_MESSAGE_TYPE_CADET_AX == type)
     {
       struct GNUNET_CADET_AX        *axmsg;
 
-      axmsg = (struct GNUNET_CADET_AX *) message;
+      axmsg = (struct GNUNET_CADET_AX *) copy;
       axmsg->cid = c->id;
       axmsg->pid = htonl (GCC_get_pid (c, fwd));
     }
@@ -3403,13 +3403,14 @@
     {
       struct GNUNET_CADET_KX        *kmsg;
 
-      kmsg = (struct GNUNET_CADET_KX *) message;
+      GNUNET_assert (GNUNET_MESSAGE_TYPE_CADET_KX == type);
+      kmsg = (struct GNUNET_CADET_KX *) copy;
       kmsg->reserved = htonl (0);
       kmsg->cid = c->id;
     }
     return send_prebuilt_message (copy, payload_type, payload_id,
-                                c, fwd, force,
-                                cont, cont_cls);
+                                  c, fwd, force,
+                                  cont, cont_cls);
   }
   return send_prebuilt_message (message, payload_type, payload_id,
                                 c, fwd, force,