1 files changed, 53 insertions, 19 deletions

diff --git a/src/transport/test_plugin_transport_http.c b/src/transport/test_plugin_transport_http.c
index d8e0b4f1f..3d1c8d5e5 100644
--- a/src/transport/test_plugin_transport_http.c
+++ b/src/transport/test_plugin_transport_http.c
@@ -42,7 +42,7 @@
 #include "transport.h"
 #include <curl/curl.h>
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_YES
 #define DEBUG GNUNET_NO
 #define DEBUG_CURL GNUNET_NO
 #define HTTP_BUFFER_SIZE 2048
@@ -305,6 +305,16 @@ static int fail_addr_to_str;
 static int fail_msgs_transmited_to_local_addrs;
 
 /**
+ * Test: transmit msg of max. size
+ */
+static int fail_msg_transmited_bigger_max_size;
+
+/**
+ * Test: transmit msg of max. size
+ */
+static int fail_msg_transmited_max_size;
+
+/**
  * Test: connect to peer without peer identification
  */
 static struct HTTP_Transfer test_no_ident;
@@ -362,12 +372,12 @@ shutdown_clean ()
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test plugin functions failed\n");
     fail = 1;
   }
-  if ((test_no_ident.test_failed == GNUNET_YES) || (test_too_short_ident.test_failed == GNUNET_YES) || (test_too_long_ident.test_failed == GNUNET_YES))
+  if ((test_no_ident.test_failed == GNUNET_YES) || (test_too_short_ident.test_failed == GNUNET_YES) || (test_too_long_ident.test_failed == GNUNET_YES) || (test_valid_ident.test_failed == GNUNET_YES))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test connect with wrong data failed\n");
     fail = 1;
   }
-  if ((test_valid_ident.test_failed == GNUNET_YES) || (fail_msgs_transmited_to_local_addrs != count_str_addr))
+  if ((fail_msgs_transmited_to_local_addrs != count_str_addr) || (fail_msg_transmited_max_size == GNUNET_YES) || (fail_msg_transmited_bigger_max_size == GNUNET_YES))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test sending with plugin failed\n");
     fail = 1;
@@ -437,23 +447,29 @@ static void task_send_cont (void *cls,
   struct Plugin_Address * tmp_addr;
   tmp_addr = addr_head;
 
-  while (tmp_addr != NULL)
+  if ((cls == &fail_msgs_transmited_to_local_addrs) && (result == GNUNET_OK))
   {
-    if (cls == tmp_addr)
-     if (result == GNUNET_OK) fail_msgs_transmited_to_local_addrs++;
-    tmp_addr = tmp_addr->next;
+    fail_msgs_transmited_to_local_addrs++;
+    if (fail_msgs_transmited_to_local_addrs == count_str_addr)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Message sent to %u addresses!\n",fail_msgs_transmited_to_local_addrs);
+    }
+    return;
   }
 
-  if (fail_msgs_transmited_to_local_addrs == count_str_addr)
+  if ((cls == &fail_msg_transmited_bigger_max_size) && (result == GNUNET_SYSERR))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Message bigger max msg size was not sent!\n");
+    fail_msg_transmited_bigger_max_size = GNUNET_NO;
+    return;
+  }
 
+  if ((cls == &fail_msg_transmited_max_size) && (result == GNUNET_OK))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Message sent to %u addresses!\n",fail_msgs_transmited_to_local_addrs);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Message with max msg size succesfully sent!\n",fail_msgs_transmited_to_local_addrs);
+    fail_msg_transmited_max_size = GNUNET_NO;
     shutdown_clean();
   }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Message was sent!\n");
-  fail = GNUNET_NO;
-  //shutdown_clean();
 }
 
 #if 0
@@ -874,7 +890,6 @@ static void pretty_printer_cb (void *cls,
 static void run_connection_tests( )
 {
   char * host_str = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,"Addr: %s\n",test_addr);
   /* resetting buffers */
   buffer_in.size = HTTP_BUFFER_SIZE;
   buffer_in.pos = 0;
@@ -944,15 +959,13 @@ static void run_connection_tests( )
   char * tmp = GNUNET_malloc(sizeof(struct GNUNET_MessageHeader));
   char address[INET6_ADDRSTRLEN];
   unsigned int port;
+  unsigned int type = 10;
 
   msg.size=htons(sizeof(struct GNUNET_MessageHeader));
-  msg.type=htons(13);
-  memcpy(tmp,&msg,sizeof(struct GNUNET_MessageHeader));
-
   tmp_addr = addr_head;
   /* send a message to all addresses advertised by plugin */
-  int count = 0;
 
+  int count = 0;
   while (tmp_addr != NULL)
   {
     if (tmp_addr->addrlen == (sizeof (struct IPv4HttpAddress)))
@@ -972,11 +985,31 @@ static void run_connection_tests( )
         GNUNET_break (0);
         return;
       }
-    api->send(api->cls, &my_identity, tmp, sizeof(struct GNUNET_MessageHeader), 0, TIMEOUT, NULL,tmp_addr->addr, tmp_addr->addrlen, GNUNET_YES, &task_send_cont, tmp_addr);
+    msg.type=htons(type);
+    memcpy(tmp,&msg,sizeof(struct GNUNET_MessageHeader));
+    api->send(api->cls, &my_identity, tmp, sizeof(struct GNUNET_MessageHeader), 0, TIMEOUT, NULL,tmp_addr->addr, tmp_addr->addrlen, GNUNET_YES, &task_send_cont, &fail_msgs_transmited_to_local_addrs);
     tmp_addr = tmp_addr->next;
     count ++;
+    type ++;
   }
 
+  /* 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);
+  uint16_t t = (uint16_t)GNUNET_SERVER_MAX_MESSAGE_SIZE-1;
+  msg.size = htons(t);
+  memcpy(tmp,&msg,sizeof(struct GNUNET_MessageHeader));
+  api->send(api->cls, &my_identity, tmp, GNUNET_SERVER_MAX_MESSAGE_SIZE-1, 0, TIMEOUT, NULL,addr_head->addr, addr_head->addrlen, GNUNET_YES, &task_send_cont, &fail_msg_transmited_max_size);
+  GNUNET_free(tmp);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No more tests to run\n");
 }
 
@@ -1009,6 +1042,7 @@ run (void *cls,
   fail_notify_address = GNUNET_YES;
   fail_addr_to_str = GNUNET_YES;
   fail_msgs_transmited_to_local_addrs = 0;
+  fail_msg_transmited_max_size = GNUNET_YES;
 
   addr_head = NULL;
   count_str_addr = 0;