adv_port = bnd_port;
if (NULL == resolver)
resolver =
- GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-resolver",
+ GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "gnunet-service-resolver",
"gnunet-service-resolver", NULL);
resolver_users++;
GNUNET_RESOLVER_connect (cfg);
if (benchmark_receive)
{
duration = GNUNET_TIME_absolute_get_duration (start_time);
- FPRINTF (stdout, _("Received %llu bytes/s (%llu bytes in %llu ms)\n"),
+ FPRINTF (stdout, _("Received %llu bytes/s (%llu bytes in %s)\n"),
1000 * traffic_received / (1 + duration.rel_value),
- traffic_received, (unsigned long long) duration.rel_value);
+ traffic_received,
+ GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_YES));
}
if (benchmark_send)
{
duration = GNUNET_TIME_absolute_get_duration (start_time);
- FPRINTF (stdout, _("Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"),
+ FPRINTF (stdout, _("Transmitted %llu bytes/s (%llu bytes in %s)\n"),
1000 * traffic_sent / (1 + duration.rel_value), traffic_sent,
- (unsigned long long) duration.rel_value);
+ GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_YES));
}
}
{
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);
if (benchmark_send)
{
start_time = GNUNET_TIME_absolute_get ();
- th = GNUNET_TRANSPORT_notify_transmit_ready (handle, peer, 32 * 1024, 0,
+ if (NULL == th)
+ th = GNUNET_TRANSPORT_notify_transmit_ready (handle, peer, 32 * 1024, 0,
GNUNET_TIME_UNIT_FOREVER_REL,
&transmit_data, NULL);
}
{
monitor_connections_counter ++;
struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get();
- char *now_str = GNUNET_STRINGS_absolute_time_to_string (now);
+ 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_connections_counter);
-
- GNUNET_free (now_str);
}
monitor_notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
{
struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get();
- char *now_str = GNUNET_STRINGS_absolute_time_to_string (now);
+ const char *now_str = GNUNET_STRINGS_absolute_time_to_string (now);
GNUNET_assert (monitor_connections_counter > 0);
monitor_connections_counter --;
_("Disconnected from"),
GNUNET_i2s (peer),
monitor_connections_counter);
- GNUNET_free (now_str);
}
{
if (!benchmark_receive)
return;
+ 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));
shutdown_task (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ if (NULL != th)
+ {
+ GNUNET_TRANSPORT_notify_transmit_ready_cancel(th);
+ th = NULL;
+ }
if (NULL != handle)
{
GNUNET_TRANSPORT_disconnect(handle);
}
}
-
-
-/**
- * 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 cfg configuration
- */
static void
-run (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+testservice_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (test_configuration)
+ struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
{
- do_test_configuration (cfg);
+ FPRINTF (stderr, _("Service `%s' is not running\n"), "transport");
+ return;
}
+
if (benchmark_send && (NULL == cpid))
{
FPRINTF (stderr, _("Option `%s' makes no sense without option `%s'.\n"),
GNUNET_TRANSPORT_connect (cfg, NULL, NULL, ¬ify_receive,
¬ify_connect, ¬ify_disconnect);
GNUNET_TRANSPORT_try_connect (handle, &pid);
+ start_time = GNUNET_TIME_absolute_get ();
end =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
&do_disconnect, NULL);
}
if (iterate_connections)
{
- peers = GNUNET_CONTAINER_multihashmap_create (20);
+ peers = GNUNET_CONTAINER_multihashmap_create (20, GNUNET_NO);
GNUNET_TRANSPORT_peer_get_active_addresses (cfg, NULL, GNUNET_YES,
TIMEOUT,
&process_address, (void *) cfg);
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 cfg configuration
+ */
+static void
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ if (test_configuration)
+ {
+ do_test_configuration (cfg);
+ }
+
+ GNUNET_CLIENT_service_test ("transport", cfg,
+ GNUNET_TIME_UNIT_SECONDS,
+ &testservice_task,
+ (void *) cfg);
}