fix for 0002392

[oweals/gnunet.git] / src / ats / test_ats_api_scheduling.c

diff --git a/src/ats/test_ats_api_scheduling.c b/src/ats/test_ats_api_scheduling.c
index a2ee7f060b87009fb4154d256af42d730f485052..c9d2206b320fe9e072568a2b1707f44f96654573 100644 (file)
--- a/src/ats/test_ats_api_scheduling.c
+++ b/src/ats/test_ats_api_scheduling.c
@@ -34,10 +34,6 @@
 #include "gnunet_ats_service.h"
 #include "ats.h"
 
-#define VERBOSE GNUNET_EXTRA_LOGGING
-
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
-
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
 
 static GNUNET_SCHEDULER_TaskIdentifier die_task;
@@ -81,7 +77,7 @@ stop_arm ()
   if (0 != GNUNET_OS_process_kill (arm_proc, SIGTERM))
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
   GNUNET_OS_process_wait (arm_proc);
-  GNUNET_OS_process_close (arm_proc);
+  GNUNET_OS_process_destroy (arm_proc);
   arm_proc = NULL;
 }
 
@@ -118,22 +114,24 @@ end ()
 
 
 static void
-address_suggest_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
-                    const char *plugin_name, const void *plugin_addr,
-                    size_t plugin_addr_len, struct Session *session,
+address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
+                    struct Session *session,
                     struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
                     struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
                     const struct GNUNET_ATS_Information *ats,
                     uint32_t ats_count)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS suggests address `%s'\n",
-              GNUNET_i2s (peer));
+              GNUNET_i2s (&address->peer));
 
   GNUNET_assert (0 ==
-                 memcmp (peer, &p[0].id, sizeof (struct GNUNET_PeerIdentity)));
-  GNUNET_assert (0 == strcmp (plugin_name, addr[0].plugin));
-  GNUNET_assert (plugin_addr_len == addr[0].addr_len);
-  GNUNET_assert (0 == memcmp (plugin_addr, addr[0].plugin, plugin_addr_len));
+                 memcmp (&address->peer, &p[0].id,
+                         sizeof (struct GNUNET_PeerIdentity)));
+  GNUNET_assert (0 == strcmp (address->transport_name, addr[0].plugin));
+  GNUNET_assert (address->address_length == addr[0].addr_len);
+  GNUNET_assert (0 ==
+                 memcmp (address->address, addr[0].plugin,
+                         address->address_length));
   GNUNET_assert (addr[0].session == session);
 
 
@@ -154,11 +152,8 @@ void
 start_arm (const char *cfgname)
 {
   arm_proc =
-      GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
+    GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm",
                                "gnunet-service-arm",
-#if VERBOSE_ARM
-                               "-L", "DEBUG",
-#endif
                                "-c", cfgname, NULL);
 }
 
@@ -166,6 +161,8 @@ static void
 check (void *cls, char *const *args, const char *cfgfile,
        const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
+  struct GNUNET_HELLO_Address address0;
+
   ret = GNUNET_SYSERR;
 
   die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
@@ -193,21 +190,23 @@ check (void *cls, char *const *args, const char *cfgfile,
 
   addr[0].plugin = "test";
   addr[0].session = NULL;
-  addr[0].addr = strdup ("test");
+  addr[0].addr = GNUNET_strdup ("test");
   addr[0].addr_len = 4;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing address creation\n");
 
-  GNUNET_ATS_address_update (ats, &p[0].id, addr[0].plugin, addr[0].addr,
-                             addr[0].addr_len, addr[0].session, NULL, 0);
+  address0.peer = p[0].id;
+  address0.transport_name = addr[0].plugin;
+  address0.address = addr[0].addr;
+  address0.address_length = addr[0].addr_len;
+  GNUNET_ATS_address_update (ats, &address0, addr[0].session, NULL, 0);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing ATS info creation\n");
 
   atsi[0].type = htonl (GNUNET_ATS_UTILIZATION_UP);
   atsi[0].value = htonl (1024);
 
-  GNUNET_ATS_address_update (ats, &p[0].id, addr[0].plugin, addr[0].addr,
-                             addr[0].addr_len, addr[0].session, atsi, 1);
+  GNUNET_ATS_address_update (ats, &address0, addr[0].session, atsi, 1);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing ATS info update\n");
 
@@ -217,14 +216,12 @@ check (void *cls, char *const *args, const char *cfgfile,
   atsi[1].type = htonl (GNUNET_ATS_UTILIZATION_DOWN);
   atsi[1].value = htonl (1024);
 
-  GNUNET_ATS_address_update (ats, &p[0].id, addr[0].plugin, addr[0].addr,
-                             addr[0].addr_len, addr[0].session, atsi, 2);
+  GNUNET_ATS_address_update (ats, &address0, addr[0].session, atsi, 2);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing manual address deletion \n");
-  GNUNET_ATS_address_update (ats, &p[1].id, addr[0].plugin, addr[0].addr,
-                             addr[0].addr_len, addr[0].session, NULL, 0);
-  GNUNET_ATS_address_destroyed (ats, &p[1].id, addr[0].plugin, addr[0].addr,
-                                addr[0].addr_len, addr[0].session);
+  address0.peer = p[1].id;      // FIXME: why? typo in old code?
+  GNUNET_ATS_address_update (ats, &address0, addr[0].session, NULL, 0);
+  GNUNET_ATS_address_destroyed (ats, &address0, addr[0].session);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Requesting peer `%s'\n",
               GNUNET_i2s (&p[0].id));
@@ -237,11 +234,7 @@ main (int argc, char *argv[])
   static char *const argv2[] = { "test_ats_api_scheduling",
     "-c",
     "test_ats_api.conf",
-#if VERBOSE
-    "-L", "DEBUG",
-#else
     "-L", "WARNING",
-#endif
     NULL
   };