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

[gnunet]

Author: bartpolot
Date: 2015-04-27 21:14:41 +0200 (Mon, 27 Apr 2015)
New Revision: 35598

Modified:
   gnunet/src/cadet/cadet_protocol.h
   gnunet/src/cadet/gnunet-service-cadet_connection.c
Log:
- add cid field to ax_kx

Modified: gnunet/src/cadet/cadet_protocol.h
===================================================================
--- gnunet/src/cadet/cadet_protocol.h   2015-04-27 19:14:39 UTC (rev 35597)
+++ gnunet/src/cadet/cadet_protocol.h   2015-04-27 19:14:41 UTC (rev 35598)
@@ -120,6 +120,11 @@
    * Type: GNUNET_MESSAGE_TYPE_CADET_AX_KX.
    */
   struct GNUNET_MessageHeader header;
+  
+  /**
+   * ID of the connection.
+   */
+  struct GNUNET_CADET_Hash cid;
 
   /**
    * Sender's ephemeral public ECC key (always for NIST P-521) encoded in a

Modified: gnunet/src/cadet/gnunet-service-cadet_connection.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_connection.c  2015-04-27 19:14:39 UTC 
(rev 35597)
+++ gnunet/src/cadet/gnunet-service-cadet_connection.c  2015-04-27 19:14:41 UTC 
(rev 35598)
@@ -3108,6 +3108,7 @@
   {
     struct GNUNET_CADET_Encrypted *emsg;
     struct GNUNET_CADET_KX        *kmsg;
+    struct GNUNET_CADET_AX_KX     *axkxmsg;
     struct GNUNET_CADET_ACK       *amsg;
     struct GNUNET_CADET_Poll      *pmsg;
     struct GNUNET_CADET_ConnectionDestroy *dmsg;
@@ -3148,6 +3149,11 @@
       kmsg->cid = c->id;
       break;
 
+    case GNUNET_MESSAGE_TYPE_CADET_AX_KX:
+      axkxmsg = (struct GNUNET_CADET_AX_KX *) data;
+      axkxmsg->cid = c->id;
+      break;
+
     case GNUNET_MESSAGE_TYPE_CADET_ACK:
       amsg = (struct GNUNET_CADET_ACK *) data;
       amsg->cid = c->id;