diff options
author | Bart Polot <bart@net.in.tum.de> | 2015-04-27 19:14:41 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2015-04-27 19:14:41 +0000 |
commit | 0cbe813cd72a955eeb39fb1aed44ac699eada2f3 (patch) | |
tree | a438ef73fc322c703c96c7c7ea420aea96728de4 | |
parent | 0c81dfb2fd9134a4e7320d8aa8c2a3826bd2ae5b (diff) | |
download | gnunet-0cbe813cd72a955eeb39fb1aed44ac699eada2f3.tar.gz gnunet-0cbe813cd72a955eeb39fb1aed44ac699eada2f3.zip |
- add cid field to ax_kx
-rw-r--r-- | src/cadet/cadet_protocol.h | 5 | ||||
-rw-r--r-- | src/cadet/gnunet-service-cadet_connection.c | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/cadet/cadet_protocol.h b/src/cadet/cadet_protocol.h index d866e20d3..c084ecc05 100644 --- a/src/cadet/cadet_protocol.h +++ b/src/cadet/cadet_protocol.h | |||
@@ -120,6 +120,11 @@ struct GNUNET_CADET_AX_KX | |||
120 | * Type: GNUNET_MESSAGE_TYPE_CADET_AX_KX. | 120 | * Type: GNUNET_MESSAGE_TYPE_CADET_AX_KX. |
121 | */ | 121 | */ |
122 | struct GNUNET_MessageHeader header; | 122 | struct GNUNET_MessageHeader header; |
123 | |||
124 | /** | ||
125 | * ID of the connection. | ||
126 | */ | ||
127 | struct GNUNET_CADET_Hash cid; | ||
123 | 128 | ||
124 | /** | 129 | /** |
125 | * Sender's ephemeral public ECC key (always for NIST P-521) encoded in a | 130 | * Sender's ephemeral public ECC key (always for NIST P-521) encoded in a |
diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c index 10acee8f9..5408b107d 100644 --- a/src/cadet/gnunet-service-cadet_connection.c +++ b/src/cadet/gnunet-service-cadet_connection.c | |||
@@ -3108,6 +3108,7 @@ GCC_send_prebuilt_message (const struct GNUNET_MessageHeader *message, | |||
3108 | { | 3108 | { |
3109 | struct GNUNET_CADET_Encrypted *emsg; | 3109 | struct GNUNET_CADET_Encrypted *emsg; |
3110 | struct GNUNET_CADET_KX *kmsg; | 3110 | struct GNUNET_CADET_KX *kmsg; |
3111 | struct GNUNET_CADET_AX_KX *axkxmsg; | ||
3111 | struct GNUNET_CADET_ACK *amsg; | 3112 | struct GNUNET_CADET_ACK *amsg; |
3112 | struct GNUNET_CADET_Poll *pmsg; | 3113 | struct GNUNET_CADET_Poll *pmsg; |
3113 | struct GNUNET_CADET_ConnectionDestroy *dmsg; | 3114 | struct GNUNET_CADET_ConnectionDestroy *dmsg; |
@@ -3148,6 +3149,11 @@ GCC_send_prebuilt_message (const struct GNUNET_MessageHeader *message, | |||
3148 | kmsg->cid = c->id; | 3149 | kmsg->cid = c->id; |
3149 | break; | 3150 | break; |
3150 | 3151 | ||
3152 | case GNUNET_MESSAGE_TYPE_CADET_AX_KX: | ||
3153 | axkxmsg = (struct GNUNET_CADET_AX_KX *) data; | ||
3154 | axkxmsg->cid = c->id; | ||
3155 | break; | ||
3156 | |||
3151 | case GNUNET_MESSAGE_TYPE_CADET_ACK: | 3157 | case GNUNET_MESSAGE_TYPE_CADET_ACK: |
3152 | amsg = (struct GNUNET_CADET_ACK *) data; | 3158 | amsg = (struct GNUNET_CADET_ACK *) data; |
3153 | amsg->cid = c->id; | 3159 | amsg->cid = c->id; |