X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Fgnunet-transport.c;h=f90ce90056eed053f4c370b5f7ee8702ba2ced4d;hb=69c3a52cfa679175da8f06bdcb8e2e4195465e44;hp=f9d3ad44ac86b5026f84e3eae572f4f96aff5c6a;hpb=2a35e345a204cb357361406f28e07bf9076cb092;p=oweals%2Fgnunet.git diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c index f9d3ad44a..f90ce9005 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 Christian Grothoff (and other contributing authors) + (C) 2011-2014 Christian Grothoff (and other contributing authors) GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -27,7 +27,6 @@ * This utility can be used to test if a transport mechanism for * GNUnet is properly configured. */ - #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_resolver_service.h" @@ -39,10 +38,223 @@ * How long do we wait for the NAT test to report success? * Should match NAT_SERVER_TIMEOUT in 'nat_test.c'. */ -#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60) +#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20) + +/** + * Timeout for a name resolution + */ #define RESOLUTION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) + +/** + * Timeout for an operations + */ #define OP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) + +/** + * Context to store name resolutions for valiation + */ +struct ValidationResolutionContext +{ + /** + * Next in DLL + */ + struct ValidationResolutionContext *next; + + /** + * Previous in DLL + */ + struct ValidationResolutionContext *prev; + + /** + * Address to resolve + */ + struct GNUNET_HELLO_Address *addrcp; + + /** + * Time of last validation + */ + struct GNUNET_TIME_Absolute last_validation; + + /** + * Address is valid until + */ + struct GNUNET_TIME_Absolute valid_until; + + /** + * Time of next validation + */ + struct GNUNET_TIME_Absolute next_validation; + + /** + * state of validation process + */ + enum GNUNET_TRANSPORT_ValidationState state; + + /** + * Tranport conversion handle + */ + struct GNUNET_TRANSPORT_AddressToStringContext *asc; + + /** + * plugin name + */ + char *transport; + + /** + * was the entry printed + */ + int printed; +}; + +/** + * Struct to store information about peers in monitor mode + */ +struct MonitoredPeer +{ + /** + * State of the peer + */ + enum GNUNET_TRANSPORT_PeerState state; + + /** + * Timeout + */ + struct GNUNET_TIME_Absolute state_timeout; + + /** + * The address to convert + */ + struct GNUNET_HELLO_Address *address; +}; + +/** + * Context to store name resolutions for valiation + */ +struct PeerResolutionContext +{ + /** + * Next in DLL + */ + struct PeerResolutionContext *next; + + /** + * Prev in DLL + */ + struct PeerResolutionContext *prev; + + /** + * The peer id + */ + struct GNUNET_PeerIdentity id; + + /** + * address to resolve + */ + struct GNUNET_HELLO_Address *addrcp; + + /** + * transport conversiion context + */ + struct GNUNET_TRANSPORT_AddressToStringContext *asc; + + /** + * peer state + */ + enum GNUNET_TRANSPORT_PeerState state; + + /** + * state timeout + */ + struct GNUNET_TIME_Absolute state_timeout; + + /** + * transport plugin + */ + char *transport; + + /** + * was the entry printed + */ + int printed; +}; + + +/** + * Context for a plugin test. + */ +struct TestContext +{ + /** + * Previous in DLL + */ + struct TestContext *prev; + + /** + * Next in DLL + */ + struct TestContext *next; + + /** + * Handle to the active NAT test. + */ + struct GNUNET_NAT_Test *tst; + + /** + * Task identifier for the timeout. + */ + struct GNUNET_SCHEDULER_Task * tsk; + + /** + * Name of plugin under test. + */ + char *name; + + /** + * Bound port + */ + unsigned long long bnd_port; + + /** + * Advertised ports + */ + unsigned long long adv_port; + +}; + + +/** + * + */ +enum TestResult +{ + /** + * NAT returned success + */ + NAT_TEST_SUCCESS = GNUNET_OK, + + /** + * NAT returned failure + */ + NAT_TEST_FAIL = GNUNET_NO, + + /** + * NAT returned failure while running test + */ + NAT_TEST_INTERNAL_FAIL = GNUNET_SYSERR, + + /** + * We could not start the test + */ + NAT_TEST_FAILED_TO_START = 2, + + /** + * We had a timeout while running the test + */ + NAT_TEST_TIMEOUT = 3 +}; + + /** * Benchmarking block size in KB */ @@ -64,9 +276,14 @@ static struct GNUNET_TRANSPORT_Handle *handle; static struct GNUNET_CONFIGURATION_Handle *cfg; /** - * Try_connect handle + * Try connect handle */ -struct GNUNET_TRANSPORT_TryConnectHandle * tc_handle; +struct GNUNET_TRANSPORT_TryConnectHandle *tc_handle; + +/** + * Try disconnect handle + */ +struct GNUNET_TRANSPORT_TryDisconnectHandle *td_handle; /** * Option -s. @@ -118,11 +335,21 @@ static int monitor_connections; */ static int monitor_validation; +/** + * Option -P. + */ +static int monitor_plugins; + /** * Option -C. */ static int try_connect; +/** + * Option -D. + */ +static int try_disconnect; + /** * Option -n. */ @@ -164,12 +391,25 @@ static struct GNUNET_TRANSPORT_TransmitHandle *th; static struct GNUNET_CONTAINER_MultiPeerMap *monitored_peers; /** - * + * Map storing information about monitored plugins's sessions. + */ +static struct GNUNET_CONTAINER_MultiPeerMap *monitored_plugins; + +/** + * Handle if we are monitoring peers at the transport level. */ static struct GNUNET_TRANSPORT_PeerMonitoringContext *pic; +/** + * Handle if we are monitoring transport validation activity. + */ static struct GNUNET_TRANSPORT_ValidationMonitoringContext *vic; +/** + * Handle if we are monitoring plugin session activity. + */ +static struct GNUNET_TRANSPORT_PluginMonitor *pm; + /** * Identity of the peer we transmit to / connect to. * (equivalent to 'cpid' string). @@ -179,12 +419,12 @@ static struct GNUNET_PeerIdentity pid; /** * Task scheduled for cleanup / termination of the process. */ -static GNUNET_SCHEDULER_TaskIdentifier end; +static struct GNUNET_SCHEDULER_Task * end; /** * Task for operation timeout */ -static GNUNET_SCHEDULER_TaskIdentifier op_timeout; +static struct GNUNET_SCHEDULER_Task * op_timeout; /** * Selected level of verbosity. @@ -196,11 +436,6 @@ static int verbosity; */ struct GNUNET_OS_Process *resolver; -/** - * Number of tasks running that still need the resolver. - */ -static unsigned int resolver_users; - /** * Number of address resolutions pending */ @@ -211,65 +446,82 @@ static unsigned int address_resolutions; */ static unsigned int address_resolution_in_progress; - /** - * Context for a plugin test. + * DLL for NAT Test Contexts: head */ -struct TestContext -{ +struct TestContext *head; - /** - * Handle to the active NAT test. - */ - struct GNUNET_NAT_Test *tst; +/** + * DLL for NAT Test Contexts: tail + */ +struct TestContext *tail; - /** - * Task identifier for the timeout. - */ - GNUNET_SCHEDULER_TaskIdentifier tsk; +/** + * DLL: head of validation resolution entries + */ +static struct ValidationResolutionContext *vc_head; - /** - * Name of plugin under test. - */ - const char *name; +/** + * DLL: tail of validation resolution entries + */ +static struct ValidationResolutionContext *vc_tail; -}; +/** + * DLL: head of resolution entries + */ +static struct PeerResolutionContext *rc_head; -struct MonitoredPeer -{ - enum GNUNET_TRANSPORT_PeerState state; - struct GNUNET_TIME_Absolute state_timeout; - struct GNUNET_HELLO_Address *address; -}; +/** + * DLL: head of resolution entries + */ +static struct PeerResolutionContext *rc_tail; - int destroy_it (void *cls, - const struct GNUNET_PeerIdentity *key, - void *value) +/** + * Function called to release data stored in the #monitored_peers map. + * + * @param cls unused + * @param key the peer identity + * @param value a `struct MonitoredPeer` to release + * @return #GNUNET_OK (continue to iterate) + */ +static int +destroy_it (void *cls, + const struct GNUNET_PeerIdentity *key, + void *value) { - struct MonitoredPeer *m = value; - GNUNET_CONTAINER_multipeermap_remove (monitored_peers, key, value); - GNUNET_free_non_null (m->address); - GNUNET_free (value); - return GNUNET_OK; + struct MonitoredPeer *m = value; + + GNUNET_assert (GNUNET_OK == + GNUNET_CONTAINER_multipeermap_remove (monitored_peers, + key, + value)); + GNUNET_free_non_null (m->address); + GNUNET_free (value); + return GNUNET_OK; } + /** * Task run in monitor mode when the user presses CTRL-C to abort. * Stops monitoring activity. * - * @param cls the 'struct GNUNET_TRANSPORT_PeerIterateContext *' + * @param cls NULL * @param tc scheduler context */ static void -shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +shutdown_task (void *cls, + const struct GNUNET_SCHEDULER_TaskContext *tc) { struct GNUNET_TIME_Relative duration; - end = GNUNET_SCHEDULER_NO_TASK; - if (GNUNET_SCHEDULER_NO_TASK != op_timeout) + struct ValidationResolutionContext *cur; + struct ValidationResolutionContext *next; + + end = NULL; + if (NULL != op_timeout) { GNUNET_SCHEDULER_cancel (op_timeout); - op_timeout = GNUNET_SCHEDULER_NO_TASK; + op_timeout = NULL; } if (NULL != tc_handle) { @@ -286,6 +538,24 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_TRANSPORT_monitor_validation_entries_cancel (vic); vic = NULL; } + if (NULL != pm) + { + GNUNET_TRANSPORT_monitor_plugins_cancel (pm); + pm = NULL; + } + + next = vc_head; + for (cur = next; NULL != cur; cur = next) + { + next = cur->next; + + GNUNET_TRANSPORT_address_to_string_cancel (cur->asc); + GNUNET_CONTAINER_DLL_remove (vc_head, vc_tail, cur); + GNUNET_free (cur->transport); + GNUNET_HELLO_address_free (cur->addrcp); + GNUNET_free (cur); + } + if (NULL != th) { GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); @@ -299,18 +569,20 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) if (benchmark_send) { duration = GNUNET_TIME_absolute_get_duration (start_time); - FPRINTF (stdout, _("Transmitted %llu bytes/s (%llu bytes in %s)\n"), - 1000LL * 1000LL * traffic_sent / (1 + duration.rel_value_us), - traffic_sent, - GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_YES)); + FPRINTF (stdout, + _("Transmitted %llu bytes/s (%llu bytes in %s)\n"), + 1000LL * 1000LL * traffic_sent / (1 + duration.rel_value_us), + traffic_sent, + GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_YES)); } if (benchmark_receive) { duration = GNUNET_TIME_absolute_get_duration (start_time); - FPRINTF (stdout, _("Received %llu bytes/s (%llu bytes in %s)\n"), - 1000LL * 1000LL * traffic_received / (1 + duration.rel_value_us), - traffic_received, - GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_YES)); + FPRINTF (stdout, + _("Received %llu bytes/s (%llu bytes in %s)\n"), + 1000LL * 1000LL * traffic_received / (1 + duration.rel_value_us), + traffic_received, + GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_YES)); } if (NULL != monitored_peers) @@ -319,57 +591,31 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_CONTAINER_multipeermap_destroy (monitored_peers); monitored_peers = NULL; } + if (NULL != monitored_plugins) + { + GNUNET_break (0 == + GNUNET_CONTAINER_multipeermap_size (monitored_plugins)); + GNUNET_CONTAINER_multipeermap_destroy (monitored_plugins); + monitored_plugins = NULL; + } } -static struct PeerResolutionContext *rc_head; -static struct PeerResolutionContext *rc_tail; - -struct PeerResolutionContext -{ - struct PeerResolutionContext *next; - struct PeerResolutionContext *prev; - struct GNUNET_PeerIdentity id; - struct GNUNET_HELLO_Address *addrcp; - struct GNUNET_TRANSPORT_AddressToStringContext *asc; - enum GNUNET_TRANSPORT_PeerState state; - struct GNUNET_TIME_Absolute state_timeout; - char *transport; - int printed; -}; - -static struct ValidationResolutionContext *vc_head; -static struct ValidationResolutionContext *vc_tail; - -struct ValidationResolutionContext -{ - struct ValidationResolutionContext *next; - struct ValidationResolutionContext *prev; - - struct GNUNET_PeerIdentity id; - struct GNUNET_HELLO_Address *addrcp; - struct GNUNET_TIME_Absolute last_validation; - struct GNUNET_TIME_Absolute valid_until; - struct GNUNET_TIME_Absolute next_validation; - enum GNUNET_TRANSPORT_ValidationState state; - - struct GNUNET_TRANSPORT_AddressToStringContext *asc; - - char *transport; - int printed; -}; static void -operation_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +operation_timeout (void *cls, + const struct GNUNET_SCHEDULER_TaskContext *tc) { struct PeerResolutionContext *cur; struct PeerResolutionContext *next; - op_timeout = GNUNET_SCHEDULER_NO_TASK; + op_timeout = NULL; if ((try_connect) || (benchmark_send) || (benchmark_receive)) { - FPRINTF (stdout, _("Failed to connect to `%s'\n"), GNUNET_i2s_full (&pid)); - if (GNUNET_SCHEDULER_NO_TASK != end) + FPRINTF (stdout, + _("Failed to connect to `%s'\n"), + GNUNET_i2s_full (&pid)); + if (NULL != end) GNUNET_SCHEDULER_cancel (end); - end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL ); + end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); ret = 1; return; } @@ -379,8 +625,9 @@ operation_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) while (NULL != (cur = next)) { next = cur->next; - FPRINTF (stdout, _("Failed to resolve address for peer `%s'\n"), - GNUNET_i2s (&cur->addrcp->peer)); + FPRINTF (stdout, + _("Failed to resolve address for peer `%s'\n"), + GNUNET_i2s (&cur->addrcp->peer)); GNUNET_CONTAINER_DLL_remove(rc_head, rc_tail, cur); GNUNET_TRANSPORT_address_to_string_cancel (cur->asc); @@ -389,16 +636,22 @@ operation_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_free(cur); } - FPRINTF (stdout, "%s", _("Failed to list connections, timeout occured\n") ); - if (GNUNET_SCHEDULER_NO_TASK != end) + FPRINTF (stdout, + "%s", + _("Failed to list connections, timeout occured\n")); + if (NULL != end) GNUNET_SCHEDULER_cancel (end); - end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL ); + end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); ret = 1; return; } - } + +static void +run_nat_test (); + + /** * Display the result of the test. * @@ -406,166 +659,235 @@ operation_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) * @param result #GNUNET_YES on success */ static void -display_test_result (struct TestContext *tc, int result) +display_test_result (struct TestContext *tc, + enum TestResult result) { - 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); + switch (result) { + case NAT_TEST_FAIL: + FPRINTF (stderr, + _("Configuration for plugin `%s' did not work!\n"), + tc->name); + break; + case NAT_TEST_SUCCESS: + FPRINTF (stderr, + _("Configuration for plugin `%s' did work!\n"), + tc->name); + break; + case NAT_TEST_INTERNAL_FAIL: + FPRINTF (stderr, + _("Internal NAT error while running test for plugin `%s'\n"), + tc->name); + break; + case NAT_TEST_FAILED_TO_START: + FPRINTF (stderr, + _("Failed to start NAT test for plugin `%s'\n"), + tc->name); + break; + case NAT_TEST_TIMEOUT: + FPRINTF (stderr, + _("Timeout while waiting for result of NAT test for plugin `%s'\n"), + tc->name); + break; + default: + FPRINTF (stderr, + _("Configuration for plugin `%s' did not work!\n"), + tc->name); + break; } - if (GNUNET_SCHEDULER_NO_TASK != tc->tsk) + if (NULL != tc->tsk) { GNUNET_SCHEDULER_cancel (tc->tsk); - tc->tsk = GNUNET_SCHEDULER_NO_TASK; + tc->tsk = NULL; } if (NULL != tc->tst) { GNUNET_NAT_test_stop (tc->tst); tc->tst = NULL; } - GNUNET_free(tc); - resolver_users--; - if ((0 == resolver_users) && (NULL != resolver)) + + GNUNET_CONTAINER_DLL_remove (head, tail, tc); + GNUNET_free (tc->name); + GNUNET_free (tc); + + if ((NULL == head) && (NULL != resolver)) { - GNUNET_break(0 == GNUNET_OS_process_kill (resolver, GNUNET_TERM_SIG)); + GNUNET_break (0 == GNUNET_OS_process_kill (resolver, + GNUNET_TERM_SIG)); GNUNET_OS_process_destroy (resolver); resolver = NULL; } + if (NULL != head) + run_nat_test (); } /** - * Function called by NAT on success. - * Clean up and update GUI (with success). + * Function called by NAT to report the outcome of the nat-test. + * Clean up and update GUI. * * @param cls test context - * @param success currently always #GNUNET_OK - * @param emsg error message, NULL on success + * @param result status code */ static void -result_callback (void *cls, int success, const char *emsg) +result_callback (void *cls, + enum GNUNET_NAT_StatusCode result) { struct TestContext *tc = cls; - display_test_result (tc, success); + display_test_result (tc, result); } + /** - * Function called if NAT failed to confirm success. - * Clean up and update GUI (with failure). + * Resolve address we got a validation state for to a string. * - * @param cls test context - * @param tc scheduler callback + * @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 + * @param valid_until until when is the address valid + * @param next_validation when will we try to revalidate the address next + * @param state where are we in the validation state machine */ static void -fail_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) -{ - struct TestContext *tstc = cls; - - tstc->tsk = GNUNET_SCHEDULER_NO_TASK; - display_test_result (tstc, GNUNET_NO); -} +resolve_validation_address (const struct GNUNET_HELLO_Address *address, + int numeric, + struct GNUNET_TIME_Absolute last_validation, + struct GNUNET_TIME_Absolute valid_until, + struct GNUNET_TIME_Absolute next_validation, + enum GNUNET_TRANSPORT_ValidationState state); +/** + * Function to call with a textual representation of an address. This + * function will be called several times with different possible + * textual representations, and a last time with @a address being NULL + * to signal the end of the iteration. Note that @a address NULL + * always is the last call, regardless of the value in @a res. + * + * @param cls closure + * @param address NULL on end of iteration, + * otherwise 0-terminated printable UTF-8 string, + * in particular an empty string if @a res is #GNUNET_NO + * @param res result of the address to string conversion: + * if #GNUNET_OK: conversion successful + * if #GNUNET_NO: address was invalid (or not supported) + * if #GNUNET_SYSERR: communication error (IPC error) + */ static void -resolve_validation_address (const struct GNUNET_PeerIdentity *id, - const struct GNUNET_HELLO_Address *address, int numeric, - struct GNUNET_TIME_Absolute last_validation, - struct GNUNET_TIME_Absolute valid_until, - struct GNUNET_TIME_Absolute next_validation, - enum GNUNET_TRANSPORT_ValidationState state); - -static void -process_validation_string (void *cls, const char *address) +process_validation_string (void *cls, + const char *address, + int res) { struct ValidationResolutionContext *vc = cls; char *s_valid; char *s_last; char *s_next; - if (address != NULL ) + if (NULL != address) { + if (GNUNET_SYSERR == res) + { + FPRINTF (stderr, + "Failed to convert address for peer `%s' plugin `%s' length %u to string \n", + GNUNET_i2s (&vc->addrcp->peer), + vc->addrcp->transport_name, + (unsigned int) vc->addrcp->address_length); + } if (GNUNET_TIME_UNIT_ZERO_ABS.abs_value_us == vc->valid_until.abs_value_us) - s_valid = GNUNET_strdup("never"); + s_valid = GNUNET_strdup ("never"); else - s_valid = GNUNET_strdup(GNUNET_STRINGS_absolute_time_to_string (vc->valid_until)); + s_valid = GNUNET_strdup (GNUNET_STRINGS_absolute_time_to_string (vc->valid_until)); if (GNUNET_TIME_UNIT_ZERO_ABS.abs_value_us == vc->last_validation.abs_value_us) - s_last = GNUNET_strdup("never"); + s_last = GNUNET_strdup ("never"); else - s_last = GNUNET_strdup(GNUNET_STRINGS_absolute_time_to_string (vc->last_validation)); + s_last = GNUNET_strdup (GNUNET_STRINGS_absolute_time_to_string (vc->last_validation)); if (GNUNET_TIME_UNIT_ZERO_ABS.abs_value_us == vc->next_validation.abs_value_us) - s_next = GNUNET_strdup("never"); + s_next = GNUNET_strdup ("never"); else - s_next = GNUNET_strdup(GNUNET_STRINGS_absolute_time_to_string (vc->next_validation)); + s_next = GNUNET_strdup (GNUNET_STRINGS_absolute_time_to_string (vc->next_validation)); FPRINTF (stdout, - _("Peer `%s' %s %s\n\t%s%s\n\t%s%s\n\t%s%s\n"), - GNUNET_i2s (&vc->id), address, - (monitor_validation) ? GNUNET_TRANSPORT_vs2s (vc->state) : "", - "Valid until : ", s_valid, - "Last validation: ",s_last, - "Next validation: ", s_next); + _("Peer `%s' %s %s\n\t%s%s\n\t%s%s\n\t%s%s\n"), + GNUNET_i2s (&vc->addrcp->peer), + (GNUNET_OK == res) ? address : "", + (monitor_validation) ? GNUNET_TRANSPORT_vs2s (vc->state) : "", + "Valid until : ", s_valid, + "Last validation: ",s_last, + "Next validation: ", s_next); GNUNET_free (s_valid); GNUNET_free (s_last); GNUNET_free (s_next); vc->printed = GNUNET_YES; + return; } - else + /* last call, we are done */ + GNUNET_assert (address_resolutions > 0); + address_resolutions--; + if ( (GNUNET_SYSERR == res) && + (GNUNET_NO == vc->printed)) { - /* done */ - GNUNET_assert(address_resolutions > 0); - address_resolutions--; - if (GNUNET_NO == vc->printed) + if (numeric == GNUNET_NO) { - if (numeric == GNUNET_NO) - { - /* Failed to resolve address, try numeric lookup */ - resolve_validation_address (&vc->id, vc->addrcp, GNUNET_NO, - vc->last_validation, vc->valid_until, vc->next_validation, - vc->state); - } - else - { - FPRINTF (stdout, _("Peer `%s' %s `%s' \n"), - GNUNET_i2s (&vc->id), "", - GNUNET_TRANSPORT_vs2s (vc->state)); - } + /* Failed to resolve address, try numeric lookup + (note: this should be unnecessary, as + transport should fallback to numeric lookup + internally if DNS takes too long anyway) */ + resolve_validation_address (vc->addrcp, + GNUNET_NO, + vc->last_validation, + vc->valid_until, + vc->next_validation, + vc->state); } - GNUNET_free (vc->transport); - GNUNET_free (vc->addrcp); - GNUNET_CONTAINER_DLL_remove(vc_head, vc_tail, vc); - GNUNET_free(vc); - if ((0 == address_resolutions) && (iterate_validation)) + else { - if (GNUNET_SCHEDULER_NO_TASK != end) - { - GNUNET_SCHEDULER_cancel (end); - end = GNUNET_SCHEDULER_NO_TASK; - } - if (GNUNET_SCHEDULER_NO_TASK != op_timeout) - { - GNUNET_SCHEDULER_cancel (op_timeout); - op_timeout = GNUNET_SCHEDULER_NO_TASK; - } - ret = 0; - end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL ); + FPRINTF (stdout, + _("Peer `%s' %s `%s' \n"), + GNUNET_i2s (&vc->addrcp->peer), + "", + GNUNET_TRANSPORT_vs2s (vc->state)); + } + } + GNUNET_free (vc->transport); + GNUNET_free (vc->addrcp); + GNUNET_CONTAINER_DLL_remove (vc_head, vc_tail, vc); + GNUNET_free (vc); + if ((0 == address_resolutions) && (iterate_validation)) + { + if (NULL != end) + { + GNUNET_SCHEDULER_cancel (end); + end = NULL; } + if (NULL != op_timeout) + { + GNUNET_SCHEDULER_cancel (op_timeout); + op_timeout = NULL; + } + ret = 0; + end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); } } - +/** + * Resolve address we got a validation state for to a string. + * + * @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 + * @param valid_until until when is the address valid + * @param next_validation when will we try to revalidate the address next + * @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, int numeric, - struct GNUNET_TIME_Absolute last_validation, - struct GNUNET_TIME_Absolute valid_until, - struct GNUNET_TIME_Absolute next_validation, - enum GNUNET_TRANSPORT_ValidationState state) +resolve_validation_address (const struct GNUNET_HELLO_Address *address, + int numeric, + struct GNUNET_TIME_Absolute last_validation, + struct GNUNET_TIME_Absolute valid_until, + struct GNUNET_TIME_Absolute next_validation, + enum GNUNET_TRANSPORT_ValidationState state) { struct ValidationResolutionContext *vc; @@ -574,7 +896,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; @@ -584,42 +905,85 @@ resolve_validation_address (const struct GNUNET_PeerIdentity *id, vc->next_validation = next_validation; /* Resolve address to string */ - vc->asc = GNUNET_TRANSPORT_address_to_string (cfg, address, numeric, - RESOLUTION_TIMEOUT, &process_validation_string, vc); + vc->asc = GNUNET_TRANSPORT_address_to_string (cfg, + address, + numeric, + RESOLUTION_TIMEOUT, + &process_validation_string, vc); } -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) +/** + * Resolve address we got a validation state for to a string. + * + * @param cls NULL + * @param address the address itself + * @param last_validation when was the address validated last + * @param valid_until until when is the address valid + * @param next_validation when will we try to revalidate the address next + * @param state where are we in the validation state machine + */ +static void +process_validation_cb (void *cls, + 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) + { + FPRINTF (stdout, + "%s", + _("Monitor disconnected from transport service. Reconnecting.\n")); + return; + } + /* done */ vic = NULL; - if (GNUNET_SCHEDULER_NO_TASK != end) + if (NULL != end) GNUNET_SCHEDULER_cancel (end); - end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL ); + end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); return; } - if ((NULL == peer) || (NULL == address)) + if (NULL == address) { /* invalid response */ vic = NULL; - if (GNUNET_SCHEDULER_NO_TASK != end) + if (NULL != end) GNUNET_SCHEDULER_cancel (end); - end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL ); + end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); return; } - resolve_validation_address (peer, address, - numeric, last_validation, - valid_until, next_validation, state); + resolve_validation_address (address, + numeric, + last_validation, + valid_until, + next_validation, + state); +} + + +static void +run_nat_test () +{ + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Running test for plugin `%s' using bind port %u and advertised port %u \n", + head->name, + (uint16_t) head->bnd_port, + (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); } + /** * Test our plugin's configuration (NAT traversal, etc.). * @@ -640,14 +1004,14 @@ do_test_configuration (const struct GNUNET_CONFIGURATION_Handle *cfg) &plugins)) { FPRINTF (stderr, "%s", _ - ("No transport plugins configured, peer will never communicate\n") ); + ("No transport plugins configured, peer will never communicate\n")); ret = 4; return; } + for (tok = strtok (plugins, " "); tok != NULL ; tok = strtok (NULL, " ")) { char section[12 + strlen (tok)]; - GNUNET_snprintf (section, sizeof(section), "transport-%s", tok); if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg, section, "PORT", @@ -657,37 +1021,39 @@ do_test_configuration (const struct GNUNET_CONFIGURATION_Handle *cfg) _("No port configured for plugin `%s', cannot test it\n"), tok); continue; } - if (GNUNET_OK - != GNUNET_CONFIGURATION_get_value_number (cfg, section, + if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg, section, "ADVERTISED_PORT", &adv_port)) adv_port = bnd_port; - if (NULL == resolver) - { - binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver"); - resolver = GNUNET_OS_start_process (GNUNET_YES, - GNUNET_OS_INHERIT_STD_OUT_AND_ERR, - NULL, NULL, NULL, - binary, - "gnunet-service-resolver", NULL ); - GNUNET_free(binary); - } - resolver_users++; - GNUNET_RESOLVER_connect (cfg); + tc = GNUNET_new (struct TestContext); tc->name = GNUNET_strdup (tok); - tc->tst = GNUNET_NAT_test_start (cfg, - (0 == strcasecmp (tok, "udp")) ? GNUNET_NO : GNUNET_YES, - (uint16_t) bnd_port, (uint16_t) adv_port, &result_callback, tc); - if (NULL == tc->tst) + tc->adv_port = adv_port; + tc->bnd_port = bnd_port; + GNUNET_CONTAINER_DLL_insert_tail (head, tail, tc); + } + GNUNET_free(plugins); + + if ((NULL != head) && (NULL == resolver)) + { + binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver"); + resolver = GNUNET_OS_start_process (GNUNET_YES, + GNUNET_OS_INHERIT_STD_OUT_AND_ERR, + NULL, NULL, NULL, + binary, + "gnunet-service-resolver", NULL); + if (NULL == resolver) { - display_test_result (tc, GNUNET_SYSERR); - continue; + FPRINTF (stderr, _("Failed to start resolver!\n")); + return; } - tc->tsk = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &fail_timeout, tc); + + GNUNET_free(binary); + GNUNET_RESOLVER_connect (cfg); + run_nat_test (); } - GNUNET_free(plugins); } + /** * Function called to notify a client about the socket * begin ready to queue more data. @a buf will be @@ -700,7 +1066,9 @@ do_test_configuration (const struct GNUNET_CONFIGURATION_Handle *cfg) * @return number of bytes written to @a buf */ static size_t -transmit_data (void *cls, size_t size, void *buf) +transmit_data (void *cls, + size_t size, + void *buf) { struct GNUNET_MessageHeader *m = buf; @@ -719,13 +1087,14 @@ transmit_data (void *cls, size_t size, void *buf) th = GNUNET_TRANSPORT_notify_transmit_ready (handle, &pid, BLOCKSIZE * 1024, GNUNET_TIME_UNIT_FOREVER_REL, - &transmit_data, NULL ); + &transmit_data, NULL); if (verbosity > 0) FPRINTF (stdout, _("Transmitting %u bytes to %s\n"), (unsigned int) size, GNUNET_i2s (&pid)); return size; } + /** * Function called to notify transport users that another * peer connected to us. @@ -734,7 +1103,8 @@ transmit_data (void *cls, size_t size, void *buf) * @param peer the peer that connected */ static void -notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer) +notify_connect (void *cls, + const struct GNUNET_PeerIdentity *peer) { if (0 != memcmp (&pid, peer, sizeof(struct GNUNET_PeerIdentity))) return; @@ -746,23 +1116,23 @@ notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer) GNUNET_i2s_full (peer)); ret = 0; - if (GNUNET_SCHEDULER_NO_TASK != op_timeout) + if (NULL != op_timeout) { GNUNET_SCHEDULER_cancel (op_timeout); - op_timeout = GNUNET_SCHEDULER_NO_TASK; + op_timeout = NULL; } - if (GNUNET_SCHEDULER_NO_TASK != end) + if (NULL != end) GNUNET_SCHEDULER_cancel (end); - end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL ); + end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); return; } if (benchmark_send) { - if (GNUNET_SCHEDULER_NO_TASK != op_timeout) + if (NULL != op_timeout) { GNUNET_SCHEDULER_cancel (op_timeout); - op_timeout = GNUNET_SCHEDULER_NO_TASK; + op_timeout = NULL; } if (verbosity > 0) FPRINTF (stdout, @@ -781,6 +1151,7 @@ notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer) } } + /** * Function called to notify transport users that another * peer disconnected from us. @@ -789,11 +1160,31 @@ notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer) * @param peer the peer that disconnected */ static void -notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) +notify_disconnect (void *cls, + const struct GNUNET_PeerIdentity *peer) { 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); @@ -803,12 +1194,13 @@ notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) { FPRINTF (stdout, _("Disconnected from peer `%s' while benchmarking\n"), GNUNET_i2s (&pid)); - if (GNUNET_SCHEDULER_NO_TASK != end) + if (NULL != end) GNUNET_SCHEDULER_cancel (end); return; } } + /** * Function called to notify transport users that another * peer connected to us. @@ -817,16 +1209,22 @@ notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) * @param peer the peer that connected */ static void -monitor_notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer) +monitor_notify_connect (void *cls, + const struct GNUNET_PeerIdentity *peer) { monitor_connect_counter++; struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get (); const char *now_str = GNUNET_STRINGS_absolute_time_to_string (now); - FPRINTF (stdout, _("%24s: %-17s %4s (%u connections in total)\n"), now_str, - _("Connected to"), GNUNET_i2s (peer), monitor_connect_counter); + FPRINTF (stdout, + _("%24s: %-17s %4s (%u connections in total)\n"), + now_str, + _("Connected to"), + GNUNET_i2s (peer), + monitor_connect_counter); } + /** * Function called to notify transport users that another * peer disconnected from us. @@ -835,7 +1233,8 @@ monitor_notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer) * @param peer the peer that disconnected */ static void -monitor_notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) +monitor_notify_disconnect (void *cls, + const struct GNUNET_PeerIdentity *peer) { struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get (); const char *now_str = GNUNET_STRINGS_absolute_time_to_string (now); @@ -843,10 +1242,15 @@ monitor_notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) GNUNET_assert(monitor_connect_counter > 0); monitor_connect_counter--; - FPRINTF (stdout, _("%24s: %-17s %4s (%u connections in total)\n"), now_str, - _("Disconnected from"), GNUNET_i2s (peer), monitor_connect_counter); + FPRINTF (stdout, + _("%24s: %-17s %4s (%u connections in total)\n"), + now_str, + _("Disconnected from"), + GNUNET_i2s (peer), + monitor_connect_counter); } + /** * Function called by the transport for each received message. * @@ -855,16 +1259,19 @@ monitor_notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) * @param message the message */ static void -notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_MessageHeader *message) +notify_receive (void *cls, + const struct GNUNET_PeerIdentity *peer, + const struct GNUNET_MessageHeader *message) { if (benchmark_receive) { if (GNUNET_MESSAGE_TYPE_DUMMY != ntohs (message->type)) return; if (verbosity > 0) - FPRINTF (stdout, _("Received %u bytes from %s\n"), - (unsigned int) ntohs (message->size), GNUNET_i2s (peer)); + FPRINTF (stdout, + _("Received %u bytes from %s\n"), + (unsigned int) ntohs (message->size), + GNUNET_i2s (peer)); if (traffic_received == 0) start_time = GNUNET_TIME_absolute_get (); @@ -873,90 +1280,155 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, } } + static void resolve_peer_address (const struct GNUNET_PeerIdentity *id, - const struct GNUNET_HELLO_Address *address, int numeric, - enum GNUNET_TRANSPORT_PeerState state, - struct GNUNET_TIME_Absolute state_timeout); + const struct GNUNET_HELLO_Address *address, + int numeric, + enum GNUNET_TRANSPORT_PeerState state, + struct GNUNET_TIME_Absolute state_timeout); + static void -print_info (const struct GNUNET_PeerIdentity *id, const char *transport, - const char *addr, enum GNUNET_TRANSPORT_PeerState state, - struct GNUNET_TIME_Absolute state_timeout) +print_info (const struct GNUNET_PeerIdentity *id, + const char *transport, + const char *addr, + enum GNUNET_TRANSPORT_PeerState state, + struct GNUNET_TIME_Absolute state_timeout) { - if ((GNUNET_YES == iterate_all) || (GNUNET_YES == monitor_connections) ) + + if ( ((GNUNET_YES == iterate_connections) && (GNUNET_YES == iterate_all)) || + (GNUNET_YES == monitor_connections)) { - FPRINTF (stdout, _("Peer `%s': %s %s in state `%s' until %s\n"), - GNUNET_i2s (id), - (NULL == transport) ? "" : transport, - (NULL == transport) ? "" : addr, - GNUNET_TRANSPORT_ps2s (state), - GNUNET_STRINGS_absolute_time_to_string (state_timeout)); + FPRINTF (stdout, + _("Peer `%s': %s %s in state `%s' until %s\n"), + GNUNET_i2s (id), + (NULL == transport) ? "" : transport, + (NULL == transport) ? "" : addr, + GNUNET_TRANSPORT_ps2s (state), + GNUNET_STRINGS_absolute_time_to_string (state_timeout)); } - else + else if ( (GNUNET_YES == iterate_connections) && + (GNUNET_TRANSPORT_is_connected(state))) { /* Only connected peers, skip state */ - FPRINTF (stdout, _("Peer `%s': %s %s\n"), GNUNET_i2s (id), transport, addr); + FPRINTF (stdout, + _("Peer `%s': %s %s\n"), + GNUNET_i2s (id), + transport, + addr); } - } + +/** + * Function called with a textual representation of an address. This + * function will be called several times with different possible + * textual representations, and a last time with @a address being NULL + * to signal the end of the iteration. Note that @a address NULL + * always is the last call, regardless of the value in @a res. + * + * @param cls closure + * @param address NULL on end of iteration, + * otherwise 0-terminated printable UTF-8 string, + * in particular an empty string if @a res is #GNUNET_NO + * @param res result of the address to string conversion: + * if #GNUNET_OK: conversion successful + * if #GNUNET_NO: address was invalid (or not supported) + * if #GNUNET_SYSERR: communication error (IPC error) + */ static void -process_peer_string (void *cls, const char *address) +process_peer_string (void *cls, + const char *address, + int res) { struct PeerResolutionContext *rc = cls; - if (address != NULL ) + if (NULL != address) { - print_info (&rc->id, rc->transport, address, rc->state, rc->state_timeout); - rc->printed = GNUNET_YES; + if (GNUNET_SYSERR == res) + { + FPRINTF (stderr, + "Failed to convert address for peer `%s' plugin `%s' length %u to string \n", + GNUNET_i2s (&rc->id), + rc->addrcp->transport_name, + (unsigned int) rc->addrcp->address_length); + print_info (&rc->id, + rc->transport, + NULL, + rc->state, + rc->state_timeout); + rc->printed = GNUNET_YES; + return; + } + if (GNUNET_OK == res) + { + print_info (&rc->id, + rc->transport, + address, + rc->state, + rc->state_timeout); + rc->printed = GNUNET_YES; + return; /* Wait for done call */ + } + /* GNUNET_NO == res: ignore, was simply not supported */ + return; } - else + /* NULL == address, last call, we are done */ + + GNUNET_assert (address_resolutions > 0); + address_resolutions--; + if (GNUNET_NO == rc->printed) { - /* done */ - GNUNET_assert(address_resolutions > 0); - address_resolutions--; - if (GNUNET_NO == rc->printed) + if (numeric == GNUNET_NO) { - if (numeric == GNUNET_NO) - { - /* Failed to resolve address, try numeric lookup */ - resolve_peer_address (&rc->id, rc->addrcp, GNUNET_YES, - rc->state, rc->state_timeout); - } - else - { - print_info (&rc->id, rc->transport, "", - rc->state, rc->state_timeout); - } + /* Failed to resolve address, try numeric lookup + (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, + GNUNET_YES, + rc->state, + rc->state_timeout); } - GNUNET_free (rc->transport); - GNUNET_free (rc->addrcp); - GNUNET_CONTAINER_DLL_remove(rc_head, rc_tail, rc); - GNUNET_free(rc); - if ((0 == address_resolutions) && (iterate_connections)) + else { - if (GNUNET_SCHEDULER_NO_TASK != end) - { - GNUNET_SCHEDULER_cancel (end); - end = GNUNET_SCHEDULER_NO_TASK; - } - if (GNUNET_SCHEDULER_NO_TASK != op_timeout) - { - GNUNET_SCHEDULER_cancel (op_timeout); - op_timeout = GNUNET_SCHEDULER_NO_TASK; - } - ret = 0; - end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL ); + print_info (&rc->id, + rc->transport, + NULL, + rc->state, + rc->state_timeout); + } + } + GNUNET_free (rc->transport); + GNUNET_free (rc->addrcp); + GNUNET_CONTAINER_DLL_remove (rc_head, rc_tail, rc); + GNUNET_free (rc); + if ((0 == address_resolutions) && (iterate_connections)) + { + if (NULL != end) + { + GNUNET_SCHEDULER_cancel (end); + end = NULL; + } + if (NULL != op_timeout) + { + GNUNET_SCHEDULER_cancel (op_timeout); + op_timeout = NULL; } + ret = 0; + end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); } } + static void resolve_peer_address (const struct GNUNET_PeerIdentity *id, - const struct GNUNET_HELLO_Address *address, int numeric, - enum GNUNET_TRANSPORT_PeerState state, - struct GNUNET_TIME_Absolute state_timeout) + const struct GNUNET_HELLO_Address *address, + int numeric, + enum GNUNET_TRANSPORT_PeerState state, + struct GNUNET_TIME_Absolute state_timeout) { struct PeerResolutionContext *rc; @@ -965,17 +1437,21 @@ resolve_peer_address (const struct GNUNET_PeerIdentity *id, GNUNET_CONTAINER_DLL_insert(rc_head, rc_tail, rc); address_resolutions++; - rc->id = (*id); + rc->id = *id; rc->transport = GNUNET_strdup(address->transport_name); rc->addrcp = GNUNET_HELLO_address_copy (address); rc->printed = GNUNET_NO; rc->state = state; rc->state_timeout = state_timeout; /* Resolve address to string */ - rc->asc = GNUNET_TRANSPORT_address_to_string (cfg, address, numeric, - RESOLUTION_TIMEOUT, &process_peer_string, rc); + rc->asc = GNUNET_TRANSPORT_address_to_string (cfg, + address, + numeric, + RESOLUTION_TIMEOUT, + &process_peer_string, rc); } + /** * Function called with information about a peers during a one shot iteration * @@ -985,35 +1461,39 @@ resolve_peer_address (const struct GNUNET_PeerIdentity *id, * 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_iteration_cb (void *cls, const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_HELLO_Address *address, - enum GNUNET_TRANSPORT_PeerState state, - struct GNUNET_TIME_Absolute state_timeout) +process_peer_iteration_cb (void *cls, + const struct GNUNET_PeerIdentity *peer, + const struct GNUNET_HELLO_Address *address, + enum GNUNET_TRANSPORT_PeerState state, + struct GNUNET_TIME_Absolute state_timeout) { - if (peer == NULL ) + if (NULL == peer) { /* done */ address_resolution_in_progress = GNUNET_NO; pic = NULL; - if (GNUNET_SCHEDULER_NO_TASK != end) + if (NULL != end) GNUNET_SCHEDULER_cancel (end); - end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL ); + end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); return; } - if ((GNUNET_NO == iterate_all) && (GNUNET_NO == GNUNET_TRANSPORT_is_connected(state)) ) + if ( (GNUNET_NO == iterate_all) && + (GNUNET_NO == GNUNET_TRANSPORT_is_connected(state))) return; /* Display only connected peers */ - if (GNUNET_SCHEDULER_NO_TASK != op_timeout) + if (NULL != op_timeout) GNUNET_SCHEDULER_cancel (op_timeout); - op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT, &operation_timeout, - NULL ); + op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT, + &operation_timeout, + NULL); - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Received address for peer `%s': %s\n", - GNUNET_i2s (peer), address->transport_name); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Received address for peer `%s': %s\n", + GNUNET_i2s (peer), + address->transport_name); if (NULL != address) resolve_peer_address (peer, address, numeric, state, state_timeout); @@ -1022,6 +1502,165 @@ process_peer_iteration_cb (void *cls, const struct GNUNET_PeerIdentity *peer, } +/** + * Context for address resolution by #plugin_monitoring_cb(). + */ +struct PluginMonitorAddress +{ + + /** + * Ongoing resolution request. + */ + struct GNUNET_TRANSPORT_AddressToStringContext *asc; + + /** + * Resolved address as string. + */ + char *str; +}; + + +/** + * Function called with a textual representation of an address. This + * function will be called several times with different possible + * textual representations, and a last time with @a address being NULL + * to signal the end of the iteration. Note that @a address NULL + * always is the last call, regardless of the value in @a res. + * + * @param cls closure + * @param address NULL on end of iteration, + * otherwise 0-terminated printable UTF-8 string, + * in particular an empty string if @a res is #GNUNET_NO + * @param res result of the address to string conversion: + * if #GNUNET_OK: conversion successful + * if #GNUNET_NO: address was invalid (or not supported) + * if #GNUNET_SYSERR: communication error (IPC error) + */ +static void +address_cb (void *cls, + const char *address, + int res) +{ + struct PluginMonitorAddress *addr = cls; + + if (NULL == address) + { + addr->asc = NULL; + return; + } + if (NULL != addr->str) + return; + addr->str = GNUNET_strdup (address); +} + + +/** + * Function called by the plugin with information about the + * current sessions managed by the plugin (for monitoring). + * + * @param cls closure (NULL) + * @param session session handle this information is about, + * NULL to indicate that we are "in sync" (initial + * iteration complete) + * @param session_ctx storage location where the application + * can store data; will point to NULL on #GNUNET_TRANSPORT_SS_INIT, + * and must be reset to NULL on #GNUNET_TRANSPORT_SS_DONE + * @param info information about the state of the session, + * NULL if @a session is also NULL and we are + * merely signalling that the initial iteration is over; + * NULL with @a session being non-NULL if the monitor + * was being cancelled while sessions were active + */ +static void +plugin_monitoring_cb (void *cls, + struct GNUNET_TRANSPORT_PluginSession *session, + void **session_ctx, + const struct GNUNET_TRANSPORT_SessionInfo *info) +{ + const char *state; + struct PluginMonitorAddress *addr; + + if ( (NULL == info) && + (NULL == session) ) + return; /* in sync with transport service */ + addr = *session_ctx; + if (NULL == info) + { + if (NULL != addr) + { + if (NULL != addr->asc) + { + GNUNET_TRANSPORT_address_to_string_cancel (addr->asc); + addr->asc = NULL; + } + GNUNET_free_non_null (addr->str); + GNUNET_free (addr); + *session_ctx = NULL; + } + return; /* shutdown */ + } + if ( (NULL != cpid) && + (0 != memcmp (&info->address->peer, + cpid, + sizeof (struct GNUNET_PeerIdentity))) ) + return; /* filtered */ + if (NULL == addr) + { + addr = GNUNET_new (struct PluginMonitorAddress); + addr->asc = GNUNET_TRANSPORT_address_to_string (cfg, + info->address, + GNUNET_NO, + 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 (GNUNET_TRANSPORT_SS_DONE == info->state) + { + if (NULL != addr->asc) + { + GNUNET_TRANSPORT_address_to_string_cancel (addr->asc); + addr->asc = NULL; + } + GNUNET_free_non_null (addr->str); + GNUNET_free (addr); + *session_ctx = NULL; + } +} + + /** * Function called with information about a peers * @@ -1034,28 +1673,27 @@ process_peer_iteration_cb (void *cls, const struct GNUNET_PeerIdentity *peer, * */ static void -process_peer_monitoring_cb (void *cls, const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_HELLO_Address *address, - enum GNUNET_TRANSPORT_PeerState state, - struct GNUNET_TIME_Absolute state_timeout) +process_peer_monitoring_cb (void *cls, + const struct GNUNET_PeerIdentity *peer, + const struct GNUNET_HELLO_Address *address, + enum GNUNET_TRANSPORT_PeerState state, + struct GNUNET_TIME_Absolute state_timeout) { struct MonitoredPeer *m; - if (peer == NULL ) + if (NULL == peer) { - /* done */ - address_resolution_in_progress = GNUNET_NO; - pic = NULL; - if (GNUNET_SCHEDULER_NO_TASK != end) - GNUNET_SCHEDULER_cancel (end); - end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL ); + FPRINTF (stdout, + "%s", + _("Monitor disconnected from transport service. Reconnecting.\n")); return; } - if (GNUNET_SCHEDULER_NO_TASK != op_timeout) + if (NULL != op_timeout) GNUNET_SCHEDULER_cancel (op_timeout); - op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT, &operation_timeout, - NULL ); + op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT, + &operation_timeout, + NULL); if (NULL == (m = GNUNET_CONTAINER_multipeermap_get (monitored_peers, peer))) { @@ -1067,16 +1705,15 @@ process_peer_monitoring_cb (void *cls, const struct GNUNET_PeerIdentity *peer, { if ( (m->state == state) && (m->state_timeout.abs_value_us == state_timeout.abs_value_us) && - ((NULL == address) && (NULL == m->address)) ) + ((NULL == address) && (NULL == m->address))) { return; /* No real change */ } - if ( ((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 */ } - if (NULL != m->address) { GNUNET_free (m->address); @@ -1088,36 +1725,91 @@ process_peer_monitoring_cb (void *cls, const struct GNUNET_PeerIdentity *peer, m->state_timeout = state_timeout; if (NULL != address) - resolve_peer_address (peer, m->address, numeric, m->state, m->state_timeout); + resolve_peer_address (peer, + m->address, + numeric, + m->state, + m->state_timeout); else - print_info (peer, NULL, NULL, m->state, m->state_timeout); + print_info (peer, + NULL, + NULL, + m->state, + m->state_timeout); } + +/** + * 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. + * + * @param cls NULL + * @param result #GNUNET_OK if we connected to the service + */ static void -try_connect_cb (void *cls, const int result) +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 = NULL; + 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 retries = 0; + + td_handle = NULL; + if (GNUNET_OK == result) + return; retries++; if (retries < 10) - tc_handle = GNUNET_TRANSPORT_try_connect (handle, &pid, try_connect_cb, - NULL ); - else { - FPRINTF (stderr, "%s", - _("Failed to send connect request to transport service\n") ); - if (GNUNET_SCHEDULER_NO_TASK != end) - GNUNET_SCHEDULER_cancel (end); - ret = 1; - end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL ); + 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); } + /** * Function called with the result of the check if the 'transport' * service is running. @@ -1126,7 +1818,8 @@ try_connect_cb (void *cls, const int result) * @param result #GNUNET_YES if transport is running */ static void -testservice_task (void *cls, int result) +testservice_task (void *cls, + int result) { int counter = 0; ret = 1; @@ -1147,23 +1840,23 @@ testservice_task (void *cls, int result) } counter = benchmark_send + benchmark_receive + iterate_connections - + monitor_connections + monitor_connects + try_connect - + iterate_validation + monitor_validation; + + monitor_connections + monitor_connects + try_connect + try_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\n"), + _("Multiple operations given. Please choose only one operation: %s, %s, %s, %s, %s, %s %s\n"), "connect", "benchmark send", "benchmark receive", "information", - "monitor", "events"); + "monitor", "events", "plugins"); return; } if (0 == counter) { FPRINTF (stderr, - _("No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"), + _("No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"), "connect", "benchmark send", "benchmark receive", "information", - "monitor", "events"); + "monitor", "events", "plugins"); return; } @@ -1180,29 +1873,29 @@ testservice_task (void *cls, int result) ¬ify_connect, ¬ify_disconnect); if (NULL == handle) { - FPRINTF (stderr, "%s", _("Failed to connect to transport service\n") ); + 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 ); + NULL); if (NULL == tc_handle) { FPRINTF (stderr, "%s", - _("Failed to send request to transport service\n") ); + _("Failed to send request to transport service\n")); ret = 1; return; } op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT, &operation_timeout, - NULL ); + NULL); } - else if (benchmark_send) /* -s: Benchmark sending */ + else if (try_disconnect) /* -D: Disconnect from peer */ { if (NULL == cpid) { FPRINTF (stderr, _("Option `%s' makes no sense without option `%s'.\n"), - "-s", "-p"); + "-D", "-p"); ret = 1; return; } @@ -1210,35 +1903,71 @@ testservice_task (void *cls, int result) ¬ify_connect, ¬ify_disconnect); if (NULL == handle) { - FPRINTF (stderr, "%s", _("Failed to connect to transport service\n") ); + 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 ); + td_handle = GNUNET_TRANSPORT_try_disconnect (handle, &pid, + &try_disconnect_cb, + NULL); + if (NULL == td_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 (benchmark_send) /* -s: Benchmark sending */ + { + if (NULL == cpid) + { + FPRINTF (stderr, _("Option `%s' makes no sense without option `%s'.\n"), + "-s", "-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") ); + _("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, - NULL ); + op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT, + &operation_timeout, + NULL); } else if (benchmark_receive) /* -b: Benchmark receiving */ { handle = GNUNET_TRANSPORT_connect (cfg, NULL, NULL, ¬ify_receive, NULL, - NULL ); + NULL); if (NULL == handle) { - FPRINTF (stderr, "%s", _("Failed to connect to transport service\n") ); + FPRINTF (stderr, "%s", _("Failed to connect to transport service\n")); ret = 1; return; } if (verbosity > 0) - FPRINTF (stdout, "%s", _("Starting to receive benchmark data\n") ); + FPRINTF (stdout, "%s", _("Starting to receive benchmark data\n")); start_time = GNUNET_TIME_absolute_get (); } @@ -1248,35 +1977,48 @@ testservice_task (void *cls, int result) 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 ); + 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); + GNUNET_NO, TIMEOUT, + &process_peer_monitoring_cb, (void *) cfg); + } + else if (monitor_plugins) /* -P: List information about plugins continuously */ + { + monitored_plugins = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO); + pm = GNUNET_TRANSPORT_monitor_plugins (cfg, + &plugin_monitoring_cb, + NULL); } else if (iterate_validation) /* -d: Print information about validations */ { vic = GNUNET_TRANSPORT_monitor_validation_entries (cfg, - (NULL == cpid) ? NULL : &pid, - GNUNET_YES, TIMEOUT, &process_validation_cb, (void *) cfg); + (NULL == cpid) ? NULL : &pid, + GNUNET_YES, TIMEOUT, + &process_validation_cb, (void *) cfg); } else if (monitor_validation) /* -f: Print information about validations continuously */ { vic = GNUNET_TRANSPORT_monitor_validation_entries (cfg, - (NULL == cpid) ? NULL : &pid, - GNUNET_NO, TIMEOUT, &process_validation_cb, (void *) cfg); + (NULL == cpid) ? NULL : &pid, + GNUNET_NO, TIMEOUT, + &process_validation_cb, (void *) cfg); } else if (monitor_connects) /* -e : Monitor (dis)connect events continuously */ { monitor_connect_counter = 0; handle = GNUNET_TRANSPORT_connect (cfg, NULL, NULL, NULL, - &monitor_notify_connect, &monitor_notify_disconnect); + &monitor_notify_connect, + &monitor_notify_disconnect); if (NULL == handle) { - FPRINTF (stderr, "%s", _("Failed to connect to transport service\n") ); + FPRINTF (stderr, + "%s", + _("Failed to connect to transport service\n")); ret = 1; return; } @@ -1289,10 +2031,11 @@ testservice_task (void *cls, int result) } end = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, - &shutdown_task, NULL ); - + &shutdown_task, + NULL); } + /** * Main function that will be run by the scheduler. * @@ -1302,8 +2045,10 @@ testservice_task (void *cls, int result) * @param mycfg configuration */ static void -run (void *cls, char * const *args, const char *cfgfile, - const struct GNUNET_CONFIGURATION_Handle *mycfg) +run (void *cls, + char * const *args, + const char *cfgfile, + const struct GNUNET_CONFIGURATION_Handle *mycfg) { cfg = (struct GNUNET_CONFIGURATION_Handle *) mycfg; if (test_configuration) @@ -1319,49 +2064,62 @@ int main (int argc, char * const *argv) { int res; - static const struct GNUNET_GETOPT_CommandLineOption options[] = - { - { 'a', "all", NULL, - gettext_noop ("print information for all peers (instead of only connected peers )"), - 0, &GNUNET_GETOPT_set_one, &iterate_all }, - { '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', "validation", NULL, - gettext_noop ("print information for all pending validations "), - 0, &GNUNET_GETOPT_set_one, &iterate_validation }, - { 'f', "monitorvalidation", NULL, - gettext_noop ("print information for all pending validations continously"), - 0, &GNUNET_GETOPT_set_one, &monitor_validation }, - { 'i', "information", NULL, - gettext_noop ("provide information about all current connections (once)"), - 0, &GNUNET_GETOPT_set_one, &iterate_connections }, - { 'm', "monitor", NULL, - gettext_noop ("provide information about all current connections (continuously)"), - 0, &GNUNET_GETOPT_set_one, &monitor_connections }, - { 'e', "events", NULL, - gettext_noop ("provide information about all connects and disconnect events (continuously)"), - 0, &GNUNET_GETOPT_set_one, &monitor_connects }, { 'n', "numeric", - NULL, gettext_noop ("do not resolve hostnames"), 0, - &GNUNET_GETOPT_set_one, &numeric }, { 'p', "peer", "PEER", - gettext_noop ("peer identity"), 1, &GNUNET_GETOPT_set_string, - &cpid }, { 's', "send", NULL, gettext_noop - ("send data for benchmarking to the other peer (until CTRL-C)"), 0, - &GNUNET_GETOPT_set_one, &benchmark_send }, - { 't', "test", NULL, - gettext_noop ("test transport configuration (involves external server)"), - 0, &GNUNET_GETOPT_set_one, &test_configuration }, - GNUNET_GETOPT_OPTION_VERBOSE (&verbosity), - GNUNET_GETOPT_OPTION_END }; + static const struct GNUNET_GETOPT_CommandLineOption options[] = { + { 'a', "all", NULL, + gettext_noop ("print information for all peers (instead of only connected peers)"), + 0, &GNUNET_GETOPT_set_one, &iterate_all }, + { '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 }, + { 'd', "validation", NULL, + gettext_noop ("print information for all pending validations "), + 0, &GNUNET_GETOPT_set_one, &iterate_validation }, + { 'f', "monitorvalidation", NULL, + gettext_noop ("print information for all pending validations continuously"), + 0, &GNUNET_GETOPT_set_one, &monitor_validation }, + { 'i', "information", NULL, + gettext_noop ("provide information about all current connections (once)"), + 0, &GNUNET_GETOPT_set_one, &iterate_connections }, + { 'm', "monitor", NULL, + gettext_noop ("provide information about all current connections (continuously)"), + 0, &GNUNET_GETOPT_set_one, &monitor_connections }, + { 'e', "events", NULL, + gettext_noop ("provide information about all connects and disconnect events (continuously)"), + 0, &GNUNET_GETOPT_set_one, &monitor_connects }, + { 'n', "numeric", + NULL, gettext_noop ("do not resolve hostnames"), 0, + &GNUNET_GETOPT_set_one, &numeric }, + { 'p', "peer", "PEER", + gettext_noop ("peer identity"), 1, &GNUNET_GETOPT_set_string, + &cpid }, + { 'P', "plugins", NULL, + gettext_noop ("monitor plugin sessions"), 0, &GNUNET_GETOPT_set_one, + &monitor_plugins }, + { 's', "send", NULL, gettext_noop + ("send data for benchmarking to the other peer (until CTRL-C)"), 0, + &GNUNET_GETOPT_set_one, &benchmark_send }, + { 't', "test", NULL, + gettext_noop ("test transport configuration (involves external server)"), + 0, &GNUNET_GETOPT_set_one, &test_configuration }, + GNUNET_GETOPT_OPTION_VERBOSE (&verbosity), + GNUNET_GETOPT_OPTION_END + }; if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) return 2; - res = GNUNET_PROGRAM_run (argc, argv, "gnunet-transport", gettext_noop - ("Direct access to transport service."), options, &run, NULL ); - GNUNET_free((void * ) argv); + res = GNUNET_PROGRAM_run (argc, argv, + "gnunet-transport", + gettext_noop ("Direct access to transport service."), + options, + &run, NULL); + GNUNET_free((void *) argv); if (GNUNET_OK == res) return ret; return 1;