X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_socket.c;h=4316e2d6c86a2b8b73e35668191128f1cc27fb26;hb=1b30cee086148975886f961aadc26e23b1bfd6f2;hp=2e6b068552d3838cbeb175c32f97637cf7d83fcc;hpb=a9445e38f25bd24eca289768fc46e44e36b842ac;p=tinc diff --git a/src/net_socket.c b/src/net_socket.c index 2e6b0685..4316e2d6 100644 --- a/src/net_socket.c +++ b/src/net_socket.c @@ -22,10 +22,9 @@ #include "system.h" -#include "avl_tree.h" +#include "splay_tree.h" #include "conf.h" #include "connection.h" -#include "event.h" #include "logger.h" #include "meta.h" #include "net.h" @@ -56,28 +55,14 @@ list_t *outgoing_list = NULL; static void configure_tcp(connection_t *c) { int option; -#ifdef O_NONBLOCK - int flags = fcntl(c->socket, F_GETFL); - - if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0) { - logger(LOG_ERR, "fcntl for %s: %s", c->hostname, strerror(errno)); - } -#elif defined(WIN32) - unsigned long arg = 1; - - if(ioctlsocket(c->socket, FIONBIO, &arg) != 0) { - logger(LOG_ERR, "ioctlsocket for %s: %d", c->hostname, sockstrerror(sockerrno)); - } -#endif - #if defined(SOL_TCP) && defined(TCP_NODELAY) option = 1; - setsockopt(c->socket, SOL_TCP, TCP_NODELAY, (void *)&option, sizeof(option)); + setsockopt(c->socket, SOL_TCP, TCP_NODELAY, (void *)&option, sizeof option); #endif #if defined(SOL_IP) && defined(IP_TOS) && defined(IPTOS_LOWDELAY) option = IPTOS_LOWDELAY; - setsockopt(c->socket, SOL_IP, IP_TOS, (void *)&option, sizeof(option)); + setsockopt(c->socket, SOL_IP, IP_TOS, (void *)&option, sizeof option); #endif } @@ -183,7 +168,7 @@ int setup_listen_socket(const sockaddr_t *sa) { /* Optimize TCP settings */ option = 1; - setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof(option)); + setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof option); #if defined(SOL_IPV6) && defined(IPV6_V6ONLY) if(sa->sa.sa_family == AF_INET6) @@ -195,10 +180,10 @@ int setup_listen_socket(const sockaddr_t *sa) { #if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE) struct ifreq ifr; - memset(&ifr, 0, sizeof(ifr)); + memset(&ifr, 0, sizeof ifr); strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ); - if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr, sizeof(ifr))) { + if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr, sizeof ifr)) { closesocket(nfd); logger(LOG_ERR, "Can't bind to interface %s: %s", iface, strerror(sockerrno)); @@ -238,30 +223,8 @@ int setup_vpn_in_socket(const sockaddr_t *sa) { return -1; } -#ifdef O_NONBLOCK - { - int flags = fcntl(nfd, F_GETFL); - - if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) { - closesocket(nfd); - logger(LOG_ERR, "System call `%s' failed: %s", "fcntl", - strerror(errno)); - return -1; - } - } -#elif defined(WIN32) - { - unsigned long arg = 1; - if(ioctlsocket(nfd, FIONBIO, &arg) != 0) { - closesocket(nfd); - logger(LOG_ERR, "Call to `%s' failed: %s", "ioctlsocket", sockstrerror(sockerrno)); - return -1; - } - } -#endif - option = 1; - setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof(option)); + setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof option); if(udp_rcvbuf && setsockopt(nfd, SOL_SOCKET, SO_RCVBUF, (void *)&udp_rcvbuf, sizeof(udp_rcvbuf))) logger(LOG_WARNING, "Can't set UDP SO_RCVBUF to %i: %s", udp_rcvbuf, strerror(errno)); @@ -322,19 +285,18 @@ int setup_vpn_in_socket(const sockaddr_t *sa) { return nfd; } /* int setup_vpn_in_socket */ +static void retry_outgoing_handler(int fd, short events, void *data) { + setup_outgoing_connection(data); +} + void retry_outgoing(outgoing_t *outgoing) { outgoing->timeout += 5; if(outgoing->timeout > maxtimeout) outgoing->timeout = maxtimeout; - if(outgoing->event) - event_del(outgoing->event); - outgoing->event = new_event(); - outgoing->event->handler = (event_handler_t) setup_outgoing_connection; - outgoing->event->time = now + outgoing->timeout; - outgoing->event->data = outgoing; - event_add(outgoing->event); + timeout_set(&outgoing->ev, retry_outgoing_handler, outgoing); + event_add(&outgoing->ev, &(struct timeval){outgoing->timeout, 0}); ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Trying to re-establish outgoing connection in %d seconds", @@ -346,7 +308,8 @@ void finish_connecting(connection_t *c) { configure_tcp(c); - c->last_ping_time = now; + c->last_ping_time = time(NULL); + c->status.connecting = false; send_id(c); } @@ -365,9 +328,9 @@ begin: if(!c->outgoing->cfg) { ifdebug(CONNECTIONS) logger(LOG_ERR, "Could not set up a meta connection to %s", c->name); - c->status.remove = true; retry_outgoing(c->outgoing); c->outgoing = NULL; + connection_del(c); return; } @@ -450,11 +413,26 @@ begin: return; } +void handle_meta_read(struct bufferevent *event, void *data) { + logger(LOG_ERR, "handle_meta_read() called"); + abort(); +} + +void handle_meta_write(struct bufferevent *event, void *data) { + ifdebug(META) logger(LOG_DEBUG, "handle_meta_write() called"); +} + +void handle_meta_connection_error(struct bufferevent *event, short what, void *data) { + connection_t *c = data; + logger(LOG_ERR, "handle_meta_connection_error() called: %d: %s", what, strerror(errno)); + terminate_connection(c, c->status.active); +} + void setup_outgoing_connection(outgoing_t *outgoing) { connection_t *c; node_t *n; - outgoing->event = NULL; + event_del(&outgoing->ev); n = lookup_node(outgoing->name); @@ -485,28 +463,40 @@ void setup_outgoing_connection(outgoing_t *outgoing) { } c->outgoing = outgoing; - c->last_ping_time = now; + c->last_ping_time = time(NULL); connection_add(c); do_outgoing_connection(c); + + c->buffer = bufferevent_new(c->socket, handle_meta_read, handle_meta_write, handle_meta_connection_error, c); + if(!c->buffer) { + logger(LOG_ERR, "bufferevent_new() failed: %s", strerror(errno)); + abort(); + } + bufferevent_disable(c->buffer, EV_READ); + + if(!thread_create(&c->thread, handle_meta_connection_data, c)) { + logger(LOG_ERR, "create_thread() failed: %s", strerror(errno)); + abort(); + } } /* accept a new tcp connect and create a new connection */ -bool handle_new_meta_connection(int sock) { +void handle_new_meta_connection(int sock, short events, void *data) { connection_t *c; sockaddr_t sa; int fd; - socklen_t len = sizeof(sa); + socklen_t len = sizeof sa; fd = accept(sock, &sa.sa, &len); if(fd < 0) { logger(LOG_ERR, "Accepting a new connection failed: %s", sockstrerror(sockerrno)); - return false; + return; } sockaddrunmap(&sa); @@ -521,10 +511,17 @@ bool handle_new_meta_connection(int sock) { c->address = sa; c->hostname = sockaddr2hostname(&sa); c->socket = fd; - c->last_ping_time = now; + c->last_ping_time = time(NULL); ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection from %s", c->hostname); + c->buffer = bufferevent_new(c->socket, NULL, handle_meta_write, handle_meta_connection_error, c); + if(!c->buffer) { + logger(LOG_ERR, "bufferevent_new() failed: %s", strerror(errno)); + abort(); + } + bufferevent_disable(c->buffer, EV_READ); + configure_tcp(c); connection_add(c); @@ -532,7 +529,10 @@ bool handle_new_meta_connection(int sock) { c->allow_request = ID; send_id(c); - return true; + if(!thread_create(&c->thread, handle_meta_connection_data, c)) { + logger(LOG_ERR, "create_thread() failed: %s", strerror(errno)); + abort(); + } } void free_outgoing(outgoing_t *outgoing) { @@ -563,7 +563,7 @@ void try_outgoing_connections(void) { continue; } - outgoing = xmalloc_and_zero(sizeof(*outgoing)); + outgoing = xmalloc_and_zero(sizeof *outgoing); outgoing->name = name; list_insert_tail(outgoing_list, outgoing); setup_outgoing_connection(outgoing);