/**
* 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, 1)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+#define RESOLUTION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+#define OP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+
+/**
+ * Benchmarking block size in KB
+ */
+#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;
+
/**
* Option -s.
*/
*/
static int test_configuration;
+/**
+ * Option -c.
+ */
+static int monitor_connects;
+
+/**
+ * Option -m.
+ */
+static int monitor_connections;
+
+/**
+ * Option -C.
+ */
+static int try_connect;
+
/**
* 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;
+/**
+ *
+ */
+struct GNUNET_TRANSPORT_PeerIterateContext *pic;
+
/**
* Identity of the peer we transmit to / connect to.
* (equivalent to 'cpid' string).
*/
static GNUNET_SCHEDULER_TaskIdentifier end;
+/**
+ * Task for operation timeout
+ */
+static GNUNET_SCHEDULER_TaskIdentifier op_timeout;
+
/**
* Selected level of verbosity.
*/
*/
static unsigned int resolver_users;
+/**
+ * Number of address resolutions pending
+ */
+static unsigned int address_resolutions;
+
+/**
+ * Address resolutions pending in progress
+ */
+static unsigned int address_resolution_in_progress;
/**
* Context for a plugin test.
};
+/**
+ * Task run in monitor mode when the user presses CTRL-C to abort.
+ * Stops monitoring activity.
+ *
+ * @param cls the 'struct GNUNET_TRANSPORT_PeerIterateContext *'
+ * @param tc scheduler context
+ */
+static void
+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)
+ {
+ GNUNET_SCHEDULER_cancel (op_timeout);
+ op_timeout = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (NULL != tc_handle)
+ {
+ GNUNET_TRANSPORT_try_connect_cancel (tc_handle);
+ tc_handle = NULL;
+ }
+ if (NULL != pic)
+ {
+ GNUNET_TRANSPORT_peer_get_active_addresses_cancel (pic);
+ pic = NULL;
+ }
+ 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));
+ }
+}
+
+
+static struct ResolutionContext *rc_head;
+static struct ResolutionContext *rc_tail;
+
+struct ResolutionContext
+{
+ struct ResolutionContext *next;
+ struct ResolutionContext *prev;
+ struct GNUNET_HELLO_Address *addrcp;
+ struct GNUNET_TRANSPORT_AddressToStringContext *asc;
+ int printed;
+};
+
+
+static void
+operation_timeout (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct ResolutionContext *cur;
+ struct ResolutionContext *next;
+ op_timeout = GNUNET_SCHEDULER_NO_TASK;
+ 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)
+ 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));
+
+ GNUNET_CONTAINER_DLL_remove (rc_head, rc_tail, cur);
+ GNUNET_TRANSPORT_address_to_string_cancel (cur->asc);
+ GNUNET_free (cur->addrcp);
+ GNUNET_free (cur);
+
+ }
+ FPRINTF (stdout, "%s", _("Failed to list connections, timeout occured\n"));
+ if (GNUNET_SCHEDULER_NO_TASK != end)
+ GNUNET_SCHEDULER_cancel (end);
+ end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+ ret = 1;
+ return;
+ }
+
+}
+
+
+
/**
* Display the result of the test.
*
* @param tc test context
- * @param result GNUNET_YES on success
+ * @param result #GNUNET_YES on success
*/
static void
display_test_result (struct TestContext *tc, int result)
resolver_users--;
if ((0 == resolver_users) && (NULL != resolver))
{
- GNUNET_break (0 == GNUNET_OS_process_kill (resolver, SIGTERM));
- GNUNET_OS_process_close (resolver);
+ GNUNET_break (0 == GNUNET_OS_process_kill (resolver, GNUNET_TERM_SIG));
+ GNUNET_OS_process_destroy (resolver);
resolver = NULL;
}
}
* Clean up and update GUI (with success).
*
* @param cls test context
- * @param success currently always GNUNET_OK
+ * @param success currently always #GNUNET_OK
*/
static void
result_callback (void *cls, int success)
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",
&adv_port))
adv_port = bnd_port;
if (NULL == resolver)
+ {
+ binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
resolver =
- GNUNET_OS_start_process (NULL, NULL, "gnunet-service-resolver",
+ GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL,
+ binary,
"gnunet-service-resolver", NULL);
+ GNUNET_free (binary);
+ }
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,
}
-/**
- * Shutdown, print statistics.
- */
-static void
-do_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct GNUNET_TIME_Relative duration;
-
- 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)
- {
- 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);
- }
-}
-
-
/**
* 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)
{
struct GNUNET_MessageHeader *m = buf;
+ 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));
traffic_sent += size;
- th = GNUNET_TRANSPORT_notify_transmit_ready (handle, &pid, 32 * 1024, 0,
+ th = GNUNET_TRANSPORT_notify_transmit_ready (handle, &pid, BLOCKSIZE * 1024, 0,
GNUNET_TIME_UNIT_FOREVER_REL,
&transmit_data, NULL);
if (verbosity > 0)
*
* @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)))
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 (GNUNET_SCHEDULER_NO_TASK != op_timeout)
+ {
+ GNUNET_SCHEDULER_cancel (op_timeout);
+ op_timeout = GNUNET_SCHEDULER_NO_TASK;
+ }
+
+ if (GNUNET_SCHEDULER_NO_TASK != 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 (GNUNET_SCHEDULER_NO_TASK != op_timeout)
+ {
+ GNUNET_SCHEDULER_cancel (op_timeout);
+ op_timeout = GNUNET_SCHEDULER_NO_TASK;
+ }
+ 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, 0,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &transmit_data, NULL);
+ else
+ GNUNET_break (0);
+ return;
}
}
static void
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 (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 (GNUNET_SCHEDULER_NO_TASK != 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)
+ 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
+
+static void
+resolve_address (const struct GNUNET_HELLO_Address *address,
+ int numeric);
+
+
+static void
process_string (void *cls, const char *address)
{
- struct GNUNET_HELLO_Address *addrcp = cls;
+ struct ResolutionContext *rc = cls;
+ struct GNUNET_HELLO_Address *addrcp = rc->addrcp;
- if ((address != NULL))
+ if (address != NULL)
{
- FPRINTF (stdout, _("Peer `%s': %s %s\n"), GNUNET_i2s (&addrcp->peer), addrcp->transport_name, address);
+ FPRINTF (stdout,
+ _("Peer `%s': %s %s\n"),
+ GNUNET_i2s (&addrcp->peer),
+ addrcp->transport_name,
+ address);
+ rc->printed = GNUNET_YES;
}
else
{
/* done */
- GNUNET_free (addrcp);
+ GNUNET_assert (address_resolutions > 0);
+ address_resolutions --;
+ if (GNUNET_NO == rc->printed)
+ {
+ if (numeric == GNUNET_NO)
+ {
+ resolve_address (rc->addrcp, GNUNET_YES ); /* Failed to resolve address, try numeric lookup */
+ }
+ else
+ FPRINTF (stdout,
+ _("Peer `%s': %s <unable to resolve address>\n"),
+ GNUNET_i2s (&addrcp->peer),
+ addrcp->transport_name);
+ }
+ GNUNET_free (rc->addrcp);
+ GNUNET_CONTAINER_DLL_remove (rc_head, rc_tail, rc);
+ GNUNET_free (rc);
+ if ((0 == address_resolutions) && (iterate_connections))
+ {
+ 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);
+ }
}
}
+
+static void
+resolve_address (const struct GNUNET_HELLO_Address *address,
+ int numeric)
+{
+ struct ResolutionContext *rc;
+
+ rc = GNUNET_new (struct ResolutionContext);
+ GNUNET_assert (NULL != rc);
+ GNUNET_CONTAINER_DLL_insert (rc_head, rc_tail, rc);
+ address_resolutions ++;
+
+ rc->addrcp = GNUNET_HELLO_address_copy(address);
+ rc->printed = GNUNET_NO;
+ /* Resolve address to string */
+ rc->asc = GNUNET_TRANSPORT_address_to_string (cfg, address, numeric,
+ RESOLUTION_TIMEOUT, &process_string,
+ rc);
+}
+
/**
- * Function to call with a human-readable format of an address
+ * Function to call with a binary address
*
* @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 binary address (NULL on disconnect)
*/
static void
process_address (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_HELLO_Address *address)
{
- const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
-
- if ((address == NULL) || (peer == NULL))
+ if (peer == NULL)
{
/* 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);
+ return;
+ }
+ if (address == NULL)
+ {
+ FPRINTF (stdout, _("Peer `%s' disconnected\n"), GNUNET_i2s (peer));
return;
}
- /* Resolve address to string */
- GNUNET_TRANSPORT_address_to_string (cfg, address, numeric,
- GNUNET_TIME_UNIT_MINUTES, &process_string,
- GNUNET_HELLO_address_copy(address));
+ if (GNUNET_SCHEDULER_NO_TASK != 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);
+ resolve_address (address, numeric);
+}
+
+
+static void
+try_connect_cb (void *cls,
+ const int result)
+{
+ static int retries = 0;
+ if (GNUNET_OK == result)
+ {
+ tc_handle = NULL;
+ 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);
+ return;
+ }
}
/**
- * Main function that will be run by the scheduler.
+ * Function called with the result of the check if the 'transport'
+ * service is running.
*
- * @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 cls closure with our configuration
+ * @param result #GNUNET_YES if transport is running
*/
static void
-run (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+testservice_task (void *cls,
+ int result)
{
- if (test_configuration)
+ int counter = 0;
+ ret = 1;
+
+ if (GNUNET_YES != result)
{
- do_test_configuration (cfg);
+ FPRINTF (stderr,
+ _("Service `%s' is not running\n"), "transport");
+ return;
}
- if (benchmark_send && (NULL == cpid))
+
+ if ( (NULL != cpid) &&
+ (GNUNET_OK != GNUNET_CRYPTO_eddsa_public_key_from_string (cpid,
+ strlen (cpid),
+ &pid.public_key)))
{
- FPRINTF (stderr, _("Option `%s' makes no sense without option `%s'.\n"),
- "-s", "-C");
+ FPRINTF (stderr, _("Failed to parse peer identity `%s'\n"), cpid);
return;
}
- if (NULL != cpid)
+
+ counter = benchmark_send + benchmark_receive + iterate_connections +
+ monitor_connections + monitor_connects + try_connect;
+
+ if (1 < counter)
{
- ret = 1;
- if (GNUNET_OK != GNUNET_CRYPTO_hash_from_string (cpid, &pid.hashPubKey))
+ FPRINTF (stderr,
+ _("Multiple operations given. Please choose only one operation: %s, %s, %s, %s, %s, %s\n"),
+ "connect", "benchmark send", "benchmark receive", "information", "monitor", "events");
+ return;
+ }
+ if (0 == counter)
+ {
+ FPRINTF (stderr,
+ _("No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"),
+ "connect", "benchmark send", "benchmark receive", "information", "monitor", "events");
+ return;
+ }
+
+ if (try_connect) /* -C: Connect to peer */
+ {
+ if (NULL == cpid)
{
- FPRINTF (stderr, _("Failed to parse peer identity `%s'\n"), 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 (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"));
+ ret = 1;
+ return;
+ }
+ start_time = GNUNET_TIME_absolute_get ();
+ op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT,
+ &operation_timeout, NULL);
}
- else if (benchmark_receive)
+ else if (benchmark_receive) /* -b: Benchmark receiving */
{
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);
+ 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 ();
+
}
- if (iterate_connections)
+ else if (iterate_connections) /* -i: List all active addresses once */
{
- GNUNET_TRANSPORT_peer_get_active_addresses (cfg, NULL, GNUNET_YES,
- GNUNET_TIME_UNIT_MINUTES,
+ address_resolution_in_progress = GNUNET_YES;
+ pic = GNUNET_TRANSPORT_peer_get_active_addresses (cfg,
+ (NULL == cpid) ? NULL : &pid,
+ GNUNET_YES,
+ TIMEOUT,
&process_address, (void *) cfg);
+ op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT,
+ &operation_timeout, NULL);
}
+ else if (monitor_connections) /* -m: List all active addresses continously */
+ {
+ address_resolution_in_progress = GNUNET_YES;
+ pic = GNUNET_TRANSPORT_peer_get_active_addresses (cfg,
+ (NULL == cpid) ? NULL : &pid,
+ GNUNET_NO,
+ TIMEOUT,
+ &process_address, (void *) cfg);
+ }
+ else if (monitor_connects) /* -e : Monitor (dis)connect events continously */
+ {
+ 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)
{
+ int res;
static const struct GNUNET_GETOPT_CommandLineOption options[] = {
{'b', "benchmark", NULL,
- gettext_noop ("measure how fast we are receiving data (until CTRL-C)"),
+ gettext_noop ("measure how fast we are receiving data from all peers (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},
+ {'C', "connect", NULL,
+ gettext_noop ("connect to a peer"),
+ 0, &GNUNET_GETOPT_set_one, &try_connect},
{'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)"),
{'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},
GNUNET_GETOPT_OPTION_VERBOSE (&verbosity),
GNUNET_GETOPT_OPTION_END
};
- return (GNUNET_OK ==
- GNUNET_PROGRAM_run (argc, argv, "gnunet-transport",
+
+ 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)) ? ret : 1;
+ &run, NULL);
+ GNUNET_free ((void *) argv);
+ if (GNUNET_OK == res)
+ return ret;
+ return 1;
}
projects / oweals / gnunet.git / blobdiff