Add v{4,6}only option

src/main.c

@@ -242,11 +242,11 @@ int main (int argc, char **argv)
 
     gt.timeout = 5000;
 
-    long down_timeout = 0;
-    long send_timeout = 0;
-    long pong_timeout = 0;
     long time_tolerance = 0;
 
+    int v4 = 1;
+    int v6 = 1;
+
     struct option opts[] = {
         { "host",           &host,           option_str    },
         { "port",           &port,           option_str    },
@@ -257,10 +257,9 @@ int main (int argc, char **argv)
         { "multiqueue",     NULL,            option_option },
         { "statefile",      &statefile,      option_str    },
         { "timeout",        &gt.timeout,     option_long   },
-        { "down-timeout",   &down_timeout,   option_long   },
-        { "send-timeout",   &send_timeout,   option_long   },
-        { "pong-timeout",   &pong_timeout,   option_long   },
         { "time-tolerance", &time_tolerance, option_long   },
+        { "v4only",         NULL,            option_option },
+        { "v6only",         NULL,            option_option },
         { "version",        NULL,            option_option },
         { NULL },
     };
@@ -273,6 +272,17 @@ int main (int argc, char **argv)
         return 0;
     }
 
+    if (option_is_set(opts, "v4only"))
+        v6 = 0;
+
+    if (option_is_set(opts, "v6only"))
+        v4 = 0;
+
+    if (!v4 && !v6) {
+        gt_log("v4only and v6only are both set\n");
+        return 1;
+    }
+
     if (!option_is_set(opts, "keyfile")) {
         gt_log("keyfile option must be set\n");
         return 1;
@@ -305,7 +315,7 @@ int main (int argc, char **argv)
     if (gt_setup_secretkey(keyfile))
         return 1;
 
-    struct mud *mud = mud_create(bind_port);
+    struct mud *mud = mud_create(bind_port, v4, v6);
 
     if (!mud) {
         gt_log("couldn't create mud\n");
@@ -314,14 +324,7 @@ int main (int argc, char **argv)
 
     mud_set_key(mud, gt.key, sizeof(gt.key));
 
-    if (down_timeout > 0)
+    mud_set_send_timeout_msec(mud, gt.timeout);
-        mud_set_down_timeout_msec(mud, down_timeout);
-
-    if (send_timeout > 0)
-        mud_set_send_timeout_msec(mud, send_timeout);
-
-    if (pong_timeout > 0)
-        mud_set_pong_timeout_msec(mud, pong_timeout);
 
     if (time_tolerance > 0)
         mud_set_time_tolerance_sec(mud, time_tolerance);
@@ -371,9 +374,12 @@ int main (int argc, char **argv)
         }
 
         struct timeval timeout = {
-            .tv_usec = 1000,
+            .tv_usec = 100000,
         };
 
+        if (mud_can_push(mud))
+            timeout.tv_usec = 1000;
+
         if _0_(select(mud_fd+1, &rfds, NULL, NULL, &timeout)==-1) {
             if (errno==EINTR)
                 continue;
@@ -397,8 +403,10 @@ int main (int argc, char **argv)
             while (1) {
                 const ssize_t r = tun_read(tun_fd, buf, sizeof(buf));
 
-                if (r<=0)
+                if (r<=0) {
+                    gt.quit |= !r;
                     break;
+                }
 
                 struct ip_common ic;
 
@@ -413,12 +421,17 @@ int main (int argc, char **argv)
             mud_pull(mud);
 
         while (1) {
-            const int r = mud_recv(mud, buf, sizeof(buf));
+            const int size = mud_recv(mud, buf, sizeof(buf));
 
-            if (r<=0)
+            if (size<=0)
                 break;
 
-            tun_write(tun_fd, buf, r);
+            const ssize_t r = tun_write(tun_fd, buf, size);
+
+            if (r<=0) {
+                gt.quit |= !r;
+                break;
+            }
         }
     }