diff options
author | Bart Polot <bart@net.in.tum.de> | 2012-11-14 14:21:18 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2012-11-14 14:21:18 +0000 |
commit | 6405272a31a887dcdc90c0732b0931b40baff542 (patch) | |
tree | 9ff37bc8da48c399f8d85b2b5f8b2833a50d0292 | |
parent | 75adc1a7619adb3f33673669984419e73b1b7edf (diff) | |
download | gnunet-6405272a31a887dcdc90c0732b0931b40baff542.tar.gz gnunet-6405272a31a887dcdc90c0732b0931b40baff542.zip |
- better debug, minor code cleanup
-rw-r--r-- | src/mesh/gnunet-service-mesh.c | 4 | ||||
-rw-r--r-- | src/mesh/mesh_block_lib.c | 2 | ||||
-rw-r--r-- | src/mesh/test_mesh_2dtorus.conf | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index a17aaa649..5bc13880e 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c | |||
@@ -1390,7 +1390,7 @@ regex_edge_iterator (void *cls, | |||
1390 | current_len = strlen (info->description) - ctx->position; | 1390 | current_len = strlen (info->description) - ctx->position; |
1391 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "* ctlen : %u\n", current_len); | 1391 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "* ctlen : %u\n", current_len); |
1392 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "* tklen : %u\n", len); | 1392 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "* tklen : %u\n", len); |
1393 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "* tk[0] : %c\n", token[0]); | 1393 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "* token : %.*s\n", len, token); |
1394 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "* nextk : %s\n", GNUNET_h2s(key)); | 1394 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "* nextk : %s\n", GNUNET_h2s(key)); |
1395 | if (len > current_len) | 1395 | if (len > current_len) |
1396 | { | 1396 | { |
@@ -1444,7 +1444,7 @@ regex_next_edge (const struct MeshRegexBlock *block, | |||
1444 | ctx->longest_match = 0; | 1444 | ctx->longest_match = 0; |
1445 | result = GNUNET_MESH_regex_block_iterate (block, size, | 1445 | result = GNUNET_MESH_regex_block_iterate (block, size, |
1446 | ®ex_edge_iterator, ctx); | 1446 | ®ex_edge_iterator, ctx); |
1447 | GNUNET_break (GNUNET_OK == result || SIZE_MAX == size); | 1447 | GNUNET_break (GNUNET_OK == result); |
1448 | 1448 | ||
1449 | /* Did anything match? */ | 1449 | /* Did anything match? */ |
1450 | if (0 == ctx->longest_match) | 1450 | if (0 == ctx->longest_match) |
diff --git a/src/mesh/mesh_block_lib.c b/src/mesh/mesh_block_lib.c index 889fb19e0..61d4607e5 100644 --- a/src/mesh/mesh_block_lib.c +++ b/src/mesh/mesh_block_lib.c | |||
@@ -192,7 +192,7 @@ GNUNET_MESH_regex_block_iterate (const struct MeshRegexBlock *block, | |||
192 | // The total size should be exactly the size of (regex + all edges) blocks | 192 | // The total size should be exactly the size of (regex + all edges) blocks |
193 | // If size == -1, block is from cache and therefore previously checked and | 193 | // If size == -1, block is from cache and therefore previously checked and |
194 | // assumed correct. | 194 | // assumed correct. |
195 | if (offset == size || (size_t) -1 == size) | 195 | if (offset == size || SIZE_MAX == size) |
196 | { | 196 | { |
197 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 197 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
198 | "* Block processed, END OK\n"); | 198 | "* Block processed, END OK\n"); |
diff --git a/src/mesh/test_mesh_2dtorus.conf b/src/mesh/test_mesh_2dtorus.conf index 10589e537..0d441416f 100644 --- a/src/mesh/test_mesh_2dtorus.conf +++ b/src/mesh/test_mesh_2dtorus.conf | |||
@@ -15,6 +15,7 @@ ACCEPT_FROM6 = ::1; | |||
15 | ACCEPT_FROM = 127.0.0.1; | 15 | ACCEPT_FROM = 127.0.0.1; |
16 | HOSTNAME = localhost | 16 | HOSTNAME = localhost |
17 | PORT = 10001 | 17 | PORT = 10001 |
18 | DISABLE_TRY_CONNECT = YES | ||
18 | 19 | ||
19 | [nse] | 20 | [nse] |
20 | WORKBITS = 0 | 21 | WORKBITS = 0 |