diff options
Diffstat (limited to 'src/cadet/gnunet-service-cadet_channel.c')
-rw-r--r-- | src/cadet/gnunet-service-cadet_channel.c | 10 |
1 files changed, 5 insertions, 5 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)); |