diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-02-15 17:37:17 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-02-15 17:37:17 +0100 |
commit | 60790f6e89914decc21c850d07aef9be237a6c41 (patch) | |
tree | 466e06ba2c6ba468cc5dfec446349824201073a9 /src/cadet | |
parent | 6bc0d9727ba8d3f57958dab50d571e1d9e6a630f (diff) | |
download | gnunet-60790f6e89914decc21c850d07aef9be237a6c41.tar.gz gnunet-60790f6e89914decc21c850d07aef9be237a6c41.zip |
spell out message types more, use correct conversion direction
Diffstat (limited to 'src/cadet')
-rw-r--r-- | src/cadet/gnunet-service-cadet-new_channel.c | 6 | ||||
-rw-r--r-- | src/cadet/gnunet-service-cadet-new_tunnels.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/cadet/gnunet-service-cadet-new_channel.c b/src/cadet/gnunet-service-cadet-new_channel.c index da9eb3c75..6df6c24cd 100644 --- a/src/cadet/gnunet-service-cadet-new_channel.c +++ b/src/cadet/gnunet-service-cadet-new_channel.c | |||
@@ -859,19 +859,19 @@ GCCH_handle_duplicate_open (struct CadetChannel *ch, | |||
859 | if (NULL == ch->dest) | 859 | if (NULL == ch->dest) |
860 | { | 860 | { |
861 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 861 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
862 | "Ignoring duplicate channel OPEN on %s: port is closed\n", | 862 | "Ignoring duplicate CHANNEL_OPEN on %s: port is closed\n", |
863 | GCCH_2s (ch)); | 863 | GCCH_2s (ch)); |
864 | return; | 864 | return; |
865 | } | 865 | } |
866 | if (NULL != ch->retry_control_task) | 866 | if (NULL != ch->retry_control_task) |
867 | { | 867 | { |
868 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 868 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
869 | "Ignoring duplicate channel OPEN on %s: control message is pending\n", | 869 | "Ignoring duplicate CHANNEL_OPEN on %s: control message is pending\n", |
870 | GCCH_2s (ch)); | 870 | GCCH_2s (ch)); |
871 | return; | 871 | return; |
872 | } | 872 | } |
873 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 873 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
874 | "Retransmitting OPEN_ACK on %s\n", | 874 | "Retransmitting CHANNEL_OPEN_ACK on %s\n", |
875 | GCCH_2s (ch)); | 875 | GCCH_2s (ch)); |
876 | ch->retry_control_task | 876 | ch->retry_control_task |
877 | = GNUNET_SCHEDULER_add_now (&send_open_ack, | 877 | = GNUNET_SCHEDULER_add_now (&send_open_ack, |
diff --git a/src/cadet/gnunet-service-cadet-new_tunnels.c b/src/cadet/gnunet-service-cadet-new_tunnels.c index c14b07ba8..1b7e4d9d3 100644 --- a/src/cadet/gnunet-service-cadet-new_tunnels.c +++ b/src/cadet/gnunet-service-cadet-new_tunnels.c | |||
@@ -1893,7 +1893,7 @@ get_next_free_ctn (struct CadetTunnel *t) | |||
1893 | ctn = ((ctn + 1) & (~ HIGH_BIT)) | highbit; | 1893 | ctn = ((ctn + 1) & (~ HIGH_BIT)) | highbit; |
1894 | } | 1894 | } |
1895 | t->next_ctn.cn = htonl (((ctn + 1) & (~ HIGH_BIT)) | highbit); | 1895 | t->next_ctn.cn = htonl (((ctn + 1) & (~ HIGH_BIT)) | highbit); |
1896 | ret.cn = ntohl (ctn); | 1896 | ret.cn = htonl (ctn); |
1897 | return ret; | 1897 | return ret; |
1898 | } | 1898 | } |
1899 | 1899 | ||
@@ -2706,7 +2706,7 @@ handle_plaintext_channel_open (void *cls, | |||
2706 | if (NULL != ch) | 2706 | if (NULL != ch) |
2707 | { | 2707 | { |
2708 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 2708 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
2709 | "Received duplicate channel OPEN on port %s from %s (%s), resending ACK\n", | 2709 | "Received duplicate channel CHANNEL_OPEN on port %s from %s (%s), resending ACK\n", |
2710 | GNUNET_h2s (&copen->port), | 2710 | GNUNET_h2s (&copen->port), |
2711 | GCT_2s (t), | 2711 | GCT_2s (t), |
2712 | GCCH_2s (ch)); | 2712 | GCCH_2s (ch)); |
@@ -2715,7 +2715,7 @@ handle_plaintext_channel_open (void *cls, | |||
2715 | return; | 2715 | return; |
2716 | } | 2716 | } |
2717 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 2717 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
2718 | "Received channel OPEN on port %s from %s\n", | 2718 | "Received CHANNEL_OPEN on port %s from %s\n", |
2719 | GNUNET_h2s (&copen->port), | 2719 | GNUNET_h2s (&copen->port), |
2720 | GCT_2s (t)); | 2720 | GCT_2s (t)); |
2721 | ch = GCCH_channel_incoming_new (t, | 2721 | ch = GCCH_channel_incoming_new (t, |