diff options
Diffstat (limited to 'src/cadet')
-rw-r--r-- | src/cadet/gnunet-service-cadet_channel.c | 10 | ||||
-rw-r--r-- | src/cadet/gnunet-service-cadet_core.c | 4 | ||||
-rw-r--r-- | src/cadet/gnunet-service-cadet_dht.c | 4 | ||||
-rw-r--r-- | src/cadet/gnunet-service-cadet_tunnels.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c index dab53b8c4..ae6d21452 100644 --- a/src/cadet/gnunet-service-cadet_channel.c +++ b/src/cadet/gnunet-service-cadet_channel.c | |||
@@ -442,7 +442,7 @@ GCCH_2s (const struct CadetChannel *ch) | |||
442 | ? "loopback" | 442 | ? "loopback" |
443 | : GNUNET_i2s (GCP_get_id (GCT_get_destination (ch->t))), | 443 | : GNUNET_i2s (GCP_get_id (GCT_get_destination (ch->t))), |
444 | GNUNET_h2s (&ch->port), | 444 | GNUNET_h2s (&ch->port), |
445 | ch->ctn, | 445 | ch->ctn.cn, |
446 | (NULL == ch->owner) | 446 | (NULL == ch->owner) |
447 | ? 0 | 447 | ? 0 |
448 | : ntohl (ch->owner->ccn.channel_of_client), | 448 | : ntohl (ch->owner->ccn.channel_of_client), |
@@ -1899,10 +1899,10 @@ GCCH_handle_local_data (struct CadetChannel *ch, | |||
1899 | GNUNET_memcpy (&crm->data_message[1], buf, buf_len); | 1899 | GNUNET_memcpy (&crm->data_message[1], buf, buf_len); |
1900 | GNUNET_CONTAINER_DLL_insert_tail (ch->head_sent, ch->tail_sent, crm); | 1900 | GNUNET_CONTAINER_DLL_insert_tail (ch->head_sent, ch->tail_sent, crm); |
1901 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1901 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1902 | "Sending message %u from local client to %s with %u bytes\n", | 1902 | "Sending message %u from local client to %s with %lu bytes\n", |
1903 | ntohl (crm->data_message->mid.mid), | 1903 | ntohl (crm->data_message->mid.mid), |
1904 | GCCH_2s (ch), | 1904 | GCCH_2s (ch), |
1905 | buf_len); | 1905 | (unsigned long) buf_len); |
1906 | if (NULL != ch->retry_data_task) | 1906 | if (NULL != ch->retry_data_task) |
1907 | { | 1907 | { |
1908 | GNUNET_SCHEDULER_cancel (ch->retry_data_task); | 1908 | GNUNET_SCHEDULER_cancel (ch->retry_data_task); |
@@ -2044,7 +2044,7 @@ GCCH_debug (struct CadetChannel *ch, enum GNUNET_ErrorType level) | |||
2044 | LOG2 (level, "CHN *** DEBUG NULL CHANNEL ***\n"); | 2044 | LOG2 (level, "CHN *** DEBUG NULL CHANNEL ***\n"); |
2045 | return; | 2045 | return; |
2046 | } | 2046 | } |
2047 | LOG2 (level, "CHN %s:%X (%p)\n", GCT_2s (ch->t), ch->ctn, ch); | 2047 | LOG2 (level, "CHN %s:%X (%p)\n", GCT_2s (ch->t), ch->ctn.cn, ch); |
2048 | if (NULL != ch->owner) | 2048 | if (NULL != ch->owner) |
2049 | { | 2049 | { |
2050 | LOG2 (level, | 2050 | LOG2 (level, |
@@ -2062,7 +2062,7 @@ GCCH_debug (struct CadetChannel *ch, enum GNUNET_ErrorType level) | |||
2062 | ntohl (ch->dest->ccn.channel_of_client)); | 2062 | ntohl (ch->dest->ccn.channel_of_client)); |
2063 | } | 2063 | } |
2064 | LOG2 (level, | 2064 | LOG2 (level, |
2065 | "CHN Message IDs recv: %d (%LLX), send: %d\n", | 2065 | "CHN Message IDs recv: %d (%llX), send: %d\n", |
2066 | ntohl (ch->mid_recv.mid), | 2066 | ntohl (ch->mid_recv.mid), |
2067 | (unsigned long long) ch->mid_futures, | 2067 | (unsigned long long) ch->mid_futures, |
2068 | ntohl (ch->mid_send.mid)); | 2068 | ntohl (ch->mid_send.mid)); |
diff --git a/src/cadet/gnunet-service-cadet_core.c b/src/cadet/gnunet-service-cadet_core.c index 9a83fa31d..95a5d3f63 100644 --- a/src/cadet/gnunet-service-cadet_core.c +++ b/src/cadet/gnunet-service-cadet_core.c | |||
@@ -296,7 +296,7 @@ discard_all_from_rung_tail () | |||
296 | while (NULL != (dir = tail->rd_head)) | 296 | while (NULL != (dir = tail->rd_head)) |
297 | { | 297 | { |
298 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 298 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
299 | "Queue full due new message %s on connection %s, dropping old message\n", | 299 | "Queue full due new message on connection %s, dropping old message\n", |
300 | GNUNET_sh2s (&dir->my_route->cid.connection_of_tunnel)); | 300 | GNUNET_sh2s (&dir->my_route->cid.connection_of_tunnel)); |
301 | GNUNET_STATISTICS_update (stats, | 301 | GNUNET_STATISTICS_update (stats, |
302 | "# messages dropped due to full buffer", | 302 | "# messages dropped due to full buffer", |
@@ -408,7 +408,7 @@ route_message (struct CadetPeer *prev, | |||
408 | { | 408 | { |
409 | /* We are in the highest rung, drop our own! */ | 409 | /* We are in the highest rung, drop our own! */ |
410 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 410 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
411 | "Queue full due new message %s on connection %s, dropping old message\n", | 411 | "Queue full due new message on connection %s, dropping old message\n", |
412 | GNUNET_sh2s (&dir->my_route->cid.connection_of_tunnel)); | 412 | GNUNET_sh2s (&dir->my_route->cid.connection_of_tunnel)); |
413 | GNUNET_STATISTICS_update (stats, | 413 | GNUNET_STATISTICS_update (stats, |
414 | "# messages dropped due to full buffer", | 414 | "# messages dropped due to full buffer", |
diff --git a/src/cadet/gnunet-service-cadet_dht.c b/src/cadet/gnunet-service-cadet_dht.c index 4e8ccbb08..e1bbeb2c3 100644 --- a/src/cadet/gnunet-service-cadet_dht.c +++ b/src/cadet/gnunet-service-cadet_dht.c | |||
@@ -195,8 +195,8 @@ announce_id (void *cls) | |||
195 | &my_full_id, | 195 | &my_full_id, |
196 | sizeof(my_full_id)); | 196 | sizeof(my_full_id)); |
197 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 197 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
198 | "Announcing my HELLO (%u bytes) in the DHT\n", | 198 | "Announcing my HELLO (%lu bytes) in the DHT\n", |
199 | size); | 199 | (unsigned long) size); |
200 | GNUNET_DHT_put (dht_handle, /* DHT handle */ | 200 | GNUNET_DHT_put (dht_handle, /* DHT handle */ |
201 | &phash, /* Key to use */ | 201 | &phash, /* Key to use */ |
202 | dht_replication_level, /* Replication level */ | 202 | dht_replication_level, /* Replication level */ |
diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c index 2ca46b5aa..78bc54a5c 100644 --- a/src/cadet/gnunet-service-cadet_tunnels.c +++ b/src/cadet/gnunet-service-cadet_tunnels.c | |||
@@ -2431,7 +2431,7 @@ connection_ready_cb (void *cls, | |||
2431 | { | 2431 | { |
2432 | case CADET_TUNNEL_KEY_UNINITIALIZED: | 2432 | case CADET_TUNNEL_KEY_UNINITIALIZED: |
2433 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 2433 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
2434 | "Do not begin KX for %s if WE have no channels waiting. Retrying after %d\n", | 2434 | "Do not begin KX for %s if WE have no channels waiting. Retrying after %llu\n", |
2435 | GCT_2s (t), | 2435 | GCT_2s (t), |
2436 | GNUNET_TIME_absolute_get_remaining (t->next_kx_attempt).rel_value_us); | 2436 | GNUNET_TIME_absolute_get_remaining (t->next_kx_attempt).rel_value_us); |
2437 | /* Do not begin KX if WE have no channels waiting! */ | 2437 | /* Do not begin KX if WE have no channels waiting! */ |