- Fixed compilation error, restored 2D torus as testing topology

diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c
index cac39552131d0b9312088ab291cacbad0ce73a42..33643e2c7b6d62ae9eec579f0a93c8a2a79f9641 100644 (file)
--- a/src/mesh/gnunet-service-mesh.c
+++ b/src/mesh/gnunet-service-mesh.c
@@ -489,7 +489,7 @@ mesh_debug (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   {
     return;
   }
-  DEBUG ("MESH: %s\n", s);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: %s\n", s);
 }
 #endif
 

diff --git a/src/mesh/test_mesh_small.conf b/src/mesh/test_mesh_small.conf
index 289547dd8a28d664d01b0966905442b65a3a56b4..11cdc5a7519e0242c59f446f6e343ddebc8dbc2e 100644 (file)
--- a/src/mesh/test_mesh_small.conf
+++ b/src/mesh/test_mesh_small.conf
@@ -63,8 +63,8 @@ HOSTNAME = localhost
 NUM_PEERS = 16
 WEAKRANDOM = YES
 TOPOLOGY = NONE
-CONNECT_TOPOLOGY = RING
-BLACKLIST_TOPOLOGY = RING
+CONNECT_TOPOLOGY = 2D_TORUS
+BLACKLIST_TOPOLOGY = 2D_TORUS
 BLACKLIST_TRANSPORTS = tcp udp http unix
 #TOPOLOGY_FILE = small.dat
 #CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM