- make no distinction between TCP and UDP port while reserving them

6 files changed, 33 insertions, 129 deletions

diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h
index 3b6fabb6e..f182d8df5 100644
--- a/src/include/gnunet_testing_lib.h
+++ b/src/include/gnunet_testing_lib.h
@@ -181,15 +181,13 @@ GNUNET_TESTING_hostkey_get (const struct GNUNET_TESTING_System *system,
 
 
 /**
- * Reserve a TCP or UDP port for a peer.
+ * Reserve a 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);
+GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system);
 
 
 /**
@@ -197,12 +195,10 @@ GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system,
  * (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);
 
 
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 4f1d8fe17..f2355da5f 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -97,17 +97,6 @@ test_testing_sharedservices_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
-
-
 EXTRA_DIST = \
   test_testing_defaults.conf
 
-
-noinst_PROGRAMS = \
-  bindfail bindok
-
-bindok_SOURCES = bindok.c
-
-bindfail_SOURCES = bindfail.c
-bindfail_LDADD = $(top_builddir)/src/util/libgnunetutil.la
-
diff --git a/src/testing/bindfail.c b/src/testing/bindfail.c
deleted file mode 100644
index 629c82df6..000000000
--- a/src/testing/bindfail.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "platform.h"
-#include "gnunet_util_lib.h"
-
-int main()
-{
-  uint16_t port = 12035;
-  struct GNUNET_NETWORK_Handle *sock1;
-  struct GNUNET_NETWORK_Handle *sock2;
-  struct sockaddr_in addr;
-  int proto;
-
-  proto = SOCK_STREAM;
-  (void) memset (&addr, 0, sizeof (struct sockaddr_in));
-  sock1 = GNUNET_NETWORK_socket_create (AF_INET, proto, 0);
-  sock2 = GNUNET_NETWORK_socket_create (AF_INET, proto, 0);
-  
-  addr.sin_port = htons (port);
-  addr.sin_addr.s_addr = INADDR_ANY;
-  
-  if (GNUNET_SYSERR == 
-      GNUNET_NETWORK_socket_bind (sock1, (const struct sockaddr *) &addr,
-                                  sizeof (addr), 0))
-  {
-    fprintf (stderr, "first bind failed. check port\n");
-    return 1;
-  }
-  if (GNUNET_SYSERR == 
-      GNUNET_NETWORK_socket_bind (sock2, (const struct sockaddr *) &addr, 
-                                  sizeof (addr), 0))
-  {
-    printf ("All OK\n");
-    return 0;
-  }
-  fprintf (stderr, "Second bind succeeded! WTF!!\n");
-  fgetc (stdin);
-  return 1;
-}
diff --git a/src/testing/bindok.c b/src/testing/bindok.c
deleted file mode 100644
index a4b74e7a0..000000000
--- a/src/testing/bindok.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "platform.h"
-
-int main()
-{
-  uint16_t port = 12035;
-  int sock1;
-  int sock2;
-  struct sockaddr_in addr;
-
-  (void) memset (&addr, 0, sizeof (struct sockaddr_in));
-  sock1 = socket (AF_INET, SOCK_DGRAM, 0);
-  sock2 = socket (AF_INET, SOCK_DGRAM, 0);
-
-  addr.sin_port = htons (port);
-  addr.sin_addr.s_addr = INADDR_ANY;
-  
-  if (0 != bind (sock1, (const struct sockaddr *) &addr, sizeof (addr)))
-  {
-    perror ("bind");
-    return 1;
-  }
-  if (0 != bind (sock2, (const struct sockaddr *) &addr, sizeof (addr)))
-  {
-    printf ("All OK\n");
-    return 0;
-  }
-  fprintf (stderr, "Second bind succeeded! WTF!!\n");
-  fgetc (stdin);
-  return 1;
-}
diff --git a/src/testing/test_testing_portreservation.c b/src/testing/test_testing_portreservation.c
index 81ba67e96..50d44a91c 100644
--- a/src/testing/test_testing_portreservation.c
+++ b/src/testing/test_testing_portreservation.c
@@ -52,27 +52,27 @@ run (void *cls, char *const *args, const char *cfgfile,
   system = GNUNET_TESTING_system_create ("/tmp/gnunet-testing-new",
                                          "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:
diff --git a/src/testing/testing.c b/src/testing/testing.c
index 70eebc3cc..9e193bd9c 100644
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -132,26 +132,14 @@ struct GNUNET_TESTING_System
   unsigned int n_shared_services;
 
   /**
-   * Bitmap where each TCP port that has already been reserved for
-   * some GNUnet peer is recorded.  Note that we additionally need to
-   * test if a port is already in use by non-GNUnet components before
-   * assigning it to a peer/service.  If we detect that a port is
-   * already in use, we also mark it in this bitmap.  So all the bits
-   * that are zero merely indicate ports that MIGHT be available for
-   * peers.
+   * Bitmap where each port that has already been reserved for some GNUnet peer
+   * is recorded.  Note that we make no distinction between TCP and UDP ports
+   * and test if a port is already in use before assigning it to a peer/service.
+   * If we detect that a port is already in use, we also mark it in this bitmap.
+   * So all the bits that are zero merely indicate ports that MIGHT be available
+   * for peers.
    */
-  uint32_t reserved_tcp_ports[65536 / 32];
-
-  /**
-   * Bitmap where each UDP port that has already been reserved for
-   * some GNUnet peer is recorded.  Note that we additionally need to
-   * test if a port is already in use by non-GNUnet components before
-   * assigning it to a peer/service.  If we detect that a port is
-   * already in use, we also mark it in this bitmap.  So all the bits
-   * that are zero merely indicate ports that MIGHT be available for
-   * peers.
-   */
-  uint32_t reserved_udp_ports[65536 / 32];
+  uint32_t reserved_ports[65536 / 32];
 
   /**
    * Counter we use to make service home paths unique on this system;
@@ -568,12 +556,10 @@ GNUNET_TESTING_system_destroy (struct GNUNET_TESTING_System *system,
  * 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)
+GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system)
 {
   struct GNUNET_NETWORK_Handle *socket;
   struct addrinfo hint;
@@ -597,15 +583,14 @@ GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system,
          open in the respective address family
   */
   hint.ai_family = AF_UNSPEC;   /* IPv4 and IPv6 */
-  hint.ai_socktype = (GNUNET_YES == is_tcp)? SOCK_STREAM : SOCK_DGRAM;
+  hint.ai_socktype = 0;
   hint.ai_protocol = 0;
   hint.ai_addrlen = 0;
   hint.ai_addr = NULL;
   hint.ai_canonname = NULL;
   hint.ai_next = NULL;
   hint.ai_flags = AI_PASSIVE | AI_NUMERICSERV;  /* Wild card address */
-  port_buckets = (GNUNET_YES == is_tcp) ?
-    system->reserved_tcp_ports : system->reserved_udp_ports;
+  port_buckets = system->reserved_ports;
   for (index = (system->lowport / 32) + 1; index < (system->highport / 32); index++)
   {
     xor_image = (UINT32_MAX ^ port_buckets[index]);
@@ -629,10 +614,17 @@ GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system,
       bind_status = GNUNET_NO;
       for (ai = ret; NULL != ai; ai = ai->ai_next)
       {
-        socket = GNUNET_NETWORK_socket_create (ai->ai_family,
-                                               (GNUNET_YES == is_tcp) ?
-                                               SOCK_STREAM : SOCK_DGRAM,
-                                               0);
+        socket = GNUNET_NETWORK_socket_create (ai->ai_family, SOCK_STREAM, 0);
+        if (NULL == socket)
+          continue;
+        bind_status = GNUNET_NETWORK_socket_bind (socket,
+                                                  ai->ai_addr,
+                                                  ai->ai_addrlen,
+                                                  0);
+        GNUNET_NETWORK_socket_close (socket);
+        if (GNUNET_OK != bind_status)
+          break;
+        socket = GNUNET_NETWORK_socket_create (ai->ai_family, SOCK_DGRAM, 0);
         if (NULL == socket)
           continue;
         bind_status = GNUNET_NETWORK_socket_bind (socket,
@@ -663,20 +655,17 @@ GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system,
  * (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)
 {
   uint32_t *port_buckets;
   uint16_t bucket;
   uint16_t pos;
 
-  port_buckets = (GNUNET_YES == is_tcp) ?
-    system->reserved_tcp_ports : system->reserved_udp_ports;
+  port_buckets = system->reserved_ports;
   bucket = port / 32;
   pos = port % 32;
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Releasing port %u\n", port);
@@ -819,8 +808,7 @@ update_config (void *cls, const char *section, const char *option,
          GNUNET_CONFIGURATION_get_value_yesno (uc->cfg, "testing",
                                                single_variable)))
     {
-      /* FIXME: What about UDP? */
-      new_port = GNUNET_TESTING_reserve_port (uc->system, GNUNET_YES);
+      new_port = GNUNET_TESTING_reserve_port (uc->system);
       if (0 == new_port)
       {
         uc->status = GNUNET_SYSERR;
@@ -998,7 +986,7 @@ associate_shared_service (struct GNUNET_TESTING_System *system,
     (void) GNUNET_asprintf (&service_home, "%s/shared/%s/%u",
                             system->tmppath, ss->sname, ss->n_instances);
     (void) GNUNET_asprintf (&i->unix_sock, "%s/sock", service_home);
-    port = GNUNET_TESTING_reserve_port (system, GNUNET_YES);
+    port = GNUNET_TESTING_reserve_port (system);
     if (0 == port)
     {
       GNUNET_free (service_home);
@@ -1589,9 +1577,7 @@ GNUNET_TESTING_peer_destroy (struct GNUNET_TESTING_Peer *peer)
   if (NULL != peer->ports)
   {
     for (cnt = 0; cnt < peer->nports; cnt++)
-      GNUNET_TESTING_release_port (peer->system, 
-                                   GNUNET_YES,
-                                   peer->ports[cnt]);
+      GNUNET_TESTING_release_port (peer->system, peer->ports[cnt]);
     GNUNET_free (peer->ports);
   }
   GNUNET_free (peer);