X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=9b39f2ce19dd5ba55043718eae54e7200d47584d;hb=668750c022a02cc54756316907f1cbbf7d673025;hp=4dd9726fe5a2ed6d52af3272ef173fa230a7f236;hpb=a29e6b49ef7a184941ab8cda2de9487744a82f83;p=tinc diff --git a/src/tincctl.c b/src/tincctl.c index 4dd9726f..9b39f2ce 100644 --- a/src/tincctl.c +++ b/src/tincctl.c @@ -1,6 +1,6 @@ /* tincctl.c -- Controlling a running tincd - Copyright (C) 2007-2021 Guus Sliepen + Copyright (C) 2007-2022 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 @@ -19,8 +19,6 @@ #include "system.h" -#include - #ifdef HAVE_READLINE #include "readline/readline.h" #include "readline/history.h" @@ -42,6 +40,8 @@ #include "version.h" #include "subnet.h" #include "keys.h" +#include "random.h" +#include "pidfile.h" #ifndef MSG_NOSIGNAL #define MSG_NOSIGNAL 0 @@ -72,7 +72,8 @@ bool force = false; bool tty = true; bool confbasegiven = false; char *scriptinterpreter = NULL; -char *scriptextension = ""; +static char defaultextension[] = ""; +char *scriptextension = defaultextension; static char *prompt; char *device = NULL; char *iface = NULL; @@ -90,88 +91,95 @@ 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:" + static const char *message = + "%s version %s (built %s %s, protocol %d.%d)\n" + "Features:" #ifdef HAVE_READLINE - " readline" + " readline" #endif #ifdef HAVE_CURSES - " curses" + " curses" #endif #ifndef DISABLE_LEGACY - " legacy_protocol" + " 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" - "and you are welcome to redistribute it under certain conditions;\n" - "see the file COPYING for details.\n"); + "\n\n" + "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" + "and you are welcome to redistribute it under certain conditions;\n" + "see the file COPYING for details.\n"; + + printf(message, PACKAGE, BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR); } static void usage(bool status) { if(status) { fprintf(stderr, "Try `%s --help\' for more information.\n", program_name); } else { - printf("Usage: %s [options] command\n\n", program_name); - printf("Valid options are:\n" - " -b, --batch Don't ask for anything (non-interactive mode).\n" - " -c, --config=DIR Read configuration options from DIR.\n" - " -n, --net=NETNAME Connect to net NETNAME.\n" - " --pidfile=FILENAME Read control cookie from FILENAME.\n" - " --force Force some commands to work despite warnings.\n" - " --help Display this help and exit.\n" - " --version Output version information and exit.\n" - "\n" - "Valid commands are:\n" - " init [name] Create initial configuration files.\n" - " get VARIABLE Print current value of VARIABLE\n" - " set VARIABLE VALUE Set VARIABLE to VALUE\n" - " add VARIABLE VALUE Add VARIABLE with the given VALUE\n" - " del VARIABLE [VALUE] Remove VARIABLE [only ones with watching VALUE]\n" - " start [tincd options] Start tincd.\n" - " stop Stop tincd.\n" - " restart [tincd options] Restart tincd.\n" - " reload Partially reload configuration of running tincd.\n" - " pid Show PID of currently running tincd.\n" + static const char *message = + "Usage: %s [options] command\n" + "\n" + "Valid options are:\n" + " -b, --batch Don't ask for anything (non-interactive mode).\n" + " -c, --config=DIR Read configuration options from DIR.\n" + " -n, --net=NETNAME Connect to net NETNAME.\n" + " --pidfile=FILENAME Read control cookie from FILENAME.\n" + " --force Force some commands to work despite warnings.\n" + " --help Display this help and exit.\n" + " --version Output version information and exit.\n" + "\n" + "Valid commands are:\n" + " init [name] Create initial configuration files.\n" + " get VARIABLE Print current value of VARIABLE\n" + " set VARIABLE VALUE Set VARIABLE to VALUE\n" + " add VARIABLE VALUE Add VARIABLE with the given VALUE\n" + " del VARIABLE [VALUE] Remove VARIABLE [only ones with watching VALUE]\n" + " start [tincd options] Start tincd.\n" + " stop Stop tincd.\n" + " restart [tincd options] Restart tincd.\n" + " reload Partially reload configuration of running tincd.\n" + " pid Show PID of currently running tincd.\n" #ifdef DISABLE_LEGACY - " generate-keys Generate a new Ed25519 public/private key pair.\n" + " generate-keys Generate a new Ed25519 public/private key pair.\n" #else - " generate-keys [bits] Generate new RSA and Ed25519 public/private key pairs.\n" - " generate-rsa-keys [bits] Generate a new RSA public/private key pair.\n" + " generate-keys [bits] Generate new RSA and Ed25519 public/private key pairs.\n" + " generate-rsa-keys [bits] Generate a new RSA public/private key pair.\n" #endif - " generate-ed25519-keys Generate a new Ed25519 public/private key pair.\n" - " dump Dump a list of one of the following things:\n" - " [reachable] nodes - all known nodes in the VPN\n" - " edges - all known connections in the VPN\n" - " subnets - all known subnets in the VPN\n" - " connections - all meta connections with ourself\n" - " [di]graph - graph of the VPN in dotty format\n" - " invitations - outstanding invitations\n" - " info NODE|SUBNET|ADDRESS Give information about a particular NODE, SUBNET or ADDRESS.\n" - " purge Purge unreachable nodes\n" - " debug N Set debug level\n" - " retry Retry all outgoing connections\n" - " disconnect NODE Close meta connection with NODE\n" + " generate-ed25519-keys Generate a new Ed25519 public/private key pair.\n" + " dump Dump a list of one of the following things:\n" + " [reachable] nodes - all known nodes in the VPN\n" + " edges - all known connections in the VPN\n" + " subnets - all known subnets in the VPN\n" + " connections - all meta connections with ourself\n" + " [di]graph - graph of the VPN in dotty format\n" + " invitations - outstanding invitations\n" + " info NODE|SUBNET|ADDRESS Give information about a particular NODE, SUBNET or ADDRESS.\n" + " purge Purge unreachable nodes\n" + " debug N Set debug level\n" + " retry Retry all outgoing connections\n" + " disconnect NODE Close meta connection with NODE\n" #ifdef HAVE_CURSES - " top Show real-time statistics\n" + " top Show real-time statistics\n" #endif - " pcap [snaplen] Dump traffic in pcap format [up to snaplen bytes per packet]\n" - " log [level] Dump log output [up to the specified level]\n" - " export Export host configuration of local node to standard output\n" - " export-all Export all host configuration files to standard output\n" - " import Import host configuration file(s) from standard input\n" - " exchange Same as export followed by import\n" - " exchange-all Same as export-all followed by import\n" - " invite NODE [...] Generate an invitation for NODE\n" - " join INVITATION Join a VPN using an INVITATION\n" - " network [NETNAME] List all known networks, or switch to the one named NETNAME.\n" - " fsck Check the configuration files for problems.\n" - " sign [FILE] Generate a signed version of a file.\n" - " verify NODE [FILE] Verify that a file was signed by the given NODE.\n" - "\n"); - printf("Report bugs to tinc@tinc-vpn.org.\n"); + " pcap [snaplen] Dump traffic in pcap format [up to snaplen bytes per packet]\n" + " log [level] Dump log output [up to the specified level]\n" + " export Export host configuration of local node to standard output\n" + " export-all Export all host configuration files to standard output\n" + " import Import host configuration file(s) from standard input\n" + " exchange Same as export followed by import\n" + " exchange-all Same as export-all followed by import\n" + " invite NODE [...] Generate an invitation for NODE\n" + " join INVITATION Join a VPN using an INVITATION\n" + " network [NETNAME] List all known networks, or switch to the one named NETNAME.\n" + " fsck Check the configuration files for problems.\n" + " sign [FILE] Generate a signed version of a file.\n" + " verify NODE [FILE] Verify that a file was signed by the given NODE.\n" + "\n" + "Report bugs to tinc@tinc-vpn.org.\n"; + + printf(message, program_name); } } @@ -275,15 +283,19 @@ ask_filename: } } -#ifdef HAVE_MINGW +#ifdef HAVE_WINDOWS if(filename[0] != '\\' && filename[0] != '/' && !strchr(filename, ':')) { #else if(filename[0] != '/') { #endif + /* The directory is a relative path or a filename. */ - getcwd(directory, sizeof(directory)); + if(!getcwd(directory, sizeof(directory))) { + fprintf(stderr, "Could not get current directory: %s\n", strerror(errno)); + return NULL; + } if((size_t)snprintf(buf2, sizeof(buf2), "%s" SLASH "%s", directory, filename) >= sizeof(buf2)) { fprintf(stderr, "Filename too long: %s" SLASH "%s\n", directory, filename); @@ -463,15 +475,15 @@ bool recvline(int fd, char *line, size_t len) { } while(!(newline = memchr(buffer, '\n', blen))) { - int result = recv(fd, buffer + blen, sizeof(buffer) - blen, 0); + ssize_t nrecv = recv(fd, buffer + blen, sizeof(buffer) - blen, 0); - if(result == -1 && sockerrno == EINTR) { + if(nrecv == -1 && sockerrno == EINTR) { continue; - } else if(result <= 0) { + } else if(nrecv <= 0) { return false; } - blen += result; + blen += nrecv; } if((size_t)(newline - buffer) >= len) { @@ -490,15 +502,15 @@ bool recvline(int fd, char *line, size_t len) { static bool recvdata(int fd, char *data, size_t len) { while(blen < len) { - int result = recv(fd, buffer + blen, sizeof(buffer) - blen, 0); + ssize_t nrecv = recv(fd, buffer + blen, sizeof(buffer) - blen, 0); - if(result == -1 && sockerrno == EINTR) { + if(nrecv == -1 && sockerrno == EINTR) { continue; - } else if(result <= 0) { + } else if(nrecv <= 0) { return false; } - blen += result; + blen += nrecv; } memcpy(data, buffer, len); @@ -508,10 +520,10 @@ static bool recvdata(int fd, char *data, size_t len) { return true; } -bool sendline(int fd, char *format, ...) { +bool sendline(int fd, const char *format, ...) { static char buffer[4096]; char *p = buffer; - int blen; + ssize_t blen; va_list ap; va_start(ap, format); @@ -527,16 +539,16 @@ bool sendline(int fd, char *format, ...) { blen++; while(blen) { - int result = send(fd, p, blen, MSG_NOSIGNAL); + ssize_t nsend = send(fd, p, blen, MSG_NOSIGNAL); - if(result == -1 && sockerrno == EINTR) { + if(nsend == -1 && sockerrno == EINTR) { continue; - } else if(result <= 0) { + } else if(nsend <= 0) { return false; } - p += result; - blen -= result; + p += nsend; + blen -= nsend; } return true; @@ -577,11 +589,12 @@ static void pcap(int fd, FILE *out, uint32_t snaplen) { char line[32]; while(recvline(fd, line, sizeof(line))) { - int code, req, len; - int n = sscanf(line, "%d %d %d", &code, &req, &len); + int code, req; + unsigned long len; + int n = sscanf(line, "%d %d %lu", &code, &req, &len); gettimeofday(&tv, NULL); - if(n != 3 || code != CONTROL || req != REQ_PCAP || len < 0 || (size_t)len > sizeof(data)) { + if(n != 3 || code != CONTROL || req != REQ_PCAP || len > sizeof(data)) { break; } @@ -599,7 +612,7 @@ static void pcap(int fd, FILE *out, uint32_t snaplen) { } } -static void logcontrol(int fd, FILE *out, int level) { +static void log_control(int fd, FILE *out, int level) { sendline(fd, "%d %d %d", CONTROL, REQ_LOG, level); char data[1024]; char line[32]; @@ -633,14 +646,14 @@ static bool stop_tincd(void) { // wait for tincd to close the connection... } - close(fd); + closesocket(fd); pid = 0; fd = -1; return true; } -#ifdef HAVE_MINGW +#ifdef HAVE_WINDOWS static bool remove_service(void) { SC_HANDLE manager = NULL; SC_HANDLE service = NULL; @@ -706,16 +719,16 @@ bool connect_tincd(bool verbose) { if(select(fd + 1, &r, NULL, NULL, &tv)) { fprintf(stderr, "Previous connection to tincd lost, reconnecting.\n"); - close(fd); + closesocket(fd); fd = -1; } else { return true; } } - FILE *f = fopen(pidfilename, "r"); + pidfile_t *pidfile = read_pidfile(); - if(!f) { + if(!pidfile) { if(verbose) { fprintf(stderr, "Could not open pid file %s: %s\n", pidfilename, strerror(errno)); } @@ -723,21 +736,11 @@ bool connect_tincd(bool verbose) { return false; } - char host[129]; - char port[129]; - - if(fscanf(f, "%20d %1024s %128s port %128s", &pid, controlcookie, host, port) != 4) { - if(verbose) { - fprintf(stderr, "Could not parse pid file %s\n", pidfilename); - } - - fclose(f); - return false; - } - - fclose(f); + pid = pidfile->pid; + strcpy(controlcookie, pidfile->cookie); -#ifndef HAVE_MINGW +#ifndef HAVE_WINDOWS + free(pidfile); if((pid == 0) || (kill(pid, 0) && (errno == ESRCH))) { fprintf(stderr, "Could not find tincd running at pid %d\n", pid); @@ -773,7 +776,7 @@ bool connect_tincd(bool verbose) { fprintf(stderr, "Cannot connect to UNIX socket %s: %s\n", unixsocketname, sockstrerror(sockerrno)); } - close(fd); + closesocket(fd); fd = -1; return false; } @@ -788,11 +791,12 @@ bool connect_tincd(bool verbose) { struct addrinfo *res = NULL; - if(getaddrinfo(host, port, &hints, &res) || !res) { + if(getaddrinfo(pidfile->host, pidfile->port, &hints, &res) || !res) { if(verbose) { - fprintf(stderr, "Cannot resolve %s port %s: %s\n", host, port, sockstrerror(sockerrno)); + fprintf(stderr, "Cannot resolve %s port %s: %s\n", pidfile->host, pidfile->port, sockstrerror(sockerrno)); } + free(pidfile); return false; } @@ -803,6 +807,7 @@ bool connect_tincd(bool verbose) { fprintf(stderr, "Cannot create TCP socket: %s\n", sockstrerror(sockerrno)); } + free(pidfile); return false; } @@ -816,14 +821,16 @@ bool connect_tincd(bool verbose) { if(connect(fd, res->ai_addr, res->ai_addrlen) < 0) { if(verbose) { - fprintf(stderr, "Cannot connect to %s port %s: %s\n", host, port, sockstrerror(sockerrno)); + fprintf(stderr, "Cannot connect to %s port %s: %s\n", pidfile->host, pidfile->port, sockstrerror(sockerrno)); } - close(fd); + free(pidfile); + closesocket(fd); fd = -1; return false; } + free(pidfile); freeaddrinfo(res); #endif @@ -842,7 +849,7 @@ bool connect_tincd(bool verbose) { fprintf(stderr, "Cannot read greeting from control socket: %s\n", sockstrerror(sockerrno)); } - close(fd); + closesocket(fd); fd = -1; return false; } @@ -852,7 +859,7 @@ bool connect_tincd(bool verbose) { fprintf(stderr, "Could not fully establish control socket connection\n"); } - close(fd); + closesocket(fd); fd = -1; return false; } @@ -875,7 +882,7 @@ static int cmd_start(int argc, char *argv[]) { char *c; char *slash = strrchr(program_name, '/'); -#ifdef HAVE_MINGW +#ifdef HAVE_WINDOWS if((c = strrchr(program_name, '\\')) > slash) { slash = c; @@ -883,19 +890,17 @@ 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 = default_c; + c = xstrdup("tincd"); } int nargc = 0; char **nargv = xzalloc((optind + argc) * sizeof(*nargv)); char *arg0 = c; -#ifdef HAVE_MINGW +#ifdef HAVE_WINDOWS /* Windows has no real concept of an "argv array". A command line is just one string. The CRT of the new process will decode the command line string to generate argv before calling main(), and (by convention) @@ -916,14 +921,11 @@ static int cmd_start(int argc, char *argv[]) { nargv[nargc++] = argv[i]; } -#ifdef HAVE_MINGW +#ifdef HAVE_WINDOWS int status = spawnvp(_P_WAIT, c, nargv); free(nargv); - - if(c != default_c) { - free(c); - } + free(c); if(status == -1) { fprintf(stderr, "Error starting %s: %s\n", c, strerror(errno)); @@ -937,11 +939,7 @@ 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); - } - + free(c); return 1; } @@ -950,11 +948,7 @@ 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); - } - + free(c); return 1; } @@ -970,7 +964,6 @@ static int cmd_start(int argc, char *argv[]) { free(nargv); - int status = -1, result; #ifdef SIGINT signal(SIGINT, SIG_IGN); #endif @@ -978,7 +971,7 @@ static int cmd_start(int argc, char *argv[]) { // Pass all log messages from the umbilical to stderr. // A nul-byte right before closure means tincd started successfully. bool failure = true; - char buf[1024]; + uint8_t buf[1024]; ssize_t len; while((len = read(pfd[0], buf, sizeof(buf))) > 0) { @@ -988,7 +981,9 @@ static int cmd_start(int argc, char *argv[]) { len--; } - write(2, buf, len); + if(write(2, buf, len) != len) { + // Nothing we can do about it. + } } if(len) { @@ -998,7 +993,8 @@ static int cmd_start(int argc, char *argv[]) { close(pfd[0]); // Make sure the child process is really gone. - result = waitpid(pid, &status, 0); + int status = -1; + pid_t result = waitpid(pid, &status, 0); #ifdef SIGINT signal(SIGINT, SIG_DFL); @@ -1010,9 +1006,7 @@ static int cmd_start(int argc, char *argv[]) { fprintf(stderr, "Error starting %s\n", c); } - if(c != default_c) { - free(c); - } + free(c); return failed ? EXIT_FAILURE : EXIT_SUCCESS; #endif @@ -1026,7 +1020,7 @@ static int cmd_stop(int argc, char *argv[]) { return 1; } -#ifdef HAVE_MINGW +#ifdef HAVE_WINDOWS return remove_service() ? EXIT_SUCCESS : EXIT_FAILURE; #else @@ -1099,7 +1093,7 @@ static int dump_invitations(void) { while((ent = readdir(dir))) { char buf[MAX_STRING_SIZE]; - if(b64decode(ent->d_name, buf, 24) != 18) { + if(b64decode_tinc(ent->d_name, buf, 24) != 18) { continue; } @@ -1243,7 +1237,7 @@ static int cmd_dump(int argc, char *argv[]) { char nexthop[4096]; int cipher, digest, maclength, compression, distance, socket, weight; short int pmtu, minmtu, maxmtu; - unsigned int options, status_int; + unsigned int options; node_status_t status; long int last_state_change; int udp_ping_rtt; @@ -1251,15 +1245,13 @@ static int cmd_dump(int argc, char *argv[]) { switch(req) { case REQ_DUMP_NODES: { - int n = sscanf(line, "%*d %*d %4095s %4095s %4095s port %4095s %d %d %d %d %x %x %4095s %4095s %d %hd %hd %hd %ld %d %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64, node, id, host, port, &cipher, &digest, &maclength, &compression, &options, &status_int, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change, &udp_ping_rtt, &in_packets, &in_bytes, &out_packets, &out_bytes); + int n = sscanf(line, "%*d %*d %4095s %4095s %4095s port %4095s %d %d %d %d %x %"PRIx32" %4095s %4095s %d %hd %hd %hd %ld %d %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64, node, id, host, port, &cipher, &digest, &maclength, &compression, &options, &status.value, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change, &udp_ping_rtt, &in_packets, &in_bytes, &out_packets, &out_bytes); if(n != 22) { fprintf(stderr, "Unable to parse node dump from tincd: %s\n", line); return 1; } - memcpy(&status, &status_int, sizeof(status)); - if(do_graph) { const char *color = "black"; @@ -1282,7 +1274,7 @@ static int cmd_dump(int argc, char *argv[]) { } 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) rx %"PRIu64" %"PRIu64" tx %"PRIu64" %"PRIu64, - node, id, host, port, cipher, digest, maclength, compression, options, status_int, nexthop, via, distance, pmtu, minmtu, maxmtu, in_packets, in_bytes, out_packets, out_bytes); + node, id, host, port, cipher, digest, maclength, compression, options, status.value, nexthop, via, distance, pmtu, minmtu, maxmtu, in_packets, in_bytes, out_packets, out_bytes); if(udp_ping_rtt != -1) { printf(" rtt %d.%03d", udp_ping_rtt / 1000, udp_ping_rtt % 1000); @@ -1302,7 +1294,7 @@ static int cmd_dump(int argc, char *argv[]) { } if(do_graph) { - float w = 1 + 65536.0 / weight; + float w = 1.0f + 65536.0f / (float)weight; if(do_graph == 1 && strcmp(node1, node2) > 0) { printf(" \"%s\" -- \"%s\" [w = %f, weight = %f];\n", node1, node2, w, w); @@ -1328,14 +1320,14 @@ static int cmd_dump(int argc, char *argv[]) { break; case REQ_DUMP_CONNECTIONS: { - int n = sscanf(line, "%*d %*d %4095s %4095s port %4095s %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.value); if(n != 6) { fprintf(stderr, "Unable to parse connection dump from tincd.\n"); return 1; } - printf("%s at %s port %s options %x socket %d status %x\n", node, host, port, options, socket, status_int); + printf("%s at %s port %s options %x socket %d status %x\n", node, host, port, options, socket, status.value); } break; @@ -1526,13 +1518,13 @@ static int cmd_log(int argc, char *argv[]) { signal(SIGINT, sigint_handler); #endif - logcontrol(fd, stdout, argc > 1 ? atoi(argv[1]) : -1); + log_control(fd, stdout, argc > 1 ? atoi(argv[1]) : DEBUG_UNSET); #ifdef SIGINT signal(SIGINT, SIG_DFL); #endif - close(fd); + closesocket(fd); fd = -1; return 0; } @@ -1553,8 +1545,8 @@ static int cmd_pid(int argc, char *argv[]) { return 0; } -int rstrip(char *value) { - int len = strlen(value); +size_t rstrip(char *value) { + size_t len = strlen(value); while(len && strchr("\t\r\n ", value[len - 1])) { value[--len] = 0; @@ -1578,7 +1570,7 @@ char *get_my_name(bool verbose) { char *value; while(fgets(buf, sizeof(buf), f)) { - int len = strcspn(buf, "\t ="); + size_t len = strcspn(buf, "\t ="); value = buf + len; value += strspn(value, "\t "); @@ -1617,7 +1609,7 @@ ecdsa_t *get_pubkey(FILE *f) { char *value; while(fgets(buf, sizeof(buf), f)) { - int len = strcspn(buf, "\t ="); + size_t len = strcspn(buf, "\t ="); value = buf + len; value += strspn(value, "\t "); @@ -1723,6 +1715,20 @@ const var_t variables[] = { {NULL, 0} }; +// Request actual port from tincd +static bool read_actual_port(void) { + pidfile_t *pidfile = read_pidfile(); + + if(pidfile) { + printf("%s\n", pidfile->port); + free(pidfile); + return true; + } else { + fprintf(stderr, "Could not get port from the pidfile.\n"); + return false; + } +} + static int cmd_config(int argc, char *argv[]) { if(argc < 2) { fprintf(stderr, "Invalid number of arguments.\n"); @@ -1733,16 +1739,17 @@ static int cmd_config(int argc, char *argv[]) { argv--, argc++; } - int action = -2; + typedef enum { GET, DEL, SET, ADD } action_t; + action_t action = GET; if(!strcasecmp(argv[1], "get")) { argv++, argc--; } else if(!strcasecmp(argv[1], "add")) { - argv++, argc--, action = 1; + argv++, argc--, action = ADD; } else if(!strcasecmp(argv[1], "del")) { - argv++, argc--, action = -1; + argv++, argc--, action = DEL; } else if(!strcasecmp(argv[1], "replace") || !strcasecmp(argv[1], "set") || !strcasecmp(argv[1], "change")) { - argv++, argc--, action = 0; + argv++, argc--, action = SET; } if(argc < 2) { @@ -1788,13 +1795,18 @@ static int cmd_config(int argc, char *argv[]) { return 1; } - if(action >= 0 && !*value) { + if((action == SET || action == ADD) && !*value) { fprintf(stderr, "No value for variable given.\n"); return 1; } - if(action < -1 && *value) { - action = 0; + if(action == GET && *value) { + action = SET; + } + + // If port is requested, try reading it from the pidfile and fall back to configs if that fails + if(action == GET && !strcasecmp(variable, "Port") && read_actual_port()) { + return 0; } /* Some simple checks. */ @@ -1825,7 +1837,7 @@ static int cmd_config(int argc, char *argv[]) { /* Discourage use of obsolete variables. */ - if(variables[i].type & VAR_OBSOLETE && action >= 0) { + if(variables[i].type & VAR_OBSOLETE && (action == SET || action == ADD)) { if(force) { fprintf(stderr, "Warning: %s is an obsolete variable!\n", variable); } else { @@ -1836,7 +1848,7 @@ static int cmd_config(int argc, char *argv[]) { /* Don't put server variables in host config files */ - if(node && !(variables[i].type & VAR_HOST) && action >= 0) { + if(node && !(variables[i].type & VAR_HOST) && (action == SET || action == ADD)) { if(force) { fprintf(stderr, "Warning: %s is not a host configuration variable!\n", variable); } else { @@ -1858,10 +1870,10 @@ static int cmd_config(int argc, char *argv[]) { /* Change "add" into "set" for variables that do not allow multiple occurrences. Turn on warnings when it seems variables might be removed unintentionally. */ - if(action == 1 && !(variables[i].type & VAR_MULTIPLE)) { + if(action == ADD && !(variables[i].type & VAR_MULTIPLE)) { warnonremove = true; - action = 0; - } else if(action == 0 && (variables[i].type & VAR_MULTIPLE)) { + action = SET; + } else if(action == SET && (variables[i].type & VAR_MULTIPLE)) { warnonremove = true; } @@ -1879,7 +1891,7 @@ static int cmd_config(int argc, char *argv[]) { } if(!found) { - if(force || action < 0) { + if(force || action == GET || action == DEL) { 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); @@ -1896,7 +1908,11 @@ static int cmd_config(int argc, char *argv[]) { char filename[PATH_MAX]; if(node) { - snprintf(filename, sizeof(filename), "%s" SLASH "%s", hosts_dir, node); + if((size_t)snprintf(filename, sizeof(filename), "%s" SLASH "%s", hosts_dir, node) >= sizeof(filename)) { + fprintf(stderr, "Filename too long: %s" SLASH "%s\n", hosts_dir, node); + free(node); + return 1; + } if(node != line) { free(node); @@ -1916,7 +1932,7 @@ static int cmd_config(int argc, char *argv[]) { char tmpfile[PATH_MAX]; FILE *tf = NULL; - if(action >= -1) { + if(action != GET) { if((size_t)snprintf(tmpfile, sizeof(tmpfile), "%s.config.tmp", filename) >= sizeof(tmpfile)) { fprintf(stderr, "Filename too long: %s.config.tmp\n", filename); return 1; @@ -1944,9 +1960,8 @@ static int cmd_config(int argc, char *argv[]) { // Parse line in a simple way char *bvalue; - int len; - len = strcspn(buf2, "\t ="); + size_t len = strcspn(buf2, "\t ="); bvalue = buf2 + len; bvalue += strspn(bvalue, "\t "); @@ -1960,19 +1975,15 @@ static int cmd_config(int argc, char *argv[]) { // Did it match? if(!strcasecmp(buf2, variable)) { - // Get - if(action < -1) { + if(action == GET) { found = true; printf("%s\n", bvalue); - // Del - } else if(action == -1) { + } else if(action == DEL) { if(!*value || !strcasecmp(bvalue, value)) { removed = true; continue; } - - // Set - } else if(action == 0) { + } else if(action == SET) { // Warn if "set" was used for variables that can occur multiple times if(warnonremove && strcasecmp(bvalue, value)) { fprintf(stderr, "Warning: removing %s = %s\n", variable, bvalue); @@ -1991,8 +2002,7 @@ static int cmd_config(int argc, char *argv[]) { set = true; continue; - // Add - } else if(action > 0) { + } else if(action == ADD) { // Check if we've already seen this variable with the same value if(!strcasecmp(bvalue, value)) { found = true; @@ -2000,7 +2010,7 @@ static int cmd_config(int argc, char *argv[]) { } } - if(action >= -1) { + if(action != GET) { // Copy original line... if(fputs(buf1, tf) < 0) { fprintf(stderr, "Error writing to temporary file %s: %s\n", tmpfile, strerror(errno)); @@ -2029,14 +2039,14 @@ static int cmd_config(int argc, char *argv[]) { } // Add new variable if necessary. - if((action > 0 && !found) || (action == 0 && !set)) { + if((action == ADD && !found) || (action == SET && !set)) { if(fprintf(tf, "%s = %s\n", variable, value) < 0) { fprintf(stderr, "Error writing to temporary file %s: %s\n", tmpfile, strerror(errno)); return 1; } } - if(action < -1) { + if(action == GET) { if(found) { return 0; } else { @@ -2052,14 +2062,14 @@ static int cmd_config(int argc, char *argv[]) { } // Could we find what we had to remove? - if(action < 0 && !removed) { + if((action == GET || action == DEL) && !removed) { remove(tmpfile); fprintf(stderr, "No configuration variables deleted.\n"); return 1; } // Replace the configuration file with the new one -#ifdef HAVE_MINGW +#ifdef HAVE_WINDOWS if(remove(filename)) { fprintf(stderr, "Error replacing file %s: %s\n", filename, strerror(errno)); @@ -2127,7 +2137,7 @@ int check_port(const char *name) { fprintf(stderr, "Warning: could not bind to port 655. "); for(int i = 0; i < 100; i++) { - int port = 0x1000 + (rand() & 0x7fff); + uint16_t port = 0x1000 + prng(0x8000); if(try_bind(port)) { char filename[PATH_MAX]; @@ -2170,7 +2180,7 @@ static int cmd_init(int argc, char *argv[]) { return 1; } - int len = rstrip(buf); + size_t len = rstrip(buf); if(!len) { fprintf(stderr, "No name given!\n"); @@ -2235,7 +2245,7 @@ static int cmd_init(int argc, char *argv[]) { check_port(name); -#ifndef HAVE_MINGW +#ifndef HAVE_WINDOWS char filename[PATH_MAX]; snprintf(filename, sizeof(filename), "%s" SLASH "tinc-up", confbase); @@ -2397,7 +2407,7 @@ static int cmd_edit(int argc, char *argv[]) { } char *command; -#ifndef HAVE_MINGW +#ifndef HAVE_WINDOWS const char *editor = getenv("VISUAL"); if(!editor) { @@ -2624,7 +2634,7 @@ static int switch_network(char *name) { } if(fd >= 0) { - close(fd); + closesocket(fd); fd = -1; } @@ -2787,7 +2797,7 @@ static int cmd_sign(int argc, char *argv[]) { long t = time(NULL); char *trailer; xasprintf(&trailer, " %s %ld", name, t); - int trailer_len = strlen(trailer); + size_t trailer_len = strlen(trailer); data = xrealloc(data, len + trailer_len); memcpy(data + len, trailer, trailer_len); @@ -2802,7 +2812,7 @@ static int cmd_sign(int argc, char *argv[]) { return 1; } - b64encode(sig, sig, 64); + b64encode_tinc(sig, sig, 64); ecdsa_free(key); fprintf(stdout, "Signature = %s %ld %s\n", name, t, sig); @@ -2902,7 +2912,7 @@ static int cmd_verify(int argc, char *argv[]) { char *trailer; xasprintf(&trailer, " %s %ld", signer, t); - int trailer_len = strlen(trailer); + size_t trailer_len = strlen(trailer); data = xrealloc(data, len + trailer_len); memcpy(data + len, trailer, trailer_len); @@ -2936,7 +2946,7 @@ static int cmd_verify(int argc, char *argv[]) { fclose(fp); - if(b64decode(sig, sig, 86) != 64 || !ecdsa_verify(key, newline, len + trailer_len - (newline - data), sig)) { + if(b64decode_tinc(sig, sig, 86) != 64 || !ecdsa_verify(key, newline, len + trailer_len - (newline - data), sig)) { fprintf(stderr, "Invalid signature\n"); free(data); ecdsa_free(key); @@ -3158,6 +3168,7 @@ static int cmd_shell(int argc, char *argv[]) { #ifdef HAVE_READLINE rl_readline_name = "tinc"; + rl_basic_word_break_characters = "\t\n "; rl_completion_entry_function = complete_nothing; rl_attempted_completion_function = completion; rl_filename_completion_desired = 0; @@ -3170,7 +3181,6 @@ static int cmd_shell(int argc, char *argv[]) { if(tty) { free(copy); free(line); - rl_basic_word_break_characters = "\t\n "; line = readline(prompt); copy = line ? xstrdup(line) : NULL; } else { @@ -3261,12 +3271,28 @@ static int cmd_shell(int argc, char *argv[]) { return result; } -static void cleanup() { +static void cleanup(void) { free(tinc_conf); free(hosts_dir); free_names(); } +static int run_command(int argc, char *argv[]) { + if(optind >= argc) { + return cmd_shell(argc, argv); + } + + for(int i = 0; commands[i].command; i++) { + if(!strcasecmp(argv[optind], commands[i].command)) { + return commands[i].function(argc - optind, argv + optind); + } + } + + fprintf(stderr, "Unknown command `%s'.\n", argv[optind]); + usage(true); + return 1; +} + int main(int argc, char *argv[]) { program_name = argv[0]; orig_argv = argv; @@ -3291,7 +3317,7 @@ int main(int argc, char *argv[]) { return 0; } -#ifdef HAVE_MINGW +#ifdef HAVE_WINDOWS static struct WSAData wsa_state; if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) { @@ -3302,20 +3328,13 @@ int main(int argc, char *argv[]) { #endif gettimeofday(&now, NULL); - srand(now.tv_sec + now.tv_usec); + random_init(); crypto_init(); + prng_init(); - if(optind >= argc) { - return cmd_shell(argc, argv); - } + int result = run_command(argc, argv); - for(int i = 0; commands[i].command; i++) { - if(!strcasecmp(argv[optind], commands[i].command)) { - return commands[i].function(argc - optind, argv + optind); - } - } + random_exit(); - fprintf(stderr, "Unknown command `%s'.\n", argv[optind]); - usage(true); - return 1; + return result; }