X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftesting%2Ftest_testing_portreservation.c;h=282df6ee2b5e454f5d0a99c0fcf38402615482c7;hb=4e29ecde9b3ad3e34af359f18b6679c06b17ce78;hp=9a69916fa64747b34e4b5bdb77ad81f8245b52d5;hpb=4d501ee10c63e2edc044d6bcdb8ba060f78b34e5;p=oweals%2Fgnunet.git

diff --git a/src/testing/test_testing_portreservation.c b/src/testing/test_testing_portreservation.c
index 9a69916fa..282df6ee2 100644
--- a/src/testing/test_testing_portreservation.c
+++ b/src/testing/test_testing_portreservation.c
@@ -1,21 +1,16 @@
 /*
       This file is part of GNUnet
-      (C) 2008, 2009, 2012 Christian Grothoff (and other contributing authors)
+      Copyright (C) 2008, 2009, 2012 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
-      by the Free Software Foundation; either version 3, or (at your
-      option) any later version.
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
 
       GNUnet is distributed in the hope that it will be useful, but
       WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      General Public License for more details.
-
-      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.
+      Affero General Public License for more details.
  */
 
 /**
@@ -27,7 +22,7 @@
 
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
 
 #define LOG(kind,...) \
   GNUNET_log (kind, __VA_ARGS__)
@@ -50,29 +45,29 @@ run (void *cls, char *const *args, const char *cfgfile,
   uint16_t old_port1;
 
   system = GNUNET_TESTING_system_create ("/tmp/gnunet-testing-new",
-                                         "localhost", NULL);
+                                         "localhost", NULL, NULL);
   GNUNET_assert (NULL != system);
-  new_port1 = GNUNET_TESTING_reserve_port (system, GNUNET_YES);
+  new_port1 = GNUNET_TESTING_reserve_port (system);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
                 "Reserved TCP port %u\n", new_port1);
   if (0 == new_port1)
     goto end;
-  new_port2 = GNUNET_TESTING_reserve_port (system, GNUNET_YES);
+  new_port2 = GNUNET_TESTING_reserve_port (system);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
                 "Reserved TCP port %u\n", new_port2);
   if (0 == new_port2)
     goto end;
   GNUNET_assert (new_port1 != new_port2);
-  GNUNET_TESTING_release_port (system, GNUNET_YES, new_port1);
+  GNUNET_TESTING_release_port (system, new_port1);
   old_port1 = new_port1;
   new_port1 = 0;
-  new_port1 = GNUNET_TESTING_reserve_port (system, GNUNET_YES);
+  new_port1 = GNUNET_TESTING_reserve_port (system);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Reserved TCP port %u\n", new_port1);
   GNUNET_assert (0 != new_port1);
   GNUNET_assert (old_port1 == new_port1);
-  GNUNET_TESTING_release_port (system, GNUNET_YES, new_port1);
-  GNUNET_TESTING_release_port (system, GNUNET_YES, new_port2);
+  GNUNET_TESTING_release_port (system, new_port1);
+  GNUNET_TESTING_release_port (system, new_port2);
   status = GNUNET_OK;
 
  end:
@@ -96,9 +91,7 @@ int main (int argc, char *argv[])
                           options,
                           &run,
                           NULL))
-  {
     return 1;
-  }
   return (GNUNET_OK == status) ? 0 : 1;
 }