From: Bart Polot <bart@net.in.tum.de>
Date: Thu, 2 Feb 2012 13:57:36 +0000 (+0000)
Subject: - Fixed compilation error, restored 2D torus as testing topology
X-Git-Tag: initial-import-from-subversion-38251~14947
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6bb36f1e073758e7c4fb9c7398cdc9c806aae252;p=oweals%2Fgnunet.git

- 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 cac395521..33643e2c7 100644
--- 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 289547dd8..11cdc5a75 100644
--- 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