Fixed id counters' cycling

[oweals/gnunet.git] / src / mesh / test_mesh_small.c

diff --git a/src/mesh/test_mesh_small.c b/src/mesh/test_mesh_small.c
index e949a89e95296c345274b8a312550927110ca552..68fc9cc249be72141706d483242ff9925a4db722 100644 (file)
--- a/src/mesh/test_mesh_small.c
+++ b/src/mesh/test_mesh_small.c
@@ -24,7 +24,7 @@
  */
 #include "platform.h"
 #include "gnunet_testing_lib.h"
-#include "gnunet_mesh_service_new.h"
+#include "gnunet_mesh_service.h"
 
 #define VERBOSE GNUNET_YES
 #define REMOVE_DIR GNUNET_YES
@@ -479,9 +479,15 @@ do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "***************** test: test_task\n");
   if (test == MULTICAST)
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "***************** test: add peer 3\n");
     GNUNET_MESH_peer_request_connect_add(t, &d3->id);
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "***************** test: add peer 2\n");
   GNUNET_MESH_peer_request_connect_add(t, &d2->id);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "***************** test: schedule timeout in 30s\n");
   if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
   {
     GNUNET_SCHEDULER_cancel (disconnect_task);
@@ -747,6 +753,12 @@ connect_cb (void *cls, const struct GNUNET_PeerIdentity *first,
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "***************** test: Problem with new connection (%s)\n",
                 emsg);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "***************** test:   (%s)\n",
+                GNUNET_i2s (first));
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "***************** test:   (%s)\n",
+                GNUNET_i2s (second));
   }
 
 }
@@ -794,7 +806,7 @@ run (void *cls, char *const *args, const char *cfgfile,
     return;
   }
 
-  mesh_peers = GNUNET_malloc (sizeof(GNUNET_PEER_Id) * (num_peers + 1));
+  mesh_peers = GNUNET_malloc (sizeof(uint16_t) * (num_peers + 1));
 
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_number (testing_cfg, "test_mesh_small",