Let the CLI prevent adding incorrect Subnets.

[tinc] / src / tincctl.c

diff --git a/src/tincctl.c b/src/tincctl.c
index bfc16af..499a7b8 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -93,6 +93,17 @@ static struct option const long_options[] = {
 static void version(void) {
        printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
               BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
+       printf("Features:"
+#ifdef HAVE_READLINE
+              " readline"
+#endif
+#ifdef HAVE_CURSES
+              " curses"
+#endif
+#ifndef DISABLE_LEGACY
+              " legacy_protocol"
+#endif
+              "\n\n");
        printf("Copyright (C) 1998-2018 Ivo Timmermans, Guus Sliepen and others.\n"
               "See the AUTHORS file for a complete list.\n\n"
               "tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
@@ -179,11 +190,13 @@ static bool parse_options(int argc, char **argv) {
                        break;
 
                case 'c': /* config file */
+                       free(confbase);
                        confbase = xstrdup(optarg);
                        confbasegiven = true;
                        break;
 
                case 'n': /* net name given */
+                       free(netname);
                        netname = xstrdup(optarg);
                        break;
 
@@ -196,6 +209,7 @@ static bool parse_options(int argc, char **argv) {
                        break;
 
                case 3:   /* open control socket here */
+                       free(pidfilename);
                        pidfilename = xstrdup(optarg);
                        break;
 
@@ -205,6 +219,7 @@ static bool parse_options(int argc, char **argv) {
 
                case '?': /* wrong options */
                        usage(true);
+                       free_names();
                        return false;
 
                default:
@@ -225,6 +240,7 @@ static bool parse_options(int argc, char **argv) {
 
        if(netname && (strpbrk(netname, "\\/") || *netname == '.')) {
                fprintf(stderr, "Invalid character in netname!\n");
+               free_names();
                return false;
        }
 
@@ -853,14 +869,17 @@ bool connect_tincd(bool verbose) {
                return false;
        }
 
-       struct sockaddr_un sa;
+       struct sockaddr_un sa = {
+               .sun_family = AF_UNIX,
+       };
 
-       sa.sun_family = AF_UNIX;
+       if(strlen(unixsocketname) >= sizeof(sa.sun_path)) {
+               fprintf(stderr, "UNIX socket filename %s is too long!", unixsocketname);
+               return false;
+       }
 
        strncpy(sa.sun_path, unixsocketname, sizeof(sa.sun_path));
 
-       sa.sun_path[sizeof(sa.sun_path) - 1] = 0;
-
        fd = socket(AF_UNIX, SOCK_STREAM, 0);
 
        if(fd < 0) {
@@ -986,10 +1005,12 @@ static int cmd_start(int argc, char *argv[]) {
 
 #endif
 
+       char *default_c = "tincd";
+
        if(slash++) {
                xasprintf(&c, "%.*stincd", (int)(slash - program_name), program_name);
        } else {
-               c = "tincd";
+               c = default_c;
        }
 
        int nargc = 0;
@@ -1020,6 +1041,12 @@ static int cmd_start(int argc, char *argv[]) {
 #ifdef HAVE_MINGW
        int status = spawnvp(_P_WAIT, c, nargv);
 
+       free(nargv);
+
+       if(c != default_c) {
+               free(c);
+       }
+
        if(status == -1) {
                fprintf(stderr, "Error starting %s: %s\n", c, strerror(errno));
                return 1;
@@ -1032,6 +1059,11 @@ static int cmd_start(int argc, char *argv[]) {
        if(socketpair(AF_UNIX, SOCK_STREAM, 0, pfd)) {
                fprintf(stderr, "Could not create umbilical socket: %s\n", strerror(errno));
                free(nargv);
+
+               if(c != default_c) {
+                       free(c);
+               }
+
                return 1;
        }
 
@@ -1040,6 +1072,11 @@ static int cmd_start(int argc, char *argv[]) {
        if(pid == -1) {
                fprintf(stderr, "Could not fork: %s\n", strerror(errno));
                free(nargv);
+
+               if(c != default_c) {
+                       free(c);
+               }
+
                return 1;
        }
 
@@ -1089,12 +1126,17 @@ static int cmd_start(int argc, char *argv[]) {
        signal(SIGINT, SIG_DFL);
 #endif
 
-       if(failure || result != pid || !WIFEXITED(status) || WEXITSTATUS(status)) {
+       bool failed = failure || result != pid || !WIFEXITED(status) || WEXITSTATUS(status);
+
+       if(failed) {
                fprintf(stderr, "Error starting %s\n", c);
-               return 1;
        }
 
-       return 0;
+       if(c != default_c) {
+               free(c);
+       }
+
+       return failed ? EXIT_FAILURE : EXIT_SUCCESS;
 #endif
 }
 
@@ -1842,7 +1884,7 @@ static int cmd_config(int argc, char *argv[]) {
        char *node = NULL;
        char *variable;
        char *value;
-       int len;
+       size_t len;
 
        len = strcspn(line, "\t =");
        value = line + len;
@@ -1894,6 +1936,7 @@ static int cmd_config(int argc, char *argv[]) {
 
                        if(!str2net(&s, value)) {
                                fprintf(stderr, "Malformed subnet definition %s\n", value);
+                               return 1;
                        }
 
                        if(!subnetcheck(s)) {
@@ -1949,6 +1992,11 @@ static int cmd_config(int argc, char *argv[]) {
 
        if(node && !check_id(node)) {
                fprintf(stderr, "Invalid name for node.\n");
+
+               if(node != line) {
+                       free(node);
+               }
+
                return 1;
        }
 
@@ -1957,6 +2005,11 @@ static int cmd_config(int argc, char *argv[]) {
                        fprintf(stderr, "Warning: %s is not a known configuration variable!\n", variable);
                } else {
                        fprintf(stderr, "%s: is not a known configuration variable! Use --force to use it anyway.\n", variable);
+
+                       if(node && node != line) {
+                               free(node);
+                       }
+
                        return 1;
                }
        }
@@ -1966,6 +2019,11 @@ static int cmd_config(int argc, char *argv[]) {
 
        if(node) {
                snprintf(filename, sizeof(filename), "%s" SLASH "%s", hosts_dir, node);
+
+               if(node != line) {
+                       free(node);
+                       node = NULL;
+               }
        } else {
                snprintf(filename, sizeof(filename), "%s", tinc_conf);
        }
@@ -3325,6 +3383,11 @@ static int cmd_shell(int argc, char *argv[]) {
        return result;
 }
 
+static void cleanup() {
+       free(tinc_conf);
+       free(hosts_dir);
+       free_names();
+}
 
 int main(int argc, char *argv[]) {
        program_name = argv[0];
@@ -3339,6 +3402,7 @@ int main(int argc, char *argv[]) {
        make_names(false);
        xasprintf(&tinc_conf, "%s" SLASH "tinc.conf", confbase);
        xasprintf(&hosts_dir, "%s" SLASH "hosts", confbase);
+       atexit(cleanup);
 
        if(show_version) {
                version();
@@ -3360,7 +3424,8 @@ int main(int argc, char *argv[]) {
 
 #endif
 
-       srand(time(NULL));
+       gettimeofday(&now, NULL);
+       srand(now.tv_sec + now.tv_usec);
        crypto_init();
 
        if(optind >= argc) {