X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fcontrol.c;h=71258b58da2361c3ee072f8ed5b6b47a6bcdf482;hb=f8190b7233871b5b47c3fc8846731d1bbdef78a5;hp=d074ebbafa7005bca163de4ff1460124ca2f5fda;hpb=8ac096b5bf9da1b3961a3ac4a03d083629222a63;p=tinc diff --git a/src/control.c b/src/control.c index d074ebba..71258b58 100644 --- a/src/control.c +++ b/src/control.c @@ -1,6 +1,6 @@ /* control.c -- Control socket handling. - Copyright (C) 2012 Guus Sliepen + Copyright (C) 2013 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 @@ -25,16 +25,15 @@ #include "graph.h" #include "logger.h" #include "meta.h" +#include "names.h" #include "net.h" #include "netutl.h" #include "protocol.h" #include "route.h" -#include "splay_tree.h" #include "utils.h" #include "xalloc.h" char controlcookie[65]; -extern char *pidfilename; static bool control_return(connection_t *c, int type, int error) { return send_request(c, "%d %d %d", CONTROL, type, error); @@ -44,7 +43,7 @@ static bool control_ok(connection_t *c, int type) { return control_return(c, type, 0); } -bool control_h(connection_t *c, char *request) { +bool control_h(connection_t *c, const char *request) { int type; if(!c->status.control || c->allow_request != CONTROL) { @@ -57,120 +56,127 @@ bool control_h(connection_t *c, char *request) { return false; } - switch (type) { - case REQ_STOP: - event_loopexit(NULL); - return control_ok(c, REQ_STOP); - - case REQ_DUMP_NODES: - return dump_nodes(c); - - case REQ_DUMP_EDGES: - return dump_edges(c); - - case REQ_DUMP_SUBNETS: - return dump_subnets(c); - - case REQ_DUMP_CONNECTIONS: - return dump_connections(c); - - 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; + switch(type) { + case REQ_STOP: + event_exit(); + return control_ok(c, REQ_STOP); + + case REQ_DUMP_NODES: + return dump_nodes(c); + + case REQ_DUMP_EDGES: + return dump_edges(c); + + case REQ_DUMP_SUBNETS: + return dump_subnets(c); + + case REQ_DUMP_CONNECTIONS: + return dump_connections(c); + + 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_RETRY: + retry(); + return control_ok(c, REQ_RETRY); + + case REQ_RELOAD: + logger(DEBUG_ALWAYS, LOG_NOTICE, "Got '%s' command", "reload"); + int result = reload_configuration(); + return control_return(c, REQ_RELOAD, result); + + 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_RETRY: - retry(); - return control_ok(c, REQ_RETRY); - - case REQ_RELOAD: - logger(DEBUG_ALWAYS, LOG_NOTICE, "Got '%s' command", "reload"); - int result = reload_configuration(); - return control_return(c, REQ_RELOAD, result); - - case REQ_DISCONNECT: { - char name[MAX_STRING_SIZE]; - connection_t *other; - splay_node_t *node, *next; - bool found = false; - - if(sscanf(request, "%*d %*d " MAX_STRING, name) != 1) - return control_return(c, REQ_DISCONNECT, -1); - - for(node = connection_tree->head; node; node = next) { - next = node->next; - other = node->data; - if(strcmp(other->name, name)) - continue; - terminate_connection(other, other->status.active); - found = true; + for list_each(connection_t, other, connection_list) { + if(strcmp(other->name, name)) { + continue; } - return control_return(c, REQ_DISCONNECT, found ? 0 : -2); + terminate_connection(other, other->edge); + found = true; } - case REQ_DUMP_TRAFFIC: - return dump_traffic(c); + return control_return(c, REQ_DISCONNECT, found ? 0 : -2); + } + + 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_PCAP: + sscanf(request, "%*d %*d %d", &c->outmaclength); + c->status.pcap = true; + pcap = true; + return true; - case REQ_LOG: - sscanf(request, "%*d %*d %d", &c->outcompression); - c->status.log = true; - logcontrol = true; - return true; + case REQ_LOG: + sscanf(request, "%*d %*d %d", &c->outcompression); + 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); + 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; } -#ifdef HAVE_FCHMOD - fchmod(fileno(f), 0600); -#else - chmod(pidfilename, 0600); -#endif // 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, (struct sockaddr *)&sa, &len)) { - xasprintf(&localhost, "127.0.0.1 port %d", myport); + if(getsockname(listen_socket[0].tcp.fd, &sa.sa, &len)) { + xasprintf(&localhost, "127.0.0.1 port %s", myport); } 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); @@ -181,9 +187,55 @@ bool init_control(void) { free(localhost); fclose(f); +#ifndef HAVE_MINGW + 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(sockerrno)); + return false; + } + + struct sockaddr_un sa_un; + + sa_un.sun_family = AF_UNIX; + + strncpy(sa_un.sun_path, unixsocketname, sizeof(sa_un.sun_path)); + + sa_un.sun_path[sizeof(sa_un.sun_path) - 1] = 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); + + umask(mask | 077); + 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(sockerrno)); + return false; + } + + if(listen(unix_fd, 3) < 0) { + logger(DEBUG_ALWAYS, LOG_ERR, "Could not listen on UNIX socket %s: %s", unixsocketname, sockstrerror(sockerrno)); + return false; + } + + io_add(&unix_socket, handle_new_unix_connection, &unix_socket, unix_fd, IO_READ); +#endif + return true; } void exit_control(void) { +#ifndef HAVE_MINGW + unlink(unixsocketname); + io_del(&unix_socket); + close(unix_socket.fd); +#endif + unlink(pidfilename); }