[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r17784 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r17784 - gnunet/src/transport |
Date: |
Wed, 26 Oct 2011 13:52:38 +0200 |
Author: grothoff
Date: 2011-10-26 13:52:38 +0200 (Wed, 26 Oct 2011)
New Revision: 17784
Modified:
gnunet/src/transport/gnunet-transport.c
Log:
kb
Modified: gnunet/src/transport/gnunet-transport.c
===================================================================
--- gnunet/src/transport/gnunet-transport.c 2011-10-26 11:46:42 UTC (rev
17783)
+++ gnunet/src/transport/gnunet-transport.c 2011-10-26 11:52:38 UTC (rev
17784)
@@ -74,15 +74,19 @@
{
duration = GNUNET_TIME_absolute_get_duration (start_time);
fprintf (stderr,
- "Received %llu bytes/s\n",
- traffic_received / (1+duration.rel_value));
+ "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 (stderr,
- "Transmitted %llu bytes/s\n",
- traffic_sent / (1+duration.rel_value));
+ "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);
}
}
@@ -116,6 +120,10 @@
0,
GNUNET_TIME_UNIT_FOREVER_REL,
&transmit_data, NULL);
+ fprintf (stderr,
+ "Transmitting %u bytes to %s\n",
+ (unsigned int) size,
+ GNUNET_i2s (&pid));
return size;
}
@@ -137,6 +145,9 @@
GNUNET_ATS_Information
* ats, uint32_t ats_count)
{
+ fprintf (stderr,
+ "Connected to %s\n",
+ GNUNET_i2s (peer));
if (0 != memcmp (&pid,
peer,
sizeof (struct GNUNET_PeerIdentity)))
@@ -174,6 +185,9 @@
const struct
GNUNET_PeerIdentity * peer)
{
+ fprintf (stderr,
+ "Disconnected from %s\n",
+ GNUNET_i2s (peer));
if ( (0 == memcmp (&pid,
peer,
sizeof (struct GNUNET_PeerIdentity))) &&
@@ -210,6 +224,10 @@
{
if (! benchmark_receive)
return;
+ fprintf (stderr,
+ "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);
@@ -237,19 +255,18 @@
if (NULL != cpid)
{
ret = 1;
- handle = GNUNET_TRANSPORT_connect (cfg, NULL, NULL,
- ¬ify_receive,
- ¬ify_connect,
- ¬ify_disconnect);
if (GNUNET_OK !=
GNUNET_CRYPTO_hash_from_string (cpid, &pid.hashPubKey))
{
fprintf (stderr,
_("Failed to parse peer identity `%s'\n"),
cpid);
- GNUNET_TRANSPORT_disconnect (handle);
return;
}
+ handle = GNUNET_TRANSPORT_connect (cfg, NULL, NULL,
+ ¬ify_receive,
+ ¬ify_connect,
+ ¬ify_disconnect);
GNUNET_TRANSPORT_try_connect (handle, &pid);
end = GNUNET_SCHEDULER_add_delayed (benchmark_send
? GNUNET_TIME_UNIT_FOREVER_REL
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r17784 - gnunet/src/transport,
gnunet <=