* 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, 30)
-#define RESOLUTION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
-#define OP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+#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
*/
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.
*/
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);
}
}
+struct ResolutionContext *rc_head;
+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))
+ if ((try_connect) || (benchmark_send) ||
+ (benchmark_receive))
{
FPRINTF (stdout, _("Failed to connect to `%s'\n"), GNUNET_h2s_full (&pid.hashPubKey));
if (GNUNET_SCHEDULER_NO_TASK != end)
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;
+ }
+
}
GNUNET_break (0);
return;
}
- if (benchmark_receive)
- {
- if (verbosity > 0)
- FPRINTF (stdout, _("Successfully connected to `%s', starting to receive benchmark data\n"),
- GNUNET_i2s (&pid));
- start_time = GNUNET_TIME_absolute_get ();
- 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);
}
}
-struct ResolutionContext
-{
- struct GNUNET_HELLO_Address *addrcp;
- int printed;
-};
+static void resolve_address (const struct GNUNET_HELLO_Address *address,
+ int numeric);
static void
GNUNET_assert (address_resolutions > 0);
address_resolutions --;
if (GNUNET_NO == rc->printed)
- FPRINTF (stdout, _("Peer `%s': %s <unable to resolve address>\n"), GNUNET_i2s (&addrcp->peer), addrcp->transport_name);
+ {
+ 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_malloc(sizeof (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 binary address
*
process_address (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_HELLO_Address *address)
{
- const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
- struct ResolutionContext *rc;
-
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)
return;
}
- rc = GNUNET_malloc(sizeof (struct ResolutionContext));
- rc->addrcp = GNUNET_HELLO_address_copy(address);
- rc->printed = GNUNET_NO;
+ if (GNUNET_SCHEDULER_NO_TASK != op_timeout)
+ GNUNET_SCHEDULER_cancel (op_timeout);
+ op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT,
+ &operation_timeout, NULL);
- GNUNET_assert (NULL != rc);
- address_resolutions ++;
- /* Resolve address to string */
- GNUNET_TRANSPORT_address_to_string (cfg, address, numeric,
- RESOLUTION_TIMEOUT, &process_string,
- rc);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received address for peer `%s': %s\n",
+ GNUNET_i2s (peer), address->transport_name);
+ resolve_address (address, numeric);
+}
+
+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;
+ }
}
testservice_task (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct GNUNET_CONFIGURATION_Handle *cfg = cls;
int counter = 0;
ret = 1;
return;
}
- end = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &shutdown_task,
- NULL);
-
- if (try_connect)
+ 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_disconnect);
if (NULL == handle)
{
- FPRINTF (stderr, _("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);
+ if (NULL == tc_handle)
+ {
+ FPRINTF (stderr, "%s", _("Failed to send request to transport service\n"));
ret = 1;
return;
}
- GNUNET_TRANSPORT_try_connect (handle, &pid);
op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT,
&operation_timeout, NULL);
}
- else if (benchmark_send) /* Benchmark sending */
+ else if (benchmark_send) /* -s: Benchmark sending */
{
if (NULL == cpid)
{
¬ify_disconnect);
if (NULL == handle)
{
- FPRINTF (stderr, _("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);
+ if (NULL == tc_handle)
+ {
+ FPRINTF (stderr, "%s", _("Failed to send request to transport service\n"));
ret = 1;
return;
}
- GNUNET_TRANSPORT_try_connect (handle, &pid);
start_time = GNUNET_TIME_absolute_get ();
op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT,
&operation_timeout, NULL);
}
- else if (benchmark_receive) /* Benchmark receiving */
+ else if (benchmark_receive) /* -b: Benchmark receiving */
{
handle =
GNUNET_TRANSPORT_connect (cfg, NULL, NULL, ¬ify_receive,
- ¬ify_connect, ¬ify_disconnect);
+ NULL, NULL);
if (NULL == handle)
{
- FPRINTF (stderr, _("Failed to connect to transport service\n"));
+ FPRINTF (stderr, "%s", _("Failed to connect to transport service\n"));
ret = 1;
return;
}
- GNUNET_TRANSPORT_try_connect (handle, &pid);
+ if (verbosity > 0)
+ FPRINTF (stdout, "%s", _("Starting to receive benchmark data\n"));
start_time = GNUNET_TIME_absolute_get ();
- op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT,
- &operation_timeout, NULL);
+
}
else if (iterate_connections) /* -i: List all active addresses once */
{
peers = GNUNET_CONTAINER_multihashmap_create (20, GNUNET_NO);
address_resolution_in_progress = GNUNET_YES;
- pic = GNUNET_TRANSPORT_peer_get_active_addresses (cfg, NULL,
+ 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 */
{
peers = GNUNET_CONTAINER_multihashmap_create (20, GNUNET_NO);
address_resolution_in_progress = GNUNET_YES;
- pic = GNUNET_TRANSPORT_peer_get_active_addresses (cfg, NULL,
+ pic = GNUNET_TRANSPORT_peer_get_active_addresses (cfg,
+ (NULL == cpid) ? NULL : &pid,
GNUNET_NO,
TIMEOUT,
&process_address, (void *) cfg);
&monitor_notify_disconnect);
if (NULL == handle)
{
- FPRINTF (stderr, _("Failed to connect to transport service\n"));
+ FPRINTF (stderr, "%s", _("Failed to connect to transport service\n"));
ret = 1;
return;
}
GNUNET_break (0);
return;
}
+
+ end = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ &shutdown_task,
+ NULL);
+
}
*/
static void
run (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+ const struct GNUNET_CONFIGURATION_Handle *mycfg)
{
- if (test_configuration)
+ cfg = (struct GNUNET_CONFIGURATION_Handle *) mycfg;
+ if (test_configuration)
{
do_test_configuration (cfg);
return;
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", NULL,
gettext_noop ("connect to a peer"),
projects / oweals / gnunet.git / blobdiff