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

[gnunet]

Author: bartpolot
Date: 2015-04-27 21:15:25 +0200 (Mon, 27 Apr 2015)
New Revision: 35629

Modified:
   gnunet/src/cadet/gnunet-service-cadet_connection.c
   gnunet/src/cadet/gnunet-service-cadet_tunnel.c
Log:
- use correct overhead size, log wrong sizes verbosely

Modified: gnunet/src/cadet/gnunet-service-cadet_connection.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_connection.c  2015-04-27 19:15:24 UTC 
(rev 35628)
+++ gnunet/src/cadet/gnunet-service-cadet_connection.c  2015-04-27 19:15:25 UTC 
(rev 35629)
@@ -2132,6 +2132,8 @@
   if (ntohs (message->size) < minimum_size)
   {
     GNUNET_break_op (0);
+    LOG (GNUNET_ERROR_TYPE_WARNING, "Size %u < %u\n",
+         ntohs (message->size), minimum_size);
     return GNUNET_SYSERR;
   }
 

Modified: gnunet/src/cadet/gnunet-service-cadet_tunnel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2015-04-27 19:15:24 UTC 
(rev 35628)
+++ gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2015-04-27 19:15:25 UTC 
(rev 35629)
@@ -1582,7 +1582,7 @@
   {
     ax_msg = (struct GNUNET_CADET_AX *) cbuf;
     msg = &ax_msg->header;
-    msg->size = htons (sizeof (struct GNUNET_CADET_Encrypted) + size);
+    msg->size = htons (sizeof (struct GNUNET_CADET_AX) + size);
     msg->type = htons (GNUNET_MESSAGE_TYPE_CADET_AX);
     esize = t_ax_encrypt (t, &ax_msg[1], message, size);
     ax_msg->Ns = htonl (t->ax->Ns++);