X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Fgnunet-transport.c;h=4e251a009256fc6a3ae85f58d72235fdc34bca1c;hb=1947bc8ef4eb37738ffc1c566d9c6f96071b29f7;hp=ee23189a8ef1badc9e0498732172eaf9cdf2a47c;hpb=5b4628337a35dac0fd34e51042b21db70dd39dee;p=oweals%2Fgnunet.git

diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c
index ee23189a8..4e251a009 100644
--- a/src/transport/gnunet-transport.c
+++ b/src/transport/gnunet-transport.c
@@ -41,6 +41,13 @@
  */
 #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)
+
+/**
+ * Benchmarking block size in KB
+ */
+#define BLOCKSIZE 4
+
 
 /**
  * Which peer should we connect to?
@@ -52,6 +59,12 @@ static char *cpid;
  */
 static struct GNUNET_TRANSPORT_Handle *handle;
 
+
+/**
+ * Try_connect handle
+ */
+struct GNUNET_TRANSPORT_TryConnectHandle * tc_handle;
+
 /**
  * Option -s.
  */
@@ -77,11 +90,21 @@ static int iterate_connections;
  */
 static int test_configuration;
 
+/**
+ * Option -c.
+ */
+static int monitor_connects;
+
 /**
  * Option -m.
  */
 static int monitor_connections;
 
+/**
+ * Option -C.
+ */
+static int try_connect;
+
 /**
  * Option -n.
  */
@@ -92,6 +115,11 @@ static int numeric;
  */
 static int ret;
 
+/**
+ * Current number of connections in monitor mode
+ */
+static int monitor_connect_counter;
+
 /**
  * Number of bytes of traffic we received so far.
  */
@@ -112,6 +140,11 @@ static struct GNUNET_TIME_Absolute start_time;
  */
 static struct GNUNET_TRANSPORT_TransmitHandle *th;
 
+/**
+ *
+ */
+struct GNUNET_TRANSPORT_PeerIterateContext *pic;
+
 /**
  * Identity of the peer we transmit to / connect to.
  * (equivalent to 'cpid' string).
@@ -123,6 +156,12 @@ static struct GNUNET_PeerIdentity pid;
  */
 static GNUNET_SCHEDULER_TaskIdentifier end;
 
+/**
+ * Task for operation timeout
+ */
+static GNUNET_SCHEDULER_TaskIdentifier op_timeout;
+
+
 static struct GNUNET_CONTAINER_MultiHashMap *peers;
 
 /**
@@ -140,6 +179,15 @@ struct GNUNET_OS_Process *resolver;
  */
 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.
@@ -165,6 +213,86 @@ struct TestContext
 };
 
 
+/**
+ * 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 (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,
+             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),
+             traffic_received,
+             GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_YES));
+  }
+}
+
+
+
+static void
+operation_timeout (void *cls,
+               const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  op_timeout = GNUNET_SCHEDULER_NO_TASK;
+  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)
+        GNUNET_SCHEDULER_cancel (end);
+      end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+      ret = 1;
+      return;
+  }
+}
+
+
+
 /**
  * Display the result of the test.
  *
@@ -197,7 +325,7 @@ display_test_result (struct TestContext *tc, int result)
   if ((0 == resolver_users) && (NULL != resolver))
   {
     GNUNET_break (0 == GNUNET_OS_process_kill (resolver, SIGTERM));
-    GNUNET_OS_process_close (resolver);
+    GNUNET_OS_process_destroy (resolver);
     resolver = NULL;
   }
 }
@@ -279,7 +407,7 @@ do_test_configuration (const struct GNUNET_CONFIGURATION_Handle *cfg)
       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);
@@ -302,38 +430,6 @@ do_test_configuration (const struct GNUNET_CONFIGURATION_Handle *cfg)
   GNUNET_free (plugins);
 }
 
-
-/**
- * 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
@@ -350,13 +446,19 @@ 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)
@@ -379,23 +481,45 @@ static void
 notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
                 const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
 {
-  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_h2s_full (&peer->hashPubKey));
+      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;
   }
 }
 
@@ -410,18 +534,72 @@ notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
 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
+ * @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_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.
@@ -437,14 +615,19 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
                 const struct GNUNET_MessageHeader *message,
                 const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
 {
-  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);
+  }
 }
 
 struct ResolutionContext
@@ -469,10 +652,19 @@ process_string (void *cls, const char *address)
   else
   {
     /* done */
