[GNUnet-SVN] r30611 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2013-11-07 19:01:51 +0100 (Thu, 07 Nov 2013)
New Revision: 30611

Modified:
   gnunet/src/mesh/gnunet-service-mesh_connection.c
   gnunet/src/mesh/gnunet-service-mesh_tunnel.c
Log:
- move connection set code to connection.c


Modified: gnunet/src/mesh/gnunet-service-mesh_connection.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-11-07 18:01:33 UTC 
(rev 30610)
+++ gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-11-07 18:01:51 UTC 
(rev 30611)
@@ -2225,6 +2225,7 @@
   switch (type)
   {
     struct GNUNET_MESH_Encrypted *emsg;
+    struct GNUNET_MESH_KX        *kmsg;
     struct GNUNET_MESH_ACK       *amsg;
     struct GNUNET_MESH_Poll      *pmsg;
     struct GNUNET_MESH_ConnectionDestroy *dmsg;
@@ -2253,6 +2254,11 @@
       }
       break;
 
+    case GNUNET_MESSAGE_TYPE_MESH_KX:
+      kmsg = (struct GNUNET_MESH_KX *) data;
+      kmsg->cid = c->id;
+      break;
+
     case GNUNET_MESSAGE_TYPE_MESH_ACK:
       amsg = (struct GNUNET_MESH_ACK *) data;
       amsg->cid = c->id;

Modified: gnunet/src/mesh/gnunet-service-mesh_tunnel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_tunnel.c        2013-11-07 18:01:33 UTC 
(rev 30610)
+++ gnunet/src/mesh/gnunet-service-mesh_tunnel.c        2013-11-07 18:01:51 UTC 
(rev 30611)
@@ -650,7 +650,6 @@
     case GNUNET_MESSAGE_TYPE_MESH_KX_EPHEMERAL:
     case GNUNET_MESSAGE_TYPE_MESH_KX_PING:
     case GNUNET_MESSAGE_TYPE_MESH_KX_PONG:
-      msg->cid = *GMC_get_id (c);
       msg->reserved = htonl (0);
       memcpy (&msg[1], message, size);
       break;