diff options
-rw-r--r-- | src/cadet/cadet_api.c | 25 | ||||
-rw-r--r-- | src/cadet/gnunet-service-cadet.c | 1 | ||||
-rw-r--r-- | src/cadet/gnunet-service-cadet_channel.c | 8 | ||||
-rw-r--r-- | src/cadet/gnunet-service-cadet_core.c | 4 | ||||
-rw-r--r-- | src/dht/plugin_block_dht.c | 15 | ||||
-rw-r--r-- | src/rps/test_rps.conf | 4 |
6 files changed, 33 insertions, 24 deletions
diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c index 3c142a95c..59f0bfe85 100644 --- a/src/cadet/cadet_api.c +++ b/src/cadet/cadet_api.c | |||
@@ -464,6 +464,10 @@ cadet_mq_send_now (void *cls) | |||
464 | } | 464 | } |
465 | ch->allow_send--; | 465 | ch->allow_send--; |
466 | ch->pending_env = NULL; | 466 | ch->pending_env = NULL; |
467 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
468 | "Sending message on channel %s to CADET, new window size is %u\n", | ||
469 | GNUNET_i2s (&ch->peer), | ||
470 | ch->allow_send); | ||
467 | GNUNET_MQ_send (ch->cadet->mq, | 471 | GNUNET_MQ_send (ch->cadet->mq, |
468 | env); | 472 | env); |
469 | GNUNET_MQ_impl_send_continue (ch->mq); | 473 | GNUNET_MQ_impl_send_continue (ch->mq); |
@@ -781,6 +785,11 @@ handle_local_ack (void *cls, | |||
781 | return; | 785 | return; |
782 | } | 786 | } |
783 | ch->allow_send++; | 787 | ch->allow_send++; |
788 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
789 | "Got an ACK on mq channel %X (peer %s); new window size is %u!\n", | ||
790 | ntohl (ch->ccn.channel_of_client), | ||
791 | GNUNET_i2s (&ch->peer), | ||
792 | ch->allow_send); | ||
784 | if (NULL == ch->pending_env) | 793 | if (NULL == ch->pending_env) |
785 | { | 794 | { |
786 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 795 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
@@ -792,9 +801,6 @@ handle_local_ack (void *cls, | |||
792 | } | 801 | } |
793 | if (NULL != ch->mq_cont) | 802 | if (NULL != ch->mq_cont) |
794 | return; /* already working on it! */ | 803 | return; /* already working on it! */ |
795 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
796 | "Got an ACK on mq channel %X, sending pending message!\n", | ||
797 | ntohl (ch->ccn.channel_of_client)); | ||
798 | ch->mq_cont | 804 | ch->mq_cont |
799 | = GNUNET_SCHEDULER_add_now (&cadet_mq_send_now, | 805 | = GNUNET_SCHEDULER_add_now (&cadet_mq_send_now, |
800 | ch); | 806 | ch); |
@@ -992,6 +998,7 @@ check_get_tunnels (void *cls, | |||
992 | { | 998 | { |
993 | size_t esize; | 999 | size_t esize; |
994 | 1000 | ||
1001 | (void) cls; | ||
995 | esize = ntohs (message->size); | 1002 | esize = ntohs (message->size); |
996 | if (sizeof (struct GNUNET_CADET_LocalInfoTunnel) == esize) | 1003 | if (sizeof (struct GNUNET_CADET_LocalInfoTunnel) == esize) |
997 | return GNUNET_OK; | 1004 | return GNUNET_OK; |
@@ -1051,6 +1058,7 @@ check_get_tunnel (void *cls, | |||
1051 | size_t esize; | 1058 | size_t esize; |
1052 | size_t msize; | 1059 | size_t msize; |
1053 | 1060 | ||
1061 | (void) cls; | ||
1054 | /* Verify message sanity */ | 1062 | /* Verify message sanity */ |
1055 | msize = ntohs (msg->header.size); | 1063 | msize = ntohs (msg->header.size); |
1056 | esize = sizeof (struct GNUNET_CADET_LocalInfoTunnel); | 1064 | esize = sizeof (struct GNUNET_CADET_LocalInfoTunnel); |
@@ -1096,7 +1104,6 @@ handle_get_tunnel (void *cls, | |||
1096 | 1104 | ||
1097 | if (NULL == h->info_cb.tunnel_cb) | 1105 | if (NULL == h->info_cb.tunnel_cb) |
1098 | return; | 1106 | return; |
1099 | |||
1100 | ch_n = ntohl (msg->channels); | 1107 | ch_n = ntohl (msg->channels); |
1101 | c_n = ntohl (msg->connections); | 1108 | c_n = ntohl (msg->connections); |
1102 | 1109 | ||
@@ -1191,13 +1198,8 @@ destroy_channel_cb (void *cls, | |||
1191 | /* struct GNUNET_CADET_Handle *handle = cls; */ | 1198 | /* struct GNUNET_CADET_Handle *handle = cls; */ |
1192 | struct GNUNET_CADET_Channel *ch = value; | 1199 | struct GNUNET_CADET_Channel *ch = value; |
1193 | 1200 | ||
1194 | if (ntohl (ch->ccn.channel_of_client) >= GNUNET_CADET_LOCAL_CHANNEL_ID_CLI) | 1201 | (void) cls; |
1195 | { | 1202 | (void) cid; |
1196 | GNUNET_break (0); | ||
1197 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
1198 | "channel %X not destroyed\n", | ||
1199 | ntohl (ch->ccn.channel_of_client)); | ||
1200 | } | ||
1201 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 1203 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
1202 | "Destroying channel due to GNUNET_CADET_disconnect()\n"); | 1204 | "Destroying channel due to GNUNET_CADET_disconnect()\n"); |
1203 | destroy_channel (ch); | 1205 | destroy_channel (ch); |
@@ -1222,6 +1224,7 @@ destroy_port_cb (void *cls, | |||
1222 | /* struct GNUNET_CADET_Handle *handle = cls; */ | 1224 | /* struct GNUNET_CADET_Handle *handle = cls; */ |
1223 | struct GNUNET_CADET_Port *port = value; | 1225 | struct GNUNET_CADET_Port *port = value; |
1224 | 1226 | ||
1227 | (void) cls; | ||
1225 | /* This is a warning, the app should have cleanly closed all open ports */ | 1228 | /* This is a warning, the app should have cleanly closed all open ports */ |
1226 | GNUNET_break (0); | 1229 | GNUNET_break (0); |
1227 | GNUNET_CADET_close_port (port); | 1230 | GNUNET_CADET_close_port (port); |
diff --git a/src/cadet/gnunet-service-cadet.c b/src/cadet/gnunet-service-cadet.c index 20e4c363e..23a4bc247 100644 --- a/src/cadet/gnunet-service-cadet.c +++ b/src/cadet/gnunet-service-cadet.c | |||
@@ -763,6 +763,7 @@ handle_local_data (void *cls, | |||
763 | buf, | 763 | buf, |
764 | payload_size)) | 764 | payload_size)) |
765 | { | 765 | { |
766 | GNUNET_break (0); | ||
766 | GNUNET_SERVICE_client_drop (c->client); | 767 | GNUNET_SERVICE_client_drop (c->client); |
767 | return; | 768 | return; |
768 | } | 769 | } |
diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c index 7a7942dea..2d8d36c6c 100644 --- a/src/cadet/gnunet-service-cadet_channel.c +++ b/src/cadet/gnunet-service-cadet_channel.c | |||
@@ -1279,8 +1279,7 @@ GCCH_handle_channel_plaintext_data (struct CadetChannel *ch, | |||
1279 | uint32_t delta; | 1279 | uint32_t delta; |
1280 | 1280 | ||
1281 | GNUNET_assert (GNUNET_NO == ch->is_loopback); | 1281 | GNUNET_assert (GNUNET_NO == ch->is_loopback); |
1282 | if ( (GNUNET_YES == ch->destroy) && | 1282 | if ( (NULL == ch->owner) && |
1283 | (NULL == ch->owner) && | ||
1284 | (NULL == ch->dest) ) | 1283 | (NULL == ch->dest) ) |
1285 | { | 1284 | { |
1286 | /* This client is gone, but we still have messages to send to | 1285 | /* This client is gone, but we still have messages to send to |
@@ -1290,8 +1289,9 @@ GCCH_handle_channel_plaintext_data (struct CadetChannel *ch, | |||
1290 | "Dropping incoming payload on %s as this end is already closed\n", | 1289 | "Dropping incoming payload on %s as this end is already closed\n", |
1291 | GCCH_2s (ch)); | 1290 | GCCH_2s (ch)); |
1292 | /* send back DESTROY notification to stop further retransmissions! */ | 1291 | /* send back DESTROY notification to stop further retransmissions! */ |
1293 | GCT_send_channel_destroy (ch->t, | 1292 | if (GNUNET_YES == ch->destroy) |
1294 | ch->ctn); | 1293 | GCT_send_channel_destroy (ch->t, |
1294 | ch->ctn); | ||
1295 | return; | 1295 | return; |
1296 | } | 1296 | } |
1297 | payload_size = ntohs (msg->header.size) - sizeof (*msg); | 1297 | payload_size = ntohs (msg->header.size) - sizeof (*msg); |
diff --git a/src/cadet/gnunet-service-cadet_core.c b/src/cadet/gnunet-service-cadet_core.c index 06d1fe3cc..65738504e 100644 --- a/src/cadet/gnunet-service-cadet_core.c +++ b/src/cadet/gnunet-service-cadet_core.c | |||
@@ -653,7 +653,7 @@ timeout_cb (void *cls) | |||
653 | NULL); | 653 | NULL); |
654 | return; | 654 | return; |
655 | } | 655 | } |
656 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 656 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
657 | "Sending BROKEN due to timeout (%s was last use, %s linger)\n", | 657 | "Sending BROKEN due to timeout (%s was last use, %s linger)\n", |
658 | GNUNET_STRINGS_absolute_time_to_string (r->last_use), | 658 | GNUNET_STRINGS_absolute_time_to_string (r->last_use), |
659 | GNUNET_STRINGS_relative_time_to_string (linger, | 659 | GNUNET_STRINGS_relative_time_to_string (linger, |
@@ -715,7 +715,7 @@ dir_ready_cb (void *cls, | |||
715 | return; | 715 | return; |
716 | } | 716 | } |
717 | odir = (dir == &route->next) ? &route->prev : &route->next; | 717 | odir = (dir == &route->next) ? &route->prev : &route->next; |
718 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 718 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
719 | "Sending BROKEN due to MQ going down\n"); | 719 | "Sending BROKEN due to MQ going down\n"); |
720 | send_broken (&route->next, | 720 | send_broken (&route->next, |
721 | &route->cid, | 721 | &route->cid, |
diff --git a/src/dht/plugin_block_dht.c b/src/dht/plugin_block_dht.c index 24f8b21b2..9f2861b50 100644 --- a/src/dht/plugin_block_dht.c +++ b/src/dht/plugin_block_dht.c | |||
@@ -66,7 +66,8 @@ block_plugin_dht_create_group (void *cls, | |||
66 | guard = va_arg (va, const char *); | 66 | guard = va_arg (va, const char *); |
67 | if (0 == strcmp (guard, | 67 | if (0 == strcmp (guard, |
68 | "seen-set-size")) | 68 | "seen-set-size")) |
69 | bf_size = GNUNET_BLOCK_GROUP_compute_bloomfilter_size (va_arg (va, unsigned int), | 69 | bf_size = GNUNET_BLOCK_GROUP_compute_bloomfilter_size (va_arg (va, |
70 | unsigned int), | ||
70 | BLOOMFILTER_K); | 71 | BLOOMFILTER_K); |
71 | else if (0 == strcmp (guard, | 72 | else if (0 == strcmp (guard, |
72 | "filter-size")) | 73 | "filter-size")) |
@@ -183,14 +184,17 @@ block_plugin_dht_get_key (void *cls, | |||
183 | return GNUNET_SYSERR; | 184 | return GNUNET_SYSERR; |
184 | if (block_size < sizeof (struct GNUNET_MessageHeader)) | 185 | if (block_size < sizeof (struct GNUNET_MessageHeader)) |
185 | { | 186 | { |
186 | GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "block-dht", | 187 | GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, |
187 | _("Block not of type %u\n"), GNUNET_BLOCK_TYPE_DHT_HELLO); | 188 | "block-dht", |
189 | _("Block not of type %u\n"), | ||
190 | GNUNET_BLOCK_TYPE_DHT_HELLO); | ||
188 | return GNUNET_NO; | 191 | return GNUNET_NO; |
189 | } | 192 | } |
190 | msg = block; | 193 | msg = block; |
191 | if (block_size != ntohs (msg->size)) | 194 | if (block_size != ntohs (msg->size)) |
192 | { | 195 | { |
193 | GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "block-dht", | 196 | GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, |
197 | "block-dht", | ||
194 | _("Size mismatch for block\n"), | 198 | _("Size mismatch for block\n"), |
195 | GNUNET_BLOCK_TYPE_DHT_HELLO); | 199 | GNUNET_BLOCK_TYPE_DHT_HELLO); |
196 | return GNUNET_NO; | 200 | return GNUNET_NO; |
@@ -200,7 +204,8 @@ block_plugin_dht_get_key (void *cls, | |||
200 | pid = (struct GNUNET_PeerIdentity *) key; | 204 | pid = (struct GNUNET_PeerIdentity *) key; |
201 | if (GNUNET_OK != GNUNET_HELLO_get_id (hello, pid)) | 205 | if (GNUNET_OK != GNUNET_HELLO_get_id (hello, pid)) |
202 | { | 206 | { |
203 | GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "block-dht", | 207 | GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, |
208 | "block-dht", | ||
204 | _("Block of type %u is malformed\n"), | 209 | _("Block of type %u is malformed\n"), |
205 | GNUNET_BLOCK_TYPE_DHT_HELLO); | 210 | GNUNET_BLOCK_TYPE_DHT_HELLO); |
206 | return GNUNET_NO; | 211 | return GNUNET_NO; |
diff --git a/src/rps/test_rps.conf b/src/rps/test_rps.conf index f171335d6..cf6b3150c 100644 --- a/src/rps/test_rps.conf +++ b/src/rps/test_rps.conf | |||
@@ -29,7 +29,7 @@ HOSTNAME = localhost | |||
29 | # MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 100 | 29 | # MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 100 |
30 | OVERLAY_TOPOLOGY = CLIQUE | 30 | OVERLAY_TOPOLOGY = CLIQUE |
31 | #OVERLAY_TOPOLOGY = SMALL_WORLD | 31 | #OVERLAY_TOPOLOGY = SMALL_WORLD |
32 | #SCALE_FREE_TOPOLOGY_CAP = | 32 | #SCALE_FREE_TOPOLOGY_CAP = |
33 | 33 | ||
34 | # OVERLAY_RANDOM_LINKS = 25 | 34 | # OVERLAY_RANDOM_LINKS = 25 |
35 | 35 | ||
@@ -74,6 +74,7 @@ DISABLE_TRY_CONNECT = YES | |||
74 | [cadet] | 74 | [cadet] |
75 | DISABLE_TRY_CONNECT = YES | 75 | DISABLE_TRY_CONNECT = YES |
76 | #OPTIONS=-l /tmp/rps_profiler_logs/cadet-[]-%Y-%m-%d.log | 76 | #OPTIONS=-l /tmp/rps_profiler_logs/cadet-[]-%Y-%m-%d.log |
77 | #PREFIX = valgrind | ||
77 | 78 | ||
78 | #[arm] | 79 | #[arm] |
79 | #GLOBAL_POSTFIX=-l /tmp/rps_profiler_logs/other-[]-%Y-%m-%d.log | 80 | #GLOBAL_POSTFIX=-l /tmp/rps_profiler_logs/other-[]-%Y-%m-%d.log |
@@ -120,4 +121,3 @@ AUTOSTART = NO | |||
120 | [fs] | 121 | [fs] |
121 | FORCESTART = NO | 122 | FORCESTART = NO |
122 | AUTOSTART = NO | 123 | AUTOSTART = NO |
123 | |||