test: keep using the same local port unless EADDRNOTAVAIL occurs

Author: ragingbulld

src/hev-conf.c

@@ -26,7 +26,6 @@ static int dmon;
 static int tmsec;
 static int brand;
 static int bport[3];
-static int nrebind;
 static unsigned int mark;
 
 static char mport[16];
@@ -68,8 +67,6 @@ hev_conf_help (void)
         "                     - <port>: specified\n"
         "                     - <port>~<port>: random allocation within the range\n"
         "                     - <port>-<port>: sequential allocation within the range\n"
-        " -r <times>          when using port range, number of times to rebind\n"
-        "                     the previous port before switching (0: disable)\n"
         "\n"
         "Forward options:\n"
         " -C <congestion>     TCP congestion control algorithm\n"
@@ -87,7 +84,7 @@ hev_conf_init (int argc, char *argv[])
     int opt;
     char c;
 
-    while ((opt = getopt (argc, argv, "46udk:c:s:h:e:f:b:r:C:T:t:p:i:")) != -1) {
+    while ((opt = getopt (argc, argv, "46udk:c:s:h:e:f:b:C:T:t:p:i:")) != -1) {
         switch (opt) {
         case '4':
             type = AF_INET;
@@ -122,9 +119,6 @@ hev_conf_init (int argc, char *argv[])
         case 'b':
             sscanf (optarg, "%u%c%u", &bport[0], &c, &bport[1]);
             break;
-        case 'r':
-            nrebind = strtoul (optarg, NULL, 10);
-            break;
         case 'C':
             ttcca = optarg;
             break;
@@ -182,10 +176,6 @@ hev_conf_init (int argc, char *argv[])
         return -1;
     }
 
-    if (nrebind < 0) {
-        nrebind = 0;
-    }
-
     if (iface && inet_pton (type, iface, &sa)) {
         baddr = iface;
         iface = NULL;
@@ -276,12 +266,6 @@ hev_conf_bport (void)
     return port;
 }
 
-int
-hev_conf_nrebind (void)
-{
-    return nrebind;
-}
-
 const char *
 hev_conf_taddr (void)
 {

src/hev-conf.h

@@ -120,16 +120,6 @@ const char *hev_conf_baddr (void);
  */
 const char *hev_conf_bport (void);
 
-/**
- * hev_conf_nrebind:
- *
- * Get the maximum number of times to rebind the previous port.
- * This is used when a port range is configured to minimize port switching.
- *
- * Returns: returns the number of times to rebind.
- */
-int hev_conf_nrebind (void);
-
 /**
  * hev_conf_taddr:
  *

src/hev-tnsk.c

@@ -27,7 +27,7 @@
 
 static struct sockaddr_storage saddr;
 static char last_port[16];
-static int rebind_times;
+static int port_valid;
 static HevTask *task;
 static int timeout;
 static int fd;
@@ -105,20 +105,19 @@ tnsk_run (void)
     iface = hev_conf_iface ();
     mark = hev_conf_mark ();
 
-    if (rebind_times > 0) {
+    if (port_valid == 1) {
         port = last_port;
-        rebind_times--;
     } else {
         port = hev_conf_bport ();
         snprintf (last_port, sizeof (last_port), "%s", port);
-        rebind_times = hev_conf_nrebind ();
+        port_valid = 1;
     }
 
     fd = hev_sock_client_base (type, SOCK_STREAM, addr, port, http, hport,
                                iface, mark, &saddr, NULL);
     if (fd < 0) {
         if (errno == EADDRNOTAVAIL) {
-            rebind_times = 0;
+            port_valid = 0;
         }
         LOGV (E, "%s", "Start TCP keep-alive service failed.");
         return;

src/hev-unsk.c

@@ -31,7 +31,7 @@ static HevTask *task;
 static int timeout;
 static unsigned int cycle;
 static char last_port[16];
-static int rebind_times;
+static int port_valid;
 
 static void
 stun_handler (void)
@@ -105,20 +105,19 @@ unsk_run (void)
     timeout = hev_conf_keep ();
     cycle = hev_conf_ucount ();
 
-    if (rebind_times > 0) {
+    if (port_valid == 1) {
         port = last_port;
-        rebind_times--;
     } else {
         port = hev_conf_bport ();
         snprintf (last_port, sizeof (last_port), "%s", port);
-        rebind_times = hev_conf_nrebind ();
+        port_valid = 1;
     }
 
     fd = hev_sock_client_base (type, SOCK_DGRAM, addr, port, stun, sport, iface,
                                mark, &saddr, &daddr);
     if (fd < 0) {
         if (errno == EADDRNOTAVAIL) {
-            rebind_times = 0;
+            port_valid = 0;
         }
         LOGV (E, "%s", "Start UDP keep-alive service failed.");
         return;