- use correct overhead size, log wrong sizes verbosely

diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c
index 0a6d537bb47dc5619d79849eb075239aebee8d8c..e952b6e8c935a776aa3d04e2e7804663f048dd06 100644 (file)
--- a/src/cadet/gnunet-service-cadet_connection.c
+++ b/src/cadet/gnunet-service-cadet_connection.c
@@ -2132,6 +2132,8 @@ check_message (const struct GNUNET_MessageHeader *message,
   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;
   }
 

diff --git a/src/cadet/gnunet-service-cadet_tunnel.c b/src/cadet/gnunet-service-cadet_tunnel.c
index 06f358e75c39f835a229dfe66044d8f6c0d391fb..ad565cb948415696bf4d17b323bbe8859818b816 100644 (file)
--- a/src/cadet/gnunet-service-cadet_tunnel.c
+++ b/src/cadet/gnunet-service-cadet_tunnel.c
@@ -1582,7 +1582,7 @@ send_prebuilt_message (const struct GNUNET_MessageHeader *message,
   {
     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++);