+    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);
     GNUNET_free (rc->addrcp);
     GNUNET_free (rc);
+    if ((0 == address_resolutions) && (iterate_connections))
+    {
+        if (GNUNET_SCHEDULER_NO_TASK != end)
+          GNUNET_SCHEDULER_cancel (end);
+        ret = 0;
+        end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+    }
   }
 }
 
@@ -493,9 +685,10 @@ process_address (void *cls, const struct GNUNET_PeerIdentity *peer,
   if (peer == NULL)
   {
     /* done */
+    address_resolution_in_progress = GNUNET_NO;
+    pic = NULL;
     return;
   }
-
   if (address == NULL)
   {
     FPRINTF (stdout, _("Peer `%s' disconnected\n"), GNUNET_i2s (peer));
@@ -507,128 +700,247 @@ process_address (void *cls, const struct GNUNET_PeerIdentity *peer,
   rc->printed = GNUNET_NO;
 
   GNUNET_assert (NULL != rc);
-
+  address_resolutions ++;
   /* Resolve address to string */
   GNUNET_TRANSPORT_address_to_string (cfg, address, numeric,
                                       RESOLUTION_TIMEOUT, &process_string,
                                       rc);
 }
 
+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;
+  }
+}
+
 
-/**
- * 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)
+testservice_task (void *cls,
+                  const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  struct GNUNET_TRANSPORT_PeerIterateContext *pic = cls;
-
-  GNUNET_TRANSPORT_peer_get_active_addresses_cancel (pic);
+  struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+  int counter = 0;
+  ret = 1;
 
-  if (NULL != peers)
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
   {
-    GNUNET_CONTAINER_multihashmap_destroy (peers);
-    peers = NULL;
+      FPRINTF (stderr, _("Service `%s' is not running\n"), "transport");
+      return;
   }
-}
 
+  if ((NULL != cpid) && (GNUNET_OK != GNUNET_CRYPTO_hash_from_string (cpid, &pid.hashPubKey)))
+  {
+      FPRINTF (stderr, _("Failed to parse peer identity `%s'\n"), cpid);
+      return;
+  }
 
+  counter = benchmark_send + benchmark_receive + iterate_connections +
+            monitor_connections + monitor_connects + try_connect;
 
-/**
- * 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)
+  if (1 < counter)
   {
-    do_test_configuration (cfg);
+    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 (benchmark_send && (NULL == cpid))
+  if (0 == counter)
   {
-    FPRINTF (stderr, _("Option `%s' makes no sense without option `%s'.\n"),
-             "-s", "-C");
+    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)
+
+  if (try_connect) /* -C: Connect to peer */
   {
-    ret = 1;
-    if (GNUNET_OK != GNUNET_CRYPTO_hash_from_string (cpid, &pid.hashPubKey))
+    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, &notify_receive,
-                                  &notify_connect, &notify_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,
+                                       &notify_receive,
+                                       &notify_connect,
+                                       &notify_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_receive)
+  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,
+                                       &notify_receive,
+                                       &notify_connect,
+                                       &notify_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) /* -b: Benchmark receiving */
   {
     handle =
         GNUNET_TRANSPORT_connect (cfg, NULL, NULL, &notify_receive,
-                                  &notify_connect, &notify_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 ();
+
+  }
+  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 == cpid) ? NULL : &pid,
+                                                GNUNET_YES,
+                                                TIMEOUT,
+                                                &process_address, (void *) cfg);
   }
-  if (iterate_connections)
+  else if (monitor_connections) /* -m: List all active addresses continously */
   {
-    peers = GNUNET_CONTAINER_multihashmap_create (20);
-    GNUNET_TRANSPORT_peer_get_active_addresses (cfg, NULL, GNUNET_YES,
+    peers = GNUNET_CONTAINER_multihashmap_create (20, GNUNET_NO);
+    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);
   }
-  if (monitor_connections)
+  else if (monitor_connects) /* -e : Monitor (dis)connect events continously */
   {
-    struct GNUNET_TRANSPORT_PeerIterateContext *pic;
+    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);
+
+}
+
 
-    pic = GNUNET_TRANSPORT_peer_get_active_addresses (cfg, NULL, GNUNET_NO,
-						      GNUNET_TIME_UNIT_FOREVER_REL,
-						      &process_address, (void *) cfg);
-    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-				  &shutdown_task,
-				  pic);
+/**
+ * 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);
+    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)"),
@@ -639,11 +951,18 @@ main (int argc, char *const *argv)
     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;
 }