[GNUnet-SVN] r10206 - gnunet/src/core

[gnunet]

Author: nevans
Date: 2010-02-04 11:50:24 +0100 (Thu, 04 Feb 2010)
New Revision: 10206

Modified:
   gnunet/src/core/core_api.c
   gnunet/src/core/test_core_api_peer1.conf
   gnunet/src/core/test_core_api_peer2.conf
Log:
minor changes, with any luck test cases will pass (literally luck though)

Modified: gnunet/src/core/core_api.c
===================================================================
--- gnunet/src/core/core_api.c  2010-02-04 10:49:38 UTC (rev 10205)
+++ gnunet/src/core/core_api.c  2010-02-04 10:50:24 UTC (rev 10206)
@@ -309,7 +309,10 @@
   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 @@
   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 @@
   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);
 }
 

Modified: gnunet/src/core/test_core_api_peer1.conf
===================================================================
--- gnunet/src/core/test_core_api_peer1.conf    2010-02-04 10:49:38 UTC (rev 
10205)
+++ gnunet/src/core/test_core_api_peer1.conf    2010-02-04 10:50:24 UTC (rev 
10206)
@@ -10,7 +10,8 @@
 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 = 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
 

Modified: gnunet/src/core/test_core_api_peer2.conf
===================================================================
--- gnunet/src/core/test_core_api_peer2.conf    2010-02-04 10:49:38 UTC (rev 
10205)
+++ gnunet/src/core/test_core_api_peer2.conf    2010-02-04 10:50:24 UTC (rev 
10206)
@@ -9,6 +9,8 @@
 [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