Add the tincctl exchange and exchange-all commands.

[tinc] / src / tincctl.c

diff --git a/src/tincctl.c b/src/tincctl.c
index dd0bbcc..6b36aa7 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -153,6 +153,8 @@ static void usage(bool status) {
                                "  export                     Export host configuration of local node to standard output\n"
                                "  export-all                 Export all host configuration files to standard output\n"
                                "  import [--force]           Import host configuration file(s) from standard input\n"
+                               "  exchange [--force]         Same as export followed by import\n"
+                               "  exchange-all [--force]     Same as export-all followed by import\n"
                                "\n");
                printf("Report bugs to tinc@tinc-vpn.org.\n");
        }
@@ -854,6 +856,11 @@ static int cmd_start(int argc, char *argv[]) {
 }
 
 static int cmd_stop(int argc, char *argv[]) {
+       if(argc > 1) {
+               fprintf(stderr, "Too many arguments!\n");
+               return 1;
+       }
+
 #ifndef HAVE_MINGW
        if(!connect_tincd(true)) {
                if(pid) {
@@ -898,6 +905,11 @@ static int cmd_restart(int argc, char *argv[]) {
 }
 
 static int cmd_reload(int argc, char *argv[]) {
+       if(argc > 1) {
+               fprintf(stderr, "Too many arguments!\n");
+               return 1;
+       }
+
        if(!connect_tincd(true))
                return 1;
 
@@ -1070,6 +1082,11 @@ static int cmd_dump(int argc, char *argv[]) {
 }
 
 static int cmd_purge(int argc, char *argv[]) {
+       if(argc > 1) {
+               fprintf(stderr, "Too many arguments!\n");
+               return 1;
+       }
+
        if(!connect_tincd(true))
                return 1;
 
@@ -1105,6 +1122,11 @@ static int cmd_debug(int argc, char *argv[]) {
 }
 
 static int cmd_retry(int argc, char *argv[]) {
+       if(argc > 1) {
+               fprintf(stderr, "Too many arguments!\n");
+               return 1;
+       }
+
        if(!connect_tincd(true))
                return 1;
 
@@ -1164,6 +1186,11 @@ static int cmd_disconnect(int argc, char *argv[]) {
 }
 
 static int cmd_top(int argc, char *argv[]) {
+       if(argc > 1) {
+               fprintf(stderr, "Too many arguments!\n");
+               return 1;
+       }
+
 #ifdef HAVE_CURSES
        if(!connect_tincd(true))
                return 1;
@@ -1177,6 +1204,11 @@ static int cmd_top(int argc, char *argv[]) {
 }
 
 static int cmd_pcap(int argc, char *argv[]) {
+       if(argc > 2) {
+               fprintf(stderr, "Too many arguments!\n");
+               return 1;
+       }
+
        if(!connect_tincd(true))
                return 1;
 
@@ -1185,6 +1217,11 @@ static int cmd_pcap(int argc, char *argv[]) {
 }
 
 static int cmd_log(int argc, char *argv[]) {
+       if(argc > 2) {
+               fprintf(stderr, "Too many arguments!\n");
+               return 1;
+       }
+
        if(!connect_tincd(true))
                return 1;
 
@@ -1193,6 +1230,11 @@ static int cmd_log(int argc, char *argv[]) {
 }
 
 static int cmd_pid(int argc, char *argv[]) {
+       if(argc > 1) {
+               fprintf(stderr, "Too many arguments!\n");
+               return 1;
+       }
+
        if(!connect_tincd(true) && !pid)
                return 1;
 
@@ -1613,7 +1655,10 @@ static int cmd_init(int argc, char *argv[]) {
                return 1;
        }
 
-       if(argc < 2) {
+       if(argc > 2) {
+               fprintf(stderr, "Too many arguments!\n");
+               return 1;
+       } else if(argc < 2) {
                if(tty) {
                        char buf[1024];
                        fprintf(stdout, "Enter the Name you want your tinc node to have: ");
@@ -1692,14 +1737,29 @@ static int cmd_init(int argc, char *argv[]) {
 }
 
 static int cmd_generate_keys(int argc, char *argv[]) {
+       if(argc > 2) {
+               fprintf(stderr, "Too many arguments!\n");
+               return 1;
+       }
+
        return !(rsa_keygen(argc > 1 ? atoi(argv[1]) : 2048, true) && ecdsa_keygen(true));
 }
 
 static int cmd_generate_rsa_keys(int argc, char *argv[]) {
+       if(argc > 2) {
+               fprintf(stderr, "Too many arguments!\n");
+               return 1;
+       }
+
        return !rsa_keygen(argc > 1 ? atoi(argv[1]) : 2048, true);
 }
 
 static int cmd_generate_ecdsa_keys(int argc, char *argv[]) {
+       if(argc > 1) {
+               fprintf(stderr, "Too many arguments!\n");
+               return 1;
+       }
+
        return !ecdsa_keygen(true);
 }
 
@@ -1709,6 +1769,11 @@ static int cmd_help(int argc, char *argv[]) {
 }
 
 static int cmd_version(int argc, char *argv[]) {
+       if(argc > 1) {
+               fprintf(stderr, "Too many arguments!\n");
+               return 1;
+       }
+
        version();
        return 0;
 }
@@ -1811,14 +1876,27 @@ static int export(const char *name, FILE *out) {
 }
 
 static int cmd_export(int argc, char *argv[]) {
+       if(argc > 1) {
+               fprintf(stderr, "Too many arguments!\n");
+               return 1;
+       }
+
        char *name = get_my_name();
        if(!name)
                return 1;
 
-       return export(name, stdout);
+       int result = export(name, stdout);
+       if(!tty)
+               fclose(stdout);
+       return result;
 }
 
 static int cmd_export_all(int argc, char *argv[]) {
+       if(argc > 1) {
+               fprintf(stderr, "Too many arguments!\n");
+               return 1;
+       }
+
        DIR *dir = opendir(hosts_dir);
        if(!dir) {
                fprintf(stderr, "Could not open host configuration directory %s: %s\n", hosts_dir, strerror(errno));
@@ -1842,21 +1920,30 @@ static int cmd_export_all(int argc, char *argv[]) {
        }
 
        closedir(dir);
+       if(!tty)
+               fclose(stdout);
        return result;
 }
 
 static int cmd_import(int argc, char *argv[]) {
+       if(argc > 1) {
+               fprintf(stderr, "Too many arguments!\n");
+               return 1;
+       }
+
        FILE *in = stdin;
        FILE *out = NULL;
 
        char buf[4096];
        char name[4096];
-       char *filename;
+       char *filename = NULL;
        int count = 0;
        bool firstline = true;
 
        while(fgets(buf, sizeof buf, in)) {
                if(sscanf(buf, "Name = %s", name) == 1) {
+                       firstline = false;
+
                        if(!check_id(name)) {
                                fprintf(stderr, "Invalid Name in input!\n");
                                return 1;
@@ -1881,7 +1968,6 @@ static int cmd_import(int argc, char *argv[]) {
                        }
 
                        count++;
-                       firstline = false;
                        continue;
                } else if(firstline) {
                        fprintf(stderr, "Junk at the beginning of the input, ignoring.\n");
@@ -1912,6 +1998,14 @@ static int cmd_import(int argc, char *argv[]) {
        }
 }
 
+static int cmd_exchange(int argc, char *argv[]) {
+       return cmd_export(argc, argv) ?: cmd_import(argc, argv);
+}
+
+static int cmd_exchange_all(int argc, char *argv[]) {
+       return cmd_export_all(argc, argv) ?: cmd_import(argc, argv);
+}
+
 static const struct {
        const char *command;
        int (*function)(int argc, char *argv[]);
@@ -1942,6 +2036,8 @@ static const struct {
        {"export", cmd_export},
        {"export-all", cmd_export_all},
        {"import", cmd_import},
+       {"exchange", cmd_exchange},
+       {"exchange-all", cmd_exchange_all},
        {NULL, NULL},
 };