X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fcontrol.c;h=2c5d4be847eba078069795c134f4cce929ff2d64;hb=1065879c8c6e8cdf8d3755024241f31eaabd4138;hp=b72ea9eeb59778509c1aa8f368110163d8288928;hpb=01f47c46af514a9d7f39c143e4558a8426a0d3eb;p=tinc diff --git a/src/control.c b/src/control.c index b72ea9ee..2c5d4be8 100644 --- a/src/control.c +++ b/src/control.c @@ -24,31 +24,122 @@ #include "system.h" #include "conf.h" #include "control.h" +#include "control_common.h" #include "logger.h" #include "xalloc.h" static int control_socket = -1; static struct event control_event; static splay_tree_t *control_socket_tree; -extern char *controlfilename; +extern char *controlsocketname; -static void handle_control_data(int fd, short events, void *event) { - char buf[MAXBUFSIZE]; - size_t inlen; +static void handle_control_data(struct bufferevent *event, void *data) { + tinc_ctl_request_t req; + size_t size; + tinc_ctl_request_t res; + struct evbuffer *res_data = NULL; - inlen = read(fd, buf, sizeof buf); + if(EVBUFFER_LENGTH(event->input) < sizeof(tinc_ctl_request_t)) + return; + + /* Copy the structure to ensure alignment */ + memcpy(&req, EVBUFFER_DATA(event->input), sizeof(tinc_ctl_request_t)); + + if(EVBUFFER_LENGTH(event->input) < req.length) + return; + + if(req.length < sizeof(tinc_ctl_request_t)) + goto failure; + + memset(&res, 0, sizeof res); + res.type = req.type; + res.id = req.id; + + res_data = evbuffer_new(); + if (res_data == NULL) { + res.res_errno = ENOMEM; + goto respond; + } + + if(req.type == REQ_STOP) { + logger(LOG_NOTICE, _("Got '%s' command"), "stop"); + event_loopexit(NULL); + goto respond; + } + + if(req.type == REQ_DUMP_NODES) { + logger(LOG_NOTICE, _("Got '%s' command"), "dump nodes"); + res.res_errno = dump_nodes(res_data); + goto respond; + } + + if(req.type == REQ_DUMP_EDGES) { + logger(LOG_NOTICE, _("Got '%s' command"), "dump edges"); + res.res_errno = dump_edges(res_data); + goto respond; + } + + if(req.type == REQ_DUMP_SUBNETS) { + logger(LOG_NOTICE, _("Got '%s' command"), "dump subnets"); + res.res_errno = dump_subnets(res_data); + goto respond; + } + + if(req.type == REQ_DUMP_CONNECTIONS) { + logger(LOG_NOTICE, _("Got '%s' command"), "dump connections"); + res.res_errno = dump_connections(res_data); + goto respond; + } + + if(req.type == REQ_DUMP_GRAPH) { + logger(LOG_NOTICE, _("Got '%s' command"), "dump graph"); + res.res_errno = dump_graph(res_data); + goto respond; + } + + if(req.type == REQ_PURGE) { + logger(LOG_NOTICE, _("Got '%s' command"), "purge"); + purge(); + goto respond; + } - if(inlen <= 0) { - logger(LOG_DEBUG, _("Closing control socket")); - event_del(event); - splay_delete(control_socket_tree, event); - close(fd); + logger(LOG_DEBUG, _("Malformed control command received")); + res.res_errno = EINVAL; + +respond: + res.length = (sizeof res) + + ((res_data == NULL) ? 0 : EVBUFFER_LENGTH(res_data)); + evbuffer_drain(event->input, req.length); + if(bufferevent_write(event, &res, sizeof res) == -1) + goto failure; + if(res_data != NULL) { + if(bufferevent_write_buffer(event, res_data) == -1) + goto failure; + evbuffer_free(res_data); } + return; + +failure: + logger(LOG_INFO, _("Closing control socket on error")); + evbuffer_free(res_data); + close(event->ev_read.ev_fd); + splay_delete(control_socket_tree, event); +} + +static void handle_control_error(struct bufferevent *event, short what, void *data) { + if(what & EVBUFFER_EOF) + logger(LOG_DEBUG, _("Control socket connection closed by peer")); + else + logger(LOG_DEBUG, _("Error while reading from control socket: %s"), strerror(errno)); + + close(event->ev_read.ev_fd); + splay_delete(control_socket_tree, event); } static void handle_new_control_socket(int fd, short events, void *data) { int newfd; - struct event *ev; + struct bufferevent *ev; + tinc_ctl_greeting_t greeting; newfd = accept(fd, NULL, NULL); @@ -58,9 +149,25 @@ static void handle_new_control_socket(int fd, short events, void *data) { return; } - ev = xmalloc(sizeof *ev); - event_set(ev, newfd, EV_READ | EV_PERSIST, handle_control_data, ev); - event_add(ev, NULL); + ev = bufferevent_new(newfd, handle_control_data, NULL, handle_control_error, NULL); + if(!ev) { + logger(LOG_ERR, _("Could not create bufferevent for new control connection: %s"), strerror(errno)); + close(newfd); + return; + } + + memset(&greeting, 0, sizeof greeting); + greeting.version = TINC_CTL_VERSION_CURRENT; + if(bufferevent_write(ev, &greeting, sizeof greeting) == -1) { + logger(LOG_ERR, + _("Cannot send greeting for new control connection: %s"), + strerror(errno)); + bufferevent_free(ev); + close(newfd); + return; + } + + bufferevent_enable(ev, EV_READ); splay_insert(control_socket_tree, ev); logger(LOG_DEBUG, _("Control socket connection accepted")); @@ -70,47 +177,67 @@ static int control_compare(const struct event *a, const struct event *b) { return a < b ? -1 : a > b ? 1 : 0; } -void init_control() { +bool init_control() { + int result; struct sockaddr_un addr; - control_socket_tree = splay_alloc_tree((splay_compare_t)control_compare, (splay_action_t)free); - - if(strlen(controlfilename) >= sizeof addr.sun_path) { + if(strlen(controlsocketname) >= sizeof addr.sun_path) { logger(LOG_ERR, _("Control socket filename too long!")); - return; + return false; } memset(&addr, 0, sizeof addr); addr.sun_family = AF_UNIX; - strncpy(addr.sun_path, controlfilename, sizeof addr.sun_path - 1); + strncpy(addr.sun_path, controlsocketname, sizeof addr.sun_path - 1); control_socket = socket(PF_UNIX, SOCK_STREAM, 0); if(control_socket < 0) { logger(LOG_ERR, _("Creating UNIX socket failed: %s"), strerror(errno)); - return; + return false; + } + + //unlink(controlsocketname); + result = bind(control_socket, (struct sockaddr *)&addr, sizeof addr); + + if(result < 0 && errno == EADDRINUSE) { + result = connect(control_socket, (struct sockaddr *)&addr, sizeof addr); + if(result < 0) { + logger(LOG_WARNING, _("Removing old control socket.")); + unlink(controlsocketname); + result = bind(control_socket, (struct sockaddr *)&addr, sizeof addr); + } else { + close(control_socket); + if(netname) + logger(LOG_ERR, _("Another tincd is already running for net `%s'."), netname); + else + logger(LOG_ERR, _("Another tincd is already running.")); + return false; + } } - unlink(controlfilename); - if(bind(control_socket, (struct sockaddr *)&addr, sizeof addr) < 0) { - logger(LOG_ERR, _("Can't bind to %s: %s\n"), controlfilename, strerror(errno)); + if(result < 0) { + logger(LOG_ERR, _("Can't bind to %s: %s\n"), controlsocketname, strerror(errno)); close(control_socket); - return; + return false; } if(listen(control_socket, 3) < 0) { - logger(LOG_ERR, _("Can't listen on %s: %s\n"), controlfilename, strerror(errno)); + logger(LOG_ERR, _("Can't listen on %s: %s\n"), controlsocketname, strerror(errno)); close(control_socket); - return; + return false; } + control_socket_tree = splay_alloc_tree((splay_compare_t)control_compare, (splay_action_t)bufferevent_free); + event_set(&control_event, control_socket, EV_READ | EV_PERSIST, handle_new_control_socket, NULL); event_add(&control_event, NULL); + + return true; } void exit_control() { - if(control_socket >= 0) { - event_del(&control_event); - close(control_socket); - } + event_del(&control_event); + close(control_socket); + unlink(controlsocketname); }