5 files changed, 21 insertions, 15 deletions

diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c
index 5946105ac..f512d3580 100644
--- a/src/transport/plugin_transport_http.c
+++ b/src/transport/plugin_transport_http.c
@@ -541,7 +541,7 @@ accessHandlerCallback (void *cls,
       }
       */
       if (cs->msgtok==NULL)
-        cs->msgtok = GNUNET_SERVER_mst_create (GNUNET_SERVER_MAX_MESSAGE_SIZE, &messageTokenizerCallback, cs);
+        cs->msgtok = GNUNET_SERVER_mst_create (GNUNET_SERVER_MAX_MESSAGE_SIZE - 1, &messageTokenizerCallback, cs);
     }
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"HTTP Daemon has new an incoming `%s' request from peer `%s'\n",method, GNUNET_i2s(&cs->identity));
   }
@@ -570,7 +570,7 @@ accessHandlerCallback (void *cls,
 
     if ((*upload_data_size > 0) && (cs->is_bad_request != GNUNET_YES))
     {
-      if (*upload_data_size + cs->pending_inbound_msg.bytes_recv <= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+      if (*upload_data_size + cs->pending_inbound_msg.bytes_recv < GNUNET_SERVER_MAX_MESSAGE_SIZE)
       {
         /* copy uploaded data to buffer */
 
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index 9b09d8948..c1397da61 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -1120,7 +1120,7 @@ tcp_plugin_send (void *cls,
         }
       sa = GNUNET_CONNECTION_create_from_sockaddr (plugin->env->sched,
                                                    af, sb, sbs,
-                                                   GNUNET_SERVER_MAX_MESSAGE_SIZE);
+                                                   GNUNET_SERVER_MAX_MESSAGE_SIZE - 1);
       if (sa == NULL)
         {
 #if DEBUG_TCP
@@ -1991,7 +1991,7 @@ tcp_plugin_server_read (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc
    *  that wants to connect to us! Send a message to establish a connection.
    */
   sock = GNUNET_CONNECTION_create_from_sockaddr (plugin->env->sched, AF_INET, (struct sockaddr *)&in_addr,
-                                                 sizeof(in_addr), GNUNET_SERVER_MAX_MESSAGE_SIZE);
+                                                 sizeof(in_addr), GNUNET_SERVER_MAX_MESSAGE_SIZE - 1);
   if (sock == NULL)
     {
       plugin->server_read_task =
diff --git a/src/transport/test_plugin_transport_http.c b/src/transport/test_plugin_transport_http.c
index 75df9c90a..9c98d8c06 100644
--- a/src/transport/test_plugin_transport_http.c
+++ b/src/transport/test_plugin_transport_http.c
@@ -1036,15 +1036,6 @@ static void run_connection_tests( )
   api->send(api->cls, &my_identity, tmp, 425, 0, TIMEOUT, NULL,addr_head->addr, addr_head->addrlen, GNUNET_YES, &task_send_cont, NULL);*/
 
 
-  /* send a message with size GNUNET_SERVER_MAX_MESSAGE_SIZE )*/
-  /*
-  GNUNET_free(tmp);
-  tmp = GNUNET_malloc(GNUNET_SERVER_MAX_MESSAGE_SIZE);
-  uint16_t t2 = (uint16_t)GNUNET_SERVER_MAX_MESSAGE_SIZE;
-  msg.size = htons(t2);
-  memcpy(tmp,&msg,sizeof(struct GNUNET_MessageHeader));
-  api->send(api->cls, &my_identity, tmp, GNUNET_SERVER_MAX_MESSAGE_SIZE, 0, TIMEOUT, NULL,addr_head->addr, addr_head->addrlen, GNUNET_YES, &task_send_cont, &fail_msg_transmited_bigger_max_size);
-*/
   /* send a message with size GNUNET_SERVER_MAX_MESSAGE_SIZE-1  */
   GNUNET_free(tmp);
   tmp = GNUNET_malloc(GNUNET_SERVER_MAX_MESSAGE_SIZE-1);
diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c
index 755d5a576..4f00fa0d9 100644
--- a/src/transport/test_transport_api_reliability.c
+++ b/src/transport/test_transport_api_reliability.c
@@ -46,7 +46,7 @@
  * 'MAX_PENDING' in 'gnunet-service-transport.c', otherwise
  * messages may be dropped even for a reliable transport.
  */
-#define TOTAL_MSGS (60000 * 2)
+#define TOTAL_MSGS (60000 * 20)
 
 /**
  * How long until we give up on transmitting the message?
@@ -152,6 +152,7 @@ static unsigned int
 get_size (unsigned int iter)
 {
   unsigned int ret;
+
   if (iter < 60000)
     return iter + sizeof (struct TestMessage);
   ret = (iter * iter * iter);
@@ -168,6 +169,7 @@ notify_receive (void *cls,
 {
   static int n;
   unsigned int s;
+  char cbuf[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1];
   const struct TestMessage *hdr;
 
   hdr = (const struct TestMessage*) message;
@@ -196,6 +198,18 @@ notify_receive (void *cls,
       die_task = GNUNET_SCHEDULER_add_now (sched, &end_badly, NULL);
       return;
     }
+  memset (cbuf, n, s - sizeof (struct TestMessage));
+  if (0 != memcmp (cbuf,
+                   &hdr[1],
+                   s - sizeof (struct TestMessage)))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Expected message %u with bits %u, but body did not match\n",
+                  n, (unsigned char) n);
+      GNUNET_SCHEDULER_cancel (sched, die_task);
+      die_task = GNUNET_SCHEDULER_add_now (sched, &end_badly, NULL);
+      return;
+    }
 #if VERBOSE
   if (ntohl(hdr->num) % 5000 == 0)
     {
diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c
index 2cd563178..d76ff6e5d 100644
--- a/src/transport/transport_api.c
+++ b/src/transport/transport_api.c
@@ -598,6 +598,7 @@ transport_notify_ready (void *cls, size_t size, void *buf)
 #endif
       if (mret != 0)    
         {
+          GNUNET_assert (mret + sizeof (struct OutboundMessage) < GNUNET_SERVER_MAX_MESSAGE_SIZE);
           obm.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SEND);
           obm.header.size = htons (mret + sizeof (struct OutboundMessage));
           obm.priority = htonl (th->priority);
@@ -1699,7 +1700,7 @@ GNUNET_TRANSPORT_notify_transmit_ready (struct GNUNET_TRANSPORT_Handle
 #if DEBUG_TRANSPORT
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "Message size is %d, max allowed is %d.\n",
-                  size + sizeof (struct OutboundMessage), GNUNET_SERVER_MAX_MESSAGE_SIZE);
+                  size + sizeof (struct OutboundMessage), GNUNET_SERVER_MAX_MESSAGE_SIZE - 1);
 #endif
       GNUNET_break (0);
       return NULL;