X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Fgnunet-transport.c;h=bed9bdc8546b782d8039318b0ce88f0b128f38cd;hb=29e6158507a0758192075ac6ece7ba8e75ddc49a;hp=635213c292d9961179221e48353e0c9546380d57;hpb=f1f603c7d0b3f03dca46a4f313472288eb080eb1;p=oweals%2Fgnunet.git diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c index 635213c29..bed9bdc85 100644 --- a/src/transport/gnunet-transport.c +++ b/src/transport/gnunet-transport.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2011-2014 Christian Grothoff (and other contributing authors) + Copyright (C) 2011-2014 GNUnet e.V. GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /** @@ -46,7 +46,7 @@ #define RESOLUTION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) /** - * Timeout for an operations + * Timeout for an operation */ #define OP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) @@ -66,11 +66,6 @@ struct ValidationResolutionContext */ struct ValidationResolutionContext *prev; - /** - * Peer identity - */ - struct GNUNET_PeerIdentity id; - /** * Address to resolve */ @@ -148,11 +143,6 @@ struct PeerResolutionContext */ struct PeerResolutionContext *prev; - /** - * The peer id - */ - struct GNUNET_PeerIdentity id; - /** * address to resolve */ @@ -281,14 +271,9 @@ static struct GNUNET_TRANSPORT_Handle *handle; static struct GNUNET_CONFIGURATION_Handle *cfg; /** - * Try connect handle + * Blacklisting handle */ -struct GNUNET_TRANSPORT_TryConnectHandle *tc_handle; - -/** - * Try disconnect handle - */ -struct GNUNET_TRANSPORT_TryDisconnectHandle *td_handle; +struct GNUNET_TRANSPORT_Blacklist *blacklist; /** * Option -s. @@ -345,15 +330,10 @@ static int monitor_validation; */ static int monitor_plugins; -/** - * Option -C. - */ -static int try_connect; - /** * Option -D. */ -static int try_disconnect; +static int do_disconnect; /** * Option -n. @@ -446,11 +426,6 @@ struct GNUNET_OS_Process *resolver; */ static unsigned int address_resolutions; -/** - * Address resolutions pending in progress - */ -static unsigned int address_resolution_in_progress; - /** * DLL for NAT Test Contexts: head */ @@ -512,15 +487,14 @@ destroy_it (void *cls, * Stops monitoring activity. * * @param cls NULL - * @param tc scheduler context */ static void -shutdown_task (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +shutdown_task (void *cls) { struct GNUNET_TIME_Relative duration; struct ValidationResolutionContext *cur; struct ValidationResolutionContext *next; + struct PeerResolutionContext *rc; end = NULL; if (NULL != op_timeout) @@ -528,11 +502,6 @@ shutdown_task (void *cls, GNUNET_SCHEDULER_cancel (op_timeout); op_timeout = NULL; } - if (NULL != tc_handle) - { - GNUNET_TRANSPORT_try_connect_cancel (tc_handle); - tc_handle = NULL; - } if (NULL != pic) { GNUNET_TRANSPORT_monitor_peers_cancel (pic); @@ -555,12 +524,23 @@ shutdown_task (void *cls, next = cur->next; GNUNET_TRANSPORT_address_to_string_cancel (cur->asc); - GNUNET_CONTAINER_DLL_remove (vc_head, vc_tail, cur); + GNUNET_CONTAINER_DLL_remove (vc_head, + vc_tail, + cur); GNUNET_free (cur->transport); GNUNET_HELLO_address_free (cur->addrcp); GNUNET_free (cur); } - + while (NULL != (rc = rc_head)) + { + GNUNET_CONTAINER_DLL_remove (rc_head, + rc_tail, + rc); + GNUNET_TRANSPORT_address_to_string_cancel (rc->asc); + GNUNET_free (rc->transport); + GNUNET_free (rc->addrcp); + GNUNET_free (rc); + } if (NULL != th) { GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); @@ -603,17 +583,26 @@ shutdown_task (void *cls, GNUNET_CONTAINER_multipeermap_destroy (monitored_plugins); monitored_plugins = NULL; } + if (NULL != blacklist) + { + GNUNET_TRANSPORT_blacklist_cancel (blacklist); + blacklist = NULL; + ret = 0; + } } +/** + * We are done, shut down. + */ static void -operation_timeout (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +operation_timeout (void *cls) { struct PeerResolutionContext *cur; struct PeerResolutionContext *next; + op_timeout = NULL; - if ((try_connect) || (benchmark_send) || (benchmark_receive)) + if ((benchmark_send) || (benchmark_receive)) { FPRINTF (stdout, _("Failed to connect to `%s'\n"), @@ -654,7 +643,7 @@ operation_timeout (void *cls, static void -run_nat_test (); +run_nat_test (void); /** @@ -694,21 +683,11 @@ display_test_result (struct TestContext *tc, tc->name); break; default: + FPRINTF (stderr, + _("Configuration for plugin `%s' did not work!\n"), + tc->name); break; } - - if (GNUNET_YES != result) - { - FPRINTF (stderr, - _("Configuration for plugin `%s' did not work!\n"), - tc->name); - } - else - { - FPRINTF (stderr, - _("Configuration for plugin `%s' is working!\n"), - tc->name); - } if (NULL != tc->tsk) { GNUNET_SCHEDULER_cancel (tc->tsk); @@ -735,6 +714,7 @@ display_test_result (struct TestContext *tc, run_nat_test (); } + /** * Function called by NAT to report the outcome of the nat-test. * Clean up and update GUI. @@ -748,14 +728,14 @@ result_callback (void *cls, { struct TestContext *tc = cls; - display_test_result (tc, result); + display_test_result (tc, + result); } /** * Resolve address we got a validation state for to a string. * - * @param id peer identity the address is for * @param address the address itself * @param numeric #GNUNET_YES to disable DNS, #GNUNET_NO to try reverse lookup * @param last_validation when was the address validated last @@ -764,8 +744,7 @@ result_callback (void *cls, * @param state where are we in the validation state machine */ static void -resolve_validation_address (const struct GNUNET_PeerIdentity *id, - const struct GNUNET_HELLO_Address *address, +resolve_validation_address (const struct GNUNET_HELLO_Address *address, int numeric, struct GNUNET_TIME_Absolute last_validation, struct GNUNET_TIME_Absolute valid_until, @@ -805,7 +784,7 @@ process_validation_string (void *cls, { FPRINTF (stderr, "Failed to convert address for peer `%s' plugin `%s' length %u to string \n", - GNUNET_i2s (&vc->id), + GNUNET_i2s (&vc->addrcp->peer), vc->addrcp->transport_name, (unsigned int) vc->addrcp->address_length); } @@ -826,7 +805,7 @@ process_validation_string (void *cls, FPRINTF (stdout, _("Peer `%s' %s %s\n\t%s%s\n\t%s%s\n\t%s%s\n"), - GNUNET_i2s (&vc->id), + GNUNET_i2s (&vc->addrcp->peer), (GNUNET_OK == res) ? address : "", (monitor_validation) ? GNUNET_TRANSPORT_vs2s (vc->state) : "", "Valid until : ", s_valid, @@ -850,8 +829,7 @@ process_validation_string (void *cls, (note: this should be unnecessary, as transport should fallback to numeric lookup internally if DNS takes too long anyway) */ - resolve_validation_address (&vc->id, - vc->addrcp, + resolve_validation_address (vc->addrcp, GNUNET_NO, vc->last_validation, vc->valid_until, @@ -862,7 +840,7 @@ process_validation_string (void *cls, { FPRINTF (stdout, _("Peer `%s' %s `%s' \n"), - GNUNET_i2s (&vc->id), + GNUNET_i2s (&vc->addrcp->peer), "", GNUNET_TRANSPORT_vs2s (vc->state)); } @@ -892,7 +870,6 @@ process_validation_string (void *cls, /** * Resolve address we got a validation state for to a string. * - * @param id peer identity the address is for * @param address the address itself * @param numeric #GNUNET_YES to disable DNS, #GNUNET_NO to try reverse lookup * @param last_validation when was the address validated last @@ -901,8 +878,7 @@ process_validation_string (void *cls, * @param state where are we in the validation state machine */ static void -resolve_validation_address (const struct GNUNET_PeerIdentity *id, - const struct GNUNET_HELLO_Address *address, +resolve_validation_address (const struct GNUNET_HELLO_Address *address, int numeric, struct GNUNET_TIME_Absolute last_validation, struct GNUNET_TIME_Absolute valid_until, @@ -916,7 +892,6 @@ resolve_validation_address (const struct GNUNET_PeerIdentity *id, GNUNET_CONTAINER_DLL_insert(vc_head, vc_tail, vc); address_resolutions++; - vc->id = (*id); vc->transport = GNUNET_strdup(address->transport_name); vc->addrcp = GNUNET_HELLO_address_copy (address); vc->printed = GNUNET_NO; @@ -938,7 +913,6 @@ resolve_validation_address (const struct GNUNET_PeerIdentity *id, * Resolve address we got a validation state for to a string. * * @param cls NULL - * @param peer peer identity the address is for * @param address the address itself * @param last_validation when was the address validated last * @param valid_until until when is the address valid @@ -947,14 +921,13 @@ resolve_validation_address (const struct GNUNET_PeerIdentity *id, */ static void process_validation_cb (void *cls, - const struct GNUNET_PeerIdentity *peer, const struct GNUNET_HELLO_Address *address, struct GNUNET_TIME_Absolute last_validation, struct GNUNET_TIME_Absolute valid_until, struct GNUNET_TIME_Absolute next_validation, enum GNUNET_TRANSPORT_ValidationState state) { - if ((NULL == peer) && (NULL == address)) + if (NULL == address) { if (monitor_validation) { @@ -963,25 +936,13 @@ process_validation_cb (void *cls, _("Monitor disconnected from transport service. Reconnecting.\n")); return; } - - /* done */ - vic = NULL; - if (NULL != end) - GNUNET_SCHEDULER_cancel (end); - end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); - return; - } - if ((NULL == peer) || (NULL == address)) - { - /* invalid response */ vic = NULL; if (NULL != end) GNUNET_SCHEDULER_cancel (end); end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); return; } - resolve_validation_address (peer, - address, + resolve_validation_address (address, numeric, last_validation, valid_until, @@ -1000,11 +961,12 @@ run_nat_test () (uint16_t) head->adv_port); head->tst = GNUNET_NAT_test_start (cfg, - (0 == strcasecmp (head->name, "udp")) ? GNUNET_NO : GNUNET_YES, - (uint16_t) head->bnd_port, - (uint16_t) head->adv_port, - TIMEOUT, - &result_callback, head); + (0 == strcasecmp (head->name, "udp")) + ? GNUNET_NO : GNUNET_YES, + (uint16_t) head->bnd_port, + (uint16_t) head->adv_port, + TIMEOUT, + &result_callback, head); } @@ -1133,24 +1095,6 @@ notify_connect (void *cls, if (0 != memcmp (&pid, peer, sizeof(struct GNUNET_PeerIdentity))) return; ret = 0; - if (try_connect) - { - /* all done, terminate instantly */ - FPRINTF (stdout, _("Successfully connected to `%s'\n"), - GNUNET_i2s_full (peer)); - ret = 0; - - if (NULL != op_timeout) - { - GNUNET_SCHEDULER_cancel (op_timeout); - op_timeout = NULL; - } - - if (NULL != end) - GNUNET_SCHEDULER_cancel (end); - end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); - return; - } if (benchmark_send) { if (NULL != op_timeout) @@ -1190,25 +1134,6 @@ notify_disconnect (void *cls, if (0 != memcmp (&pid, peer, sizeof(struct GNUNET_PeerIdentity))) return; - if (try_disconnect) - { - /* all done, terminate instantly */ - FPRINTF (stdout, _("Successfully disconnected from `%s'\n"), - GNUNET_i2s_full (peer)); - ret = 0; - - if (NULL != op_timeout) - { - GNUNET_SCHEDULER_cancel (op_timeout); - op_timeout = NULL; - } - - if (NULL != end) - GNUNET_SCHEDULER_cancel (end); - end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); - return; - } - if (NULL != th) { GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); @@ -1305,9 +1230,17 @@ notify_receive (void *cls, } +/** + * Convert address to a printable format. + * + * @param address the address + * @param numeric #GNUNET_YES to convert to numeric format, #GNUNET_NO + * to try to use reverse DNS + * @param state state the peer is in + * @param state_timeout when will the peer's state expire + */ static void -resolve_peer_address (const struct GNUNET_PeerIdentity *id, - const struct GNUNET_HELLO_Address *address, +resolve_peer_address (const struct GNUNET_HELLO_Address *address, int numeric, enum GNUNET_TRANSPORT_PeerState state, struct GNUNET_TIME_Absolute state_timeout); @@ -1374,10 +1307,10 @@ process_peer_string (void *cls, { FPRINTF (stderr, "Failed to convert address for peer `%s' plugin `%s' length %u to string \n", - GNUNET_i2s (&rc->id), + GNUNET_i2s (&rc->addrcp->peer), rc->addrcp->transport_name, (unsigned int) rc->addrcp->address_length); - print_info (&rc->id, + print_info (&rc->addrcp->peer, rc->transport, NULL, rc->state, @@ -1387,7 +1320,7 @@ process_peer_string (void *cls, } if (GNUNET_OK == res) { - print_info (&rc->id, + print_info (&rc->addrcp->peer, rc->transport, address, rc->state, @@ -1400,6 +1333,7 @@ process_peer_string (void *cls, } /* NULL == address, last call, we are done */ + rc->asc = NULL; GNUNET_assert (address_resolutions > 0); address_resolutions--; if (GNUNET_NO == rc->printed) @@ -1410,15 +1344,14 @@ process_peer_string (void *cls, (note: this should not be needed, as transport should fallback to numeric conversion if DNS takes too long) */ - resolve_peer_address (&rc->id, - rc->addrcp, + resolve_peer_address (rc->addrcp, GNUNET_YES, rc->state, rc->state_timeout); } else { - print_info (&rc->id, + print_info (&rc->addrcp->peer, rc->transport, NULL, rc->state, @@ -1442,14 +1375,24 @@ process_peer_string (void *cls, op_timeout = NULL; } ret = 0; - end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); + end = GNUNET_SCHEDULER_add_now (&shutdown_task, + NULL); } } +/** + * Convert address to a printable format and print it + * together with the given state data. + * + * @param address the address + * @param numeric #GNUNET_YES to convert to numeric format, #GNUNET_NO + * to try to use reverse DNS + * @param state state the peer is in + * @param state_timeout when will the peer's state expire + */ static void -resolve_peer_address (const struct GNUNET_PeerIdentity *id, - const struct GNUNET_HELLO_Address *address, +resolve_peer_address (const struct GNUNET_HELLO_Address *address, int numeric, enum GNUNET_TRANSPORT_PeerState state, struct GNUNET_TIME_Absolute state_timeout) @@ -1457,12 +1400,11 @@ resolve_peer_address (const struct GNUNET_PeerIdentity *id, struct PeerResolutionContext *rc; rc = GNUNET_new (struct PeerResolutionContext); - GNUNET_assert(NULL != rc); - GNUNET_CONTAINER_DLL_insert(rc_head, rc_tail, rc); + GNUNET_CONTAINER_DLL_insert (rc_head, + rc_tail, + rc); address_resolutions++; - - rc->id = (*id); - rc->transport = GNUNET_strdup(address->transport_name); + rc->transport = GNUNET_strdup (address->transport_name); rc->addrcp = GNUNET_HELLO_address_copy (address); rc->printed = GNUNET_NO; rc->state = state; @@ -1496,11 +1438,7 @@ process_peer_iteration_cb (void *cls, if (NULL == peer) { /* done */ - address_resolution_in_progress = GNUNET_NO; pic = NULL; - if (NULL != end) - GNUNET_SCHEDULER_cancel (end); - end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); return; } @@ -1517,12 +1455,19 @@ process_peer_iteration_cb (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received address for peer `%s': %s\n", GNUNET_i2s (peer), - address->transport_name); + address ? address->transport_name : ""); if (NULL != address) - resolve_peer_address (peer, address, numeric, state, state_timeout); + resolve_peer_address (address, + numeric, + state, + state_timeout); else - print_info (peer, NULL, NULL, state, state_timeout); + print_info (peer, + NULL, + NULL, + state, + state_timeout); } @@ -1541,9 +1486,69 @@ struct PluginMonitorAddress * Resolved address as string. */ char *str; + + /** + * Last event we got and did not yet print because + * @e str was NULL (address not yet resolved). + */ + struct GNUNET_TRANSPORT_SessionInfo si; }; +/** + * Print information about a plugin monitoring event. + * + * @param addr out internal context + * @param info the monitoring information + */ +static void +print_plugin_event_info (struct PluginMonitorAddress *addr, + const struct GNUNET_TRANSPORT_SessionInfo *info) +{ + const char *state; + + switch (info->state) + { + case GNUNET_TRANSPORT_SS_INIT: + state = "INIT"; + break; + case GNUNET_TRANSPORT_SS_HANDSHAKE: + state = "HANDSHAKE"; + break; + case GNUNET_TRANSPORT_SS_UP: + state = "UP"; + break; + case GNUNET_TRANSPORT_SS_UPDATE: + state = "UPDATE"; + break; + case GNUNET_TRANSPORT_SS_DONE: + state = "DONE"; + break; + default: + state = "UNKNOWN"; + break; + } + fprintf (stdout, + "%s: state %s timeout in %s @ %s%s\n", + GNUNET_i2s (&info->address->peer), + state, + GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (info->session_timeout), + GNUNET_YES), + addr->str, + (info->is_inbound == GNUNET_YES) ? " (INBOUND)" : ""); + fprintf (stdout, + "%s: queue has %3u messages and %6u bytes\n", + GNUNET_i2s (&info->address->peer), + info->num_msg_pending, + info->num_bytes_pending); + if (0 != GNUNET_TIME_absolute_get_remaining (info->receive_delay).rel_value_us) + fprintf (stdout, + "%s: receiving blocked until %s\n", + GNUNET_i2s (&info->address->peer), + GNUNET_STRINGS_absolute_time_to_string (info->receive_delay)); +} + + /** * Function called with a textual representation of an address. This * function will be called several times with different possible @@ -1575,6 +1580,8 @@ address_cb (void *cls, if (NULL != addr->str) return; addr->str = GNUNET_strdup (address); + print_plugin_event_info (addr, + &addr->si); } @@ -1601,7 +1608,6 @@ plugin_monitoring_cb (void *cls, void **session_ctx, const struct GNUNET_TRANSPORT_SessionInfo *info) { - const char *state; struct PluginMonitorAddress *addr; if ( (NULL == info) && @@ -1633,44 +1639,17 @@ plugin_monitoring_cb (void *cls, addr = GNUNET_new (struct PluginMonitorAddress); addr->asc = GNUNET_TRANSPORT_address_to_string (cfg, info->address, - GNUNET_NO, + numeric, GNUNET_TIME_UNIT_FOREVER_REL, &address_cb, addr); *session_ctx = addr; } - switch (info->state) - { - case GNUNET_TRANSPORT_SS_INIT: - state = "INIT"; - break; - case GNUNET_TRANSPORT_SS_HANDSHAKE: - state = "HANDSHAKE"; - break; - case GNUNET_TRANSPORT_SS_UP: - state = "UP"; - break; - case GNUNET_TRANSPORT_SS_UPDATE: - state = "UPDATE"; - break; - case GNUNET_TRANSPORT_SS_DONE: - state = "DONE"; - break; - default: - state = "UNKNOWN"; - break; - } - fprintf (stdout, - "%s: %s %s (# %u/%u b) blocked until %s timeout in %s [%s]\n", - GNUNET_i2s (&info->address->peer), - addr->str, - (info->is_inbound == GNUNET_YES) ? "<-" : ((info->is_inbound == GNUNET_NO) ? "->" : "<>"), - info->num_msg_pending, - info->num_bytes_pending, - GNUNET_STRINGS_absolute_time_to_string (info->receive_delay), - GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (info->session_timeout), - GNUNET_YES), - state); + if (NULL == addr->str) + addr->si = *info; + else + print_plugin_event_info (addr, + info); if (GNUNET_TRANSPORT_SS_DONE == info->state) { if (NULL != addr->asc) @@ -1688,13 +1667,12 @@ plugin_monitoring_cb (void *cls, /** * Function called with information about a peers * - * @param cls closure + * @param cls closure, NULL * @param peer identity of the peer, NULL for final callback when operation done * @param address binary address used to communicate with this peer, * NULL on disconnect or when done * @param state current state this peer is in * @param state_timeout time out for the current state - * */ static void process_peer_monitoring_cb (void *cls, @@ -1719,22 +1697,28 @@ process_peer_monitoring_cb (void *cls, &operation_timeout, NULL); - if (NULL == (m = GNUNET_CONTAINER_multipeermap_get (monitored_peers, peer))) + if (NULL == (m = GNUNET_CONTAINER_multipeermap_get (monitored_peers, + peer))) { m = GNUNET_new (struct MonitoredPeer); - GNUNET_CONTAINER_multipeermap_put (monitored_peers, peer, - m, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); + GNUNET_CONTAINER_multipeermap_put (monitored_peers, + peer, + m, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); } else { if ( (m->state == state) && - (m->state_timeout.abs_value_us == state_timeout.abs_value_us) && - ((NULL == address) && (NULL == m->address))) + (m->state_timeout.abs_value_us == state_timeout.abs_value_us) && + (NULL == address) && + (NULL == m->address) ) { return; /* No real change */ } - if ( (m->state == state) && ((NULL != address) && (NULL != m->address)) && - (0 == GNUNET_HELLO_address_cmp(m->address, address))) + if ( (m->state == state) && + (NULL != address) && + (NULL != m->address) && + (0 == GNUNET_HELLO_address_cmp(m->address, address)) ) return; /* No real change */ } @@ -1749,8 +1733,7 @@ process_peer_monitoring_cb (void *cls, m->state_timeout = state_timeout; if (NULL != address) - resolve_peer_address (peer, - m->address, + resolve_peer_address (m->address, numeric, m->state, m->state_timeout); @@ -1764,73 +1747,23 @@ process_peer_monitoring_cb (void *cls, /** - * Function called with our result of trying to connect to a peer - * using the transport service. Will retry 10 times, and if we still - * fail to connect terminate with an error message. + * Function called with the transport service checking if we + * want to blacklist a peer. Return #GNUNET_SYSERR for the + * peer that we should disconnect from. * * @param cls NULL - * @param result #GNUNET_OK if we connected to the service + * @param cpid peer to check blacklisting for + * @return #GNUNET_OK if the connection is allowed, #GNUNET_SYSERR if not */ -static void -try_connect_cb (void *cls, - const int result) -{ - static int retries = 0; - - tc_handle = NULL; - if (GNUNET_OK == result) - return; - retries++; - if (retries < 10) - { - tc_handle = GNUNET_TRANSPORT_try_connect (handle, - &pid, - &try_connect_cb, - NULL); - return; - } - FPRINTF (stderr, - "%s", - _("Failed to send connect request to transport service\n")); - if (NULL != end) - GNUNET_SCHEDULER_cancel (end); - ret = 1; - end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); -} - - -/** - * Function called with our result of trying to disconnect a peer - * using the transport service. Will retry 10 times, and if we still - * fail to disconnect, terminate with an error message. - * - * @param cls NULL - * @param result #GNUNET_OK if we connected to the service - */ -static void -try_disconnect_cb (void *cls, - const int result) +static int +blacklist_cb (void *cls, + const struct GNUNET_PeerIdentity *cpid) { - static int retries = 0; - - td_handle = NULL; - if (GNUNET_OK == result) - return; - retries++; - if (retries < 10) - { - td_handle = GNUNET_TRANSPORT_try_disconnect (handle, - &pid, - &try_disconnect_cb, - NULL); - return; - } - FPRINTF (stderr, "%s", - _("Failed to send disconnect request to transport service\n")); - if (NULL != end) - GNUNET_SCHEDULER_cancel (end); - ret = 1; - end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); + if (0 == memcmp (cpid, + &pid, + sizeof (struct GNUNET_PeerIdentity))) + return GNUNET_SYSERR; + return GNUNET_OK; } @@ -1854,24 +1787,27 @@ testservice_task (void *cls, return; } - if ((NULL != cpid) - && (GNUNET_OK - != GNUNET_CRYPTO_eddsa_public_key_from_string (cpid, strlen (cpid), - &pid.public_key))) + if ( (NULL != cpid) && + (GNUNET_OK != + GNUNET_CRYPTO_eddsa_public_key_from_string (cpid, + strlen (cpid), + &pid.public_key))) { - FPRINTF (stderr, _("Failed to parse peer identity `%s'\n"), cpid); + FPRINTF (stderr, + _("Failed to parse peer identity `%s'\n"), + cpid); return; } counter = benchmark_send + benchmark_receive + iterate_connections - + monitor_connections + monitor_connects + try_connect + try_disconnect + + + monitor_connections + monitor_connects + do_disconnect + + iterate_validation + monitor_validation + monitor_plugins; if (1 < counter) { FPRINTF (stderr, - _("Multiple operations given. Please choose only one operation: %s, %s, %s, %s, %s, %s %s\n"), - "connect", "benchmark send", "benchmark receive", "information", + _("Multiple operations given. Please choose only one operation: %s, %s, %s, %s, %s, %s %s\n"), + "disconnect", "benchmark send", "benchmark receive", "information", "monitor", "events", "plugins"); return; } @@ -1879,71 +1815,35 @@ testservice_task (void *cls, { FPRINTF (stderr, _("No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"), - "connect", "benchmark send", "benchmark receive", "information", + "disconnect", "benchmark send", "benchmark receive", "information", "monitor", "events", "plugins"); return; } - if (try_connect) /* -C: Connect to peer */ + if (do_disconnect) /* -D: Disconnect from peer */ { if (NULL == cpid) { - FPRINTF (stderr, _("Option `%s' makes no sense without option `%s'.\n"), - "-C", "-p"); - ret = 1; - return; - } - handle = GNUNET_TRANSPORT_connect (cfg, NULL, NULL, ¬ify_receive, - ¬ify_connect, ¬ify_disconnect); - if (NULL == handle) - { - FPRINTF (stderr, "%s", _("Failed to connect to transport service\n")); - ret = 1; - return; - } - tc_handle = GNUNET_TRANSPORT_try_connect (handle, &pid, try_connect_cb, - NULL); - if (NULL == tc_handle) - { - FPRINTF (stderr, "%s", - _("Failed to send request to transport service\n")); - ret = 1; - return; - } - op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT, &operation_timeout, - NULL); - - } - else if (try_disconnect) /* -D: Disconnect from peer */ - { - if (NULL == cpid) - { - FPRINTF (stderr, _("Option `%s' makes no sense without option `%s'.\n"), - "-D", "-p"); - ret = 1; - return; - } - handle = GNUNET_TRANSPORT_connect (cfg, NULL, NULL, ¬ify_receive, - ¬ify_connect, ¬ify_disconnect); - if (NULL == handle) - { - FPRINTF (stderr, "%s", _("Failed to connect to transport service\n")); + FPRINTF (stderr, + _("Option `%s' makes no sense without option `%s'.\n"), + "-D", "-p"); ret = 1; return; } - td_handle = GNUNET_TRANSPORT_try_disconnect (handle, &pid, - &try_disconnect_cb, - NULL); - if (NULL == td_handle) + blacklist = GNUNET_TRANSPORT_blacklist (cfg, + &blacklist_cb, + NULL); + if (NULL == blacklist) { - FPRINTF (stderr, "%s", - _("Failed to send request to transport service\n")); + FPRINTF (stderr, + "%s", + _("Failed to connect to transport service for disconnection\n")); ret = 1; return; } - op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT, &operation_timeout, - NULL); - + FPRINTF (stdout, + "%s", + _("Blacklisting request in place, stop with CTRL-C\n")); } else if (benchmark_send) /* -s: Benchmark sending */ { @@ -1954,7 +1854,9 @@ testservice_task (void *cls, ret = 1; return; } - handle = GNUNET_TRANSPORT_connect (cfg, NULL, NULL, + handle = GNUNET_TRANSPORT_connect (cfg, + NULL, + NULL, ¬ify_receive, ¬ify_connect, ¬ify_disconnect); @@ -1964,17 +1866,6 @@ testservice_task (void *cls, ret = 1; return; } - tc_handle = GNUNET_TRANSPORT_try_connect (handle, - &pid, - &try_connect_cb, - NULL); - if (NULL == tc_handle) - { - FPRINTF (stderr, "%s", - _("Failed to send request to transport service\n")); - ret = 1; - return; - } start_time = GNUNET_TIME_absolute_get (); op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT, &operation_timeout, @@ -1982,8 +1873,12 @@ testservice_task (void *cls, } else if (benchmark_receive) /* -b: Benchmark receiving */ { - handle = GNUNET_TRANSPORT_connect (cfg, NULL, NULL, ¬ify_receive, NULL, - NULL); + handle = GNUNET_TRANSPORT_connect (cfg, + NULL, + NULL, + ¬ify_receive, + NULL, + NULL); if (NULL == handle) { FPRINTF (stderr, "%s", _("Failed to connect to transport service\n")); @@ -1997,19 +1892,21 @@ testservice_task (void *cls, } else if (iterate_connections) /* -i: List information about peers once */ { - address_resolution_in_progress = GNUNET_YES; pic = GNUNET_TRANSPORT_monitor_peers (cfg, (NULL == cpid) ? NULL : &pid, GNUNET_YES, TIMEOUT, &process_peer_iteration_cb, (void *) cfg); - op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT, &operation_timeout, - NULL); + op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT, + &operation_timeout, + NULL); } else if (monitor_connections) /* -m: List information about peers continuously */ { - monitored_peers = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO); - address_resolution_in_progress = GNUNET_YES; - pic = GNUNET_TRANSPORT_monitor_peers (cfg, (NULL == cpid) ? NULL : &pid, - GNUNET_NO, TIMEOUT, - &process_peer_monitoring_cb, (void *) cfg); + monitored_peers = GNUNET_CONTAINER_multipeermap_create (10, + GNUNET_NO); + pic = GNUNET_TRANSPORT_monitor_peers (cfg, + (NULL == cpid) ? NULL : &pid, + GNUNET_NO, + TIMEOUT, + &process_peer_monitoring_cb, NULL); } else if (monitor_plugins) /* -P: List information about plugins continuously */ { @@ -2095,12 +1992,9 @@ main (int argc, char * const *argv) { 'b', "benchmark", NULL, gettext_noop ("measure how fast we are receiving data from all peers (until CTRL-C)"), 0, &GNUNET_GETOPT_set_one, &benchmark_receive }, - { 'C', "connect", - NULL, gettext_noop ("connect to a peer"), 0, - &GNUNET_GETOPT_set_one, &try_connect }, { 'D', "disconnect", NULL, gettext_noop ("disconnect to a peer"), 0, - &GNUNET_GETOPT_set_one, &try_disconnect }, + &GNUNET_GETOPT_set_one, &do_disconnect }, { 'd', "validation", NULL, gettext_noop ("print information for all pending validations "), 0, &GNUNET_GETOPT_set_one, &iterate_validation },