diff options
author | Bart Polot <bart@net.in.tum.de> | 2012-08-21 16:12:29 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2012-08-21 16:12:29 +0000 |
commit | 743161ad14a85e7a9a000cca842477e6bc1f6eeb (patch) | |
tree | 7ef8364421902cee38c5bb2e4c123db9ba110af4 /src | |
parent | 913e868e18f756199ed1ea5365ff7fb1a72eeedc (diff) | |
download | gnunet-743161ad14a85e7a9a000cca842477e6bc1f6eeb.tar.gz gnunet-743161ad14a85e7a9a000cca842477e6bc1f6eeb.zip |
- more info on error
Diffstat (limited to 'src')
-rw-r--r-- | src/mesh/gnunet-service-mesh.c | 21 | ||||
-rw-r--r-- | src/mesh/test_mesh_local_traffic.c | 4 |
2 files changed, 22 insertions, 3 deletions
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index 2189d611d..61c7dec52 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c | |||
@@ -6893,6 +6893,12 @@ handle_local_to_origin (void *cls, struct GNUNET_SERVER_Client *client, | |||
6893 | t = tunnel_get_by_local_id (c, tid); | 6893 | t = tunnel_get_by_local_id (c, tid); |
6894 | if (NULL == t) | 6894 | if (NULL == t) |
6895 | { | 6895 | { |
6896 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Tunnel %X unknown.\n", tid); | ||
6897 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, " for client %u.\n", c->id); | ||
6898 | if (t->owner == c) | ||
6899 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, " (client is owner)\n"); | ||
6900 | else | ||
6901 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, " (client is leaf)\n"); | ||
6896 | GNUNET_break (0); | 6902 | GNUNET_break (0); |
6897 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); | 6903 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); |
6898 | return; | 6904 | return; |
@@ -6999,6 +7005,12 @@ handle_local_multicast (void *cls, struct GNUNET_SERVER_Client *client, | |||
6999 | if (NULL == t) | 7005 | if (NULL == t) |
7000 | { | 7006 | { |
7001 | GNUNET_break (0); | 7007 | GNUNET_break (0); |
7008 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Tunnel %X unknown.\n", tid); | ||
7009 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, " for client %u.\n", c->id); | ||
7010 | if (t->owner == c) | ||
7011 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, " (client is owner)\n"); | ||
7012 | else | ||
7013 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, " (client is leaf)\n"); GNUNET_break (0); | ||
7002 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); | 7014 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); |
7003 | return; | 7015 | return; |
7004 | } | 7016 | } |
@@ -7078,6 +7090,12 @@ handle_local_ack (void *cls, struct GNUNET_SERVER_Client *client, | |||
7078 | if (NULL == t) | 7090 | if (NULL == t) |
7079 | { | 7091 | { |
7080 | GNUNET_break (0); // FIXME fc | 7092 | GNUNET_break (0); // FIXME fc |
7093 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Tunnel %X unknown.\n", tid); | ||
7094 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, " for client %u.\n", c->id); | ||
7095 | if (t->owner == c) | ||
7096 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, " (client is owner)\n"); | ||
7097 | else | ||
7098 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, " (client is leaf)\n"); | ||
7081 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); | 7099 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); |
7082 | return; | 7100 | return; |
7083 | } | 7101 | } |
@@ -7099,7 +7117,8 @@ handle_local_ack (void *cls, struct GNUNET_SERVER_Client *client, | |||
7099 | tunnel_send_fwd_ack (t, GNUNET_MESSAGE_TYPE_MESH_LOCAL_ACK); | 7117 | tunnel_send_fwd_ack (t, GNUNET_MESSAGE_TYPE_MESH_LOCAL_ACK); |
7100 | } | 7118 | } |
7101 | 7119 | ||
7102 | GNUNET_SERVER_receive_done (client, GNUNET_OK); | 7120 | GNUNET_SERVER_receive_done (client, GNUNET_OK); |
7121 | |||
7103 | return; | 7122 | return; |
7104 | } | 7123 | } |
7105 | 7124 | ||
diff --git a/src/mesh/test_mesh_local_traffic.c b/src/mesh/test_mesh_local_traffic.c index c3e99f84a..749c9cd46 100644 --- a/src/mesh/test_mesh_local_traffic.c +++ b/src/mesh/test_mesh_local_traffic.c | |||
@@ -32,7 +32,7 @@ | |||
32 | 32 | ||
33 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5) | 33 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5) |
34 | 34 | ||
35 | #define TARGET 1000 | 35 | #define TARGET 100000 |
36 | 36 | ||
37 | /** | 37 | /** |
38 | * DIFFERENT TESTS TO RUN | 38 | * DIFFERENT TESTS TO RUN |
@@ -512,7 +512,7 @@ main (int argc, char *argv[]) | |||
512 | FPRINTF (stderr, "\nTest time %llu ms\n", | 512 | FPRINTF (stderr, "\nTest time %llu ms\n", |
513 | (unsigned long long) total_time.rel_value); | 513 | (unsigned long long) total_time.rel_value); |
514 | FPRINTF (stderr, "Test payload bandwidth: %f kb/s\n", | 514 | FPRINTF (stderr, "Test payload bandwidth: %f kb/s\n", |
515 | 4 * 1000.0 / total_time.rel_value); // 4bytes * ms | 515 | total_traffic * 4.0 / total_time.rel_value); // 4bytes * kb/ms |
516 | FPRINTF (stderr, "Test throughput: %f packets/s\n\n", | 516 | FPRINTF (stderr, "Test throughput: %f packets/s\n\n", |
517 | total_traffic * 1000.0 / total_time.rel_value); // 1000 packets * ms | 517 | total_traffic * 1000.0 / total_time.rel_value); // 1000 packets * ms |
518 | GAUGER ("MESH", | 518 | GAUGER ("MESH", |