From: Nathan S. Evans <evans@in.tum.de>
Date: Thu, 4 Feb 2010 10:50:24 +0000 (+0000)
Subject: minor changes, with any luck test cases will pass (literally luck though)
X-Git-Tag: initial-import-from-subversion-38251~22799
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c604393646fddb6c18fc3fe26f40f91d4c0836ce;p=oweals%2Fgnunet.git

minor changes, with any luck test cases will pass (literally luck though)
---

diff --git a/src/core/core_api.c b/src/core/core_api.c
index 77c13db86..d87515741 100644
--- a/src/core/core_api.c
+++ b/src/core/core_api.c
@@ -309,7 +309,10 @@ request_start (void *cls, size_t size, void *buf)
   struct GNUNET_CORE_Handle *h = cls;
   struct GNUNET_CORE_TransmitHandle *th;
   size_t ret;
-
+#if DEBUG_CORE
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "request_start called\n");
+#endif
   h->th = NULL;
   th = h->pending_head;
   if (buf == NULL)
@@ -348,7 +351,11 @@ trigger_next_request (struct GNUNET_CORE_Handle *h)
   struct GNUNET_CORE_TransmitHandle *th;
 
   if (h->currently_down)
-    return;                     /* connection temporarily down */
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "\nIn trigger_next_request, connection currently down...\n");
+      return;                     /* connection temporarily down */
+    }
   if (NULL == (th = h->pending_head))
     return;                     /* no requests pending */
   GNUNET_assert (NULL == h->th);
@@ -845,12 +852,17 @@ produce_send (void *cls, size_t size, void *buf)
   dt = notify (notify_cls, size - sizeof (struct SendMessage), &sm[1]);
   if (0 == dt)
     {
+#if DEBUG_CORE
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Size of clients message to peer %s is 0!\n",
+              GNUNET_i2s(&th->peer));
+#endif
       /* client decided to send nothing! */
       return 0;
     }
   GNUNET_assert (dt >= sizeof (struct GNUNET_MessageHeader));
   sm->header.size = htons (dt + sizeof (struct SendMessage));
-  GNUNET_assert (dt + sizeof (struct SendMessage) < size);
+  GNUNET_assert (dt + sizeof (struct SendMessage) <= size);
   return dt + sizeof (struct SendMessage);
 }
 
diff --git a/src/core/test_core_api_peer1.conf b/src/core/test_core_api_peer1.conf
index 42533cebb..e1a1bb9ed 100644
--- a/src/core/test_core_api_peer1.conf
+++ b/src/core/test_core_api_peer1.conf
@@ -10,7 +10,8 @@ PORT = 12464
 PORT = 12465
 PLUGINS = tcp
 #PREFIX = xterm -T transport1 -e
-#PREFIX = xterm -T transport1 -e gdb -x cmd --args
+#PREFIX= xterm -e xterm -T transport1 -e gdb --args
+#PREFIX = xterm -T transport1 -e gdb --args
 #PREFIX = xterm -T transport1 -e valgrind --tool=memcheck
 DEBUG = YES
 
@@ -37,7 +38,7 @@ PORT = 12469
 PORT = 12470
 #PREFIX = xterm -T core1 -e valgrind --tool=memcheck
 #OPTIONS = -l log-core-1
-#PREFIX = xterm -T core1 -e gdb -x cmd --args
+#PREFIX = xterm -e xterm -T core1 -e gdb --args
 #PREFIX = xterm -T core1 -e 
 DEBUG = YES
 
diff --git a/src/core/test_core_api_peer2.conf b/src/core/test_core_api_peer2.conf
index 2d27bf6c5..fd0521543 100644
--- a/src/core/test_core_api_peer2.conf
+++ b/src/core/test_core_api_peer2.conf
@@ -9,6 +9,8 @@ PORT = 22464
 [transport]
 PORT = 22465
 PLUGINS = tcp
+#PREFIX = xterm -T transport2 -e gdb --args
+#PREFIX = xterm -e xterm -T transport2 -e gdb --args
 #PREFIX = xterm -T transport2 -e
 #PREFIX = xterm -T transport2 -e valgrind --tool=memcheck
 DEBUG = YES