From 716af5857b059047ddeca165307c9d197f82292d Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Mon, 17 Mar 2014 15:27:09 +0000 Subject: [PATCH] no set_state to DISCONNECT_FINISHED required before free_neighbour fixing log output --- .../gnunet-service-transport_clients.c | 4 ++-- .../gnunet-service-transport_neighbours.c | 21 +++++++------------ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/transport/gnunet-service-transport_clients.c b/src/transport/gnunet-service-transport_clients.c index b695ca416..10da37088 100644 --- a/src/transport/gnunet-service-transport_clients.c +++ b/src/transport/gnunet-service-transport_clients.c @@ -809,8 +809,8 @@ clients_handle_request_connect (void *cls, struct GNUNET_SERVER_Client *client, } else { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received a request connect message for peer `%s'\n", + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + _("Received a request connect message for peer `%s'\n"), GNUNET_i2s (&trcm->peer)); (void) GST_blacklist_test_allowed (&trcm->peer, NULL, &try_connect_if_allowed, diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index c88b9248f..db2adccab 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c @@ -832,7 +832,7 @@ free_neighbour (struct NeighbourMapEntry *n, struct GNUNET_HELLO_Address *backup_primary; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Freeing neighbur state of peer `%s'\n", + "Freeing neighbour state of peer `%s'\n", GNUNET_i2s (&n->id)); n->is_active = NULL; /* always free'd by its own continuation! */ @@ -854,6 +854,7 @@ free_neighbour (struct NeighbourMapEntry *n, GNUNET_NO); disconnect_notify_cb (callback_cls, &n->id); } + /* Mark peer as disconnected */ set_state (n, GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED); if (NULL != n->primary_address.address) @@ -2504,7 +2505,7 @@ switch_address_bl_check_cont (void *cls, if (result == GNUNET_NO) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Blacklist denied to switch to suggested address `%s' sesion %p for peer `%s'\n", + "Blacklist denied to switch to suggested address `%s' session %p for peer `%s'\n", GST_plugins_a2s (blc_ctx->address), blc_ctx->session, GNUNET_i2s (&blc_ctx->address->peer)); @@ -2519,8 +2520,8 @@ switch_address_bl_check_cont (void *cls, return; } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Blacklist accepted to switch to suggested address `%s' for peer `%s'\n", + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Blacklist accepted to switch to suggested address `%s' session %p for peer `%s'\n", GST_plugins_a2s (blc_ctx->address), blc_ctx->session, GNUNET_i2s (&blc_ctx->address->peer)); @@ -2536,7 +2537,8 @@ switch_address_bl_check_cont (void *cls, { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Failed to obtain new session for peer `%s' and address '%s'\n", - GNUNET_i2s (&blc_ctx->address->peer), GST_plugins_a2s (blc_ctx->address)); + GNUNET_i2s (&blc_ctx->address->peer), + GST_plugins_a2s (blc_ctx->address)); GNUNET_ATS_address_destroyed (GST_ats, blc_ctx->address, NULL); return; } @@ -2949,7 +2951,7 @@ master_task (void *cls, n->task = GNUNET_SCHEDULER_NO_TASK; delay = GNUNET_TIME_absolute_get_remaining (n->timeout); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Master task runs for neighbour `%s' in state %s with timeout in %s\n", GNUNET_i2s (&n->id), GNUNET_TRANSPORT_ps2s(n->state), @@ -2960,7 +2962,6 @@ master_task (void *cls, case GNUNET_TRANSPORT_PS_NOT_CONNECTED: /* invalid state for master task, clean up */ GNUNET_break (0); - set_state (n, GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED); free_neighbour (n, GNUNET_NO); return; case GNUNET_TRANSPORT_PS_INIT_ATS: @@ -2969,7 +2970,6 @@ master_task (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Connection to `%s' timed out waiting for ATS to provide address\n", GNUNET_i2s (&n->id)); - set_state (n, GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED); free_neighbour (n, GNUNET_NO); return; } @@ -2980,7 +2980,6 @@ master_task (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connection to `%s' timed out waiting for BLACKLIST to approve address\n", GNUNET_i2s (&n->id)); - set_state (n, GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED); free_neighbour (n, GNUNET_NO); return; } @@ -3007,7 +3006,6 @@ master_task (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connection to `%s' timed out waiting BLACKLIST to approve address to use for received CONNECT\n", GNUNET_i2s (&n->id)); - set_state (n, GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED); free_neighbour (n, GNUNET_NO); return; } @@ -3018,7 +3016,6 @@ master_task (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connection to `%s' timed out waiting ATS to provide address to use for CONNECT_ACK\n", GNUNET_i2s (&n->id)); - set_state (n, GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED); free_neighbour (n, GNUNET_NO); return; } @@ -3029,7 +3026,6 @@ master_task (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connection to `%s' timed out waiting BLACKLIST to approve address to use for CONNECT_ACK\n", GNUNET_i2s (&n->id)); - set_state (n, GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED); free_neighbour (n, GNUNET_NO); return; } @@ -3852,7 +3848,6 @@ disconnect_all_neighbours (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting peer `%4s', %s\n", GNUNET_i2s (&n->id), "SHUTDOWN_TASK"); - set_state (n, GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED); free_neighbour (n, GNUNET_NO); return GNUNET_OK; } -- 2.25.1