/*
- This file is part of GNUnet.
- (C) 2009 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
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- 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.
-*/
+ This file is part of GNUnet.
+ (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
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ 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.
+ */
/**
* @file src/transport/gnunet-transport.c
* 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"
/**
* 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, 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
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
+#define BLOCKSIZE 4
/**
* Which peer should we connect to?
*/
static struct GNUNET_TRANSPORT_Handle *handle;
+/**
+ * Configuration handle
+ */
+static struct GNUNET_CONFIGURATION_Handle *cfg;
+
+/**
+ * Try connect handle
+ */
+struct GNUNET_TRANSPORT_TryConnectHandle *tc_handle;
+
+/**
+ * Try disconnect handle
+ */
+struct GNUNET_TRANSPORT_TryDisconnectHandle *td_handle;
+
/**
* Option -s.
*/
*/
static int iterate_connections;
+/**
+ * Option -d.
+ */
+static int iterate_validation;
+
+/**
+ * Option -a.
+ */
+static int iterate_all;
+
/**
* Option -t.
*/
static int test_configuration;
+/**
+ * Option -c.
+ */
+static int monitor_connects;
+
+/**
+ * Option -m.
+ */
+static int monitor_connections;
+
+/**
+ * Option -f.
+ */
+static int monitor_validation;
+
+/**
+ * Option -P.
+ */
+static int monitor_plugins;
+
+/**
+ * Option -C.
+ */
+static int try_connect;
+
+/**
+ * Option -D.
+ */
+static int try_disconnect;
+
/**
* Option -n.
*/
*/
static int ret;
+/**
+ * Current number of connections in monitor mode
+ */
+static int monitor_connect_counter;
+
/**
* Number of bytes of traffic we received so far.
*/
*/
static struct GNUNET_TRANSPORT_TransmitHandle *th;
+/**
+ * Map storing information about monitored peers
+ */
+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).
/**
* Task scheduled for cleanup / termination of the process.
*/
-static GNUNET_SCHEDULER_TaskIdentifier end;
+static struct GNUNET_SCHEDULER_Task * end;
+
+/**
+ * Task for operation timeout
+ */
+static struct GNUNET_SCHEDULER_Task * op_timeout;
/**
* Selected level of verbosity.
struct GNUNET_OS_Process *resolver;
/**
- * Number of tasks running that still need the resolver.
+ * Number of address resolutions pending
*/
-static unsigned int resolver_users;
+static unsigned int address_resolutions;
+/**
+ * Address resolutions pending in progress
+ */
+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;
+
+/**
+ * DLL: head of resolution entries
+ */
+static struct PeerResolutionContext *rc_tail;
/**
- * Display the result of the test.
+ * Function called to release data stored in the #monitored_peers map.
*
- * @param tc test context
- * @param result GNUNET_YES on success
+ * @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_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 NULL
+ * @param tc scheduler context
*/
static void
-display_test_result (struct TestContext *tc, int result)
+shutdown_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (GNUNET_YES != result)
+ struct GNUNET_TIME_Relative duration;
+ struct ValidationResolutionContext *cur;
+ struct ValidationResolutionContext *next;
+
+ end = NULL;
+ if (NULL != op_timeout)
{
- FPRINTF (stderr, "Configuration for plugin `%s' did not work!\n", tc->name);
+ GNUNET_SCHEDULER_cancel (op_timeout);
+ op_timeout = NULL;
}
- else
+ if (NULL != tc_handle)
{
- FPRINTF (stderr, "Configuration for plugin `%s' is working!\n", tc->name);
+ GNUNET_TRANSPORT_try_connect_cancel (tc_handle);
+ tc_handle = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != tc->tsk)
+ if (NULL != pic)
{
- GNUNET_SCHEDULER_cancel (tc->tsk);
- tc->tsk = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_TRANSPORT_monitor_peers_cancel (pic);
+ pic = NULL;
}
- if (NULL != tc->tst)
+ if (NULL != vic)
{
- GNUNET_NAT_test_stop (tc->tst);
- tc->tst = NULL;
+ GNUNET_TRANSPORT_monitor_validation_entries_cancel (vic);
+ vic = NULL;
}
- GNUNET_free (tc);
- resolver_users--;
- if ((0 == resolver_users) && (NULL != resolver))
+ if (NULL != pm)
{
- GNUNET_break (0 == GNUNET_OS_process_kill (resolver, SIGTERM));
- GNUNET_OS_process_close (resolver);
- resolver = NULL;
+ 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);
+ th = NULL;
+ }
+ if (NULL != handle)
+ {
+ GNUNET_TRANSPORT_disconnect (handle);
+ handle = NULL;
+ }
+ 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));
+ }
+ 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));
+ }
+
+ if (NULL != monitored_peers)
+ {
+ GNUNET_CONTAINER_multipeermap_iterate (monitored_peers, &destroy_it, NULL);
+ 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;
+ }
+}
-/**
- * Function called by NAT on success.
- * Clean up and update GUI (with success).
- *
- * @param cls test context
- * @param success currently always GNUNET_OK
- */
static void
-result_callback (void *cls, int success)
+operation_timeout (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct TestContext *tc = cls;
+ struct PeerResolutionContext *cur;
+ struct PeerResolutionContext *next;
+ op_timeout = NULL;
+ if ((try_connect) || (benchmark_send) || (benchmark_receive))
+ {
+ 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);
+ ret = 1;
+ return;
+ }
+ if (iterate_connections)
+ {
+ next = rc_head;
+ while (NULL != (cur = next))
+ {
+ next = cur->next;
+ FPRINTF (stdout,
+ _("Failed to resolve address for peer `%s'\n"),
+ GNUNET_i2s (&cur->addrcp->peer));
- display_test_result (tc, success);
+ GNUNET_CONTAINER_DLL_remove(rc_head, rc_tail, cur);
+ GNUNET_TRANSPORT_address_to_string_cancel (cur->asc);
+ GNUNET_free(cur->transport);
+ GNUNET_free(cur->addrcp);
+ GNUNET_free(cur);
+
+ }
+ 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);
+ ret = 1;
+ return;
+ }
}
+static void
+run_nat_test ();
+
+
/**
- * Function called if NAT failed to confirm success.
- * Clean up and update GUI (with failure).
+ * Display the result of the test.
+ *
+ * @param tc test context
+ * @param result #GNUNET_YES on success
+ */
+static void
+display_test_result (struct TestContext *tc,
+ enum TestResult result)
+{
+ 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 (NULL != tc->tsk)
+ {
+ GNUNET_SCHEDULER_cancel (tc->tsk);
+ tc->tsk = NULL;
+ }
+ if (NULL != tc->tst)
+ {
+ GNUNET_NAT_test_stop (tc->tst);
+ tc->tst = NULL;
+ }
+
+ 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_OS_process_destroy (resolver);
+ resolver = NULL;
+ }
+ if (NULL != head)
+ run_nat_test ();
+}
+
+/**
+ * Function called by NAT to report the outcome of the nat-test.
+ * Clean up and update GUI.
*
* @param cls test context
- * @param tc scheduler callback
+ * @param result status code
+ */
+static void
+result_callback (void *cls,
+ enum GNUNET_NAT_StatusCode result)
+{
+ struct TestContext *tc = cls;
+
+ display_test_result (tc, result);
+}
+
+
+/**
+ * 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_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
+process_validation_string (void *cls,
+ const char *address,
+ int res)
+{
+ struct ValidationResolutionContext *vc = cls;
+ char *s_valid;
+ char *s_last;
+ char *s_next;
+
+ 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");
+ else
+ 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");
+ else
+ 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");
+ else
+ 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->addrcp->peer),
+ (GNUNET_OK == res) ? address : "<invalid 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;
+ }
+ /* last call, we are done */
+ GNUNET_assert (address_resolutions > 0);
+ address_resolutions--;
+ if ( (GNUNET_SYSERR == res) &&
+ (GNUNET_NO == vc->printed))
+ {
+ if (numeric == GNUNET_NO)
+ {
+ /* 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);
+ }
+ else
+ {
+ FPRINTF (stdout,
+ _("Peer `%s' %s `%s' \n"),
+ GNUNET_i2s (&vc->addrcp->peer),
+ "<unable to resolve address>",
+ 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_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;
+
+ vc = GNUNET_new (struct ValidationResolutionContext);
+ GNUNET_assert(NULL != vc);
+ GNUNET_CONTAINER_DLL_insert(vc_head, vc_tail, vc);
+ address_resolutions++;
+
+ vc->transport = GNUNET_strdup(address->transport_name);
+ vc->addrcp = GNUNET_HELLO_address_copy (address);
+ vc->printed = GNUNET_NO;
+ vc->state = state;
+ vc->last_validation = last_validation;
+ vc->valid_until = valid_until;
+ 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);
+}
+
+
+/**
+ * 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
-fail_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+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)
{
- struct TestContext *tstc = cls;
+ if (NULL == address)
+ {
+ if (monitor_validation)
+ {
+ FPRINTF (stdout,
+ "%s",
+ _("Monitor disconnected from transport service. Reconnecting.\n"));
+ return;
+ }
- tstc->tsk = GNUNET_SCHEDULER_NO_TASK;
- display_test_result (tstc, GNUNET_NO);
+ /* done */
+ vic = NULL;
+ if (NULL != end)
+ GNUNET_SCHEDULER_cancel (end);
+ end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+ return;
+ }
+ if (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 (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);
}
unsigned long long bnd_port;
unsigned long long adv_port;
struct TestContext *tc;
+ char *binary;
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (cfg, "transport", "plugins",
- &plugins))
+ if (GNUNET_OK
+ != GNUNET_CONFIGURATION_get_value_string (cfg, "transport", "plugins",
+ &plugins))
{
- FPRINTF (stderr,
- _
- ("No transport plugins configured, peer will never communicate\n"), NULL);
+ FPRINTF (stderr, "%s", _
+ ("No transport plugins configured, peer will never communicate\n"));
ret = 4;
return;
}
- for (tok = strtok (plugins, " "); tok != NULL; tok = strtok (NULL, " "))
+
+ 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", &bnd_port))
+ GNUNET_snprintf (section, sizeof(section), "transport-%s", tok);
+ if (GNUNET_OK
+ != GNUNET_CONFIGURATION_get_value_number (cfg, section, "PORT",
+ &bnd_port))
{
FPRINTF (stderr,
- _("No port configured for plugin `%s', cannot test it\n"), tok);
+ _("No port configured for plugin `%s', cannot test it\n"), tok);
continue;
}
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (cfg, section, "ADVERTISED_PORT",
- &adv_port))
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg, section,
+ "ADVERTISED_PORT", &adv_port))
adv_port = bnd_port;
- if (NULL == resolver)
- resolver =
- GNUNET_OS_start_process (NULL, NULL, "gnunet-service-resolver",
- "gnunet-service-resolver", NULL);
- resolver_users++;
- GNUNET_RESOLVER_connect (cfg);
- tc = GNUNET_malloc (sizeof (struct TestContext));
+
+ 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)
- {
- display_test_result (tc, GNUNET_SYSERR);
- continue;
- }
- tc->tsk = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &fail_timeout, tc);
+ tc->adv_port = adv_port;
+ tc->bnd_port = bnd_port;
+ GNUNET_CONTAINER_DLL_insert_tail (head, tail, tc);
}
- GNUNET_free (plugins);
-}
-
-
-/**
- * Shutdown, print statistics.
- */
-static void
-do_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct GNUNET_TIME_Relative duration;
+ GNUNET_free(plugins);
- if (NULL != th)
- {
- GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
- th = NULL;
- }
- GNUNET_TRANSPORT_disconnect (handle);
- if (benchmark_receive)
- {
- duration = GNUNET_TIME_absolute_get_duration (start_time);
- FPRINTF (stdout, _("Received %llu bytes/s (%llu bytes in %llu ms)\n"),
- 1000 * traffic_received / (1 + duration.rel_value),
- traffic_received, (unsigned long long) duration.rel_value);
- }
- if (benchmark_send)
+ if ((NULL != head) && (NULL == resolver))
{
- duration = GNUNET_TIME_absolute_get_duration (start_time);
- FPRINTF (stdout, _("Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"),
- 1000 * traffic_sent / (1 + duration.rel_value), traffic_sent,
- (unsigned long long) duration.rel_value);
+ 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)
+ {
+ FPRINTF (stderr, _("Failed to start resolver!\n"));
+ return;
+ }
+
+ GNUNET_free(binary);
+ GNUNET_RESOLVER_connect (cfg);
+ run_nat_test ();
}
}
/**
* Function called to notify a client about the socket
- * begin ready to queue more data. "buf" will be
- * NULL and "size" zero if the socket was closed for
+ * begin ready to queue more data. @a buf will be
+ * NULL and @a size zero if the socket was closed for
* writing in the meantime.
*
* @param cls closure
- * @param size number of bytes available in buf
+ * @param size number of bytes available in @a buf
* @param buf where the callee should write the message
- * @return number of bytes written to buf
+ * @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;
- GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader));
- GNUNET_assert (size < GNUNET_SERVER_MAX_MESSAGE_SIZE);
+ if ((NULL == buf) || (0 == size))
+ {
+ th = NULL;
+ return 0;
+ }
+
+ GNUNET_assert(size >= sizeof(struct GNUNET_MessageHeader));
+ GNUNET_assert(size < GNUNET_SERVER_MAX_MESSAGE_SIZE);
m->size = ntohs (size);
m->type = ntohs (GNUNET_MESSAGE_TYPE_DUMMY);
- memset (&m[1], 52, size - sizeof (struct GNUNET_MessageHeader));
+ memset (&m[1], 52, size - sizeof(struct GNUNET_MessageHeader));
traffic_sent += size;
- th = GNUNET_TRANSPORT_notify_transmit_ready (handle, &pid, 32 * 1024, 0,
+ th = GNUNET_TRANSPORT_notify_transmit_ready (handle, &pid,
+ BLOCKSIZE * 1024,
GNUNET_TIME_UNIT_FOREVER_REL,
&transmit_data, NULL);
if (verbosity > 0)
FPRINTF (stdout, _("Transmitting %u bytes to %s\n"), (unsigned int) size,
- GNUNET_i2s (&pid));
+ GNUNET_i2s (&pid));
return size;
}
*
* @param cls closure
* @param peer the peer that connected
- * @param ats performance data
- * @param ats_count number of entries in ats (excluding 0-termination)
*/
static void
-notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
+notify_connect (void *cls,
+ const struct GNUNET_PeerIdentity *peer)
{
- if (verbosity > 0)
- FPRINTF (stdout, _("Connected to %s\n"), GNUNET_i2s (peer));
- if (0 != memcmp (&pid, peer, sizeof (struct GNUNET_PeerIdentity)))
+ if (0 != memcmp (&pid, peer, sizeof(struct GNUNET_PeerIdentity)))
return;
ret = 0;
- if (benchmark_send)
+ if (try_connect)
{
- start_time = GNUNET_TIME_absolute_get ();
- th = GNUNET_TRANSPORT_notify_transmit_ready (handle, peer, 32 * 1024, 0,
- GNUNET_TIME_UNIT_FOREVER_REL,
- &transmit_data, NULL);
+ /* 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;
}
- else
+ if (benchmark_send)
{
- /* all done, terminate instantly */
- GNUNET_SCHEDULER_cancel (end);
- end = GNUNET_SCHEDULER_add_now (&do_disconnect, NULL);
+ if (NULL != op_timeout)
+ {
+ GNUNET_SCHEDULER_cancel (op_timeout);
+ op_timeout = NULL;
+ }
+ if (verbosity > 0)
+ FPRINTF (stdout,
+ _("Successfully connected to `%s', starting to send benchmark data in %u Kb blocks\n"),
+ GNUNET_i2s (&pid), BLOCKSIZE);
+ start_time = GNUNET_TIME_absolute_get ();
+ if (NULL == th)
+ th = GNUNET_TRANSPORT_notify_transmit_ready (handle, peer,
+ BLOCKSIZE * 1024,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &transmit_data,
+ NULL);
+ else
+ GNUNET_break(0);
+ return;
}
}
* @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 (verbosity > 0)
- FPRINTF (stdout, _("Disconnected from %s\n"), GNUNET_i2s (peer));
- if ((0 == memcmp (&pid, peer, sizeof (struct GNUNET_PeerIdentity))) &&
- (NULL != th))
+ 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);
th = NULL;
- GNUNET_SCHEDULER_cancel (end);
- end = GNUNET_SCHEDULER_add_now (&do_disconnect, NULL);
+ }
+ if (benchmark_send)
+ {
+ FPRINTF (stdout, _("Disconnected from peer `%s' while benchmarking\n"),
+ GNUNET_i2s (&pid));
+ if (NULL != end)
+ GNUNET_SCHEDULER_cancel (end);
+ return;
}
}
+/**
+ * Function called to notify transport users that another
+ * peer connected to us.
+ *
+ * @param cls closure
+ * @param peer the peer that connected
+ */
+static void
+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);
+}
+
+
+/**
+ * Function called to notify transport users that another
+ * peer disconnected from us.
+ *
+ * @param cls closure
+ * @param peer the peer that disconnected
+ */
+static void
+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);
+
+ 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);
+}
+
+
/**
* Function called by the transport for each received message.
*
* @param cls closure
* @param peer (claimed) identity of the other peer
* @param message the message
- * @param ats performance data
- * @param ats_count number of entries in ats
*/
static void
-notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
+notify_receive (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_MessageHeader *message)
{
- if (!benchmark_receive)
+ 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));
+
+ if (traffic_received == 0)
+ start_time = GNUNET_TIME_absolute_get ();
+ traffic_received += ntohs (message->size);
return;
- if (verbosity > 0)
- 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 ();
- traffic_received += ntohs (message->size);
+ }
}
-void
-process_string (void *cls, const char *address)
+
+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);
+
+
+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)
{
- struct GNUNET_HELLO_Address *addrcp = cls;
- if ((address != NULL))
+ if ( ((GNUNET_YES == iterate_connections) && (GNUNET_YES == iterate_all)) ||
+ (GNUNET_YES == monitor_connections))
{
- FPRINTF (stdout, _("Peer `%s': %s %s\n"), GNUNET_i2s (&addrcp->peer), addrcp->transport_name, address);
+ FPRINTF (stdout,
+ _("Peer `%s': %s %s in state `%s' until %s\n"),
+ GNUNET_i2s (id),
+ (NULL == transport) ? "<none>" : transport,
+ (NULL == transport) ? "<none>" : 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)))
{
- /* done */
- GNUNET_free (addrcp);
+ /* Only connected peers, skip state */
+ FPRINTF (stdout,
+ _("Peer `%s': %s %s\n"),
+ GNUNET_i2s (id),
+ transport,
+ addr);
}
}
+
/**
- * Function to call with a human-readable format of an address
+ * 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 peer identity of the peer
- * @param transport name of the plugin
- * @param addr binary address
- * @param addrlen number of bytes in addr
+ * @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_address (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_HELLO_Address *address)
+process_peer_string (void *cls,
+ const char *address,
+ int res)
{
- const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+ struct PeerResolutionContext *rc = cls;
- if ((address == NULL) || (peer == NULL))
+ if (NULL != address)
{
- /* done */
+ 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;
}
+ /* NULL == address, last call, we are done */
+ GNUNET_assert (address_resolutions > 0);
+ address_resolutions--;
+ if (GNUNET_NO == rc->printed)
+ {
+ if (numeric == GNUNET_NO)
+ {
+ /* 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);
+ }
+ else
+ {
+ 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)
+{
+ struct PeerResolutionContext *rc;
+
+ rc = GNUNET_new (struct PeerResolutionContext);
+ GNUNET_assert(NULL != rc);
+ GNUNET_CONTAINER_DLL_insert(rc_head, rc_tail, rc);
+ address_resolutions++;
+
+ 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 */
- GNUNET_TRANSPORT_address_to_string (cfg, address, numeric,
- GNUNET_TIME_UNIT_MINUTES, &process_string,
- GNUNET_HELLO_address_copy(address));
+ rc->asc = GNUNET_TRANSPORT_address_to_string (cfg,
+ address,
+ numeric,
+ RESOLUTION_TIMEOUT,
+ &process_peer_string, rc);
}
/**
- * Main function that will be run by the scheduler.
+ * Function called with information about a peers during a one shot iteration
*
* @param cls closure
- * @param args remaining command-line arguments
- * @param cfgfile name of the configuration file used (for saving, can be NULL!)
- * @param cfg configuration
+ * @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
-run (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+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 (test_configuration)
+ if (NULL == peer)
{
- do_test_configuration (cfg);
+ /* 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;
}
- if (benchmark_send && (NULL == cpid))
+
+ if ( (GNUNET_NO == iterate_all) &&
+ (GNUNET_NO == GNUNET_TRANSPORT_is_connected(state)))
+ return; /* Display only connected peers */
+
+ if (NULL != op_timeout)
+ GNUNET_SCHEDULER_cancel (op_timeout);
+ 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);
+
+ if (NULL != address)
+ resolve_peer_address (peer, address, numeric, state, state_timeout);
+ else
+ print_info (peer, NULL, NULL, state, state_timeout);
+}
+
+
+/**
+ * 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)
{
- FPRINTF (stderr, _("Option `%s' makes no sense without option `%s'.\n"),
- "-s", "-C");
+ addr->asc = NULL;
return;
}
- if (NULL != cpid)
+ 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)
{
- ret = 1;
- if (GNUNET_OK != GNUNET_CRYPTO_hash_from_string (cpid, &pid.hashPubKey))
+ if (NULL != addr)
{
- FPRINTF (stderr, _("Failed to parse peer identity `%s'\n"), cpid);
+ 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
+ *
+ * @param cls closure
+ * @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,
+ 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 (NULL == peer)
+ {
+ FPRINTF (stdout,
+ "%s",
+ _("Monitor disconnected from transport service. Reconnecting.\n"));
+ return;
+ }
+
+ if (NULL != op_timeout)
+ GNUNET_SCHEDULER_cancel (op_timeout);
+ op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT,
+ &operation_timeout,
+ NULL);
+
+ 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);
+ }
+ else
+ {
+ if ( (m->state == state) &&
+ (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)))
+ return; /* No real change */
+ }
+
+ if (NULL != m->address)
+ {
+ GNUNET_free (m->address);
+ m->address = NULL;
+ }
+ if (NULL != address)
+ m->address = GNUNET_HELLO_address_copy (address);
+ m->state = state;
+ m->state_timeout = state_timeout;
+
+ if (NULL != address)
+ resolve_peer_address (peer,
+ m->address,
+ numeric,
+ m->state,
+ m->state_timeout);
+ else
+ 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)
+{
+ 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 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);
+}
+
+
+/**
+ * Function called with the result of the check if the 'transport'
+ * service is running.
+ *
+ * @param cls closure with our configuration
+ * @param result #GNUNET_YES if transport is running
+ */
+static void
+testservice_task (void *cls,
+ int result)
+{
+ int counter = 0;
+ ret = 1;
+
+ if (GNUNET_YES != result)
+ {
+ FPRINTF (stderr, _("Service `%s' is not running\n"), "transport");
+ return;
+ }
+
+ 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);
+ return;
+ }
+
+ counter = benchmark_send + benchmark_receive + iterate_connections
+ + 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 %s\n"),
+ "connect", "benchmark send", "benchmark receive", "information",
+ "monitor", "events", "plugins");
+ return;
+ }
+ if (0 == counter)
+ {
+ FPRINTF (stderr,
+ _("No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"),
+ "connect", "benchmark send", "benchmark receive", "information",
+ "monitor", "events", "plugins");
+ return;
+ }
+
+ if (try_connect) /* -C: Connect to 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);
- GNUNET_TRANSPORT_try_connect (handle, &pid);
- end =
- GNUNET_SCHEDULER_add_delayed (benchmark_send ?
- GNUNET_TIME_UNIT_FOREVER_REL :
- GNUNET_TIME_UNIT_SECONDS, &do_disconnect,
- NULL);
+ 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"));
+ ret = 1;
+ return;
+ }
+ 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_receive)
+ else if (benchmark_send) /* -s: Benchmark sending */
{
- handle =
- GNUNET_TRANSPORT_connect (cfg, NULL, NULL, ¬ify_receive,
- ¬ify_connect, ¬ify_disconnect);
- GNUNET_TRANSPORT_try_connect (handle, &pid);
- end =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &do_disconnect, NULL);
+ 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"));
+ ret = 1;
+ return;
+ }
+ start_time = GNUNET_TIME_absolute_get ();
+ op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT,
+ &operation_timeout,
+ NULL);
}
- if (iterate_connections)
+ else if (benchmark_receive) /* -b: Benchmark receiving */
+ {
+ handle = GNUNET_TRANSPORT_connect (cfg, NULL, NULL, ¬ify_receive, NULL,
+ NULL);
+ if (NULL == handle)
+ {
+ 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"));
+ start_time = GNUNET_TIME_absolute_get ();
+
+ }
+ 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);
+ }
+ 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);
+ }
+ 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);
+ }
+ else if (monitor_validation) /* -f: Print information about validations continuously */
{
- GNUNET_TRANSPORT_peer_get_active_addresses (cfg, NULL, GNUNET_YES,
- GNUNET_TIME_UNIT_MINUTES,
- &process_address, (void *) cfg);
+ vic = GNUNET_TRANSPORT_monitor_validation_entries (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);
+ if (NULL == handle)
+ {
+ FPRINTF (stderr,
+ "%s",
+ _("Failed to connect to transport service\n"));
+ ret = 1;
+ return;
+ }
+ ret = 0;
+ }
+ else
+ {
+ GNUNET_break(0);
+ return;
+ }
+
+ end = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ &shutdown_task,
+ NULL);
}
+/**
+ * Main function that will be run by the scheduler.
+ *
+ * @param cls closure
+ * @param args remaining command-line arguments
+ * @param cfgfile name of the configuration file used (for saving, can be NULL!)
+ * @param mycfg configuration
+ */
+static void
+run (void *cls,
+ char * const *args,
+ const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *mycfg)
+{
+ cfg = (struct GNUNET_CONFIGURATION_Handle *) mycfg;
+ if (test_configuration)
+ {
+ do_test_configuration (cfg);
+ return;
+ }
+ GNUNET_CLIENT_service_test ("transport", cfg, GNUNET_TIME_UNIT_SECONDS,
+ &testservice_task, (void *) cfg);
+}
+
int
-main (int argc, char *const *argv)
+main (int argc, char * const *argv)
{
+ int res;
static const struct GNUNET_GETOPT_CommandLineOption options[] = {
- {'b', "benchmark", NULL,
- gettext_noop ("measure how fast we are receiving data (until CTRL-C)"),
- 0, &GNUNET_GETOPT_set_one, &benchmark_receive},
- {'C', "connect", "PEER",
- gettext_noop ("try to connect to the given peer"),
- 1, &GNUNET_GETOPT_set_string, &cpid},
- {'i', "information", NULL,
- gettext_noop ("provide information about all current connections (once)"),
- 0, &GNUNET_GETOPT_set_one, &iterate_connections},
- {'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},
- {'n', "numeric", NULL,
- gettext_noop ("do not resolve hostnames"),
- 0, &GNUNET_GETOPT_set_one, &numeric},
+ { '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
};
- return (GNUNET_OK ==
- GNUNET_PROGRAM_run (argc, argv, "gnunet-transport",
- gettext_noop
- ("Direct access to transport service."), options,
- &run, NULL)) ? ret : 1;
-}
+ 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);
+ if (GNUNET_OK == res)
+ return ret;
+ return 1;
+}
/* end of gnunet-transport.c */
projects / oweals / gnunet.git / blobdiff