[GNUnet-SVN] r25584 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2012-12-20 16:01:02 +0100 (Thu, 20 Dec 2012)
New Revision: 25584

Modified:
   gnunet/src/mesh/test_mesh_small.c
Log:
- add new test type, fix disconnect

Modified: gnunet/src/mesh/test_mesh_small.c
===================================================================
--- gnunet/src/mesh/test_mesh_small.c   2012-12-20 14:50:25 UTC (rev 25583)
+++ gnunet/src/mesh/test_mesh_small.c   2012-12-20 15:01:02 UTC (rev 25584)
@@ -54,6 +54,7 @@
 #define SPEED_ACK 4
 #define SPEED_MIN 5
 #define SPEED_NOBUF 6
+#define P2P_SIGNAL 10
 
 /**
  * Which test are we running?
@@ -759,10 +760,10 @@
   if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
   {
     GNUNET_SCHEDULER_cancel (disconnect_task);
-    disconnect_task =
-        GNUNET_SCHEDULER_add_delayed (TIMEOUT, &disconnect_mesh_peers,
-                                      (void *) __LINE__);
   }
+  disconnect_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+                                                  &disconnect_mesh_peers,
+                                                  (void *) __LINE__);
 }
 
 /**
@@ -884,6 +885,13 @@
     test_name = "multicast";
     ok_goal = 10;
   }
+  else if (strstr (argv[0], "test_mesh_small_signal") != NULL)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SIGNAL\n");
+    test = P2P_SIGNAL;
+    test_name = "signal";
+    ok_goal = 5;
+  }
   else if (strstr (argv[0], "test_mesh_small_speed_ack") != NULL)
   {
    /* Each peer is supposed to generate the following callbacks: