[GNUnet-SVN] r24843 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2012-11-08 15:33:44 +0100 (Thu, 08 Nov 2012)
New Revision: 24843

Modified:
   gnunet/src/transport/gnunet-transport.c
Log:
- gnunet-transport improvement done

Modified: gnunet/src/transport/gnunet-transport.c
===================================================================
--- gnunet/src/transport/gnunet-transport.c     2012-11-08 14:20:53 UTC (rev 
24842)
+++ gnunet/src/transport/gnunet-transport.c     2012-11-08 14:33:44 UTC (rev 
24843)
@@ -515,6 +515,12 @@
       if (verbosity > 0)
         FPRINTF (stdout, _("Successfully connected to `%s', starting to 
receive benchmark data\n"),
             GNUNET_i2s (&pid));
+      if (GNUNET_SCHEDULER_NO_TASK != op_timeout)
+      {
+        GNUNET_SCHEDULER_cancel (op_timeout);
+        op_timeout = GNUNET_SCHEDULER_NO_TASK;
+      }
+
       start_time = GNUNET_TIME_absolute_get ();
       return;
   }
@@ -616,9 +622,16 @@
   {
     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 (0 == memcmp (&pid, peer, sizeof (struct GNUNET_PeerIdentity)))
+    {
+      if (verbosity > 0)
+        FPRINTF (stdout, _("Received %u bytes from %s\n"),
+                 (unsigned int) ntohs (message->size), GNUNET_i2s (peer));
+    }
+    else
+        /* Received data from other peer*/ return;
+
     if (traffic_received == 0)
       start_time = GNUNET_TIME_absolute_get ();
     traffic_received += ntohs (message->size);
@@ -740,16 +753,13 @@
     return;
   }
 
-  end = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                      &shutdown_task,
-                                      NULL);
-
   if (try_connect)
   {
     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,
@@ -793,6 +803,13 @@
   }
   else if (benchmark_receive) /* Benchmark receiving */
   {
+    if (NULL == cpid)
+    {
+      FPRINTF (stderr, _("Option `%s' makes no sense without option `%s'.\n"),
+               "-b", "-p");
+      ret = 1;
+      return;
+    }
     handle =
         GNUNET_TRANSPORT_connect (cfg, NULL, NULL, &notify_receive,
                                   &notify_connect, &notify_disconnect);
@@ -844,6 +861,11 @@
     GNUNET_break (0);
     return;
   }
+
+  end = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+                                      &shutdown_task,
+                                      NULL);
+
 }