fix #4546

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

diff --git a/src/dv/gnunet-dv.c b/src/dv/gnunet-dv.c
index 901739cc2070595ae9e42fbc23632988c3e2a0dc..d0917d3631bd15086b44ffbdd15f7f84d4597ee2 100644 (file)
--- a/src/dv/gnunet-dv.c
+++ b/src/dv/gnunet-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.
 */
 /**
  * @file dv/gnunet-dv.c
@@ -43,11 +43,13 @@ static int verbose;
  * @param cls closure
  * @param peer newly connected peer
  * @param distance distance to the peer
+ * @param network the network the next hop is located in
  */
 static void
 connect_cb (void *cls,
            const struct GNUNET_PeerIdentity *peer,
-           uint32_t distance, uint32_t network)
+           uint32_t distance,
+            enum GNUNET_ATS_Network_Type network)
 {
   fprintf (stderr, "Connect: %s at %u\n",
           GNUNET_i2s (peer),
@@ -61,11 +63,13 @@ connect_cb (void *cls,
  * @param cls closure
  * @param peer connected peer
  * @param distance new distance to the peer
+ * @param network network used on first hop to peer
  */
 static void
 change_cb (void *cls,
           const struct GNUNET_PeerIdentity *peer,
-          uint32_t distance)
+          uint32_t distance,
+           enum GNUNET_ATS_Network_Type network)
 {
   fprintf (stderr, "Change: %s at %u\n",
           GNUNET_i2s (peer),
@@ -115,11 +119,9 @@ message_cb (void *cls,
  * Task run on shutdown.
  *
  * @param cls NULL
- * @param tc unused
  */
 static void
-shutdown_task (void *cls,
-              const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
 {
   GNUNET_DV_service_disconnect (sh);
   sh = NULL;
@@ -143,8 +145,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                                  &change_cb,
                                  &disconnect_cb,
                                  &message_cb);
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                               &shutdown_task, NULL);
+  GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
 }