fixing #3657 (replace ATS_Information with struct), but WIHTOUT fixing ATS testcases yet

2 files changed, 34 insertions, 77 deletions

diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c
index 93cc0628f..7ea4a300e 100644
--- a/src/dv/gnunet-service-dv.c
+++ b/src/dv/gnunet-service-dv.c
@@ -1159,46 +1159,6 @@ schedule_refresh_routes ()
 
 
 /**
- * Get distance information from 'atsi'.
- *
- * @param atsi performance data
- * @param atsi_count number of entries in atsi
- * @return connected transport distance
- */
-static uint32_t
-get_atsi_distance (const struct GNUNET_ATS_Information *atsi,
-                   uint32_t atsi_count)
-{
-  uint32_t i;
-
-  for (i = 0; i < atsi_count; i++)
-    if (ntohl (atsi[i].type) == GNUNET_ATS_QUALITY_NET_DISTANCE)
-      return (0 == ntohl (atsi[i].value)) ? DIRECT_NEIGHBOR_COST : ntohl (atsi[i].value); // FIXME: 0 check should not be required once ATS is fixed!
-  /* If we do not have explicit distance data, assume direct neighbor. */
-  return DIRECT_NEIGHBOR_COST;
-}
-
-
-/**
- * Get network information from 'atsi'.
- *
- * @param atsi performance data
- * @param atsi_count number of entries in atsi
- * @return connected transport network
- */
-static enum GNUNET_ATS_Network_Type
-get_atsi_network (const struct GNUNET_ATS_Information *atsi,
-                   uint32_t atsi_count)
-{
-  uint32_t i;
-
-  for (i = 0; i < atsi_count; i++)
-    if (ntohl (atsi[i].type) == GNUNET_ATS_NETWORK_TYPE)
-      return (enum GNUNET_ATS_Network_Type) ntohl (atsi[i].value);
-  return GNUNET_ATS_NET_UNSPECIFIED;
-}
-
-/**
  * Multipeermap iterator for freeing routes that go via a particular
  * neighbor that disconnected and is thus no longer available.
  *
@@ -1308,8 +1268,7 @@ handle_direct_disconnect (struct DirectNeighbor *neighbor)
  *        #GNUNET_SYSERR if this address is no longer available for ATS
  * @param bandwidth_out assigned outbound bandwidth for the connection
  * @param bandwidth_in assigned inbound bandwidth for the connection
- * @param ats performance data for the address (as far as known)
- * @param ats_count number of performance records in @a ats
+ * @param prop performance data for the address (as far as known)
  */
 static void
 handle_ats_update (void *cls,
@@ -1317,12 +1276,11 @@ handle_ats_update (void *cls,
                    int active,
                    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
                    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
-                   const struct GNUNET_ATS_Information *ats,
-                   uint32_t ats_count)
+                   const struct GNUNET_ATS_Properties *prop)
 {
   struct DirectNeighbor *neighbor;
   uint32_t distance;
-  enum GNUNET_ATS_Network_Type network = GNUNET_ATS_NET_UNSPECIFIED;
+  enum GNUNET_ATS_Network_Type network;
 
   if (NULL == address)
   {
@@ -1335,8 +1293,8 @@ handle_ats_update (void *cls,
     // FIXME: handle disconnect/inactive case too!
     return;
   }
-  distance = get_atsi_distance (ats, ats_count);
-  network = get_atsi_network (ats, ats_count);
+  distance = prop->distance;
+  network = prop->scope;
   GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != network);
   /* check if entry exists */
   neighbor = GNUNET_CONTAINER_multipeermap_get (direct_neighbors,
diff --git a/src/dv/plugin_transport_dv.c b/src/dv/plugin_transport_dv.c
index 382e57596..f84c4a1b6 100644
--- a/src/dv/plugin_transport_dv.c
+++ b/src/dv/plugin_transport_dv.c
@@ -234,14 +234,12 @@ static void
 notify_distance_change (struct Session *session)
 {
   struct Plugin *plugin = session->plugin;
-  struct GNUNET_ATS_Information ats;
 
   if (GNUNET_YES != session->active)
     return;
-  ats.type = htonl ((uint32_t) GNUNET_ATS_QUALITY_NET_DISTANCE);
-  ats.value = htonl (session->distance);
-  plugin->env->update_address_metrics (plugin->env->cls,
-      session->address, session, &ats, 1);
+  plugin->env->update_address_distance (plugin->env->cls,
+                                        session->address,
+                                        session->distance);
 }
 
 
@@ -260,21 +258,20 @@ unbox_cb (void *cls,
 {
   struct Plugin *plugin = cls;
   struct Session *session = client;
-  struct GNUNET_ATS_Information ats;
 
-  ats.type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
-  ats.value = htonl (session->distance);
   session->active = GNUNET_YES;
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Delivering message of type %u with %u bytes from peer `%s'\n",
        ntohs (message->type),
        ntohs (message->size),
        GNUNET_i2s (&session->sender));
-
-  plugin->env->receive (plugin->env->cls, session->address, session,
+  plugin->env->receive (plugin->env->cls,
+                        session->address,
+                        session,
                         message);
-  plugin->env->update_address_metrics (plugin->env->cls,
-      session->address, session, &ats, 1);
+  plugin->env->update_address_distance (plugin->env->cls,
+                                        session->address,
+                                        session->distance);
   return GNUNET_OK;
 }
 
@@ -294,12 +291,12 @@ handle_dv_message_received (void *cls,
                             const struct GNUNET_MessageHeader *msg)
 {
   struct Plugin *plugin = cls;
-  struct GNUNET_ATS_Information ats;
   struct Session *session;
 
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Received DV_MESSAGE_RECEIVED message for peer `%s': new distance %u\n",
-       GNUNET_i2s (sender), distance);
+       GNUNET_i2s (sender),
+       distance);
   session = GNUNET_CONTAINER_multipeermap_get (plugin->sessions,
                                                sender);
   if (NULL == session)
@@ -320,17 +317,19 @@ handle_dv_message_received (void *cls,
                                GNUNET_NO);
     return;
   }
-  ats.type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
-  ats.value = htonl (distance);
   session->active = GNUNET_YES;
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Delivering message of type %u with %u bytes from peer `%s'\n",
        ntohs (msg->type),
        ntohs (msg->size),
        GNUNET_i2s (sender));
-  plugin->env->receive (plugin->env->cls, session->address, session, msg);
-  plugin->env->update_address_metrics (plugin->env->cls,
-      session->address, session, &ats, 1);
+  plugin->env->receive (plugin->env->cls,
+                        session->address,
+                        session,
+                        msg);
+  plugin->env->update_address_distance (plugin->env->cls,
+                                        session->address,
+                                        session->distance);
 }
 
 
@@ -350,7 +349,6 @@ handle_dv_connect (void *cls,
 {
   struct Plugin *plugin = cls;
   struct Session *session;
-  struct GNUNET_ATS_Information ats[2];
 
   GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != network);
   /**
@@ -358,8 +356,7 @@ handle_dv_connect (void *cls,
    * If you remove it, also remove libgnunetats linkage from Makefile.am
    */
   LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Received `%s' message for peer `%s' with next hop in network %s\n",
-       "DV_CONNECT",
+       "Received DV_CONNECT message for peer `%s' with next hop in network %s\n",
        GNUNET_i2s (peer),
        GNUNET_ATS_print_network_type (network));
 
@@ -375,7 +372,8 @@ handle_dv_connect (void *cls,
 
   session = GNUNET_new (struct Session);
   session->address = GNUNET_HELLO_address_allocate (peer, "dv",
-      NULL, 0, GNUNET_HELLO_ADDRESS_INFO_NONE);
+                                                    NULL, 0,
+                                                    GNUNET_HELLO_ADDRESS_INFO_NONE);
   session->sender = *peer;
   session->plugin = plugin;
   session->distance = distance;
@@ -391,14 +389,15 @@ handle_dv_connect (void *cls,
        GNUNET_i2s (peer),
        distance);
 
-  /* Notify transport and ats about new connection */
-  ats[0].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
-  ats[0].value = htonl (distance);
-  ats[1].type = htonl (GNUNET_ATS_NETWORK_TYPE);
-  ats[1].value = htonl ((uint32_t) network);
   session->active = GNUNET_YES;
-  plugin->env->session_start (plugin->env->cls, session->address,
-                              session, ats, 2);
+  plugin->env->session_start (plugin->env->cls,
+                              session->address,
+                              session,
+                              network);
+  plugin->env->update_address_distance (plugin->env->cls,
+                                        session->address,
+                                        session->distance);
+
   notify_session_monitor (session->plugin,
                           session,
                           GNUNET_TRANSPORT_SS_UP);