From 98b1662426f743a0f234db47fc6d0e441a6cf09a Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Tue, 15 Nov 2011 16:14:19 +0000 Subject: debug messages need to print correct address format --- src/transport/plugin_transport_http_server.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c index 507cad216..0acfaf60b 100644 --- a/src/transport/plugin_transport_http_server.c +++ b/src/transport/plugin_transport_http_server.c @@ -290,10 +290,11 @@ server_receive_mst_cb (void *cls, void *client, if (delay.rel_value > 0) { -#if VERBOSE_CLIENT +#if VERBOSE_SERVER GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, "Server: peer `%s' address `%s' next read delayed for %llu ms\n", - GNUNET_i2s (&s->target), GNUNET_a2s (s->addr, s->addrlen), + GNUNET_i2s (&s->target), + http_plugin_address_to_string (NULL, s->addr, s->addrlen), delay); #endif } @@ -654,8 +655,8 @@ server_access_cb (void *cls, struct MHD_Connection *mhd_connection, #if VERBOSE_SERVER GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, "Server: Peer `%s' PUT on address `%s' connected\n", - GNUNET_i2s (&s->target), GNUNET_a2s (s->addr, - s->addrlen)); + GNUNET_i2s (&s->target), + http_plugin_address_to_string (NULL, s->addr, s->addrlen)); #endif return MHD_YES; } @@ -666,8 +667,8 @@ server_access_cb (void *cls, struct MHD_Connection *mhd_connection, #if VERBOSE_SERVER GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, "Server: peer `%s' PUT on address `%s' received %Zu bytes\n", - GNUNET_i2s (&s->target), GNUNET_a2s (s->addr, - s->addrlen), + GNUNET_i2s (&s->target), + http_plugin_address_to_string (NULL,s->addr, s->addrlen), *upload_data_size); #endif struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get (); @@ -760,7 +761,7 @@ server_disconnect_cb (void *cls, struct MHD_Connection *connection, GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name, "Server: %X peer `%s' GET on address `%s' disconnected\n", s->server_send, GNUNET_i2s (&s->target), - GNUNET_a2s (s->addr, s->addrlen)); + http_plugin_address_to_string (NULL, s->addr, s->addrlen)); #endif s->server_send = NULL; @@ -780,7 +781,7 @@ server_disconnect_cb (void *cls, struct MHD_Connection *connection, GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name, "Server: %X peer `%s' PUT on address `%s' disconnected\n", s->server_recv, GNUNET_i2s (&s->target), - GNUNET_a2s (s->addr, s->addrlen)); + http_plugin_address_to_string (NULL, s->addr, s->addrlen)); #endif s->server_recv = NULL; if (s->server_send != NULL) @@ -821,7 +822,8 @@ server_disconnect_cb (void *cls, struct MHD_Connection *connection, #if VERBOSE_SERVER GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, "Server: peer `%s' on address `%s' disconnected\n", - GNUNET_i2s (&s->target), GNUNET_a2s (s->addr, s->addrlen)); + GNUNET_i2s (&s->target), + http_plugin_address_to_string (NULL, s->addr, s->addrlen)); #endif if (s->msg_tk != NULL) { -- cgit v1.2.3