From 30b1be2179042384fa652dda414d80f8c2463b77 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 27 May 2012 19:16:54 +0000
Subject: [PATCH] -fixing testing testcase build issues

---
 src/include/gnunet_testing_lib-new.h          | 26 +++++++++++++++++++
 .../test_testing_new_portreservation.c        | 14 +++++-----
 src/testing/testing_new.c                     | 12 ++++-----
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/src/include/gnunet_testing_lib-new.h b/src/include/gnunet_testing_lib-new.h
index bf6abfc44..9d8bc364b 100644
--- a/src/include/gnunet_testing_lib-new.h
+++ b/src/include/gnunet_testing_lib-new.h
@@ -73,6 +73,7 @@ GNUNET_TESTING_system_create (const char *tmppath,
 			      const char *controller);
 
 
+
 /**
  * Free system resources.
  *
@@ -109,6 +110,31 @@ GNUNET_TESTING_hostkey_get (uint32_t key_number,
 			    struct GNUNET_PeerIdentity *id);
 
 
+/**
+ * Reserve a TCP or UDP port for a peer.
+ *
+ * @param system system to use for reservation tracking
+ * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP
+ * @return 0 if no free port was available
+ */
+uint16_t 
+GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system,
+			     int is_tcp);
+
+
+/**
+ * Release reservation of a TCP or UDP port for a peer
+ * (used during GNUNET_TESTING_peer_destroy).
+ *
+ * @param system system to use for reservation tracking
+ * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP
+ * @param port reserved port to release
+ */
+void
+GNUNET_TESTING_release_port (struct GNUNET_TESTING_System *system,
+			     int is_tcp,
+			     uint16_t port);
+
 
 /**
  * Create a new configuration using the given configuration
diff --git a/src/testing/test_testing_new_portreservation.c b/src/testing/test_testing_new_portreservation.c
index c1382df38..012fbecc1 100644
--- a/src/testing/test_testing_new_portreservation.c
+++ b/src/testing/test_testing_new_portreservation.c
@@ -47,26 +47,26 @@ run (void *cls, char *const *args, const char *cfgfile,
   system = GNUNET_TESTING_system_create ("/tmp/gnunet-testing-new",
                                          "localhost");
   GNUNET_assert (NULL != system);
-  new_port1 = reserve_port (system, GNUNET_YES);
+  new_port1 = GNUNET_TESTING_reserve_port (system, GNUNET_YES);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
                 "Reserved TCP port %u\n", new_port1);
   GNUNET_assert (0 != new_port1);
-  new_port2 = reserve_port (system, GNUNET_YES);
+  new_port2 = GNUNET_TESTING_reserve_port (system, GNUNET_YES);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
                 "Reserved TCP port %u\n", new_port2);
   GNUNET_assert (0 != new_port2);
   GNUNET_assert (new_port1 != new_port2);
-  release_port (system, GNUNET_YES, new_port1);
+  GNUNET_TESTING_release_port (system, GNUNET_YES, new_port1);
   old_port1 = new_port1;
   new_port1 = 0;
-  new_port1 = reserve_port (system, GNUNET_YES);
+  new_port1 = GNUNET_TESTING_reserve_port (system, GNUNET_YES);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Reserved TCP port %u\n", new_port1);
   GNUNET_assert (0 != new_port1);
   GNUNET_assert (old_port1 == new_port1);
-  release_port (system, GNUNET_YES, new_port1);
-  release_port (system, GNUNET_YES, new_port2);
-  release_port (system, GNUNET_YES, new_port2 + 1); /* OK to get error :) */
+  GNUNET_TESTING_release_port (system, GNUNET_YES, new_port1);
+  GNUNET_TESTING_release_port (system, GNUNET_YES, new_port2);
+  GNUNET_TESTING_release_port (system, GNUNET_YES, new_port2 + 1); /* OK to get error :) */
   GNUNET_TESTING_system_destroy (system, GNUNET_NO);
 }
 
diff --git a/src/testing/testing_new.c b/src/testing/testing_new.c
index 79ece3a26..820e91ff9 100644
--- a/src/testing/testing_new.c
+++ b/src/testing/testing_new.c
@@ -204,10 +204,9 @@ GNUNET_TESTING_system_destroy (struct GNUNET_TESTING_System *system,
  * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP
  * @return 0 if no free port was available
  */
-// static 
 uint16_t 
-reserve_port (struct GNUNET_TESTING_System *system,
-	      int is_tcp)
+GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system,
+			     int is_tcp)
 {
   struct GNUNET_NETWORK_Handle *socket;
   struct addrinfo hint;
@@ -277,11 +276,10 @@ reserve_port (struct GNUNET_TESTING_System *system,
  * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP
  * @param port reserved port to release
  */
-// static 
 void
-release_port (struct GNUNET_TESTING_System *system,
-	      int is_tcp,
-	      uint16_t port)
+GNUNET_TESTING_release_port (struct GNUNET_TESTING_System *system,
+			     int is_tcp,
+			     uint16_t port)
 {
   uint32_t *port_buckets;
   uint16_t bucket;
-- 
2.25.1