X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fport.cc;h=b955ca4b96be0cbf067ba36c148b572ce38bf849;hb=9065046a3fd404f72fb090cb0da65cfa8443032f;hp=904a0addc5733d3ea4f8715057aa1befa8f0292a;hpb=23bbe3972dada1e21493437ba64be129e86b59fc;p=awesomized%2Flibmemcached

diff --git a/libtest/port.cc b/libtest/port.cc
index 904a0add..b955ca4b 100644
--- a/libtest/port.cc
+++ b/libtest/port.cc
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "libtest/yatlcon.h"
 #include <libtest/common.h>
 
 #include <cassert>
@@ -57,6 +57,18 @@
 
 #include <libtest/signal.h>
 
+#ifndef SOCK_CLOEXEC 
+#  define SOCK_CLOEXEC 0
+#endif
+
+#ifndef SOCK_NONBLOCK 
+#  define SOCK_NONBLOCK 0
+#endif
+
+#ifndef FD_CLOEXEC
+#  define FD_CLOEXEC 0
+#endif
+
 #ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #endif
@@ -66,15 +78,21 @@ using namespace libtest;
 struct socket_st {
   typedef std::vector< std::pair< int, in_port_t> > socket_port_t;
   socket_port_t _pair;
+  in_port_t last_port;
+
+  socket_st():
+    last_port(0)
+  { }
 
   void release(in_port_t _arg)
   {
-    for(socket_port_t::iterator iter= _pair.begin();
-        iter != _pair.end();
-        iter++)
+    for (socket_port_t::iterator iter= _pair.begin();
+         iter != _pair.end();
+         ++iter)
     {
       if ((*iter).second == _arg)
       {
+        shutdown((*iter).first, SHUT_RDWR);
         close((*iter).first);
       }
     }
@@ -82,10 +100,11 @@ struct socket_st {
 
   ~socket_st()
   {
-    for(socket_port_t::iterator iter= _pair.begin();
-        iter != _pair.end();
-        iter++)
+    for (socket_port_t::iterator iter= _pair.begin();
+         iter != _pair.end();
+         ++iter)
     {
+      shutdown((*iter).first, SHUT_RDWR);
       close((*iter).first);
     }
   }
@@ -114,50 +133,98 @@ void release_port(in_port_t arg)
 
 in_port_t get_free_port()
 {
-  in_port_t ret_port= in_port_t(0);
+  const in_port_t default_port= in_port_t(-1);
 
   int retries= 1024;
 
-  while (retries--)
+  in_port_t ret_port;
+  while (--retries)
   {
+    ret_port= default_port;
     int sd;
     if ((sd= socket(AF_INET, SOCK_STREAM, 0)) != -1)
     {
       int optval= 1;
       if (setsockopt(sd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)) != -1)
-      {
+      { 
         struct sockaddr_in sin;
         sin.sin_port= 0;
         sin.sin_addr.s_addr= 0;
         sin.sin_addr.s_addr= INADDR_ANY;
         sin.sin_family= AF_INET;
 
-        if (bind(sd, (struct sockaddr *)&sin,sizeof(struct sockaddr_in) ) != -1)
+        int bind_ret;
+        do
         {
-          socklen_t addrlen= sizeof(sin);
+          if ((bind_ret= bind(sd, (struct sockaddr *)&sin, sizeof(struct sockaddr_in) )) != -1)
+          {
+            socklen_t addrlen= sizeof(sin);
 
-          if (getsockname(sd, (struct sockaddr *)&sin, &addrlen) != -1)
+            if (getsockname(sd, (struct sockaddr *)&sin, &addrlen) != -1)
+            {
+              ret_port= sin.sin_port;
+            }
+          }
+          else
           {
-            ret_port= sin.sin_port;
+            if (errno != EADDRINUSE)
+            {
+              Error << strerror(errno);
+            }
           }
-        }
-      }
 
-      all_socket_fd._pair.push_back(std::make_pair(sd, ret_port));
+          if (errno == EADDRINUSE)
+          {
+            libtest::dream(2, 0);
+          }
+        } while (bind_ret == -1 and errno == EADDRINUSE);
+
+        all_socket_fd._pair.push_back(std::make_pair(sd, ret_port));
+      }
+      else
+      {
+        Error << strerror(errno);
+      }
+    }
+    else
+    {
+      Error << strerror(errno);
     }
 
-    if (ret_port > 1024)
+    if (ret_port == default_port)
+    {
+      Error << "no ret_port set:" << strerror(errno);
+    }
+    else if (ret_port > 1024 and ret_port != all_socket_fd.last_port)
     {
       break;
     }
   }
 
   // We handle the case where if we max out retries, we still abort.
-  if (ret_port <= 1024)
+  if (retries == 0)
+  {
+    fatal_message("No port could be found, exhausted retry");
+  }
+
+  if (ret_port == 0)
   {
     fatal_message("No port could be found");
   }
 
+  if (ret_port == default_port)
+  {
+    fatal_message("No port could be found");
+  }
+
+  if (ret_port <= 1024)
+  {
+    fatal_message("No port could be found, though some where available below or at 1024");
+  }
+
+  all_socket_fd.last_port= ret_port;
+  release_port(ret_port);
+
   return ret_port;
 }