X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=5dd6410c7fec6077829a5b79d1823f814a455477;hb=3a316823b971396a428f020f401b9fe41252d98d;hp=1eb98180292c22641b56dd9924e27b4e801e02d3;hpb=d8ca00fe40ff4b6d87e7e64c273f536fab462356;p=tinc diff --git a/src/tincctl.c b/src/tincctl.c index 1eb98180..5dd6410c 100644 --- a/src/tincctl.c +++ b/src/tincctl.c @@ -1,6 +1,6 @@ /* tincctl.c -- Controlling a running tincd - Copyright (C) 2007-2015 Guus Sliepen + Copyright (C) 2007-2017 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -74,6 +74,9 @@ bool netnamegiven = false; char *scriptinterpreter = NULL; char *scriptextension = ""; static char *prompt; +char *device = NULL; +char *iface = NULL; +int debug_level = -1; static struct option const long_options[] = { {"batch", no_argument, NULL, 'b'}, @@ -89,7 +92,7 @@ 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("Copyright (C) 1998-2015 Ivo Timmermans, Guus Sliepen and others.\n" + printf("Copyright (C) 1998-2017 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" "and you are welcome to redistribute it under certain conditions;\n" @@ -165,7 +168,7 @@ static bool parse_options(int argc, char **argv) { int r; int option_index = 0; - while((r = getopt_long(argc, argv, "+c:n:", long_options, &option_index)) != EOF) { + while((r = getopt_long(argc, argv, "+bc:n:", long_options, &option_index)) != EOF) { switch (r) { case 0: /* long option */ break; @@ -261,13 +264,13 @@ static void disable_old_keys(const char *filename, const char *what) { if(!r) return; - snprintf(tmpfile, sizeof tmpfile, "%s.tmp", filename); + snprintf(tmpfile, sizeof(tmpfile), "%s.tmp", filename); struct stat st = {.st_mode = 0600}; fstat(fileno(r), &st); w = fopenmask(tmpfile, "w", st.st_mode); - while(fgets(buf, sizeof buf, r)) { + while(fgets(buf, sizeof(buf), r)) { if(!block && !strncmp(buf, "-----BEGIN ", 11)) { if((strstr(buf, " ED25519 ") && strstr(what, "Ed25519")) || (strstr(buf, " RSA ") && strstr(what, "RSA"))) { disabled = true; @@ -310,7 +313,7 @@ static void disable_old_keys(const char *filename, const char *what) { #ifdef HAVE_MINGW // We cannot atomically replace files on Windows. char bakfile[PATH_MAX] = ""; - snprintf(bakfile, sizeof bakfile, "%s.bak", filename); + snprintf(bakfile, sizeof(bakfile), "%s.bak", filename); if(rename(filename, bakfile) || rename(tmpfile, filename)) { rename(bakfile, filename); #else @@ -330,7 +333,7 @@ static void disable_old_keys(const char *filename, const char *what) { static FILE *ask_and_open(const char *filename, const char *what, const char *mode, bool ask, mode_t perms) { FILE *r; - char *directory; + char directory[PATH_MAX] = "."; char buf[PATH_MAX]; char buf2[PATH_MAX]; @@ -339,7 +342,7 @@ static FILE *ask_and_open(const char *filename, const char *what, const char *mo /* Ask for a file and/or directory name. */ fprintf(stderr, "Please enter a file to save %s to [%s]: ", what, filename); - if(fgets(buf, sizeof buf, stdin) == NULL) { + if(fgets(buf, sizeof(buf), stdin) == NULL) { fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno)); return NULL; } @@ -358,8 +361,8 @@ static FILE *ask_and_open(const char *filename, const char *what, const char *mo if(filename[0] != '/') { #endif /* The directory is a relative path or a filename. */ - directory = get_current_dir_name(); - snprintf(buf2, sizeof buf2, "%s" SLASH "%s", directory, filename); + getcwd(directory, sizeof(directory)); + snprintf(buf2, sizeof(buf2), "%s" SLASH "%s", directory, filename); filename = buf2; } @@ -394,7 +397,7 @@ static bool ed25519_keygen(bool ask) { } else fprintf(stderr, "Done.\n"); - snprintf(fname, sizeof fname, "%s" SLASH "ed25519_key.priv", confbase); + snprintf(fname, sizeof(fname), "%s" SLASH "ed25519_key.priv", confbase); f = ask_and_open(fname, "private Ed25519 key", "a", ask, 0600); if(!f) @@ -408,9 +411,9 @@ static bool ed25519_keygen(bool ask) { fclose(f); if(name) - snprintf(fname, sizeof fname, "%s" SLASH "hosts" SLASH "%s", confbase, name); + snprintf(fname, sizeof(fname), "%s" SLASH "hosts" SLASH "%s", confbase, name); else - snprintf(fname, sizeof fname, "%s" SLASH "ed25519_key.pub", confbase); + snprintf(fname, sizeof(fname), "%s" SLASH "ed25519_key.pub", confbase); f = ask_and_open(fname, "public Ed25519 key", "a", ask, 0666); @@ -446,11 +449,13 @@ static bool rsa_keygen(int bits, bool ask) { // Make sure the key size is a multiple of 8 bits. bits &= ~0x7; - // Force them to be between 1024 and 8192 bits long. - if(bits < 1024) - bits = 1024; - if(bits > 8192) - bits = 8192; + // Make sure that a valid key size is used. + if(bits < 1024 || bits > 8192) { + fprintf(stderr, "Invalid key size %d specified! It should be between 1024 and 8192 bits.\n", bits); + return false; + } else if(bits < 2048) { + fprintf(stderr, "WARNING: generating a weak %d bits RSA key! 2048 or more bits are recommended.\n", bits); + } fprintf(stderr, "Generating %d bits keys:\n", bits); @@ -460,7 +465,7 @@ static bool rsa_keygen(int bits, bool ask) { } else fprintf(stderr, "Done.\n"); - snprintf(fname, sizeof fname, "%s" SLASH "rsa_key.priv", confbase); + snprintf(fname, sizeof(fname), "%s" SLASH "rsa_key.priv", confbase); f = ask_and_open(fname, "private RSA key", "a", ask, 0600); if(!f) @@ -474,9 +479,9 @@ static bool rsa_keygen(int bits, bool ask) { fclose(f); if(name) - snprintf(fname, sizeof fname, "%s" SLASH "hosts" SLASH "%s", confbase, name); + snprintf(fname, sizeof(fname), "%s" SLASH "hosts" SLASH "%s", confbase, name); else - snprintf(fname, sizeof fname, "%s" SLASH "rsa_key.pub", confbase); + snprintf(fname, sizeof(fname), "%s" SLASH "rsa_key.pub", confbase); f = ask_and_open(fname, "public RSA key", "a", ask, 0666); @@ -508,10 +513,10 @@ bool recvline(int fd, char *line, size_t len) { char *newline = NULL; if(!fd) - abort(); + return false; while(!(newline = memchr(buffer, '\n', blen))) { - int result = recv(fd, buffer + blen, sizeof buffer - blen, 0); + int result = recv(fd, buffer + blen, sizeof(buffer) - blen, 0); if(result == -1 && sockerrno == EINTR) continue; else if(result <= 0) @@ -537,7 +542,7 @@ bool recvdata(int fd, char *data, size_t len) { len = blen; while(blen < len) { - int result = recv(fd, buffer + blen, sizeof buffer - blen, 0); + int result = recv(fd, buffer + blen, sizeof(buffer) - blen, 0); if(result == -1 && sockerrno == EINTR) continue; else if(result <= 0) @@ -559,10 +564,11 @@ bool sendline(int fd, char *format, ...) { va_list ap; va_start(ap, format); - blen = vsnprintf(buffer, sizeof buffer, format, ap); + blen = vsnprintf(buffer, sizeof(buffer), format, ap); + buffer[sizeof(buffer) - 1] = 0; va_end(ap); - if(blen < 1 || blen >= sizeof buffer) + if(blen < 1 || blen >= sizeof(buffer)) return false; buffer[blen] = '\n'; @@ -597,7 +603,7 @@ static void pcap(int fd, FILE *out, int snaplen) { 0xa1b2c3d4, 2, 4, 0, 0, - snaplen ?: sizeof data, + snaplen ?: sizeof(data), 1, }; @@ -610,15 +616,15 @@ static void pcap(int fd, FILE *out, int snaplen) { struct timeval tv; - fwrite(&header, sizeof header, 1, out); + fwrite(&header, sizeof(header), 1, out); fflush(out); char line[32]; - while(recvline(fd, line, sizeof line)) { + while(recvline(fd, line, sizeof(line))) { int code, req, len; int n = sscanf(line, "%d %d %d", &code, &req, &len); gettimeofday(&tv, NULL); - if(n != 3 || code != CONTROL || req != REQ_PCAP || len < 0 || len > sizeof data) + if(n != 3 || code != CONTROL || req != REQ_PCAP || len < 0 || len > sizeof(data)) break; if(!recvdata(fd, data, len)) break; @@ -626,7 +632,7 @@ static void pcap(int fd, FILE *out, int snaplen) { packet.tv_usec = tv.tv_usec; packet.len = len; packet.origlen = len; - fwrite(&packet, sizeof packet, 1, out); + fwrite(&packet, sizeof(packet), 1, out); fwrite(data, len, 1, out); fflush(out); } @@ -637,10 +643,10 @@ static void logcontrol(int fd, FILE *out, int level) { char data[1024]; char line[32]; - while(recvline(fd, line, sizeof line)) { + while(recvline(fd, line, sizeof(line))) { int code, req, len; int n = sscanf(line, "%d %d %d", &code, &req, &len); - if(n != 3 || code != CONTROL || req != REQ_LOG || len < 0 || len > sizeof data) + if(n != 3 || code != CONTROL || req != REQ_LOG || len < 0 || len > sizeof(data)) break; if(!recvdata(fd, data, len)) break; @@ -720,9 +726,17 @@ bool connect_tincd(bool verbose) { fclose(f); #ifndef HAVE_MINGW + if ((pid == 0) || (kill(pid, 0) && (errno == ESRCH))) { + fprintf(stderr, "Could not find tincd running at pid %d\n", pid); + /* clean up the stale socket and pid file */ + unlink(pidfilename); + unlink(unixsocketname); + return false; + } + struct sockaddr_un sa; sa.sun_family = AF_UNIX; - strncpy(sa.sun_path, unixsocketname, sizeof sa.sun_path); + strncpy(sa.sun_path, unixsocketname, sizeof(sa.sun_path)); fd = socket(AF_UNIX, SOCK_STREAM, 0); if(fd < 0) { @@ -731,7 +745,7 @@ bool connect_tincd(bool verbose) { return false; } - if(connect(fd, (struct sockaddr *)&sa, sizeof sa) < 0) { + if(connect(fd, (struct sockaddr *)&sa, sizeof(sa)) < 0) { if(verbose) fprintf(stderr, "Cannot connect to UNIX socket %s: %s\n", unixsocketname, sockstrerror(sockerrno)); close(fd); @@ -783,13 +797,13 @@ bool connect_tincd(bool verbose) { #ifdef SO_NOSIGPIPE static const int one = 1; - setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, (void *)&one, sizeof one); + setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, (void *)&one, sizeof(one)); #endif char data[4096]; int version; - if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %s %d", &code, data, &version) != 3 || code != 0) { + if(!recvline(fd, line, sizeof(line)) || sscanf(line, "%d %4095s %d", &code, data, &version) != 3 || code != 0) { if(verbose) fprintf(stderr, "Cannot read greeting from control socket: %s\n", sockstrerror(sockerrno)); close(fd); @@ -799,7 +813,7 @@ bool connect_tincd(bool verbose) { sendline(fd, "%d ^%s %d", ID, controlcookie, TINC_CTL_VERSION_CURRENT); - if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &version, &pid) != 3 || code != 4 || version != TINC_CTL_VERSION_CURRENT) { + if(!recvline(fd, line, sizeof(line)) || sscanf(line, "%d %d %d", &code, &version, &pid) != 3 || code != 4 || version != TINC_CTL_VERSION_CURRENT) { if(verbose) fprintf(stderr, "Could not fully establish control socket connection\n"); close(fd); @@ -834,7 +848,7 @@ static int cmd_start(int argc, char *argv[]) { c = "tincd"; int nargc = 0; - char **nargv = xzalloc((optind + argc) * sizeof *nargv); + char **nargv = xzalloc((optind + argc) * sizeof(*nargv)); char *arg0 = c; #ifdef HAVE_MINGW @@ -878,8 +892,8 @@ static int cmd_start(int argc, char *argv[]) { if(!pid) { close(pfd[0]); - char buf[100] = ""; - snprintf(buf, sizeof buf, "%d", pfd[1]); + char buf[100]; + snprintf(buf, sizeof(buf), "%d", pfd[1]); setenv("TINC_UMBILICAL", buf, true); exit(execvp(c, nargv)); } else { @@ -899,7 +913,7 @@ static int cmd_start(int argc, char *argv[]) { char buf[1024]; ssize_t len; - while((len = read(pfd[0], buf, sizeof buf)) > 0) { + while((len = read(pfd[0], buf, sizeof(buf))) > 0) { failure = buf[len - 1]; if(!failure) len--; @@ -937,11 +951,11 @@ static int cmd_stop(int argc, char *argv[]) { if(!connect_tincd(true)) { if(pid) { if(kill(pid, SIGTERM)) { - fprintf(stderr, "Could not send TERM signal to process with PID %u: %s\n", pid, strerror(errno)); + fprintf(stderr, "Could not send TERM signal to process with PID %d: %s\n", pid, strerror(errno)); return 1; } - fprintf(stderr, "Sent TERM signal to process with PID %u.\n", pid); + fprintf(stderr, "Sent TERM signal to process with PID %d.\n", pid); waitpid(pid, NULL, 0); return 0; } @@ -951,7 +965,7 @@ static int cmd_stop(int argc, char *argv[]) { sendline(fd, "%d %d", CONTROL, REQ_STOP); - while(recvline(fd, line, sizeof line)) { + while(recvline(fd, line, sizeof(line))) { // Wait for tincd to close the connection... } #else @@ -980,7 +994,7 @@ static int cmd_reload(int argc, char *argv[]) { return 1; sendline(fd, "%d %d", CONTROL, REQ_RELOAD); - if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_RELOAD || result) { + if(!recvline(fd, line, sizeof(line)) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_RELOAD || result) { fprintf(stderr, "Could not reload configuration.\n"); return 1; } @@ -991,7 +1005,7 @@ static int cmd_reload(int argc, char *argv[]) { static int dump_invitations(void) { char dname[PATH_MAX]; - snprintf(dname, sizeof dname, "%s" SLASH "invitations", confbase); + snprintf(dname, sizeof(dname), "%s" SLASH "invitations", confbase); DIR *dir = opendir(dname); if(!dir) { if(errno == ENOENT) { @@ -1012,16 +1026,15 @@ static int dump_invitations(void) { continue; char fname[PATH_MAX]; - snprintf(fname, sizeof fname, "%s" SLASH "%s", dname, ent->d_name); + snprintf(fname, sizeof(fname), "%s" SLASH "%s", dname, ent->d_name); FILE *f = fopen(fname, "r"); if(!f) { fprintf(stderr, "Cannot open %s: %s\n", fname, strerror(errno)); - fclose(f); continue; } buf[0] = 0; - if(!fgets(buf, sizeof buf, f)) { + if(!fgets(buf, sizeof(buf), f)) { fprintf(stderr, "Invalid invitation file %s", fname); fclose(f); continue; @@ -1103,9 +1116,9 @@ static int cmd_dump(int argc, char *argv[]) { else if(do_graph == 2) printf("digraph {\n"); - while(recvline(fd, line, sizeof line)) { + while(recvline(fd, line, sizeof(line))) { char node1[4096], node2[4096]; - int n = sscanf(line, "%d %d %s %s", &code, &req, node1, node2); + int n = sscanf(line, "%d %d %4095s %4095s", &code, &req, node1, node2); if(n == 2) { if(do_graph && req == REQ_DUMP_NODES) continue; @@ -1137,13 +1150,13 @@ static int cmd_dump(int argc, char *argv[]) { switch(req) { case REQ_DUMP_NODES: { - int n = sscanf(line, "%*d %*d %s %s %s port %s %d %d %d %d %x %x %s %s %d %hd %hd %hd %ld", node, id, host, port, &cipher, &digest, &maclength, &compression, &options, &status_int, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change); + int n = sscanf(line, "%*d %*d %4095s %4095s %4095s port %4095s %d %d %d %d %x %x %4095s %4095s %d %hd %hd %hd %ld", node, id, host, port, &cipher, &digest, &maclength, &compression, &options, &status_int, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change); if(n != 17) { fprintf(stderr, "Unable to parse node dump from tincd: %s\n", line); return 1; } - memcpy(&status, &status_int, sizeof status); + memcpy(&status, &status_int, sizeof(status)); if(do_graph) { const char *color = "black"; @@ -1161,13 +1174,13 @@ static int cmd_dump(int argc, char *argv[]) { } else { if(only_reachable && !status.reachable) continue; - printf("%s id %s at %s port %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s distance %d pmtu %hd (min %hd max %hd)\n", + printf("%s id %s at %s port %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s distance %d pmtu %d (min %d max %d)\n", node, id, host, port, cipher, digest, maclength, compression, options, status_int, nexthop, via, distance, pmtu, minmtu, maxmtu); } } break; case REQ_DUMP_EDGES: { - int n = sscanf(line, "%*d %*d %s %s %s port %s %s port %s %x %d", from, to, host, port, local_host, local_port, &options, &weight); + int n = sscanf(line, "%*d %*d %4095s %4095s %4095s port %4095s %4095s port %4095s %x %d", from, to, host, port, local_host, local_port, &options, &weight); if(n != 8) { fprintf(stderr, "Unable to parse edge dump from tincd.\n"); return 1; @@ -1185,7 +1198,7 @@ static int cmd_dump(int argc, char *argv[]) { } break; case REQ_DUMP_SUBNETS: { - int n = sscanf(line, "%*d %*d %s %s", subnet, node); + int n = sscanf(line, "%*d %*d %4095s %4095s", subnet, node); if(n != 2) { fprintf(stderr, "Unable to parse subnet dump from tincd.\n"); return 1; @@ -1194,7 +1207,7 @@ static int cmd_dump(int argc, char *argv[]) { } break; case REQ_DUMP_CONNECTIONS: { - int n = sscanf(line, "%*d %*d %s %s port %s %x %d %x", node, host, port, &options, &socket, &status_int); + int n = sscanf(line, "%*d %*d %4095s %4095s port %4095s %x %d %x", node, host, port, &options, &socket, &status_int); if(n != 6) { fprintf(stderr, "Unable to parse connection dump from tincd.\n"); return 1; @@ -1222,7 +1235,7 @@ static int cmd_purge(int argc, char *argv[]) { return 1; sendline(fd, "%d %d", CONTROL, REQ_PURGE); - if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_PURGE || result) { + if(!recvline(fd, line, sizeof(line)) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_PURGE || result) { fprintf(stderr, "Could not purge old information.\n"); return 1; } @@ -1243,7 +1256,7 @@ static int cmd_debug(int argc, char *argv[]) { int origlevel; sendline(fd, "%d %d %d", CONTROL, REQ_SET_DEBUG, debuglevel); - if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &origlevel) != 3 || code != CONTROL || req != REQ_SET_DEBUG) { + if(!recvline(fd, line, sizeof(line)) || sscanf(line, "%d %d %d", &code, &req, &origlevel) != 3 || code != CONTROL || req != REQ_SET_DEBUG) { fprintf(stderr, "Could not set debug level.\n"); return 1; } @@ -1262,7 +1275,7 @@ static int cmd_retry(int argc, char *argv[]) { return 1; sendline(fd, "%d %d", CONTROL, REQ_RETRY); - if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_RETRY || result) { + if(!recvline(fd, line, sizeof(line)) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_RETRY || result) { fprintf(stderr, "Could not retry outgoing connections.\n"); return 1; } @@ -1285,7 +1298,7 @@ static int cmd_connect(int argc, char *argv[]) { return 1; sendline(fd, "%d %d %s", CONTROL, REQ_CONNECT, argv[1]); - if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_CONNECT || result) { + if(!recvline(fd, line, sizeof(line)) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_CONNECT || result) { fprintf(stderr, "Could not connect to %s.\n", argv[1]); return 1; } @@ -1308,7 +1321,7 @@ static int cmd_disconnect(int argc, char *argv[]) { return 1; sendline(fd, "%d %d %s", CONTROL, REQ_DISCONNECT, argv[1]); - if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_DISCONNECT || result) { + if(!recvline(fd, line, sizeof(line)) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_DISCONNECT || result) { fprintf(stderr, "Could not disconnect %s.\n", argv[1]); return 1; } @@ -1384,7 +1397,7 @@ static int cmd_pid(int argc, char *argv[]) { return 1; } - if(!connect_tincd(true) && !pid) + if(!connect_tincd(true) || !pid) return 1; printf("%d\n", pid); @@ -1408,7 +1421,7 @@ char *get_my_name(bool verbose) { char buf[4096]; char *value; - while(fgets(buf, sizeof buf, f)) { + while(fgets(buf, sizeof(buf), f)) { int len = strcspn(buf, "\t ="); value = buf + len; value += strspn(value, "\t "); @@ -1433,10 +1446,10 @@ char *get_my_name(bool verbose) { return NULL; } -static ecdsa_t *get_pubkey(FILE *f) { +ecdsa_t *get_pubkey(FILE *f) { char buf[4096]; char *value; - while(fgets(buf, sizeof buf, f)) { + while(fgets(buf, sizeof(buf), f)) { int len = strcspn(buf, "\t ="); value = buf + len; value += strspn(value, "\t "); @@ -1477,9 +1490,11 @@ const var_t variables[] = { {"Hostnames", VAR_SERVER}, {"IffOneQueue", VAR_SERVER}, {"Interface", VAR_SERVER}, + {"InvitationExpire", VAR_SERVER}, {"KeyExpire", VAR_SERVER}, {"ListenAddress", VAR_SERVER | VAR_MULTIPLE}, {"LocalDiscovery", VAR_SERVER}, + {"LogLevel", VAR_SERVER}, {"MACExpire", VAR_SERVER}, {"MaxConnectionBurst", VAR_SERVER}, {"MaxOutputBufferSize", VAR_SERVER}, @@ -1558,10 +1573,10 @@ static int cmd_config(int argc, char *argv[]) { } // Concatenate the rest of the command line - strncpy(line, argv[1], sizeof line - 1); + strncpy(line, argv[1], sizeof(line) - 1); for(int i = 2; i < argc; i++) { - strncat(line, " ", sizeof line - 1 - strlen(line)); - strncat(line, argv[i], sizeof line - 1 - strlen(line)); + strncat(line, " ", sizeof(line) - 1 - strlen(line)); + strncat(line, argv[i], sizeof(line) - 1 - strlen(line)); } // Liberal parsing into node name, variable name and value. @@ -1670,9 +1685,9 @@ static int cmd_config(int argc, char *argv[]) { // Open the right configuration file. char filename[PATH_MAX]; if(node) - snprintf(filename, sizeof filename, "%s" SLASH "%s", hosts_dir, node); + snprintf(filename, sizeof(filename), "%s" SLASH "%s", hosts_dir, node); else - snprintf(filename, sizeof filename, "%s", tinc_conf); + snprintf(filename, sizeof(filename), "%s", tinc_conf); FILE *f = fopen(filename, "r"); if(!f) { @@ -1684,7 +1699,7 @@ static int cmd_config(int argc, char *argv[]) { FILE *tf = NULL; if(action >= -1) { - snprintf(tmpfile, sizeof tmpfile, "%s.config.tmp", filename); + snprintf(tmpfile, sizeof(tmpfile), "%s.config.tmp", filename); tf = fopen(tmpfile, "w"); if(!tf) { fprintf(stderr, "Could not open temporary file %s: %s\n", tmpfile, strerror(errno)); @@ -1700,9 +1715,9 @@ static int cmd_config(int argc, char *argv[]) { bool removed = false; found = false; - while(fgets(buf1, sizeof buf1, f)) { - buf1[sizeof buf1 - 1] = 0; - strncpy(buf2, buf1, sizeof buf2); + while(fgets(buf1, sizeof(buf1), f)) { + buf1[sizeof(buf1) - 1] = 0; + strncpy(buf2, buf1, sizeof(buf2)); // Parse line in a simple way char *bvalue; @@ -1843,7 +1858,7 @@ static bool try_bind(int port) { bool success = true; char portstr[16]; - snprintf(portstr, sizeof portstr, "%d", port); + snprintf(portstr, sizeof(portstr), "%d", port); if(getaddrinfo(NULL, portstr, &hint, &ai) || !ai) return false; @@ -1877,7 +1892,7 @@ int check_port(char *name) { int port = 0x1000 + (rand() & 0x7fff); if(try_bind(port)) { char filename[PATH_MAX]; - snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", confbase, name); + snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", confbase, name); FILE *f = fopen(filename, "a"); if(!f) { fprintf(stderr, "Could not open %s: %s\n", filename, strerror(errno)); @@ -1909,7 +1924,7 @@ static int cmd_init(int argc, char *argv[]) { if(tty) { char buf[1024]; fprintf(stderr, "Enter the Name you want your tinc node to have: "); - if(!fgets(buf, sizeof buf, stdin)) { + if(!fgets(buf, sizeof(buf), stdin)) { fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno)); return 1; } @@ -1972,7 +1987,7 @@ static int cmd_init(int argc, char *argv[]) { #ifndef HAVE_MINGW char filename[PATH_MAX]; - snprintf(filename, sizeof filename, "%s" SLASH "tinc-up", confbase); + snprintf(filename, sizeof(filename), "%s" SLASH "tinc-up", confbase); if(access(filename, F_OK)) { FILE *f = fopenmask(filename, "w", 0777); if(!f) { @@ -2087,7 +2102,7 @@ static int cmd_edit(int argc, char *argv[]) { if(strncmp(argv[1], "hosts" SLASH, 6)) { for(int i = 0; conffiles[i]; i++) { if(!strcmp(argv[1], conffiles[i])) { - snprintf(filename, sizeof filename, "%s" SLASH "%s", confbase, argv[1]); + snprintf(filename, sizeof(filename), "%s" SLASH "%s", confbase, argv[1]); break; } } @@ -2096,7 +2111,7 @@ static int cmd_edit(int argc, char *argv[]) { } if(!*filename) { - snprintf(filename, sizeof filename, "%s" SLASH "%s", hosts_dir, argv[1]); + snprintf(filename, sizeof(filename), "%s" SLASH "%s", hosts_dir, argv[1]); char *dash = strchr(argv[1], '-'); if(dash) { *dash++ = 0; @@ -2127,7 +2142,7 @@ static int cmd_edit(int argc, char *argv[]) { static int export(const char *name, FILE *out) { char filename[PATH_MAX]; - snprintf(filename, sizeof filename, "%s" SLASH "%s", hosts_dir, name); + snprintf(filename, sizeof(filename), "%s" SLASH "%s", hosts_dir, name); FILE *in = fopen(filename, "r"); if(!in) { fprintf(stderr, "Could not open configuration file %s: %s\n", filename, strerror(errno)); @@ -2136,7 +2151,7 @@ static int export(const char *name, FILE *out) { fprintf(out, "Name = %s\n", name); char buf[4096]; - while(fgets(buf, sizeof buf, in)) { + while(fgets(buf, sizeof(buf), in)) { if(strcspn(buf, "\t =") != 4 || strncasecmp(buf, "Name", 4)) fputs(buf, out); } @@ -2218,8 +2233,8 @@ static int cmd_import(int argc, char *argv[]) { int count = 0; bool firstline = true; - while(fgets(buf, sizeof buf, in)) { - if(sscanf(buf, "Name = %s", name) == 1) { + while(fgets(buf, sizeof(buf), in)) { + if(sscanf(buf, "Name = %4095s", name) == 1) { firstline = false; if(!check_id(name)) { @@ -2230,7 +2245,7 @@ static int cmd_import(int argc, char *argv[]) { if(out) fclose(out); - snprintf(filename, sizeof filename, "%s" SLASH "%s", hosts_dir, name); + snprintf(filename, sizeof(filename), "%s" SLASH "%s", hosts_dir, name); if(!force && !access(filename, F_OK)) { fprintf(stderr, "Host configuration file %s already exists, skipping.\n", filename); @@ -2284,26 +2299,29 @@ static int cmd_exchange_all(int argc, char *argv[]) { } static int switch_network(char *name) { + if(strcmp(name, ".")) { + if(!check_netname(name, false)) { + fprintf(stderr, "Invalid character in netname!\n"); + return 1; + } + + if(!check_netname(name, true)) + fprintf(stderr, "Warning: unsafe character in netname!\n"); + } + if(fd >= 0) { close(fd); fd = -1; } - free(confbase); - confbase = NULL; - free(pidfilename); - pidfilename = NULL; - free(logfilename); - logfilename = NULL; - free(unixsocketname); - unixsocketname = NULL; + free_names(); + netname = strcmp(name, ".") ? xstrdup(name) : NULL; + make_names(false); + free(tinc_conf); free(hosts_dir); free(prompt); - free(netname); - netname = strcmp(name, ".") ? xstrdup(name) : NULL; - xasprintf(&tinc_conf, "%s" SLASH "tinc.conf", confbase); xasprintf(&hosts_dir, "%s" SLASH "hosts", confbase); xasprintf(&prompt, "%s> ", identname); @@ -2337,7 +2355,7 @@ static int cmd_network(int argc, char *argv[]) { } char fname[PATH_MAX]; - snprintf(fname, sizeof fname, "%s/%s/tinc.conf", confdir, ent->d_name); + snprintf(fname, sizeof(fname), "%s/%s/tinc.conf", confdir, ent->d_name); if(!access(fname, R_OK)) printf("%s\n", ent->d_name); } @@ -2391,7 +2409,7 @@ static int cmd_sign(int argc, char *argv[]) { } char fname[PATH_MAX]; - snprintf(fname, sizeof fname, "%s" SLASH "ed25519_key.priv", confbase); + snprintf(fname, sizeof(fname), "%s" SLASH "ed25519_key.priv", confbase); FILE *fp = fopen(fname, "r"); if(!fp) { fprintf(stderr, "Could not open %s: %s\n", fname, strerror(errno)); @@ -2510,10 +2528,12 @@ static int cmd_verify(int argc, char *argv[]) { char *newline = memchr(data, '\n', len); if(!newline || (newline - data > MAX_STRING_SIZE - 1)) { fprintf(stderr, "Invalid input\n"); + free(data); return 1; } *newline++ = '\0'; + size_t skip = newline - data; char signer[MAX_STRING_SIZE] = ""; char sig[MAX_STRING_SIZE] = ""; @@ -2521,11 +2541,13 @@ static int cmd_verify(int argc, char *argv[]) { if(sscanf(data, "Signature = %s %ld %s", signer, &t, sig) != 3 || strlen(sig) != 86 || !t || !check_id(signer)) { fprintf(stderr, "Invalid input\n"); + free(data); return 1; } if(node && strcmp(node, signer)) { fprintf(stderr, "Signature is not made by %s\n", node); + free(data); return 1; } @@ -2540,8 +2562,10 @@ static int cmd_verify(int argc, char *argv[]) { memcpy(data + len, trailer, trailer_len); free(trailer); + newline = data + skip; + char fname[PATH_MAX]; - snprintf(fname, sizeof fname, "%s" SLASH "hosts" SLASH "%s", confbase, node); + snprintf(fname, sizeof(fname), "%s" SLASH "hosts" SLASH "%s", confbase, node); FILE *fp = fopen(fname, "r"); if(!fp) { fprintf(stderr, "Could not open %s: %s\n", fname, strerror(errno)); @@ -2700,9 +2724,9 @@ static char *complete_info(const char *text, int state) { sendline(fd, "%d %d", CONTROL, REQ_DUMP_SUBNETS); } - while(recvline(fd, line, sizeof line)) { + while(recvline(fd, line, sizeof(line))) { char item[4096]; - int n = sscanf(line, "%d %d %s", &code, &req, item); + int n = sscanf(line, "%d %d %4095s", &code, &req, item); if(n == 2) { i++; if(i >= 2) @@ -2755,7 +2779,7 @@ static int cmd_shell(int argc, char *argv[]) { char buf[4096]; char *line = NULL; int maxargs = argc + 16; - char **nargv = xmalloc(maxargs * sizeof *nargv); + char **nargv = xmalloc(maxargs * sizeof(*nargv)); for(int i = 0; i < argc; i++) nargv[i] = argv[i]; @@ -2778,13 +2802,13 @@ static int cmd_shell(int argc, char *argv[]) { if(line) copy = xstrdup(line); } else { - line = fgets(buf, sizeof buf, stdin); + line = fgets(buf, sizeof(buf), stdin); } #else if(tty) fputs(prompt, stdout); - line = fgets(buf, sizeof buf, stdin); + line = fgets(buf, sizeof(buf), stdin); #endif if(!line) @@ -2803,10 +2827,8 @@ static int cmd_shell(int argc, char *argv[]) { while(p && *p) { if(nargc >= maxargs) { - fprintf(stderr, "next %p '%s', p %p '%s'\n", next, next, p, p); - abort(); maxargs *= 2; - nargv = xrealloc(nargv, maxargs * sizeof *nargv); + nargv = xrealloc(nargv, maxargs * sizeof(*nargv)); } nargv[nargc++] = p; @@ -2817,8 +2839,10 @@ static int cmd_shell(int argc, char *argv[]) { if(nargc == argc) continue; - if(!strcasecmp(nargv[argc], "exit") || !strcasecmp(nargv[argc], "quit")) + if(!strcasecmp(nargv[argc], "exit") || !strcasecmp(nargv[argc], "quit")) { + free(nargv); return result; + } bool found = false;