Remove down-timeout and use timeout for send-timeout

Update mud
2016-04-08 14:38:07 +00:00 · 2016-04-08 13:00:52 +00:00 · 2016-04-05 14:23:45 +00:00 · 2016-04-05 14:17:07 +00:00 · 2016-04-05 06:42:03 +00:00 · 2016-04-04 20:05:33 +00:00
2 changed files with 25 additions and 15 deletions
--- a/2
+++ b/2
--- a/src/main.c
+++ b/src/main.c
@@ -242,17 +242,20 @@ int main (int argc, char **argv)

    gt.timeout = 5000;

+    long time_tolerance = 0;
+
    struct option opts[] = {
-        { "host",        &host,         option_str    },
-        { "port",        &port,         option_str    },
-        { "bind",        &bind_list,    option_str    },
-        { "bind-port",   &bind_port,    option_str    },
-        { "dev",         &dev,          option_str    },
-        { "keyfile",     &keyfile,      option_str    },
-        { "multiqueue",  NULL,          option_option },
-        { "statefile",   &statefile,    option_str    },
-        { "timeout",     &gt.timeout,   option_long   },
-        { "version",     NULL,          option_option },
+        { "host",           &host,           option_str    },
+        { "port",           &port,           option_str    },
+        { "bind",           &bind_list,      option_str    },
+        { "bind-port",      &bind_port,      option_str    },
+        { "dev",            &dev,            option_str    },
+        { "keyfile",        &keyfile,        option_str    },
+        { "multiqueue",     NULL,            option_option },
+        { "statefile",      &statefile,      option_str    },
+        { "timeout",        &gt.timeout,     option_long   },
+        { "time-tolerance", &time_tolerance, option_long   },
+        { "version",        NULL,            option_option },
        { NULL },
    };

@@ -305,6 +308,11 @@ int main (int argc, char **argv)

    mud_set_key(mud, gt.key, sizeof(gt.key));

+    mud_set_send_timeout_msec(mud, gt.timeout);
+
+    if (time_tolerance > 0)
+        mud_set_time_tolerance_sec(mud, time_tolerance);
+
    if (bind_list) {
        char tmp[1024];
        char *name = &tmp[0];
@@ -362,12 +370,14 @@ int main (int argc, char **argv)

        if (mud_is_up(mud)) {
            if (!started) {
-                state("STARTED", NULL);
+                state("STARTED", tun_name);
                started = 1;
            }
-        } else if (started) {
-            state("STOPPED", NULL);
-            started = 0;
+        } else {
+            if (started) {
+                state("STOPPED", tun_name);
+                started = 0;
+            }
        }

        if (FD_ISSET(tun_fd, &rfds)) {
Author	SHA1	Message	Date
angt	efd5e0bb36	Remove down-timeout and use timeout for send-timeout	2016-04-08 14:38:07 +00:00
angt	ade4617d53	Update mud	2016-04-08 13:00:52 +00:00
angt	64a5fd8227	Update mud	2016-04-05 14:23:45 +00:00
angt	eba968797c	Add {down,send,pong}-timeout and time-tolerance option	2016-04-05 14:17:07 +00:00
angt	d60f28a7fe	Update mud	2016-04-05 06:42:03 +00:00
angt	32069eb104	Print tun device on STARTED and STOPPED too	2016-04-04 20:05:33 +00:00