* 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.
*/
*/
static GNUNET_SCHEDULER_TaskIdentifier op_timeout;
-
-static struct GNUNET_CONTAINER_MultiHashMap *peers;
-
/**
* Selected level of verbosity.
*/
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);
GNUNET_TRANSPORT_disconnect(handle);
handle = NULL;
}
- if (NULL != peers)
- {
- GNUNET_CONTAINER_multihashmap_destroy (peers);
- peers = NULL;
- }
if (benchmark_send)
{
duration = GNUNET_TIME_absolute_get_duration (start_time);
FPRINTF (stdout, _("Transmitted %llu bytes/s (%llu bytes in %s)\n"),
- 1000 * traffic_sent / (1 + duration.rel_value), traffic_sent,
+ 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"),
- 1000 * traffic_received / (1 + duration.rel_value),
+ 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)
+ 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_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)
{
- FPRINTF (stdout, _("Failed to connect to `%s'\n"), GNUNET_h2s_full (&pid.hashPubKey));
+ 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_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 (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, 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,
GNUNET_free (plugins);
}
+
/**
* 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))
+ if ((NULL == buf) || (0 == size))
{
th = NULL;
return 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 (0 != memcmp (&pid, peer, sizeof (struct GNUNET_PeerIdentity)))
return;
if (try_connect)
{
/* all done, terminate instantly */
- FPRINTF (stdout, _("Successfully connected to `%s'\n"), GNUNET_h2s_full (&peer->hashPubKey));
+ FPRINTF (stdout,
+ _("Successfully connected to `%s'\n"),
+ GNUNET_i2s_full (peer));
ret = 0;
if (GNUNET_SCHEDULER_NO_TASK != op_timeout)
*
* @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
-monitor_notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
+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"),
+ FPRINTF (stdout,
+ _("%24s: %-17s %4s (%u connections in total)\n"),
now_str,
_("Connected to"),
GNUNET_i2s (peer),
GNUNET_assert (monitor_connect_counter > 0);
monitor_connect_counter --;
- FPRINTF (stdout, _("%24s: %-17s %4s (%u connections in total)\n"),
+ FPRINTF (stdout,
+ _("%24s: %-17s %4s (%u connections in total)\n"),
now_str,
_("Disconnected from"),
GNUNET_i2s (peer),
* @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 (GNUNET_MESSAGE_TYPE_DUMMY != ntohs (message->type))
return;
if (verbosity > 0)
- FPRINTF (stdout, _("Received %u bytes from %s\n"),
+ FPRINTF (stdout,
+ _("Received %u bytes from %s\n"),
(unsigned int) ntohs (message->size), GNUNET_i2s (peer));
if (traffic_received == 0)
}
}
-struct ResolutionContext
-{
- struct GNUNET_HELLO_Address *addrcp;
- int printed;
-};
+static void
+resolve_address (const struct GNUNET_HELLO_Address *address,
+ int numeric);
static void
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
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_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 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);
+}
+
+
+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;
+ }
}
+/**
+ * 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,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+ int result)
{
- struct GNUNET_CONFIGURATION_Handle *cfg = cls;
int counter = 0;
ret = 1;
- if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
+ if (GNUNET_YES != result)
{
- FPRINTF (stderr, _("Service `%s' is not running\n"), "transport");
- return;
+ FPRINTF (stderr,
+ _("Service `%s' is not running\n"), "transport");
+ return;
}
- if ((NULL != cpid) && (GNUNET_OK != GNUNET_CRYPTO_hash_from_string (cpid, &pid.hashPubKey)))
+ 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;
+ FPRINTF (stderr, _("Failed to parse peer identity `%s'\n"), cpid);
+ return;
}
counter = benchmark_send + benchmark_receive + iterate_connections +
if (1 < counter)
{
- FPRINTF (stderr, _("Multiple operations given. Please choose only one operation: %s, %s, %s, %s, %s, %s\n"),
+ 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"),
+ 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 (NULL == cpid)
{
- FPRINTF (stderr, _("Option `%s' makes no sense without option `%s'.\n"),
+ FPRINTF (stderr,
+ _("Option `%s' makes no sense without option `%s'.\n"),
"-C", "-p");
ret = 1;
return;
¬ify_disconnect);
if (NULL == handle)
{
- FPRINTF (stderr, "%s", _("Failed to connect to transport service\n"));
+ FPRINTF (stderr,
+ "%s",
+ _("Failed to connect to transport service\n"));
ret = 1;
return;
}
- GNUNET_TRANSPORT_try_connect (handle, &pid);
+ 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);
ret = 1;
return;
}
- GNUNET_TRANSPORT_try_connect (handle, &pid);
+ 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 (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);
* @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 mycfg configuration
*/
static void
run (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+ 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);
+ GNUNET_TIME_UNIT_SECONDS,
+ &testservice_task,
+ (void *) cfg);
}
projects / oweals / gnunet.git / blobdiff