aboutsummaryrefslogtreecommitdiff
path: root/src/mesh
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2012-02-02 13:57:36 +0000
committerBart Polot <bart@net.in.tum.de>2012-02-02 13:57:36 +0000
commit6bb36f1e073758e7c4fb9c7398cdc9c806aae252 (patch)
tree7dd26e4e2aca7241bf72341c72cc5c88e6825164 /src/mesh
parent0f0e9c17a954e80c0baaa31b01e3f8ac27c24b03 (diff)
downloadgnunet-6bb36f1e073758e7c4fb9c7398cdc9c806aae252.tar.gz
gnunet-6bb36f1e073758e7c4fb9c7398cdc9c806aae252.zip
- Fixed compilation error, restored 2D torus as testing topology
Diffstat (limited to 'src/mesh')
-rw-r--r--src/mesh/gnunet-service-mesh.c2
-rw-r--r--src/mesh/test_mesh_small.conf4
2 files changed, 3 insertions, 3 deletions
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)
489 { 489 {
490 return; 490 return;
491 } 491 }
492 DEBUG ("MESH: %s\n", s); 492 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: %s\n", s);
493} 493}
494#endif 494#endif
495 495
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
63NUM_PEERS = 16 63NUM_PEERS = 16
64WEAKRANDOM = YES 64WEAKRANDOM = YES
65TOPOLOGY = NONE 65TOPOLOGY = NONE
66CONNECT_TOPOLOGY = RING 66CONNECT_TOPOLOGY = 2D_TORUS
67BLACKLIST_TOPOLOGY = RING 67BLACKLIST_TOPOLOGY = 2D_TORUS
68BLACKLIST_TRANSPORTS = tcp udp http unix 68BLACKLIST_TRANSPORTS = tcp udp http unix
69#TOPOLOGY_FILE = small.dat 69#TOPOLOGY_FILE = small.dat
70#CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM 70#CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM