fix #4546

[oweals/gnunet.git] / src / dv / gnunet-service-dv.c

diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c
index d134d88f4bedf0e53d6a32a5dd8c2e2f9e637bd6..df95fd67b36f5498ffdb72ab5bfbfba2325f231c 100644 (file)
--- a/src/dv/gnunet-service-dv.c
+++ b/src/dv/gnunet-service-dv.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2013 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2013 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -398,11 +398,9 @@ static int in_shutdown;
  *
  * @param cls the 'struct DirectNeighbor' of the peer we're building
  *        a routing consensus with
- * @param tc scheduler context
  */
 static void
-initiate_set_union (void *cls,
-                   const struct GNUNET_SCHEDULER_TaskContext *tc);
+initiate_set_union (void *cls);
 
 
 /**
@@ -1132,11 +1130,9 @@ refresh_routes (void *cls,
  * Task to run #refresh_routes() on all direct neighbours.
  *
  * @param cls NULL
- * @param tc unused
  */
 static void
-refresh_routes_task (void *cls,
-                     const struct GNUNET_SCHEDULER_TaskContext *tc)
+refresh_routes_task (void *cls)
 {
   rr_task = NULL;
   GNUNET_CONTAINER_multipeermap_iterate (direct_neighbors,
@@ -1158,46 +1154,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 +1264,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 +1272,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 +1289,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,
@@ -1734,11 +1688,9 @@ listen_set_union (void *cls,
  *
  * @param cls the `struct DirectNeighbor *` of the peer we're building
  *        a routing consensus with
- * @param tc scheduler context
  */
 static void
-initiate_set_union (void *cls,
-                   const struct GNUNET_SCHEDULER_TaskContext *tc)
+initiate_set_union (void *cls)
 {
   struct DirectNeighbor *neighbor = cls;
 
@@ -2124,11 +2076,9 @@ free_direct_neighbors (void *cls,
  * Task run during shutdown.
  *
  * @param cls unused
- * @param tc unused
  */
 static void
-shutdown_task (void *cls,
-               const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
 {
   unsigned int i;
 
@@ -2279,8 +2229,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
                                                  MAX_QUEUE_SIZE_PLUGIN);
   stats = GNUNET_STATISTICS_create ("dv", cfg);
   GNUNET_SERVER_add_handlers (server, plugin_handlers);
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                               &shutdown_task, NULL);
+  GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
 }