X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_socket.c;h=ab3c17e02a110b41d9044cdc25c15c3c74ca4a0b;hp=7f3db5c8bf59b499ebd4aced678498af1719bc81;hb=796c14b75c9e8066b4f68f6ce7cdaddd97c46a87;hpb=248d300f1be0d5f2aae39202041699ab2b46c56b diff --git a/src/net_socket.c b/src/net_socket.c index 7f3db5c8..ab3c17e0 100644 --- a/src/net_socket.c +++ b/src/net_socket.c @@ -1,7 +1,7 @@ /* net_socket.c -- Handle various kinds of sockets. Copyright (C) 1998-2005 Ivo Timmermans, - 2000-2012 Guus Sliepen + 2000-2013 Guus Sliepen 2006 Scott Lamb 2009 Florian Forster @@ -22,11 +22,13 @@ #include "system.h" -#include "splay_tree.h" #include "conf.h" #include "connection.h" +#include "control_common.h" +#include "list.h" #include "logger.h" #include "meta.h" +#include "names.h" #include "net.h" #include "netutl.h" #include "protocol.h" @@ -43,9 +45,13 @@ int maxtimeout = 900; int seconds_till_retry = 5; int udp_rcvbuf = 0; int udp_sndbuf = 0; +int max_connection_burst = 100; listen_socket_t listen_socket[MAXSOCKETS]; int listen_sockets; +#ifndef HAVE_MINGW +io_t unix_socket; +#endif list_t *outgoing_list = NULL; /* Setup sockets */ @@ -63,7 +69,7 @@ static void configure_tcp(connection_t *c) { unsigned long arg = 1; if(ioctlsocket(c->socket, FIONBIO, &arg) != 0) { - logger(DEBUG_ALWAYS, LOG_ERR, "ioctlsocket for %s: %d", c->hostname, sockstrerror(sockerrno)); + logger(DEBUG_ALWAYS, LOG_ERR, "ioctlsocket for %s: %s", c->hostname, sockstrerror(sockerrno)); } #endif @@ -107,6 +113,34 @@ static bool bind_to_interface(int sd) { return true; } +static bool bind_to_address(connection_t *c) { + int s = -1; + + for(int i = 0; i < listen_sockets; i++) { + if(listen_socket[i].sa.sa.sa_family != c->address.sa.sa_family) + continue; + if(s >= 0) + return false; + s = i; + } + + if(s < 0) + return false; + + sockaddr_t sa = listen_socket[s].sa; + if(sa.sa.sa_family == AF_INET) + sa.in.sin_port = 0; + else if(sa.sa.sa_family == AF_INET6) + sa.in6.sin6_port = 0; + + if(bind(c->socket, &sa.sa, SALEN(sa.sa))) { + logger(DEBUG_CONNECTIONS, LOG_WARNING, "Can't bind outgoing socket: %s", strerror(errno)); + return false; + } + + return true; +} + int setup_listen_socket(const sockaddr_t *sa) { int nfd; char *addrstr; @@ -271,7 +305,7 @@ 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) { +static void retry_outgoing_handler(void *data) { setup_outgoing_connection(data); } @@ -281,21 +315,15 @@ void retry_outgoing(outgoing_t *outgoing) { if(outgoing->timeout > maxtimeout) outgoing->timeout = maxtimeout; - timeout_set(&outgoing->ev, retry_outgoing_handler, outgoing); - event_add(&outgoing->ev, &(struct timeval){outgoing->timeout, 0}); + timeout_add(&outgoing->ev, retry_outgoing_handler, outgoing, &(struct timeval){outgoing->timeout, rand() % 100000}); - logger(DEBUG_CONNECTIONS, LOG_NOTICE, - "Trying to re-establish outgoing connection in %d seconds", - outgoing->timeout); + logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Trying to re-establish outgoing connection in %d seconds", outgoing->timeout); } void finish_connecting(connection_t *c) { logger(DEBUG_CONNECTIONS, LOG_INFO, "Connected to %s (%s)", c->name, c->hostname); - if(proxytype != PROXY_EXEC) - configure_tcp(c); - - c->last_ping_time = time(NULL); + c->last_ping_time = now.tv_sec; c->status.connecting = false; send_id(c); @@ -306,7 +334,7 @@ static void do_outgoing_pipe(connection_t *c, char *command) { int fd[2]; if(socketpair(AF_UNIX, SOCK_STREAM, 0, fd)) { - logger(DEBUG_ALWAYS, LOG_ERR, "Could not create socketpair: %s\n", strerror(errno)); + logger(DEBUG_ALWAYS, LOG_ERR, "Could not create socketpair: %s", strerror(errno)); return; } @@ -339,7 +367,7 @@ static void do_outgoing_pipe(connection_t *c, char *command) { int result = system(command); if(result < 0) - logger(DEBUG_ALWAYS, LOG_ERR, "Could not execute %s: %s\n", command, strerror(errno)); + logger(DEBUG_ALWAYS, LOG_ERR, "Could not execute %s: %s", command, strerror(errno)); else if(result) logger(DEBUG_ALWAYS, LOG_ERR, "%s exited with non-zero status %d", command, result); exit(result); @@ -349,63 +377,103 @@ static void do_outgoing_pipe(connection_t *c, char *command) { #endif } -bool do_outgoing_connection(connection_t *c) { +static void handle_meta_write(connection_t *c) { + if(c->outbuf.len <= c->outbuf.offset) + return; + + ssize_t outlen = send(c->socket, c->outbuf.data + c->outbuf.offset, c->outbuf.len - c->outbuf.offset, 0); + if(outlen <= 0) { + if(!errno || errno == EPIPE) { + logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection closed by %s (%s)", c->name, c->hostname); + } else if(sockwouldblock(sockerrno)) { + logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Sending %d bytes to %s (%s) would block", c->outbuf.len - c->outbuf.offset, c->name, c->hostname); + return; + } else { + logger(DEBUG_CONNECTIONS, LOG_ERR, "Could not send %d bytes of data to %s (%s): %s", c->outbuf.len - c->outbuf.offset, c->name, c->hostname, strerror(errno)); + } + + terminate_connection(c, c->status.active); + return; + } + + buffer_read(&c->outbuf, outlen); + if(!c->outbuf.len) + io_set(&c->io, IO_READ); +} + +static void handle_meta_io(void *data, int flags) { + connection_t *c = data; + + if(c->status.connecting) { + c->status.connecting = false; + + int result; + socklen_t len = sizeof result; + getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&result, &len); + + if(!result) + finish_connecting(c); + else { + logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Error while connecting to %s (%s): %s", c->name, c->hostname, sockstrerror(result)); + terminate_connection(c, false); + return; + } + } + + if(flags & IO_WRITE) + handle_meta_write(c); + else + handle_meta_connection_data(c); +} + +bool do_outgoing_connection(outgoing_t *outgoing) { char *address, *port, *space; struct addrinfo *proxyai = NULL; int result; - if(!c->outgoing) { - logger(DEBUG_ALWAYS, LOG_ERR, "do_outgoing_connection() for %s called without c->outgoing", c->name); - abort(); - } - begin: - if(!c->outgoing->ai) { - if(!c->outgoing->cfg) { - logger(DEBUG_CONNECTIONS, LOG_ERR, "Could not set up a meta connection to %s", - c->name); - retry_outgoing(c->outgoing); - c->outgoing = NULL; - connection_del(c); + if(!outgoing->ai) { + if(!outgoing->cfg) { + logger(DEBUG_CONNECTIONS, LOG_ERR, "Could not set up a meta connection to %s", outgoing->name); + retry_outgoing(outgoing); return false; } - get_config_string(c->outgoing->cfg, &address); + get_config_string(outgoing->cfg, &address); space = strchr(address, ' '); if(space) { port = xstrdup(space + 1); *space = 0; } else { - if(!get_config_string(lookup_config(c->config_tree, "Port"), &port)) + if(!get_config_string(lookup_config(outgoing->config_tree, "Port"), &port)) port = xstrdup("655"); } - c->outgoing->ai = str2addrinfo(address, port, SOCK_STREAM); + outgoing->ai = str2addrinfo(address, port, SOCK_STREAM); free(address); free(port); - c->outgoing->aip = c->outgoing->ai; - c->outgoing->cfg = lookup_config_next(c->config_tree, c->outgoing->cfg); + outgoing->aip = outgoing->ai; + outgoing->cfg = lookup_config_next(outgoing->config_tree, outgoing->cfg); } - if(!c->outgoing->aip) { - if(c->outgoing->ai) - freeaddrinfo(c->outgoing->ai); - c->outgoing->ai = NULL; + if(!outgoing->aip) { + if(outgoing->ai) + freeaddrinfo(outgoing->ai); + outgoing->ai = NULL; goto begin; } - memcpy(&c->address, c->outgoing->aip->ai_addr, c->outgoing->aip->ai_addrlen); - c->outgoing->aip = c->outgoing->aip->ai_next; + connection_t *c = new_connection(); + c->outgoing = outgoing; - if(c->hostname) - free(c->hostname); + memcpy(&c->address, outgoing->aip->ai_addr, outgoing->aip->ai_addrlen); + outgoing->aip = outgoing->aip->ai_next; c->hostname = sockaddr2hostname(&c->address); - logger(DEBUG_CONNECTIONS, LOG_INFO, "Trying to connect to %s (%s)", c->name, - c->hostname); + logger(DEBUG_CONNECTIONS, LOG_INFO, "Trying to connect to %s (%s)", outgoing->name, c->hostname); if(!proxytype) { c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP); @@ -414,14 +482,18 @@ begin: do_outgoing_pipe(c, proxyhost); } else { proxyai = str2addrinfo(proxyhost, proxyport, SOCK_STREAM); - if(!proxyai) + if(!proxyai) { + free_connection(c); goto begin; + } logger(DEBUG_CONNECTIONS, LOG_INFO, "Using proxy at %s port %s", proxyhost, proxyport); c->socket = socket(proxyai->ai_family, SOCK_STREAM, IPPROTO_TCP); + configure_tcp(c); } if(c->socket == -1) { logger(DEBUG_CONNECTIONS, LOG_ERR, "Creating socket for %s failed: %s", c->hostname, sockstrerror(sockerrno)); + free_connection(c); goto begin; } @@ -437,6 +509,7 @@ begin: #endif bind_to_interface(c->socket); + bind_to_address(c); } /* Connect */ @@ -450,97 +523,163 @@ begin: freeaddrinfo(proxyai); } - if(result == -1) { - if(sockinprogress(sockerrno)) { - c->status.connecting = true; - return true; - } - - closesocket(c->socket); - - logger(DEBUG_CONNECTIONS, LOG_ERR, "%s: %s", c->hostname, sockstrerror(sockerrno)); + if(result == -1 && !sockinprogress(sockerrno)) { + logger(DEBUG_CONNECTIONS, LOG_ERR, "Could not connect to %s (%s): %s", outgoing->name, c->hostname, sockstrerror(sockerrno)); + free_connection(c); goto begin; } - finish_connecting(c); + /* Now that there is a working socket, fill in the rest and register this connection. */ + + c->status.connecting = true; + c->name = xstrdup(outgoing->name); + c->outcipher = myself->connection->outcipher; + c->outdigest = myself->connection->outdigest; + c->outmaclength = myself->connection->outmaclength; + c->outcompression = myself->connection->outcompression; + c->last_ping_time = now.tv_sec; + + connection_add(c); + + io_add(&c->io, handle_meta_io, c, c->socket, IO_READ|IO_WRITE); return true; } -static void handle_meta_write(int sock, short events, void *data) { - connection_t *c = data; +void setup_outgoing_connection(outgoing_t *outgoing) { + timeout_del(&outgoing->ev); - ssize_t outlen = send(c->socket, c->outbuf.data + c->outbuf.offset, c->outbuf.len - c->outbuf.offset, 0); - if(outlen <= 0) { - logger(DEBUG_ALWAYS, LOG_ERR, "Onoes, outlen = %d (%s)", (int)outlen, strerror(errno)); - terminate_connection(c, c->status.active); + node_t *n = lookup_node(outgoing->name); + + if(n && n->connection) { + logger(DEBUG_CONNECTIONS, LOG_INFO, "Already connected to %s", outgoing->name); + + n->connection->outgoing = outgoing; return; } - buffer_read(&c->outbuf, outlen); - if(!c->outbuf.len && event_initialized(&c->outevent)) - event_del(&c->outevent); + init_configuration(&outgoing->config_tree); + read_host_config(outgoing->config_tree, outgoing->name); + outgoing->cfg = lookup_config(outgoing->config_tree, "Address"); + + if(!outgoing->cfg) { + logger(DEBUG_ALWAYS, LOG_ERR, "No address specified for %s", outgoing->name); + return; + } + + do_outgoing_connection(outgoing); } -void setup_outgoing_connection(outgoing_t *outgoing) { +/* + accept a new tcp connect and create a + new connection +*/ +void handle_new_meta_connection(void *data, int flags) { + listen_socket_t *l = data; connection_t *c; - node_t *n; + sockaddr_t sa; + int fd; + socklen_t len = sizeof sa; + + fd = accept(l->tcp.fd, &sa.sa, &len); + + if(fd < 0) { + logger(DEBUG_ALWAYS, LOG_ERR, "Accepting a new connection failed: %s", sockstrerror(sockerrno)); + return; + } + + sockaddrunmap(&sa); + + // Check if we get many connections from the same host + + static sockaddr_t prev_sa; + static time_t prev_time; + static int tarpit = -1; + + if(tarpit >= 0) { + closesocket(tarpit); + tarpit = -1; + } - if(event_initialized(&outgoing->ev)) - event_del(&outgoing->ev); + if(!sockaddrcmp_noport(&sa, &prev_sa)) { + static int samehost_burst; + static int samehost_burst_time; - n = lookup_node(outgoing->name); + if(now.tv_sec - samehost_burst_time > samehost_burst) + samehost_burst = 0; + else + samehost_burst -= now.tv_sec - samehost_burst_time; - if(n) - if(n->connection) { - logger(DEBUG_CONNECTIONS, LOG_INFO, "Already connected to %s", outgoing->name); + samehost_burst_time = now.tv_sec; + samehost_burst++; - n->connection->outgoing = outgoing; + if(samehost_burst > max_connection_burst) { + tarpit = fd; return; } + } + + memcpy(&prev_sa, &sa, sizeof sa); + prev_time = now.tv_sec; + + // Check if we get many connections from different hosts + + static int connection_burst; + static int connection_burst_time; + + if(now.tv_sec - connection_burst_time > connection_burst) + connection_burst = 0; + else + connection_burst -= now.tv_sec - connection_burst_time; + + connection_burst_time = now.tv_sec; + connection_burst++; + + if(connection_burst >= max_connection_burst) { + connection_burst = max_connection_burst; + tarpit = fd; + return; + } + + // Accept the new connection c = new_connection(); - c->name = xstrdup(outgoing->name); + c->name = xstrdup(""); c->outcipher = myself->connection->outcipher; c->outdigest = myself->connection->outdigest; c->outmaclength = myself->connection->outmaclength; c->outcompression = myself->connection->outcompression; - init_configuration(&c->config_tree); - read_connection_config(c); + c->address = sa; + c->hostname = sockaddr2hostname(&sa); + c->socket = fd; + c->last_ping_time = now.tv_sec; - outgoing->cfg = lookup_config(c->config_tree, "Address"); + logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection from %s", c->hostname); - if(!outgoing->cfg) { - logger(DEBUG_ALWAYS, LOG_ERR, "No address specified for %s", c->name); - free_connection(c); - return; - } + io_add(&c->io, handle_meta_io, c, c->socket, IO_READ); - c->outgoing = outgoing; - c->last_ping_time = time(NULL); + configure_tcp(c); connection_add(c); - if (do_outgoing_connection(c)) { - event_set(&c->inevent, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c); - event_set(&c->outevent, c->socket, EV_WRITE | EV_PERSIST, handle_meta_write, c); - event_add(&c->inevent, NULL); - } + c->allow_request = ID; + send_id(c); } +#ifndef HAVE_MINGW /* - accept a new tcp connect and create a - new connection + accept a new UNIX socket connection */ -void handle_new_meta_connection(int sock, short events, void *data) { +void handle_new_unix_connection(void *data, int flags) { + io_t *io = data; connection_t *c; sockaddr_t sa; int fd; socklen_t len = sizeof sa; - fd = accept(sock, &sa.sa, &len); + fd = accept(io->fd, &sa.sa, &len); if(fd < 0) { logger(DEBUG_ALWAYS, LOG_ERR, "Accepting a new connection failed: %s", sockstrerror(sockerrno)); @@ -550,35 +689,33 @@ void handle_new_meta_connection(int sock, short events, void *data) { sockaddrunmap(&sa); c = new_connection(); - c->name = xstrdup(""); - c->outcipher = myself->connection->outcipher; - c->outdigest = myself->connection->outdigest; - c->outmaclength = myself->connection->outmaclength; - c->outcompression = myself->connection->outcompression; - + c->name = xstrdup(""); c->address = sa; - c->hostname = sockaddr2hostname(&sa); + c->hostname = xstrdup("localhost port unix"); c->socket = fd; - c->last_ping_time = time(NULL); + c->last_ping_time = now.tv_sec; logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection from %s", c->hostname); - event_set(&c->inevent, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c); - event_set(&c->outevent, c->socket, EV_WRITE | EV_PERSIST, handle_meta_write, c); - event_add(&c->inevent, NULL); - - configure_tcp(c); + io_add(&c->io, handle_meta_io, c, c->socket, IO_READ); connection_add(c); c->allow_request = ID; + send_id(c); } +#endif static void free_outgoing(outgoing_t *outgoing) { + timeout_del(&outgoing->ev); + if(outgoing->ai) freeaddrinfo(outgoing->ai); + if(outgoing->config_tree) + exit_configuration(&outgoing->config_tree); + if(outgoing->name) free(outgoing->name); @@ -586,13 +723,19 @@ static void free_outgoing(outgoing_t *outgoing) { } void try_outgoing_connections(void) { - static config_t *cfg = NULL; - char *name; - outgoing_t *outgoing; - - outgoing_list = list_alloc((list_action_t)free_outgoing); - - for(cfg = lookup_config(config_tree, "ConnectTo"); cfg; cfg = lookup_config_next(config_tree, cfg)) { + /* If there is no outgoing list yet, create one. Otherwise, mark all outgoings as deleted. */ + + if(!outgoing_list) { + outgoing_list = list_alloc((list_action_t)free_outgoing); + } else { + for list_each(outgoing_t, outgoing, outgoing_list) + outgoing->timeout = -1; + } + + /* Make sure there is one outgoing_t in the list for each ConnectTo. */ + + for(config_t *cfg = lookup_config(config_tree, "ConnectTo"); cfg; cfg = lookup_config_next(config_tree, cfg)) { + char *name; get_config_string(cfg, &name); if(!check_id(name)) { @@ -603,9 +746,37 @@ void try_outgoing_connections(void) { continue; } - outgoing = xmalloc_and_zero(sizeof *outgoing); - outgoing->name = name; - list_insert_tail(outgoing_list, outgoing); - setup_outgoing_connection(outgoing); + bool found = false; + + for list_each(outgoing_t, outgoing, outgoing_list) { + if(!strcmp(outgoing->name, name)) { + found = true; + outgoing->timeout = 0; + break; + } + } + + if(!found) { + outgoing_t *outgoing = xzalloc(sizeof *outgoing); + outgoing->name = name; + list_insert_tail(outgoing_list, outgoing); + setup_outgoing_connection(outgoing); + } } + + /* Terminate any connections whose outgoing_t is to be deleted. */ + + for list_each(connection_t, c, connection_list) { + if(c->outgoing && c->outgoing->timeout == -1) { + c->outgoing = NULL; + logger(DEBUG_CONNECTIONS, LOG_INFO, "No more outgoing connection to %s", c->name); + terminate_connection(c, c->status.active); + } + } + + /* Delete outgoing_ts for which there is no ConnectTo. */ + + for list_each(outgoing_t, outgoing, outgoing_list) + if(outgoing->timeout == -1) + list_delete_node(outgoing_list, node); }