Update mud

Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>

Makefile

@@ -2,31 +2,37 @@ NAME    := glorytun
 VERSION := $(shell ./version.sh)
 DIST    := $(NAME)-$(VERSION)
 
+CFLAGS  ?= -std=c11 -O2 -Wall -fstack-protector-strong
+FLAGS   := $(CFLAGS) $(LDFLAGS) $(CPPFLAGS)
+
 CC      ?= cc
-DESTDIR ?=
 prefix  ?= /usr
 Q       := @
 
-CFLAGS := -std=c11 -O2 -Wall -fstack-protector-strong
+ifneq ($(X),)
+    H = $(X)-
+    FLAGS += -static
+endif
 
-FLAGS := $(CFLAGS) $(LDFLAGS) $(CPPFLAGS)
 FLAGS += -DPACKAGE_NAME=\"$(NAME)\" -DPACKAGE_VERSION=\"$(VERSION)\"
-
+FLAGS += -I.static/$(X)/libsodium-stable/src/libsodium/include
-FLAGS += -I.static/$(CROSS)/libsodium-stable/src/libsodium/include
+FLAGS += -L.static/$(X)/libsodium-stable/src/libsodium/.libs
-FLAGS += -L.static/$(CROSS)/libsodium-stable/src/libsodium/.libs
 
 SRC := argz/argz.c mud/mud.c mud/aegis256/aegis256.c $(wildcard src/*.c)
 HDR := argz/argz.h mud/mud.h mud/aegis256/aegis256.h $(wildcard src/*.h)
 
 $(NAME): $(SRC) $(HDR)
-	@echo "$(NAME)"
+	$(Q)$(H)$(CC) $(FLAGS) -o $(NAME) $(SRC) -lsodium
-	$(Q)$(CC) $(FLAGS) -o $(NAME) $(SRC) -lsodium
+
+$(NAME)-strip: $(NAME)
+	$(Q)cp $< $@
+	$(Q)$(H)strip -x $@
 
 .PHONY: install
-install: $(NAME)
+install: $(NAME)-strip
 	@echo "$(DESTDIR)$(prefix)/bin/$(NAME)"
 	$(Q)install -m 755 -d $(DESTDIR)$(prefix)/bin
-	$(Q)install -m 755 -s $(NAME) $(DESTDIR)$(prefix)/bin
+	$(Q)install -m 755 $(NAME)-strip $(DESTDIR)$(prefix)/bin/$(NAME)
 
 .PHONY: clean
 clean:

src/bind.c

@@ -305,7 +305,8 @@ gt_bind(int argc, char **argv)
                                       req.path.rate_tx,
                                       req.path.rate_rx,
                                       req.path.beat,
-                                      req.path.fixed_rate))
+                                      req.path.fixed_rate,
+                                      req.path.loss_limit))
                         res.ret = errno;
                     break;
                 case CTL_CONF:

src/common.h

@@ -12,6 +12,8 @@
 #include <errno.h>
 
 #include <arpa/inet.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
 
 #ifndef PACKAGE_NAME
 #define PACKAGE_NAME "glorytun"

src/ctl.h

@@ -27,6 +27,7 @@ struct ctl_msg {
             unsigned long rate_rx;
             unsigned long beat;
             unsigned char fixed_rate;
+            unsigned char loss_limit;
         } path;
         struct {
             char tun_name[64];

src/path.c

@@ -40,6 +40,7 @@ gt_path_print_status(struct mud_path *path, int term)
             "  rtt:     %.3f ms\n"
             "  rttvar:  %.3f ms\n"
             "  rate:    %s\n"
+            "  losslim: %u\n"
             "  beat:    %"PRIu64" ms\n"
             "  tx:\n"
             "    rate:  %"PRIu64" bytes/sec\n"
@@ -52,7 +53,7 @@ gt_path_print_status(struct mud_path *path, int term)
             : "path %s %s"
             " %s %"PRIu16" %s %"PRIu16" %s %"PRIu16
             " %zu %.3f %.3f"
-            " %s"
+            " %s %u"
             " %"PRIu64
             " %"PRIu64" %"PRIu64" %"PRIu64
             " %"PRIu64" %"PRIu64" %"PRIu64
@@ -69,6 +70,7 @@ gt_path_print_status(struct mud_path *path, int term)
         (double)path->rtt.val / 1e3,
         (double)path->rtt.var / 1e3,
         path->conf.fixed_rate ? "fixed" : "auto",
+        path->conf.loss_limit * 100 / 255,
         path->conf.beat / 1000,
         path->tx.rate,
         path->tx.loss * 100 / 255,
@@ -145,6 +147,7 @@ int
 gt_path(int argc, char **argv)
 {
     const char *dev = NULL;
+    unsigned int loss_limit = 0;
 
     struct ctl_msg req = {
         .type = CTL_STATE,
@@ -165,6 +168,7 @@ gt_path(int argc, char **argv)
         {"up|backup|down", NULL, NULL, argz_option},
         {"rate", NULL, &ratez, argz_option},
         {"beat", "SECONDS", &req.path.beat, argz_time},
+        {"losslimit", "PERCENT", &loss_limit, argz_percent},
         {NULL}};
 
     if (argz(pathz, argc, argv))
@@ -189,9 +193,11 @@ gt_path(int argc, char **argv)
         return 1;
     }
 
-    int set_rate = argz_is_set(pathz, "rate");
+    int set = argz_is_set(pathz, "rate")
+           || argz_is_set(pathz, "beat")
+           || argz_is_set(pathz, "losslimit");
 
-    if (set_rate && !req.path.addr.ss_family) {
+    if (set && !req.path.addr.ss_family) {
         gt_log("please specify a path\n");
         return 1;
     }
@@ -204,6 +210,9 @@ gt_path(int argc, char **argv)
         req.path.state = MUD_DOWN;
     }
 
+    if (loss_limit)
+        req.path.loss_limit = loss_limit * 255 / 100;
+
     if (argz_is_set(ratez, "fixed")) {
         req.path.fixed_rate = 3;
     } else if (argz_is_set(ratez, "auto")) {
@@ -213,7 +222,7 @@ gt_path(int argc, char **argv)
     int ret;
 
     if (!req.path.addr.ss_family ||
-        (req.path.state == MUD_EMPTY && !set_rate)) {
+        (req.path.state == MUD_EMPTY && !set)) {
         ret = gt_path_status(fd, req.path.state, &req.path.addr);
     } else {
         ret = ctl_reply(fd, &res, &req);

src/set.c

@@ -47,7 +47,6 @@ gt_set(int argc, char **argv)
         {"tc", "CS|AF|EF", &req.conf.tc, gt_argz_tc},
         {"kxtimeout", "SECONDS", &req.conf.kxtimeout, argz_time},
         {"timetolerance", "SECONDS", &req.conf.timetolerance, argz_time},
-        {"losslimit", "PERCENT", &req.conf.losslimit, argz_percent},
         {"keepalive", "SECONDS", &req.conf.keepalive, argz_time},
         {NULL}};
 

src/tun.c

@@ -131,13 +131,21 @@ tun_create_by_name(char *name, size_t len, const char *dev_name)
 static int
 tun_create_by_name(char *name, size_t len, const char *dev_name)
 {
-    int ret = snprintf(name, len, "/dev/%s", dev_name);
+    int ret = snprintf(name, len, "%s", dev_name);
 
     if (ret <= 0 || (size_t)ret >= len) {
         errno = EINVAL;
         return -1;
     }
 
+    char tmp[64];
+    ret = snprintf(tmp, sizeof(tmp), "/dev/%s", dev_name);
+
+    if (ret <= 0 || (size_t)ret >= sizeof(tmp)) {
+        errno = EINVAL;
+        return -1;
+    }
+
     return open(tmp, O_RDWR);
 }