X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fnet_socket.c;h=63bf49ea3c6f0511de3322e9d84e21d8ddcc5092;hp=374ba205b68ec6ebb42acc80151a2df1a35951fb;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=fd7e81983ca4cae7cdf2a67a35500284f17761c4 diff --git a/src/net_socket.c b/src/net_socket.c index 374ba205..63bf49ea 100644 --- a/src/net_socket.c +++ b/src/net_socket.c @@ -72,186 +72,27 @@ static void configure_tcp(connection_t *c) { #endif } -static bool bind_to_address(meshlink_handle_t *mesh, connection_t *c) { - int s = -1; - - for(int i = 0; i < mesh->listen_sockets && mesh->listen_socket[i].bindto; i++) { - if(mesh->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 = mesh->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(mesh, MESHLINK_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; - int option; - - nfd = socket(sa->sa.sa_family, SOCK_STREAM, IPPROTO_TCP); - - if(nfd < 0) { - logger(NULL, MESHLINK_ERROR, "Creating metasocket failed: %s", sockstrerror(sockerrno)); - return -1; - } - -#ifdef FD_CLOEXEC - fcntl(nfd, F_SETFD, FD_CLOEXEC); -#endif - - /* Optimize TCP settings */ - - option = 1; - setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof(option)); - -#if defined(IPV6_V6ONLY) - - if(sa->sa.sa_family == AF_INET6) { - setsockopt(nfd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&option, sizeof(option)); - } - -#else -#warning IPV6_V6ONLY not defined -#endif - - if(bind(nfd, &sa->sa, SALEN(sa->sa))) { - closesocket(nfd); - addrstr = sockaddr2hostname(sa); - logger(NULL, MESHLINK_ERROR, "Can't bind to %s/tcp: %s", addrstr, sockstrerror(sockerrno)); - free(addrstr); - return -1; - } - - if(listen(nfd, 3)) { - closesocket(nfd); - logger(NULL, MESHLINK_ERROR, "System call `%s' failed: %s", "listen", sockstrerror(sockerrno)); - return -1; - } - - return nfd; -} - -int setup_vpn_in_socket(meshlink_handle_t *mesh, const sockaddr_t *sa) { - int nfd; - char *addrstr; - int option; - - nfd = socket(sa->sa.sa_family, SOCK_DGRAM, IPPROTO_UDP); - - if(nfd < 0) { - logger(mesh, MESHLINK_ERROR, "Creating UDP socket failed: %s", sockstrerror(sockerrno)); - return -1; - } - -#ifdef FD_CLOEXEC - fcntl(nfd, F_SETFD, FD_CLOEXEC); -#endif - -#ifdef O_NONBLOCK - { - int flags = fcntl(nfd, F_GETFL); - - if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) { - closesocket(nfd); - logger(mesh, MESHLINK_ERROR, "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(mesh, MESHLINK_ERROR, "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_BROADCAST, (void *)&option, sizeof(option)); - -#if defined(IPV6_V6ONLY) - - if(sa->sa.sa_family == AF_INET6) { - setsockopt(nfd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&option, sizeof(option)); - } - -#endif - -#if defined(IP_DONTFRAG) && !defined(IP_DONTFRAGMENT) -#define IP_DONTFRAGMENT IP_DONTFRAG -#endif - -#if defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO) - option = IP_PMTUDISC_DO; - setsockopt(nfd, IPPROTO_IP, IP_MTU_DISCOVER, (void *)&option, sizeof(option)); -#elif defined(IP_DONTFRAGMENT) - option = 1; - setsockopt(nfd, IPPROTO_IP, IP_DONTFRAGMENT, (void *)&option, sizeof(option)); -#endif - -#if defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO) - option = IPV6_PMTUDISC_DO; - setsockopt(nfd, IPPROTO_IPV6, IPV6_MTU_DISCOVER, (void *)&option, sizeof(option)); -#elif defined(IPV6_DONTFRAG) - option = 1; - setsockopt(nfd, IPPROTO_IPV6, IPV6_DONTFRAG, (void *)&option, sizeof(option)); -#endif - - if(bind(nfd, &sa->sa, SALEN(sa->sa))) { - closesocket(nfd); - addrstr = sockaddr2hostname(sa); - logger(mesh, MESHLINK_ERROR, "Can't bind to %s/udp: %s", addrstr, sockstrerror(sockerrno)); - free(addrstr); - return -1; - } - - return nfd; -} /* int setup_vpn_in_socket */ - static void retry_outgoing_handler(event_loop_t *loop, void *data) { + assert(data); + meshlink_handle_t *mesh = loop->data; outgoing_t *outgoing = data; setup_outgoing_connection(mesh, outgoing); } void retry_outgoing(meshlink_handle_t *mesh, outgoing_t *outgoing) { - outgoing->timeout += 5; + if(!mesh->reachable && mesh->loop.now.tv_sec < mesh->last_unreachable + mesh->dev_class_traits[mesh->devclass].fast_retry_period) { + outgoing->timeout = 1; + } else { + outgoing->timeout += 5; + } if(outgoing->timeout > mesh->maxtimeout) { outgoing->timeout = mesh->maxtimeout; } - timeout_add(&mesh->loop, &outgoing->ev, retry_outgoing_handler, outgoing, &(struct timeval) { - outgoing->timeout, rand() % 100000 + timeout_add(&mesh->loop, &outgoing->ev, retry_outgoing_handler, outgoing, &(struct timespec) { + outgoing->timeout, prng(mesh, TIMER_FUDGE) }); logger(mesh, MESHLINK_INFO, "Trying to re-establish outgoing connection in %d seconds", outgoing->timeout); @@ -491,7 +332,7 @@ static bool get_next_outgoing_address(meshlink_handle_t *mesh, outgoing_t *outgo return false; } -bool do_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) { +void do_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) { struct addrinfo *proxyai = NULL; int result; @@ -505,7 +346,7 @@ begin: retry_outgoing(mesh, outgoing); } - return false; + return; } connection_t *c = new_connection(); @@ -556,8 +397,6 @@ begin: #endif - bind_to_address(mesh, c); - /* Connect */ if(!mesh->proxytype) { @@ -577,14 +416,27 @@ begin: /* Now that there is a working socket, fill in the rest and register this connection. */ c->status.connecting = true; + c->status.initiator = true; c->name = xstrdup(outgoing->node->name); c->last_ping_time = mesh->loop.now.tv_sec; connection_add(mesh, c); io_add(&mesh->loop, &c->io, handle_meta_io, c, c->socket, IO_READ | IO_WRITE); +} + +void reset_outgoing(outgoing_t *outgoing) { + if(outgoing->ai) { + if(outgoing->state == OUTGOING_RECENT || outgoing->state == OUTGOING_KNOWN) { + free_known_addresses(outgoing->ai); + } else { + freeaddrinfo(outgoing->ai); + } + } - return true; + outgoing->ai = NULL; + outgoing->aip = NULL; + outgoing->state = OUTGOING_START; } void setup_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) { @@ -597,16 +449,7 @@ void setup_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) { return; } - - if(outgoing->ai) { - if(outgoing->state == OUTGOING_RECENT || outgoing->state == OUTGOING_KNOWN) { - free_known_addresses(outgoing->ai); - } else { - freeaddrinfo(outgoing->ai); - } - } - - outgoing->state = OUTGOING_START; + reset_outgoing(outgoing); if(outgoing->node->status.blacklisted) { return;