From 871f48809705bda0d889992150c3c89080d5bfd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20Gallou=C3=ABt?= <adrien@gallouet.fr>
Date: Sat, 9 Mar 2019 15:06:21 +0000
Subject: [PATCH] Remove old sync command
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
---
 Makefile.am  |  1 -
 README.md    |  1 -
 meson.build  |  1 -
 mud          |  2 +-
 src/bind.c   |  3 ---
 src/common.h |  1 -
 src/ctl.h    |  1 -
 src/main.c   |  1 -
 src/sync.c   | 76 ----------------------------------------------------
 9 files changed, 1 insertion(+), 86 deletions(-)
 delete mode 100644 src/sync.c

diff --git a/Makefile.am b/Makefile.am
index 43407cc..42a09f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,6 @@ glorytun_SOURCES = \
     src/set.c \
     src/show.c \
     src/str.h \
-    src/sync.c \
     src/tun.c \
     src/tun.h
 
diff --git a/README.md b/README.md
index c971206..06c9261 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,6 @@ available commands:
   bench    start a crypto bench
   bind     start a new tunnel
   set      change tunnel properties
-  sync     re-sync tunnels
   keygen   generate a new secret key
   path     manage paths
   version  show version
diff --git a/meson.build b/meson.build
index 5b8c867..c8ded67 100644
--- a/meson.build
+++ b/meson.build
@@ -33,7 +33,6 @@ executable('glorytun', install: true,
     'src/path.c',
     'src/set.c',
     'src/show.c',
-    'src/sync.c',
     'src/tun.c',
   ],
   dependencies: [
diff --git a/mud b/mud
index f67a5b4..7a5bb06 160000
--- a/mud
+++ b/mud
@@ -1 +1 @@
-Subproject commit f67a5b4fed0208fcffe8502473099c70b685342f
+Subproject commit 7a5bb0690e88fd224df24bb755be2c551e579fcd
diff --git a/src/bind.c b/src/bind.c
index 0f98ca7..2111735 100644
--- a/src/bind.c
+++ b/src/bind.c
@@ -300,9 +300,6 @@ gt_bind(int argc, char **argv)
                     res.status.bind = bind_addr;
                     res.status.peer = peer_addr;
                     break;
-                case CTL_SYNC:
-                    res.ms = mud_sync(mud);
-                    break;
                 }
                 if (sendto(ctl_fd, &res, sizeof(res), 0,
                            (const struct sockaddr *)&ss, sl) == -1)
diff --git a/src/common.h b/src/common.h
index b8ac74e..25b4b33 100644
--- a/src/common.h
+++ b/src/common.h
@@ -74,4 +74,3 @@ int gt_path   (int, char **);
 int gt_keygen (int, char **);
 int gt_bench  (int, char **);
 int gt_set    (int, char **);
-int gt_sync   (int, char **);
diff --git a/src/ctl.h b/src/ctl.h
index 74e8635..654af8f 100644
--- a/src/ctl.h
+++ b/src/ctl.h
@@ -13,7 +13,6 @@ enum ctl_type {
     CTL_KXTIMEOUT,
     CTL_TIMETOLERANCE,
     CTL_PATH_STATUS,
-    CTL_SYNC,
 };
 
 struct ctl_msg {
diff --git a/src/main.c b/src/main.c
index 11ea37c..517d307 100644
--- a/src/main.c
+++ b/src/main.c
@@ -64,7 +64,6 @@ main(int argc, char **argv)
         {"bench", "start a crypto bench", gt_bench},
         {"bind", "start a new tunnel", gt_bind},
         {"set", "change tunnel properties", gt_set},
-        {"sync", "re-sync tunnels", gt_sync},
         {"keygen", "generate a new secret key", gt_keygen},
         {"path", "manage paths", gt_path},
         {"version", "show version", gt_version},
diff --git a/src/sync.c b/src/sync.c
deleted file mode 100644
index 8c96831..0000000
--- a/src/sync.c
+++ /dev/null
@@ -1,76 +0,0 @@
-#include "common.h"
-#include "ctl.h"
-#include "str.h"
-
-#include "../argz/argz.h"
-
-#include <stdio.h>
-#include <dirent.h>
-
-static int
-gt_sync_dev(const char *dev, unsigned long timeout)
-{
-    const int fd = ctl_connect(GT_RUNDIR, dev);
-
-    if (fd < 0) {
-        if (fd == -1)
-            perror("sync");
-        return 1;
-    }
-
-    struct ctl_msg res, req = {
-        .type = CTL_SYNC,
-    };
-
-    int ret = ctl_reply(fd, &res, &req);
-
-    if (!ret) {
-        if (res.ms > timeout)
-            ret = 1;
-    } else {
-        perror("sync");
-    }
-
-    ctl_delete(fd);
-
-    return ret;
-}
-
-int
-gt_sync(int argc, char **argv)
-{
-    const char *dev = NULL;
-    unsigned long timeout = 20000;
-
-    struct argz syncz[] = {
-        {"dev", "NAME", &dev, argz_str},
-        {"timeout", "SECONDS", &timeout, argz_time},
-        {NULL}};
-
-    if (argz(syncz, argc, argv))
-        return 1;
-
-    if (dev)
-        return !!gt_sync_dev(dev, timeout);
-
-    DIR *dp = opendir(GT_RUNDIR);
-
-    if (!dp) {
-        if (errno == ENOENT)
-            return 0;
-        perror("sync");
-        return 1;
-    }
-
-    int ret = 0;
-    struct dirent *d = NULL;
-
-    while (d = readdir(dp), d) {
-        if (d->d_name[0] != '.')
-            ret |= !!gt_sync_dev(d->d_name, timeout);
-    }
-
-    closedir(dp);
-
-    return ret;
-}