new api function to get network for session

1 files changed, 103 insertions, 16 deletions

diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index 32a0706dc..4cc75790e 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -1925,6 +1925,9 @@ handle_test_blacklist_cont (void *cls,
 {
   struct BlackListCheckContext *bcc = cls;
   struct NeighbourMapEntry *n;
+  struct GNUNET_TRANSPORT_PluginFunctions *papi;
+        struct GNUNET_ATS_Information ats;
+        int net;
 
   bcc->bc = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -1990,10 +1993,29 @@ handle_test_blacklist_cont (void *cls,
     if (GNUNET_OK == result)
     {
       /* valid new address, let ATS know! */
-      GNUNET_ATS_address_add (GST_ats,
-                              bcc->na.address,
-                              bcc->na.session,
-                              NULL, 0);
+      GNUNET_assert (bcc->na.address->transport_name != NULL);
+      if (NULL == (papi = GST_plugins_find (bcc->na.address->transport_name)))
+      {
+        /* we don't have the plugin for this address */
+        GNUNET_break (0);
+      }
+      else
+      {
+        if (NULL != papi->get_network)
+        {
+                net = papi->get_network (NULL, bcc->na.session);
+                ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
+                ats.value = net;
+//                      GNUNET_break (0);
+//                      fprintf (stderr, "NET: %u\n", ntohl(net));
+                GNUNET_ATS_address_add (GST_ats,
+                                                                                                                                bcc->na.address,
+                                                                                                                                bcc->na.session,
+                                                                                                                                &ats, 1);
+        }
+        else
+                GNUNET_break (0);
+      }
     }
     n->state = S_CONNECT_RECV_ATS;
     n->timeout = GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT);
@@ -2755,6 +2777,9 @@ GST_neighbours_handle_connect_ack (const struct GNUNET_MessageHeader *message,
   const struct SessionConnectMessage *scm;
   struct GNUNET_TIME_Absolute ts;
   struct NeighbourMapEntry *n;
+  struct GNUNET_TRANSPORT_PluginFunctions *papi;
+        struct GNUNET_ATS_Information ats;
+        int net;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received CONNECT_ACK message from peer `%s'\n",
@@ -2802,10 +2827,29 @@ GST_neighbours_handle_connect_ack (const struct GNUNET_MessageHeader *message,
                        n->primary_address.bandwidth_in,
                        n->primary_address.bandwidth_out);
     /* Tell ATS that the outbound session we created to send CONNECT was successfull */
-    GNUNET_ATS_address_add (GST_ats,
-                            n->primary_address.address,
-                            n->primary_address.session,
-                            NULL, 0);
+    GNUNET_assert (n->primary_address.address->transport_name != NULL);
+    if (NULL == (papi = GST_plugins_find (n->primary_address.address->transport_name)))
+    {
+      /* we don't have the plugin for this address */
+        GNUNET_break (0);
+    }
+    else
+    {
+        if (NULL != papi->get_network)
+        {
+                net = papi->get_network (NULL, n->primary_address.session);
+                ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
+                ats.value = net;
+//              GNUNET_break (0);
+//              fprintf (stderr, "NET: %u\n", ntohl(net));
+        GNUNET_ATS_address_add (GST_ats,
+                                n->primary_address.address,
+                                n->primary_address.session,
+                                &ats, 1);
+        }
+        else
+                GNUNET_break (0);
+    }
     set_address (&n->primary_address,
                  n->primary_address.address,
                  n->primary_address.session,
@@ -2850,10 +2894,31 @@ GST_neighbours_handle_connect_ack (const struct GNUNET_MessageHeader *message,
     n->state = S_CONNECTED;
     n->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
     GNUNET_break (GNUNET_NO == n->alternative_address.ats_active);
-    GNUNET_ATS_address_add(GST_ats,
-                           n->alternative_address.address,
-                           n->alternative_address.session,
-                           NULL, 0);
+
+    GNUNET_assert (n->alternative_address.address->transport_name != NULL);
+    if (NULL == (papi = GST_plugins_find (n->alternative_address.address->transport_name)))
+    {
+      /* we don't have the plugin for this address */
+        GNUNET_break (0);
+    }
+    else
+    {
+        if (NULL != papi->get_network)
+        {
+                net = papi->get_network (NULL, n->alternative_address.session);
+                ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
+                ats.value = net;
+//              GNUNET_break (0);
+//              fprintf (stderr, "NET: %u\n", ntohl(net));
+        GNUNET_ATS_address_add (GST_ats,
+                                n->alternative_address.address,
+                                n->alternative_address.session,
+                                &ats, 1);
+        }
+        else
+                GNUNET_break (0);
+    }
+
     set_address (&n->primary_address,
                  n->alternative_address.address,
                  n->alternative_address.session,
@@ -3060,10 +3125,32 @@ GST_neighbours_handle_session_ack (const struct GNUNET_MessageHeader *message,
   connect_notify_cb (callback_cls, &n->id,
                      n->primary_address.bandwidth_in,
                      n->primary_address.bandwidth_out);
-  GNUNET_ATS_address_add(GST_ats,
-                         n->primary_address.address,
-                         n->primary_address.session,
-                         NULL, 0);
+
+  GNUNET_assert (n->primary_address.address->transport_name != NULL);
+  struct GNUNET_TRANSPORT_PluginFunctions *papi;
+  if (NULL == (papi = GST_plugins_find (n->primary_address.address->transport_name)))
+  {
+    /* we don't have the plugin for this address */
+        GNUNET_break (0);
+  }
+  else
+  {
+        if (NULL != papi->get_network)
+        {
+                int net = papi->get_network (NULL, n->primary_address.session);
+                struct GNUNET_ATS_Information ats;
+                ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
+                ats.value = net;
+//              GNUNET_break (0);
+//              fprintf (stderr, "NET: %u\n", ntohl(net));
+      GNUNET_ATS_address_add (GST_ats,
+                              n->primary_address.address,
+                              n->primary_address.session,
+                              &ats, 1);
+        }
+        else
+                GNUNET_break (0);
+  }
   set_address (&n->primary_address,
                n->primary_address.address,
                n->primary_address.session,