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

[gnunet]

Author: nevans
Date: 2010-04-28 18:36:39 +0200 (Wed, 28 Apr 2010)
New Revision: 11108

Modified:
   gnunet/src/transport/gnunet-service-transport.c
   gnunet/src/transport/transport_api.c
Log:
missing distance metrics in transport stuffs

Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2010-04-28 15:21:59 UTC 
(rev 11107)
+++ gnunet/src/transport/gnunet-service-transport.c     2010-04-28 16:36:39 UTC 
(rev 11108)
@@ -3177,6 +3177,7 @@
   im->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_RECV);
   im->latency = GNUNET_TIME_relative_hton (n->latency);
   im->peer = n->id;
+  im->distance = ntohl(n->distance);
   memcpy (&im[1], message, msize);
   cpos = clients;
   while (cpos != NULL)
@@ -3278,6 +3279,7 @@
        n->latency = fal->latency;
       else
        n->latency.value = (fal->latency.value + n->latency.value) / 2;
+
       n->distance = fal->distance;
       if (GNUNET_NO == n->received_pong)
        {
@@ -4043,7 +4045,7 @@
 static struct GNUNET_TIME_Relative
 plugin_env_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
                     const struct GNUNET_MessageHeader *message,
-                    unsigned int distance,
+                    uint32_t distance,
                    struct Session *session,
                    const char *sender_address,
                     size_t sender_address_len)

Modified: gnunet/src/transport/transport_api.c
===================================================================
--- gnunet/src/transport/transport_api.c        2010-04-28 15:21:59 UTC (rev 
11107)
+++ gnunet/src/transport/transport_api.c        2010-04-28 16:36:39 UTC (rev 
11108)
@@ -1497,7 +1497,7 @@
       if (h->nc_cb != NULL)
        h->nc_cb (h->cls, &n->id,
                  GNUNET_TIME_relative_ntoh (cim->latency), 
-                 ntohs (cim->distance));
+                 ntohl (cim->distance));
       break;
     case GNUNET_MESSAGE_TYPE_TRANSPORT_DISCONNECT:
       if (size != sizeof (struct DisconnectInfoMessage))
@@ -1587,7 +1587,7 @@
        }
       if (h->rec != NULL)
        h->rec (h->cls, &im->peer, imm,
-               GNUNET_TIME_relative_ntoh (im->latency), ntohs(im->distance));
+               GNUNET_TIME_relative_ntoh (im->latency), ntohl(im->distance));
       break;
     default:
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,