X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=56179c6ec19d3576246463c54493b80220cd2c3f;hb=1065879c8c6e8cdf8d3755024241f31eaabd4138;hp=c4a96663da6bad56421d0e91ec7863c2cc56df99;hpb=e9043e17c76f92b787c9ecdaf1a2ae7916f690a6;p=tinc diff --git a/src/tincctl.c b/src/tincctl.c index c4a96663..56179c6e 100644 --- a/src/tincctl.c +++ b/src/tincctl.c @@ -30,8 +30,9 @@ #include -#include "protocol.h" #include "xalloc.h" +#include "protocol.h" +#include "control_common.h" /* The name this program was run with. */ char *program_name = NULL; @@ -80,6 +81,7 @@ static void usage(bool status) { " stop Stop tincd.\n" " 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" " dump Dump a list of one of the following things:\n" " nodes - all known nodes in the VPN\n" @@ -87,6 +89,7 @@ static void usage(bool status) { " subnets - all known subnets in the VPN\n" " connections - all meta connections with ourself\n" " graph - graph of the VPN in dotty format\n" + " purge Purge unreachable nodes\n" "\n")); printf(_("Report bugs to tinc@tinc-vpn.org.\n")); } @@ -326,9 +329,118 @@ static void make_names(void) { } } -int main(int argc, char **argv) { - int fd; +static int fullread(int fd, void *data, size_t datalen) { + int rv, len = 0; + + while (len < datalen) { + rv = read(fd, data + len, datalen - len); + if(rv == -1 && errno == EINTR) + continue; + else if (rv == -1) + return rv; + else if (rv == 0) { + errno = ENODATA; + return -1; + } + len += rv; + } + return 0; +} + +/* + Send a request (raw) +*/ +static int send_ctl_request(int fd, enum request_type type, + void const *outdata, size_t outdatalen, + int *res_errno_p, void **indata_p, + size_t *indatalen_p) { + tinc_ctl_request_t req; + int rv; + struct iovec vector[2] = { + {&req, sizeof(req)}, + {(void*) outdata, outdatalen} + }; + void *indata; + + if(res_errno_p == NULL) + return -1; + + memset(&req, 0, sizeof req); + req.length = sizeof req + outdatalen; + req.type = type; + req.res_errno = 0; + + while((rv = writev(fd, vector, 2)) == -1 && errno == EINTR) ; + if(rv != req.length) + return -1; + + if(fullread(fd, &req, sizeof req) == -1) + return -1; + + if(req.length < sizeof req) { + errno = EINVAL; + return -1; + } + + if(req.length > sizeof req) { + if (indata_p == NULL) { + errno = EINVAL; + return -1; + } + + indata = xmalloc(req.length - sizeof req); + + if(fullread(fd, indata, req.length - sizeof req) == -1) { + free(indata); + return -1; + } + + *indata_p = indata; + if(indatalen_p != NULL) + *indatalen_p = req.length - sizeof req; + } + + *res_errno_p = req.res_errno; + + return 0; +} + +/* + Send a request (with printfs) +*/ +static int send_ctl_request_cooked(int fd, enum request_type type, + void const *outdata, size_t outdatalen) +{ + int res_errno = -1; + char *buf = NULL; + size_t buflen = 0; + + if(send_ctl_request(fd, type, outdata, outdatalen, &res_errno, + (void**) &buf, &buflen)) { + fprintf(stderr, _("Error sending request: %s\n"), strerror(errno)); + return -1; + } + + if(buf != NULL) { + printf("%*s", buflen, buf); + free(buf); + } + + if(res_errno != 0) { + fprintf(stderr, _("Server reported error: %s\n"), strerror(res_errno)); + return -1; + } + + return 0; +} + +int main(int argc, char *argv[], char *envp[]) { struct sockaddr_un addr; + int fd; + int len; + tinc_ctl_greeting_t greeting; + tinc_ctl_request_t req; + program_name = argv[0]; setlocale(LC_ALL, ""); @@ -363,10 +475,21 @@ int main(int argc, char **argv) { return 1; } + // First handle commands that don't involve connecting to a running tinc daemon. + if(!strcasecmp(argv[optind], "generate-keys")) { return !keygen(optind > argc ? atoi(argv[optind + 1]) : 1024); } + if(!strcasecmp(argv[optind], "start")) { + argv[optind] = NULL; + execve("tincd", argv, envp); + fprintf(stderr, _("Could not start tincd: %s"), strerror(errno)); + return 1; + } + + // Now handle commands that do involve connecting to a running tinc daemon. + if(strlen(controlsocketname) >= sizeof addr.sun_path) { fprintf(stderr, _("Control socket filename too long!\n")); return 1; @@ -387,8 +510,82 @@ int main(int argc, char **argv) { return 1; } - printf("Connected to %s.\n", controlsocketname); + if(fullread(fd, &greeting, sizeof greeting) == -1) { + fprintf(stderr, _("Cannot read greeting from control socket: %s\n"), + strerror(errno)); + return 1; + } + + if(greeting.version != TINC_CTL_VERSION_CURRENT) { + fprintf(stderr, _("Version mismatch: server %d, client %d\n"), + greeting.version, TINC_CTL_VERSION_CURRENT); + return 1; + } + + struct ucred cred; + socklen_t credlen = sizeof cred; + + if(getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &cred, &credlen) < 0) { + fprintf(stderr, _("Could not obtain PID: %s\n"), strerror(errno)); + return 1; + } + + if(!strcasecmp(argv[optind], "pid")) { + printf("%d\n", cred.pid); + return 0; + } + + if(!strcasecmp(argv[optind], "stop")) { + return send_ctl_request_cooked(fd, REQ_STOP, NULL, 0) != -1; + } + + if(!strcasecmp(argv[optind], "reload")) { + return send_ctl_request_cooked(fd, REQ_RELOAD, NULL, 0) != -1; + } + + if(!strcasecmp(argv[optind], "restart")) { + return send_ctl_request_cooked(fd, REQ_RESTART, NULL, 0) != -1; + } + if(!strcasecmp(argv[optind], "dump")) { + if (argc < optind + 2) { + fprintf(stderr, _("Not enough arguments.\n")); + usage(true); + return 1; + } + + if(!strcasecmp(argv[optind+1], "nodes")) { + return send_ctl_request_cooked(fd, REQ_DUMP_NODES, NULL, 0) != -1; + } + + if(!strcasecmp(argv[optind+1], "edges")) { + return send_ctl_request_cooked(fd, REQ_DUMP_EDGES, NULL, 0) != -1; + } + + if(!strcasecmp(argv[optind+1], "subnets")) { + return send_ctl_request_cooked(fd, REQ_DUMP_SUBNETS, NULL, 0) != -1; + } + + if(!strcasecmp(argv[optind+1], "connections")) { + return send_ctl_request_cooked(fd, REQ_DUMP_CONNECTIONS, NULL, 0) != -1; + } + + if(!strcasecmp(argv[optind+1], "graph")) { + return send_ctl_request_cooked(fd, REQ_DUMP_GRAPH, NULL, 0) != -1; + } + + fprintf(stderr, _("Unknown dump type '%s'.\n"), argv[optind+1]); + usage(true); + return 1; + } + + if(!strcasecmp(argv[optind], "purge")) { + return send_ctl_request_cooked(fd, REQ_PURGE, NULL, 0) != -1; + } + + fprintf(stderr, _("Unknown command `%s'.\n"), argv[optind]); + usage(true); + close(fd); return 0;