removing ats functions from plugins, instead provide callback function

1 files changed, 36 insertions, 1 deletions

diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index 644d27e24..8294f35dc 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -360,6 +360,40 @@ plugin_env_session_end (void *cls, const struct GNUNET_PeerIdentity *peer,
 
 
 /**
+ * Function that will be called to figure if an address is an loopback,
+ * LAN, WAN etc. address
+ *
+ * @param cls closure
+ * @param addr binary address
+ * @param addrlen length of the address
+ * @return ATS Information containing the network type
+ */
+static const struct GNUNET_ATS_Information
+plugin_env_address_to_type (void *cls,
+                            const struct sockaddr *addr,
+                            size_t addrlen)
+{
+  struct GNUNET_ATS_Information ats;
+  ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
+  ats.value = htonl (GNUNET_ATS_NET_UNSPECIFIED);
+  if (GST_ats == NULL)
+  {
+    GNUNET_break (0);
+    return ats;
+  }
+  if ((addrlen != sizeof (struct sockaddr_in)) && (addrlen != sizeof (struct sockaddr_in6)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Malformed address with length %u `%s'\n",
+                addrlen,
+                GNUNET_a2s(addr, addrlen));
+    GNUNET_break (0);
+    return ats;
+  }
+  return GNUNET_ATS_address_get_type(GST_ats, addr, addrlen);
+}
+
+
+/**
  * Function called by ATS to notify the callee that the
  * assigned bandwidth or address for a given peer was changed.  If the
  * callback is called with address/bandwidth assignments of zero, the
@@ -551,7 +585,8 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
       GNUNET_ATS_scheduling_init (GST_cfg, &ats_request_address_change, NULL);
   GST_plugins_load (&plugin_env_receive_callback,
                     &plugin_env_address_change_notification,
-                    &plugin_env_session_end);
+                    &plugin_env_session_end,
+                    &plugin_env_address_to_type);
   GST_neighbours_start (NULL, &neighbours_connect_notification,
                         &neighbours_disconnect_notification);
   GST_clients_start (server);