X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=7d27341effe7f21f397f10ef32761decc9426420;hb=9708bbfa8e3094de8932a30b1d24c661558d8a03;hp=632e7ac6efa8720197e7623b69b429087c49f528;hpb=a22041922f160667573e9a5ae3f4195e1668906a;p=tinc diff --git a/src/tincctl.c b/src/tincctl.c index 632e7ac6..7d27341e 100644 --- a/src/tincctl.c +++ b/src/tincctl.c @@ -1,6 +1,6 @@ /* tincctl.c -- Controlling a running tincd - Copyright (C) 2007-2009 Guus Sliepen + Copyright (C) 2007-2011 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 @@ -24,27 +24,24 @@ #include "xalloc.h" #include "protocol.h" #include "control_common.h" +#include "ecdsagen.h" #include "rsagen.h" #include "utils.h" +#include "tincctl.h" +#include "top.h" /* The name this program was run with. */ -char *program_name = NULL; +static char *program_name = NULL; /* If nonzero, display usage information and exit. */ -bool show_help = false; +static bool show_help = false; /* If nonzero, print the version on standard output and exit. */ -bool show_version = false; - -/* If nonzero, it will attempt to kill a running tincd and exit. */ -int kill_tincd = 0; - -/* If nonzero, generate public/private keypair for this host/net. */ -int generate_keys = 0; +static bool show_version = false; static char *name = NULL; static char *identname = NULL; /* program name for syslog */ -static char *controlcookiename = NULL; /* cookie file location */ +static char *pidfilename = NULL; /* pid file location */ static char controlcookie[1024]; char *netname = NULL; char *confbase = NULL; @@ -58,7 +55,7 @@ static struct option const long_options[] = { {"net", required_argument, NULL, 'n'}, {"help", no_argument, NULL, 1}, {"version", no_argument, NULL, 2}, - {"controlcookie", required_argument, NULL, 5}, + {"pidfile", required_argument, NULL, 5}, {NULL, 0, NULL, 0} }; @@ -69,11 +66,11 @@ static void usage(bool status) { else { printf("Usage: %s [options] command\n\n", program_name); printf("Valid options are:\n" - " -c, --config=DIR Read configuration options from DIR.\n" - " -n, --net=NETNAME Connect to net NETNAME.\n" - " --controlcookie=FILENAME Read control socket from FILENAME.\n" - " --help Display this help and exit.\n" - " --version Output version information and exit.\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" + " --help Display this help and exit.\n" + " --version Output version information and exit.\n" "\n" "Valid commands are:\n" " start Start tincd.\n" @@ -81,7 +78,9 @@ static void usage(bool status) { " restart Restart tincd.\n" " reload Reload configuration of running tincd.\n" " pid Show PID of currently running tincd.\n" - " generate-keys [bits] Generate a new public/private keypair.\n" + " generate-keys [bits] Generate new RSA and ECDSA public/private keypairs.\n" + " generate-rsa-keys [bits] Generate a new RSA public/private keypair.\n" + " generate-ecdsa-keys Generate a new ECDSA public/private keypair.\n" " dump Dump a list of one of the following things:\n" " nodes - all known nodes in the VPN\n" " edges - all known connections in the VPN\n" @@ -93,6 +92,10 @@ static void usage(bool status) { " retry Retry all outgoing connections\n" " reload Partial reload of configuration\n" " disconnect NODE Close meta connection with NODE\n" +#ifdef HAVE_CURSES + " top Show real-time statistics\n" +#endif + " pcap Dump traffic in pcap format\n" "\n"); printf("Report bugs to tinc@tinc-vpn.org.\n"); } @@ -124,7 +127,7 @@ static bool parse_options(int argc, char **argv) { break; case 5: /* open control socket here */ - controlcookiename = xstrdup(optarg); + pidfilename = xstrdup(optarg); break; case '?': @@ -144,7 +147,6 @@ FILE *ask_and_open(const char *filename, const char *what, const char *mode) { char *directory; char buf[PATH_MAX]; char buf2[PATH_MAX]; - size_t len; /* Check stdin and stdout */ if(isatty(0) && isatty(1)) { @@ -153,13 +155,13 @@ FILE *ask_and_open(const char *filename, const char *what, const char *mode) { what, filename); fflush(stdout); - if(fgets(buf, sizeof buf, stdin) < 0) { + if(fgets(buf, sizeof buf, stdin) == NULL) { fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno)); return NULL; } - len = strlen(buf); + size_t len = strlen(buf); if(len) buf[--len] = 0; @@ -192,11 +194,70 @@ FILE *ask_and_open(const char *filename, const char *what, const char *mode) { return r; } +/* + Generate a public/private ECDSA keypair, and ask for a file to store + them in. +*/ +static bool ecdsa_keygen() { + ecdsa_t key; + FILE *f; + char *filename; + + fprintf(stderr, "Generating ECDSA keypair:\n"); + + if(!ecdsa_generate(&key)) { + fprintf(stderr, "Error during key generation!\n"); + return false; + } else + fprintf(stderr, "Done.\n"); + + xasprintf(&filename, "%s/ecdsa_key.priv", confbase); + f = ask_and_open(filename, "private ECDSA key", "a"); + + if(!f) + return false; + +#ifdef HAVE_FCHMOD + /* Make it unreadable for others. */ + fchmod(fileno(f), 0600); +#endif + + if(ftell(f)) + fprintf(stderr, "Appending key to existing contents.\nMake sure only one key is stored in the file.\n"); + + ecdsa_write_pem_private_key(&key, f); + + fclose(f); + free(filename); + + if(name) + xasprintf(&filename, "%s/hosts/%s", confbase, name); + else + xasprintf(&filename, "%s/ecdsa_key.pub", confbase); + + f = ask_and_open(filename, "public ECDSA key", "a"); + + if(!f) + return false; + + if(ftell(f)) + fprintf(stderr, "Appending key to existing contents.\nMake sure only one key is stored in the file.\n"); + + char *pubkey = ecdsa_get_base64_public_key(&key); + fprintf(f, "ECDSAPublicKey = %s\n", pubkey); + free(pubkey); + + fclose(f); + free(filename); + + return true; +} + /* Generate a public/private RSA keypair, and ask for a file to store them in. */ -static bool keygen(int bits) { +static bool rsa_keygen(int bits) { rsa_t key; FILE *f; char *filename; @@ -274,16 +335,16 @@ static void make_names(void) { xasprintf(&confbase, "%s", installdir); } } - if(!controlcookiename) - xasprintf(&controlcookiename, "%s/cookie", confbase); + if(!pidfilename) + xasprintf(&pidfilename, "%s/pid", confbase); RegCloseKey(key); if(*installdir) return; } #endif - if(!controlcookiename) - xasprintf(&controlcookiename, "%s/run/%s.cookie", LOCALSTATEDIR, identname); + if(!pidfilename) + xasprintf(&pidfilename, "%s/run/%s.pid", LOCALSTATEDIR, identname); if(netname) { if(!confbase) @@ -296,9 +357,10 @@ static void make_names(void) { } } -static bool recvline(int fd, char *line, size_t len) { - static char buffer[4096]; - static size_t blen = 0; +static char buffer[4096]; +static size_t blen = 0; + +bool recvline(int fd, char *line, size_t len) { char *newline = NULL; while(!(newline = memchr(buffer, '\n', blen))) { @@ -323,7 +385,24 @@ static bool recvline(int fd, char *line, size_t len) { return true; } -static bool sendline(int fd, char *format, ...) { +bool recvdata(int fd, char *data, size_t len) { + while(blen < len) { + int result = recv(fd, buffer + blen, sizeof buffer - blen, 0); + if(result == -1 && errno == EINTR) + continue; + else if(result <= 0) + return false; + blen += result; + } + + memcpy(data, buffer, len); + memmove(buffer, buffer + len, blen - len); + blen -= len; + + return true; +} + +bool sendline(int fd, char *format, ...) { static char buffer[4096]; char *p = buffer; size_t blen = 0; @@ -352,10 +431,62 @@ static bool sendline(int fd, char *format, ...) { return true; } +void pcap(int fd, FILE *out) { + sendline(fd, "%d %d", CONTROL, REQ_PCAP); + char data[9018]; + + struct { + uint32_t magic; + uint16_t major; + uint16_t minor; + uint32_t tz_offset; + uint32_t tz_accuracy; + uint32_t snaplen; + uint32_t ll_type; + } header = { + 0xa1b2c3d4, + 2, 4, + 0, 0, + sizeof data, + 1, + }; + + struct { + uint32_t tv_sec; + uint32_t tv_usec; + uint32_t len; + uint32_t origlen; + } packet; + + struct timeval tv; + + fwrite(&header, sizeof header, 1, out); + fflush(out); + + char line[32]; + 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) + break; + if(!recvdata(fd, data, len)) + break; + packet.tv_sec = tv.tv_sec; + packet.tv_usec = tv.tv_usec; + packet.len = len; + packet.origlen = len; + fwrite(&packet, sizeof packet, 1, out); + fwrite(data, len, 1, out); + fflush(out); + } +} + int main(int argc, char *argv[], char *envp[]) { int fd; int result; - int port; + char host[128]; + char port[128]; int pid; program_name = argv[0]; @@ -366,8 +497,8 @@ int main(int argc, char *argv[], char *envp[]) { make_names(); if(show_version) { - printf("%s version %s (built %s %s, protocol %d)\n", PACKAGE, - VERSION, __DATE__, __TIME__, PROT_CURRENT); + printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE, + VERSION, __DATE__, __TIME__, PROT_MAJOR, PROT_MINOR); printf("Copyright (C) 1998-2009 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" @@ -390,8 +521,16 @@ int main(int argc, char *argv[], char *envp[]) { // First handle commands that don't involve connecting to a running tinc daemon. + if(!strcasecmp(argv[optind], "generate-rsa-keys")) { + return !rsa_keygen(optind > argc ? atoi(argv[optind + 1]) : 2048); + } + + if(!strcasecmp(argv[optind], "generate-ecdsa-keys")) { + return !ecdsa_keygen(); + } + if(!strcasecmp(argv[optind], "generate-keys")) { - return !keygen(optind > argc ? atoi(argv[optind + 1]) : 2048); + return !(rsa_keygen(optind > argc ? atoi(argv[optind + 1]) : 2048) && ecdsa_keygen()); } if(!strcasecmp(argv[optind], "start")) { @@ -408,13 +547,13 @@ int main(int argc, char *argv[], char *envp[]) { * ancestors are writable only by trusted users, which we don't verify. */ - FILE *f = fopen(controlcookiename, "r"); + FILE *f = fopen(pidfilename, "r"); if(!f) { - fprintf(stderr, "Could not open control socket cookie file %s: %s\n", controlcookiename, strerror(errno)); + fprintf(stderr, "Could not open pid file %s: %s\n", pidfilename, strerror(errno)); return 1; } - if(fscanf(f, "%1024s %d %d", controlcookie, &port, &pid) != 3) { - fprintf(stderr, "Could not parse control socket cookie file %s\n", controlcookiename); + if(fscanf(f, "%20d %1024s %128s port %128s", &pid, controlcookie, host, port) != 4) { + fprintf(stderr, "Could not parse pid file %s\n", pidfilename); return 1; } @@ -425,13 +564,21 @@ int main(int argc, char *argv[], char *envp[]) { } #endif - struct sockaddr_in addr; - memset(&addr, 0, sizeof addr); - addr.sin_family = AF_INET; - addr.sin_addr.s_addr = htonl(0x7f000001); - addr.sin_port = htons(port); + struct addrinfo hints = { + .ai_family = AF_UNSPEC, + .ai_socktype = SOCK_STREAM, + .ai_protocol = IPPROTO_TCP, + .ai_flags = 0, + }; + + struct addrinfo *res = NULL; + + if(getaddrinfo(host, port, &hints, &res) || !res) { + fprintf(stderr, "Cannot resolve %s port %s: %s", host ?: "localhost", port, strerror(errno)); + return 1; + } - fd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); + fd = socket(res->ai_family, SOCK_STREAM, IPPROTO_TCP); if(fd < 0) { fprintf(stderr, "Cannot create TCP socket: %s\n", sockstrerror(sockerrno)); return 1; @@ -445,12 +592,13 @@ int main(int argc, char *argv[], char *envp[]) { } #endif - if(connect(fd, (struct sockaddr *)&addr, sizeof addr) < 0) { - - fprintf(stderr, "Cannot connect to %s: %s\n", controlcookiename, sockstrerror(sockerrno)); + if(connect(fd, res->ai_addr, res->ai_addrlen) < 0) { + fprintf(stderr, "Cannot connect to %s port %s: %s\n", host ?: "localhost", port, sockstrerror(sockerrno)); return 1; } + freeaddrinfo(res); + char line[4096]; char data[4096]; int code, version, req; @@ -517,7 +665,6 @@ int main(int argc, char *argv[], char *envp[]) { } bool do_graph = false; - int dumps = 1; if(!strcasecmp(argv[optind+1], "nodes")) sendline(fd, "%d %d", CONTROL, REQ_DUMP_NODES); @@ -531,7 +678,6 @@ int main(int argc, char *argv[], char *envp[]) { sendline(fd, "%d %d", CONTROL, REQ_DUMP_NODES); sendline(fd, "%d %d", CONTROL, REQ_DUMP_EDGES); do_graph = true; - dumps = 2; printf("digraph {\n"); } else { fprintf(stderr, "Unknown dump type '%s'.\n", argv[optind+1]); @@ -626,6 +772,18 @@ int main(int argc, char *argv[], char *envp[]) { return 0; } +#ifdef HAVE_CURSES + if(!strcasecmp(argv[optind], "top")) { + top(fd); + return 0; + } +#endif + + if(!strcasecmp(argv[optind], "pcap")) { + pcap(fd, stdout); + return 0; + } + fprintf(stderr, "Unknown command `%s'.\n", argv[optind]); usage(true);