4 files changed, 23 insertions, 12 deletions

diff --git a/src/cadet/gnunet-service-cadet.c b/src/cadet/gnunet-service-cadet.c
index 7ac4c6370..3f868145e 100644
--- a/src/cadet/gnunet-service-cadet.c
+++ b/src/cadet/gnunet-service-cadet.c
@@ -168,14 +168,18 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
 int
 main (int argc, char *const *argv)
 {
-  int ret;
   int r;
 
   shutting_down = GNUNET_NO;
   r = GNUNET_SERVICE_run (argc, argv, "cadet", GNUNET_SERVICE_OPTION_NONE, &run,
                           NULL);
   GNUNET_free (my_private_key);
-  ret = (GNUNET_OK == r) ? 0 : 1;
 
-  return ret;
+  if (GNUNET_OK != r)
+  {
+    FPRINTF (stderr, "GNUNET_SERVICE_run for CADET has failed!\n");
+    return 1;
+  }
+
+  return 0;
 }
diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c
index 14677c96c..74186310a 100644
--- a/src/cadet/gnunet-service-cadet_channel.c
+++ b/src/cadet/gnunet-service-cadet_channel.c
@@ -737,7 +737,7 @@ channel_retransmit_message (void *cls,
   copy = rel->head_sent;
   if (NULL == copy)
   {
-    GNUNET_break (0);
+    GNUNET_break (0); // FIXME tripped in rps testcase
     return;
   }
 
@@ -1778,6 +1778,8 @@ GCCH_handle_local_data (struct CadetChannel *ch,
 /**
  * Handle a channel destroy requested by a client.
  *
+ * TODO: add "reason" field
+ *
  * Destroy the channel and the tunnel in case this was the last channel.
  *
  * @param ch Channel.
diff --git a/src/cadet/gnunet-service-cadet_tunnel.c b/src/cadet/gnunet-service-cadet_tunnel.c
index 9f3156c38..0b314f9a2 100644
--- a/src/cadet/gnunet-service-cadet_tunnel.c
+++ b/src/cadet/gnunet-service-cadet_tunnel.c
@@ -2143,7 +2143,14 @@ void
 GCT_init (const struct GNUNET_CONFIGURATION_Handle *c,
           const struct GNUNET_CRYPTO_EddsaPrivateKey *key)
 {
+  int expected_overhead;
+
   LOG (GNUNET_ERROR_TYPE_DEBUG, "init\n");
+
+  expected_overhead =
+    sizeof (struct GNUNET_CADET_Encrypted) + sizeof (struct GNUNET_CADET_Data);
+  GNUNET_assert (GNUNET_CONSTANTS_CADET_P2P_OVERHEAD == expected_overhead);
+
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_number (c, "CADET", "DEFAULT_TTL",
                                              &default_ttl))
diff --git a/src/include/gnunet_constants.h b/src/include/gnunet_constants.h
index 1d2e65581..9ef500388 100644
--- a/src/include/gnunet_constants.h
+++ b/src/include/gnunet_constants.h
@@ -121,18 +121,16 @@ extern "C"
 #define GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE (63 * 1024)
 
 /**
- * Size of the CADET message overhead
- * - sizeof(GNUNET_CADET_Encrypted) // FIXME use GNUNET_CADET_EncryptedAck when available
- * - sizeof(GNUNET_CADET_Data)
-
+ * Size of the CADET message overhead.
+ * See gnunet-service-cadet_tunnel.c: GCT_init for more info.
  */
-#define GNUNET_CONSTANTS_CADET_P2P_OVERHEAD (sizeof (struct GNUNET_CADET_Encrypted) + sizeof (struct GNUNET_CADET_Data))
+#define GNUNET_CONSTANTS_CADET_P2P_OVERHEAD 92
 
 /**
- * Same as core, the conservative value would be:
- * GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE - GNUNET_CONSTANTS_CADET_P2P_OVERHEAD
+ * Maximum message size that can be sent on CADET.
  */
-#define GNUNET_CONSTANTS_MAX_CADET_MESSAGE_SIZE (62 * 1024)
+#define GNUNET_CONSTANTS_MAX_CADET_MESSAGE_SIZE \
+(GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE - GNUNET_CONSTANTS_CADET_P2P_OVERHEAD)
 
 /**
  * Largest block that can be stored in the DHT.