From c75f5d562074a44d9e0349ba877e5ea3370787a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20Gallou=C3=ABt?= <adrien@gallouet.fr>
Date: Tue, 31 Dec 2019 19:30:49 +0000
Subject: [PATCH] Do not allow mtu manipulation anymore
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
---
 src/bind.c |  6 +-----
 src/ctl.h  |  2 --
 src/set.c  | 25 -------------------------
 3 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/src/bind.c b/src/bind.c
index 9c2d572..26af523 100644
--- a/src/bind.c
+++ b/src/bind.c
@@ -91,7 +91,7 @@ gt_setup_mtu(struct mud *mud, size_t old, const char *tun_name)
 {
     size_t mtu = mud_get_mtu(mud);
 
-    if (mtu == old)
+    if (!mtu || mtu == old)
         return mtu;
 
     if (iface_set_mtu(tun_name, mtu) == -1)
@@ -351,10 +351,6 @@ gt_bind(int argc, char **argv)
                         res.ret = 0;
                     }
                     break;
-                case CTL_MTU:
-                    mud_set_mtu(mud, req.mtu);
-                    res.mtu = mtu = gt_setup_mtu(mud, mtu, tun_name);
-                    break;
                 case CTL_TC:
                     if (mud_set_tc(mud, req.tc))
                         res.ret = errno;
diff --git a/src/ctl.h b/src/ctl.h
index 42403db..ead0a34 100644
--- a/src/ctl.h
+++ b/src/ctl.h
@@ -11,7 +11,6 @@ enum ctl_type {
     CTL_NONE = 0,
     CTL_STATE,
     CTL_STATUS,
-    CTL_MTU,
     CTL_TC,
     CTL_KXTIMEOUT,
     CTL_TIMETOLERANCE,
@@ -40,7 +39,6 @@ struct ctl_msg {
             struct sockaddr_storage peer;
         } status;
         struct mud_bad bad;
-        size_t mtu;
         int tc;
         unsigned long ms;
         unsigned percent;
diff --git a/src/set.c b/src/set.c
index e17bcb9..3dfca43 100644
--- a/src/set.c
+++ b/src/set.c
@@ -7,26 +7,6 @@
 
 #include "../argz/argz.h"
 
-static int
-gt_set_mtu(int fd, size_t mtu)
-{
-    struct ctl_msg res, req = {
-        .type = CTL_MTU,
-        .mtu = mtu,
-    };
-
-    int ret = ctl_reply(fd, &res, &req);
-
-    if (ret) {
-        perror("set mtu");
-        return 1;
-    }
-
-    printf("mtu set to %zu\n", res.mtu);
-
-    return 0;
-}
-
 static int
 gt_set_kxtimeout(int fd, unsigned long ms)
 {
@@ -129,7 +109,6 @@ int
 gt_set(int argc, char **argv)
 {
     const char *dev = NULL;
-    size_t mtu;
     int tc;
     unsigned long kxtimeout;
     unsigned long timetolerance;
@@ -137,7 +116,6 @@ gt_set(int argc, char **argv)
 
     struct argz pathz[] = {
         {"dev", "NAME", &dev, argz_str},
-        {"mtu", "BYTES", &mtu, argz_bytes},
         {"tc", "CS|AF|EF", &tc, gt_argz_tc},
         {"kxtimeout", "SECONDS", &kxtimeout, argz_time},
         {"timetolerance", "SECONDS", &timetolerance, argz_time},
@@ -168,9 +146,6 @@ gt_set(int argc, char **argv)
 
     int ret = 0;
 
-    if (argz_is_set(pathz, "mtu"))
-        ret |= gt_set_mtu(fd, mtu);
-
     if (argz_is_set(pathz, "tc"))
         ret |= gt_set_tc(fd, tc);