X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_socket.c;h=2dfaa2f0b1831a2f14f137a297761c9a63be1c43;hb=5a132550deb58473285e5f91705d286aef47be71;hp=808e1c660d0c8ef36a0c06475e5d6b045e7c5638;hpb=911c05f873ad967c40d04aa7347b1067fe62c055;p=tinc diff --git a/src/net_socket.c b/src/net_socket.c index 808e1c66..2dfaa2f0 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-2007 Guus Sliepen + 2000-2009 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 @@ -33,6 +33,8 @@ #include "utils.h" #include "xalloc.h" +#include + #ifdef WSAEINPROGRESS #define EINPROGRESS WSAEINPROGRESS #endif @@ -48,6 +50,7 @@ int seconds_till_retry = 5; listen_socket_t listen_socket[MAXSOCKETS]; int listen_sockets; +list_t *outgoing_list = NULL; /* Setup sockets */ @@ -79,7 +82,95 @@ static void configure_tcp(connection_t *c) { #endif } -int setup_listen_socket(const sockaddr_t *sa) { +static bool bind_to_interface(int sd) { /* {{{ */ + char *iface; + +#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE) + struct ifreq ifr; + int status; +#endif /* defined(SOL_SOCKET) && defined(SO_BINDTODEVICE) */ + + if(!get_config_string (lookup_config (config_tree, "BindToInterface"), &iface)) + return true; + +#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE) + memset(&ifr, 0, sizeof(ifr)); + strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ); + ifr.ifr_ifrn.ifrn_name[IFNAMSIZ - 1] = 0; + + status = setsockopt(sd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr)); + if(status) { + logger(LOG_ERR, _("Can't bind to interface %s: %s"), iface, + strerror(errno)); + return false; + } +#else /* if !defined(SOL_SOCKET) || !defined(SO_BINDTODEVICE) */ + logger(LOG_WARNING, _("%s not supported on this platform"), "BindToInterface"); +#endif + + return true; +} /* }}} bool bind_to_interface */ + +static bool bind_to_address(connection_t *c) { /* {{{ */ + char *node; + struct addrinfo *ai_list; + struct addrinfo *ai_ptr; + struct addrinfo ai_hints; + int status; + + assert(c != NULL); + assert(c->socket >= 0); + + node = NULL; + if(!get_config_string(lookup_config(config_tree, "BindToAddress"), + &node)) + return true; + + assert(node != NULL); + + memset(&ai_hints, 0, sizeof(ai_hints)); + ai_hints.ai_family = c->address.sa.sa_family; + /* We're called from `do_outgoing_connection' only. */ + ai_hints.ai_socktype = SOCK_STREAM; + ai_hints.ai_protocol = IPPROTO_TCP; + + ai_list = NULL; + + status = getaddrinfo(node, /* service = */ NULL, + &ai_hints, &ai_list); + if(status) { + free(node); + logger(LOG_WARNING, _("Error looking up %s port %s: %s"), + node, _("any"), gai_strerror(status)); + return false; + } + assert(ai_list != NULL); + + status = -1; + for(ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next) { + status = bind(c->socket, + ai_list->ai_addr, ai_list->ai_addrlen); + if(!status) + break; + } + + + if(status) { + logger(LOG_ERR, _("Can't bind to %s/tcp: %s"), node, + strerror(errno)); + } else ifdebug(CONNECTIONS) { + logger(LOG_DEBUG, "Successfully bound outgoing " + "TCP socket to %s", node); + } + + free(node); + freeaddrinfo(ai_list); + + return status ? false : true; +} /* }}} bool bind_to_address */ + +int setup_listen_socket(const sockaddr_t *sa) +{ int nfd; char *addrstr; int option; @@ -119,7 +210,7 @@ int setup_listen_socket(const sockaddr_t *sa) { return -1; } #else - logger(LOG_WARNING, _("BindToInterface not supported on this platform")); + logger(LOG_WARNING, _("%s not supported on this platform"), "BindToInterface"); #endif } @@ -188,45 +279,23 @@ int setup_vpn_in_socket(const sockaddr_t *sa) { #endif #if defined(SOL_IP) && defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO) - { - bool choice; - - if(get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice) && choice) { - option = IP_PMTUDISC_DO; - setsockopt(nfd, SOL_IP, IP_MTU_DISCOVER, &option, sizeof option); - } + if(myself->options & OPTION_PMTU_DISCOVERY) { + option = IP_PMTUDISC_DO; + setsockopt(nfd, SOL_IP, IP_MTU_DISCOVER, &option, sizeof(option)); } #endif #if defined(SOL_IPV6) && defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO) - { - bool choice; - - if(get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice) && choice) { - option = IPV6_PMTUDISC_DO; - setsockopt(nfd, SOL_IPV6, IPV6_MTU_DISCOVER, &option, sizeof option); - } + if(myself->options & OPTION_PMTU_DISCOVERY) { + option = IPV6_PMTUDISC_DO; + setsockopt(nfd, SOL_IPV6, IPV6_MTU_DISCOVER, &option, sizeof(option)); } #endif -#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE) - { - char *iface; - struct ifreq ifr; - - if(get_config_string(lookup_config(config_tree, "BindToInterface"), &iface)) { - memset(&ifr, 0, sizeof ifr); - strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ); - - if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof ifr)) { - closesocket(nfd); - logger(LOG_ERR, _("Can't bind to interface %s: %s"), iface, - strerror(errno)); - return -1; - } - } + if (!bind_to_interface(nfd)) { + closesocket(nfd); + return -1; } -#endif if(bind(nfd, &sa->sa, SALEN(sa->sa))) { closesocket(nfd); @@ -238,7 +307,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) { setup_outgoing_connection(data); @@ -336,6 +405,9 @@ begin: setsockopt(c->socket, SOL_IPV6, IPV6_V6ONLY, &option, sizeof option); #endif + bind_to_interface(c->socket); + bind_to_address(c); + /* Optimize TCP settings */ configure_tcp(c); @@ -412,8 +484,6 @@ void setup_outgoing_connection(outgoing_t *outgoing) { if(!outgoing->cfg) { logger(LOG_ERR, _("No address specified for %s"), c->name); free_connection(c); - free(outgoing->name); - free(outgoing); return; } @@ -486,13 +556,37 @@ void handle_new_meta_connection(int sock, short events, void *data) { send_id(c); } -void try_outgoing_connections(void) { +void free_outgoing(outgoing_t *outgoing) { + if(outgoing->ai) + freeaddrinfo(outgoing->ai); + + if(outgoing->name) + free(outgoing->name); + + free(outgoing); +} + +void try_outgoing_connections(void) +{ static config_t *cfg = NULL; char *name; outgoing_t *outgoing; - + connection_t *c; + splay_node_t *node; + cp(); + if(outgoing_list) { + for(node = connection_tree->head; node; node = node->next) { + c = node->data; + c->outgoing = NULL; + } + + list_delete_list(outgoing_list); + } + + outgoing_list = list_alloc((list_action_t)free_outgoing); + for(cfg = lookup_config(config_tree, "ConnectTo"); cfg; cfg = lookup_config_next(config_tree, cfg)) { get_config_string(cfg, &name); @@ -506,6 +600,7 @@ void try_outgoing_connections(void) { outgoing = xmalloc_and_zero(sizeof *outgoing); outgoing->name = name; + list_insert_tail(outgoing_list, outgoing); setup_outgoing_connection(outgoing); } }