From 60790f6e89914decc21c850d07aef9be237a6c41 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 15 Feb 2017 17:37:17 +0100 Subject: [PATCH] spell out message types more, use correct conversion direction --- src/cadet/gnunet-service-cadet-new_channel.c | 6 +++--- 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, if (NULL == ch->dest) { LOG (GNUNET_ERROR_TYPE_DEBUG, - "Ignoring duplicate channel OPEN on %s: port is closed\n", + "Ignoring duplicate CHANNEL_OPEN on %s: port is closed\n", GCCH_2s (ch)); return; } if (NULL != ch->retry_control_task) { LOG (GNUNET_ERROR_TYPE_DEBUG, - "Ignoring duplicate channel OPEN on %s: control message is pending\n", + "Ignoring duplicate CHANNEL_OPEN on %s: control message is pending\n", GCCH_2s (ch)); return; } LOG (GNUNET_ERROR_TYPE_DEBUG, - "Retransmitting OPEN_ACK on %s\n", + "Retransmitting CHANNEL_OPEN_ACK on %s\n", GCCH_2s (ch)); ch->retry_control_task = 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) ctn = ((ctn + 1) & (~ HIGH_BIT)) | highbit; } t->next_ctn.cn = htonl (((ctn + 1) & (~ HIGH_BIT)) | highbit); - ret.cn = ntohl (ctn); + ret.cn = htonl (ctn); return ret; } @@ -2706,7 +2706,7 @@ handle_plaintext_channel_open (void *cls, if (NULL != ch) { LOG (GNUNET_ERROR_TYPE_DEBUG, - "Received duplicate channel OPEN on port %s from %s (%s), resending ACK\n", + "Received duplicate channel CHANNEL_OPEN on port %s from %s (%s), resending ACK\n", GNUNET_h2s (&copen->port), GCT_2s (t), GCCH_2s (ch)); @@ -2715,7 +2715,7 @@ handle_plaintext_channel_open (void *cls, return; } LOG (GNUNET_ERROR_TYPE_DEBUG, - "Received channel OPEN on port %s from %s\n", + "Received CHANNEL_OPEN on port %s from %s\n", GNUNET_h2s (&copen->port), GCT_2s (t)); ch = GCCH_channel_incoming_new (t, -- 2.25.1