X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fcontrol.c;h=6e8580a4947b753c9f2b3f649536db38f017a541;hb=668750c022a02cc54756316907f1cbbf7d673025;hp=f7d67ac3f763366edce35840078a74eb1a9aeacb;hpb=09b0b49b98cc16f6b281e4e635c2c70234e38865;p=tinc diff --git a/src/control.c b/src/control.c index f7d67ac3..6e8580a4 100644 --- a/src/control.c +++ b/src/control.c @@ -18,13 +18,10 @@ */ #include "system.h" -#include "crypto.h" #include "conf.h" #include "control.h" #include "control_common.h" -#include "graph.h" #include "logger.h" -#include "meta.h" #include "names.h" #include "net.h" #include "netutl.h" @@ -32,6 +29,8 @@ #include "route.h" #include "utils.h" #include "xalloc.h" +#include "random.h" +#include "pidfile.h" char controlcookie[65]; @@ -56,154 +55,171 @@ bool control_h(connection_t *c, const char *request) { return false; } - switch (type) { - case REQ_STOP: - event_exit(); - return control_ok(c, REQ_STOP); + switch(type) { + case REQ_STOP: + event_exit(); + return control_ok(c, REQ_STOP); - case REQ_DUMP_NODES: - return dump_nodes(c); + case REQ_DUMP_NODES: + return dump_nodes(c); - case REQ_DUMP_EDGES: - return dump_edges(c); + case REQ_DUMP_EDGES: + return dump_edges(c); - case REQ_DUMP_SUBNETS: - return dump_subnets(c); + case REQ_DUMP_SUBNETS: + return dump_subnets(c); - case REQ_DUMP_CONNECTIONS: - return dump_connections(c); + case REQ_DUMP_CONNECTIONS: + return dump_connections(c); - case REQ_PURGE: - purge(); - return control_ok(c, REQ_PURGE); + case REQ_PURGE: + purge(); + return control_ok(c, REQ_PURGE); - case REQ_SET_DEBUG: { - int new_level; - if(sscanf(request, "%*d %*d %d", &new_level) != 1) - return false; - send_request(c, "%d %d %d", CONTROL, REQ_SET_DEBUG, debug_level); - if(new_level >= 0) - debug_level = new_level; - return true; + case REQ_SET_DEBUG: { + int new_level; + + if(sscanf(request, "%*d %*d %d", &new_level) != 1) { + return false; } - case REQ_RETRY: - retry(); - return control_ok(c, REQ_RETRY); + send_request(c, "%d %d %d", CONTROL, REQ_SET_DEBUG, debug_level); - case REQ_RELOAD: - logger(DEBUG_ALWAYS, LOG_NOTICE, "Got '%s' command", "reload"); - int result = reload_configuration(); - return control_return(c, REQ_RELOAD, result); + if(new_level >= 0) { + debug_level = new_level; + } - case REQ_DISCONNECT: { - char name[MAX_STRING_SIZE]; - bool found = false; + return true; + } - if(sscanf(request, "%*d %*d " MAX_STRING, name) != 1) - return control_return(c, REQ_DISCONNECT, -1); + case REQ_RETRY: + retry(); + return control_ok(c, REQ_RETRY); - for list_each(connection_t, other, connection_list) { - if(strcmp(other->name, name)) - continue; - terminate_connection(other, other->status.active); - found = true; - } + case REQ_RELOAD: + logger(DEBUG_ALWAYS, LOG_NOTICE, "Got '%s' command", "reload"); + int result = reload_configuration(); + return control_return(c, REQ_RELOAD, result); - return control_return(c, REQ_DISCONNECT, found ? 0 : -2); + case REQ_DISCONNECT: { + char name[MAX_STRING_SIZE]; + bool found = false; + + if(sscanf(request, "%*d %*d " MAX_STRING, name) != 1) { + return control_return(c, REQ_DISCONNECT, -1); } - case REQ_DUMP_TRAFFIC: - return dump_traffic(c); + for list_each(connection_t, other, &connection_list) { + if(strcmp(other->name, name)) { + continue; + } + + terminate_connection(other, other->edge); + found = true; + } - case REQ_PCAP: - sscanf(request, "%*d %*d %d", &c->outmaclength); - c->status.pcap = true; - pcap = true; - return true; + return control_return(c, REQ_DISCONNECT, found ? 0 : -2); + } - case REQ_LOG: - sscanf(request, "%*d %*d %d", &c->outcompression); - c->status.log = true; - logcontrol = true; - return true; + case REQ_DUMP_TRAFFIC: + return dump_traffic(c); + + case REQ_PCAP: + sscanf(request, "%*d %*d %d", &c->outmaclength); + c->status.pcap = true; + pcap = true; + return true; + + case REQ_LOG: { + int level = 0; + sscanf(request, "%*d %*d %d", &level); + c->log_level = CLAMP(level, DEBUG_UNSET, DEBUG_SCARY_THINGS); + c->status.log = true; + logcontrol = true; + return true; + } - default: - return send_request(c, "%d %d", CONTROL, REQ_INVALID); + default: + return send_request(c, "%d %d", CONTROL, REQ_INVALID); } } bool init_control(void) { - randomize(controlcookie, sizeof controlcookie / 2); - bin2hex(controlcookie, controlcookie, sizeof controlcookie / 2); - - mode_t mask = umask(0); - umask(mask | 077); - FILE *f = fopen(pidfilename, "w"); - umask(mask); - - if(!f) { - logger(DEBUG_ALWAYS, LOG_ERR, "Cannot write control socket cookie file %s: %s", pidfilename, strerror(errno)); - return false; - } + randomize(controlcookie, sizeof(controlcookie) / 2); + bin2hex(controlcookie, controlcookie, sizeof(controlcookie) / 2); // Get the address and port of the first listening socket char *localhost = NULL; - sockaddr_t sa; - socklen_t len = sizeof sa; + sockaddr_t sa = {0}; + socklen_t len = sizeof(sa); // Make sure we have a valid address, and map 0.0.0.0 and :: to 127.0.0.1 and ::1. - if(getsockname(listen_socket[0].tcp.fd, (struct sockaddr *)&sa, &len)) { - xasprintf(&localhost, "127.0.0.1 port %s", myport); + if(getsockname(listen_socket[0].tcp.fd, &sa.sa, &len)) { + xasprintf(&localhost, "127.0.0.1 port %s", myport.tcp); } else { if(sa.sa.sa_family == AF_INET) { - if(sa.in.sin_addr.s_addr == 0) + if(sa.in.sin_addr.s_addr == 0) { sa.in.sin_addr.s_addr = htonl(0x7f000001); + } } else if(sa.sa.sa_family == AF_INET6) { static const uint8_t zero[16] = {0}; - if(!memcmp(sa.in6.sin6_addr.s6_addr, zero, sizeof zero)) + + if(!memcmp(sa.in6.sin6_addr.s6_addr, zero, sizeof(zero))) { sa.in6.sin6_addr.s6_addr[15] = 1; + } } localhost = sockaddr2hostname(&sa); } - fprintf(f, "%d %s %s\n", (int)getpid(), controlcookie, localhost); - + bool wrote = write_pidfile(controlcookie, localhost); free(localhost); - fclose(f); -#ifndef HAVE_MINGW + if(!wrote) { + logger(DEBUG_ALWAYS, LOG_ERR, "Cannot write control socket cookie file %s: %s", pidfilename, strerror(errno)); + return false; + } + +#ifndef HAVE_WINDOWS int unix_fd = socket(AF_UNIX, SOCK_STREAM, 0); + if(unix_fd < 0) { - logger(DEBUG_ALWAYS, LOG_ERR, "Could not create UNIX socket: %s", sockstrerror(errno)); + logger(DEBUG_ALWAYS, LOG_ERR, "Could not create UNIX socket: %s", sockstrerror(sockerrno)); + return false; + } + + struct sockaddr_un sa_un = { + .sun_family = AF_UNIX, + }; + + if(strlen(unixsocketname) >= sizeof(sa_un.sun_path)) { + logger(DEBUG_ALWAYS, LOG_ERR, "UNIX socket filename %s is too long!", unixsocketname); return false; } - struct sockaddr_un sun; - sun.sun_family = AF_UNIX; - strncpy(sun.sun_path, unixsocketname, sizeof sun.sun_path); + strncpy(sa_un.sun_path, unixsocketname, sizeof(sa_un.sun_path)); - if(connect(unix_fd, (struct sockaddr *)&sun, sizeof sun) >= 0) { + if(connect(unix_fd, (struct sockaddr *)&sa_un, sizeof(sa_un)) >= 0) { logger(DEBUG_ALWAYS, LOG_ERR, "UNIX socket %s is still in use!", unixsocketname); return false; } unlink(unixsocketname); + mode_t mask = umask(0); umask(mask | 077); - int result = bind(unix_fd, (struct sockaddr *)&sun, sizeof sun); + int result = bind(unix_fd, (struct sockaddr *)&sa_un, sizeof(sa_un)); umask(mask); if(result < 0) { - logger(DEBUG_ALWAYS, LOG_ERR, "Could not bind UNIX socket to %s: %s", unixsocketname, sockstrerror(errno)); + logger(DEBUG_ALWAYS, LOG_ERR, "Could not bind UNIX socket to %s: %s", unixsocketname, sockstrerror(sockerrno)); return false; } if(listen(unix_fd, 3) < 0) { - logger(DEBUG_ALWAYS, LOG_ERR, "Could not listen on UNIX socket %s: %s", unixsocketname, sockstrerror(errno)); + logger(DEBUG_ALWAYS, LOG_ERR, "Could not listen on UNIX socket %s: %s", unixsocketname, sockstrerror(sockerrno)); return false; } @@ -214,7 +230,7 @@ bool init_control(void) { } void exit_control(void) { -#ifndef HAVE_MINGW +#ifndef HAVE_WINDOWS unlink(unixsocketname); io_del(&unix_socket); close(unix_socket.fd);