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

[gnunet]

Author: wachs
Date: 2013-10-18 15:09:38 +0200 (Fri, 18 Oct 2013)
New Revision: 30314

Modified:
   gnunet/src/transport/gnunet-service-transport_neighbours.c
   gnunet/src/transport/gnunet-service-transport_neighbours.h
   gnunet/src/transport/gnunet-service-transport_validation.c
Log:
payload and data


Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c  2013-10-18 
12:45:47 UTC (rev 30313)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c  2013-10-18 
13:09:38 UTC (rev 30314)
@@ -993,6 +993,8 @@
                            cont, cont_cls)))) &&
        (NULL != cont))
     cont (cont_cls, &n->id, GNUNET_SYSERR, msgbuf_size, 0);
+  GST_neighbours_notify_data_sent (&n->id,
+      n->primary_address.address, n->primary_address.session, msgbuf_size);
   GNUNET_break (NULL != papi);
 }
 
@@ -1593,6 +1595,8 @@
                     UINT_MAX,
                     GNUNET_TIME_UNIT_FOREVER_REL,
                     NULL, NULL);
+  GST_neighbours_notify_data_sent (&na->address->peer,
+      na->address, na->session, sizeof (struct SessionConnectMessage));
 
 }
 
@@ -2482,10 +2486,14 @@
 
 void
 GST_neighbours_notify_data_sent (const struct GNUNET_PeerIdentity *peer,
-    size_t size)
+                     const struct GNUNET_HELLO_Address *address,
+                     struct Session *session,
+                     size_t size)
 {
   struct NeighbourMapEntry *n;
   n = lookup_neighbour (peer);
+  if (n->primary_address.session != session)
+    return;
   if (NULL == n)
   {
       return;

Modified: gnunet/src/transport/gnunet-service-transport_neighbours.h
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.h  2013-10-18 
12:45:47 UTC (rev 30313)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.h  2013-10-18 
13:09:38 UTC (rev 30314)
@@ -222,7 +222,9 @@
 
 void
 GST_neighbours_notify_data_sent (const struct GNUNET_PeerIdentity *peer,
-    size_t size);
+                     const struct GNUNET_HELLO_Address *address,
+                     struct Session *session,
+                     size_t size);
 
 /**
  * For an existing neighbour record, set the active connection to

Modified: gnunet/src/transport/gnunet-service-transport_validation.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_validation.c  2013-10-18 
12:45:47 UTC (rev 30313)
+++ gnunet/src/transport/gnunet-service-transport_validation.c  2013-10-18 
13:09:38 UTC (rev 30314)
@@ -28,6 +28,7 @@
 #include "gnunet-service-transport_plugins.h"
 #include "gnunet-service-transport_hello.h"
 #include "gnunet-service-transport_blacklist.h"
+#include "gnunet-service-transport_neighbours.h"
 #include "gnunet-service-transport.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_ats_service.h"
@@ -552,11 +553,12 @@
         network = papi->get_network (ve->address, session);
         if (GNUNET_ATS_NET_UNSPECIFIED == network)
         {
-          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                                                       "Could not obtain a 
valid network for `%s' %s\n",
-                      GNUNET_i2s (pid), GST_plugins_a2s (ve->address));
-               GNUNET_break (0);
+          GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+              "Could not obtain a valid network for `%s' %s\n",
+              GNUNET_i2s (pid), GST_plugins_a2s (ve->address));
+          GNUNET_break(0);
         }
+        GST_neighbours_notify_data_sent (pid, ve->address, session, tsize);
       }
       else
       {
@@ -881,6 +883,9 @@
               (const char *) pong, ntohs (pong->header.size),
               PONG_PRIORITY, ACCEPTABLE_PING_DELAY,
               NULL, NULL);
+  GST_neighbours_notify_data_sent (&address->peer,
+      address, session, pong->header.size);
+
 }
 
 
@@ -1102,6 +1107,10 @@
                         (const char *) pong, ntohs (pong->header.size),
                         PONG_PRIORITY, ACCEPTABLE_PING_DELAY,
                         NULL, NULL);
+      if (-1 != ret)
+        GST_neighbours_notify_data_sent (sender,
+            sender_address, session, pong->header.size);
+
     }
   }
   if (ret != -1)