X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=6d7f03b877e0be11a69e81093c46b4bfa060616a;hb=af2e0c9a32642065aedd2e67ca1f5791ca7a407d;hp=632e7ac6efa8720197e7623b69b429087c49f528;hpb=ce8775000ab38229a78ecf3dc26bab008ca0f332;p=tinc diff --git a/src/tincctl.c b/src/tincctl.c index 632e7ac6..6d7f03b8 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 @@ -26,21 +26,17 @@ #include "control_common.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 */ @@ -48,6 +44,7 @@ static char *controlcookiename = NULL; /* cookie file location */ static char controlcookie[1024]; char *netname = NULL; char *confbase = NULL; +static char *host = NULL; #ifdef HAVE_MINGW static struct WSAData wsa_state; @@ -55,6 +52,7 @@ static struct WSAData wsa_state; static struct option const long_options[] = { {"config", required_argument, NULL, 'c'}, + {"host", required_argument, NULL, 'h'}, {"net", required_argument, NULL, 'n'}, {"help", no_argument, NULL, 1}, {"version", no_argument, NULL, 2}, @@ -93,6 +91,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"); } @@ -102,7 +104,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, "c:n:h:", long_options, &option_index)) != EOF) { switch (r) { case 0: /* long option */ break; @@ -111,6 +113,10 @@ static bool parse_options(int argc, char **argv) { confbase = xstrdup(optarg); break; + case 'h': /* alternative host to connect to */ + host = xstrdup(optarg); + break; + case 'n': /* net name given */ netname = xstrdup(optarg); break; @@ -153,7 +159,7 @@ 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; @@ -296,9 +302,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 +330,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 +376,61 @@ 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 port[128]; int pid; program_name = argv[0]; @@ -413,7 +488,7 @@ int main(int argc, char *argv[], char *envp[]) { fprintf(stderr, "Could not open control socket cookie file %s: %s\n", controlcookiename, strerror(errno)); return 1; } - if(fscanf(f, "%1024s %d %d", controlcookie, &port, &pid) != 3) { + if(fscanf(f, "%1024s %128s %d", controlcookie, port, &pid) != 3) { fprintf(stderr, "Could not parse control socket cookie file %s\n", controlcookiename); return 1; } @@ -425,13 +500,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 +528,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 +601,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 +614,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 +708,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);