X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_socket.c;h=5f9e2173e749355b88ed7ec0d523cca1adcda08d;hp=05485f8dc3a190b41d398266a8411205e3059f85;hb=0e945413315c9d15a3eb013fa3731dd978a8c7b8;hpb=5eca9520d93bced1275d45e5e2a933d69354cd6d diff --git a/src/net_socket.c b/src/net_socket.c index 05485f8d..5f9e2173 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-2002 Ivo Timmermans , - 2000-2002 Guus Sliepen + Copyright (C) 1998-2003 Ivo Timmermans , + 2000-2003 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 @@ -17,65 +17,28 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: net_socket.c,v 1.1.2.22 2002/09/15 14:55:53 guus Exp $ + $Id: net_socket.c,v 1.1.2.32 2003/07/28 22:06:09 guus Exp $ */ -#include "config.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -/* SunOS really wants sys/socket.h BEFORE net/if.h, - and FreeBSD wants these lines below the rest. */ -#include -#include -#include -#ifdef HAVE_NETINET_IN_SYSTM_H -#include -#endif -#ifdef HAVE_NETINET_IP_H -#include -#endif -#ifdef HAVE_NETINET_TCP_H -#include -#endif - -#include -#include -#include -#include +#include "system.h" +#include "avl_tree.h" #include "conf.h" #include "connection.h" +#include "event.h" +#include "logger.h" #include "meta.h" #include "net.h" #include "netutl.h" -#include "process.h" #include "protocol.h" -#include "subnet.h" -#include "graph.h" -#include "process.h" -#include "route.h" -#include "device.h" -#include "event.h" +#include "utils.h" +#include "xalloc.h" -#include "system.h" - -#ifndef HAVE_RAND_PSEUDO_BYTES -#define RAND_pseudo_bytes RAND_bytes +#ifdef WSAEINPROGRESS +#define EINPROGRESS WSAEINPROGRESS #endif -int addressfamily = AF_INET; +int addressfamily = AF_UNSPEC; int maxtimeout = 900; int seconds_till_retry = 5; @@ -84,13 +47,13 @@ int listen_sockets; /* Setup sockets */ -int setup_listen_socket(sockaddr_t *sa) +int setup_listen_socket(const sockaddr_t *sa) { int nfd, flags; char *addrstr; int option; -#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE) - char *interface; + char *iface; +#ifdef SO_BINDTODEVICE struct ifreq ifr; #endif @@ -99,18 +62,20 @@ int setup_listen_socket(sockaddr_t *sa) nfd = socket(sa->sa.sa_family, SOCK_STREAM, IPPROTO_TCP); if(nfd < 0) { - syslog(LOG_ERR, _("Creating metasocket failed: %s"), strerror(errno)); + logger(LOG_ERR, _("Creating metasocket failed: %s"), strerror(errno)); return -1; } +#ifdef O_NONBLOCK flags = fcntl(nfd, F_GETFL); if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) { close(nfd); - syslog(LOG_ERR, _("System call `%s' failed: %s"), "fcntl", + logger(LOG_ERR, _("System call `%s' failed: %s"), "fcntl", strerror(errno)); return -1; } +#endif /* Optimize TCP settings */ @@ -127,26 +92,26 @@ int setup_listen_socket(sockaddr_t *sa) #endif if(get_config_string - (lookup_config(config_tree, "BindToInterface"), &interface)) { + (lookup_config(config_tree, "BindToInterface"), &iface)) { #if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE) memset(&ifr, 0, sizeof(ifr)); - strncpy(ifr.ifr_ifrn.ifrn_name, interface, IFNAMSIZ); + strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ); if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) { close(nfd); - syslog(LOG_ERR, _("Can't bind to interface %s: %s"), interface, + logger(LOG_ERR, _("Can't bind to interface %s: %s"), iface, strerror(errno)); return -1; } #else - syslog(LOG_WARNING, _("BindToDevice not supported on this platform")); + logger(LOG_WARNING, _("BindToInterface not supported on this platform")); #endif } if(bind(nfd, &sa->sa, SALEN(sa->sa))) { close(nfd); addrstr = sockaddr2hostname(sa); - syslog(LOG_ERR, _("Can't bind to %s/tcp: %s"), addrstr, + logger(LOG_ERR, _("Can't bind to %s/tcp: %s"), addrstr, strerror(errno)); free(addrstr); return -1; @@ -154,7 +119,7 @@ int setup_listen_socket(sockaddr_t *sa) if(listen(nfd, 3)) { close(nfd); - syslog(LOG_ERR, _("System call `%s' failed: %s"), "listen", + logger(LOG_ERR, _("System call `%s' failed: %s"), "listen", strerror(errno)); return -1; } @@ -162,13 +127,13 @@ int setup_listen_socket(sockaddr_t *sa) return nfd; } -int setup_vpn_in_socket(sockaddr_t *sa) +int setup_vpn_in_socket(const sockaddr_t *sa) { int nfd, flags; char *addrstr; int option; #if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE) - char *interface; + char *iface; struct ifreq ifr; #endif @@ -177,30 +142,32 @@ int setup_vpn_in_socket(sockaddr_t *sa) nfd = socket(sa->sa.sa_family, SOCK_DGRAM, IPPROTO_UDP); if(nfd < 0) { - syslog(LOG_ERR, _("Creating UDP socket failed: %s"), strerror(errno)); + logger(LOG_ERR, _("Creating UDP socket failed: %s"), strerror(errno)); return -1; } +#ifdef O_NONBLOCK flags = fcntl(nfd, F_GETFL); if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) { close(nfd); - syslog(LOG_ERR, _("System call `%s' failed: %s"), "fcntl", + logger(LOG_ERR, _("System call `%s' failed: %s"), "fcntl", strerror(errno)); return -1; } +#endif option = 1; setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option)); #if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE) if(get_config_string - (lookup_config(config_tree, "BindToInterface"), &interface)) { + (lookup_config(config_tree, "BindToInterface"), &iface)) { memset(&ifr, 0, sizeof(ifr)); - strncpy(ifr.ifr_ifrn.ifrn_name, interface, IFNAMSIZ); + strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ); if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) { close(nfd); - syslog(LOG_ERR, _("Can't bind to interface %s: %s"), interface, + logger(LOG_ERR, _("Can't bind to interface %s: %s"), iface, strerror(errno)); return -1; } @@ -210,7 +177,7 @@ int setup_vpn_in_socket(sockaddr_t *sa) if(bind(nfd, &sa->sa, SALEN(sa->sa))) { close(nfd); addrstr = sockaddr2hostname(sa); - syslog(LOG_ERR, _("Can't bind to %s/udp: %s"), addrstr, + logger(LOG_ERR, _("Can't bind to %s/udp: %s"), addrstr, strerror(errno)); free(addrstr); return -1; @@ -236,64 +203,16 @@ void retry_outgoing(outgoing_t *outgoing) event->data = outgoing; event_add(event); - if(debug_lvl >= DEBUG_CONNECTIONS) - syslog(LOG_NOTICE, + ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), outgoing->timeout); } -int setup_outgoing_socket(connection_t *c) -{ - int option; - - cp(); - - if(debug_lvl >= DEBUG_CONNECTIONS) - syslog(LOG_INFO, _("Trying to connect to %s (%s)"), c->name, - c->hostname); - - c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP); - - if(c->socket == -1) { - syslog(LOG_ERR, _("Creating socket for %s failed: %s"), c->hostname, - strerror(errno)); - return -1; - } - - /* Optimize TCP settings */ - -#if defined(SOL_TCP) && defined(TCP_NODELAY) - option = 1; - setsockopt(c->socket, SOL_TCP, TCP_NODELAY, &option, sizeof(option)); -#endif - -#if defined(SOL_IP) && defined(IP_TOS) - option = IPTOS_LOWDELAY; - setsockopt(c->socket, SOL_IP, IP_TOS, &option, sizeof(option)); -#endif - - /* Connect */ - - if(connect(c->socket, &c->address.sa, SALEN(c->address.sa)) == -1) { - close(c->socket); - syslog(LOG_ERR, _("Error while connecting to %s (%s): %s"), c->name, - c->hostname, strerror(errno)); - return -1; - } - - if(debug_lvl >= DEBUG_CONNECTIONS) - syslog(LOG_INFO, _("Connected to %s (%s)"), c->name, c->hostname); - - return 0; -} - - void finish_connecting(connection_t *c) { cp(); - if(debug_lvl >= DEBUG_CONNECTIONS) - syslog(LOG_INFO, _("Connected to %s (%s)"), c->name, c->hostname); + ifdebug(CONNECTIONS) logger(LOG_INFO, _("Connected to %s (%s)"), c->name, c->hostname); c->last_ping_time = now; @@ -310,10 +229,9 @@ void do_outgoing_connection(connection_t *c) begin: if(!c->outgoing->ai) { if(!c->outgoing->cfg) { - if(debug_lvl >= DEBUG_CONNECTIONS) - syslog(LOG_ERR, _("Could not set up a meta connection to %s"), + ifdebug(CONNECTIONS) logger(LOG_ERR, _("Could not set up a meta connection to %s"), c->name); - c->status.remove = 1; + c->status.remove = true; retry_outgoing(c->outgoing); return; } @@ -346,15 +264,13 @@ begin: c->hostname = sockaddr2hostname(&c->address); - if(debug_lvl >= DEBUG_CONNECTIONS) - syslog(LOG_INFO, _("Trying to connect to %s (%s)"), c->name, + ifdebug(CONNECTIONS) logger(LOG_INFO, _("Trying to connect to %s (%s)"), c->name, c->hostname); c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP); if(c->socket == -1) { - if(debug_lvl >= DEBUG_CONNECTIONS) - syslog(LOG_ERR, _("Creating socket for %s failed: %s"), c->hostname, + ifdebug(CONNECTIONS) logger(LOG_ERR, _("Creating socket for %s failed: %s"), c->hostname, strerror(errno)); goto begin; @@ -374,11 +290,13 @@ begin: /* Non-blocking */ +#ifdef O_NONBLOCK flags = fcntl(c->socket, F_GETFL); if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0) { - syslog(LOG_ERR, _("fcntl for %s: %s"), c->hostname, strerror(errno)); + logger(LOG_ERR, _("fcntl for %s: %s"), c->hostname, strerror(errno)); } +#endif /* Connect */ @@ -386,14 +304,13 @@ begin: if(result == -1) { if(errno == EINPROGRESS) { - c->status.connecting = 1; + c->status.connecting = true; return; } close(c->socket); - if(debug_lvl >= DEBUG_CONNECTIONS) - syslog(LOG_ERR, _("%s: %s"), c->hostname, strerror(errno)); + ifdebug(CONNECTIONS) logger(LOG_ERR, _("%s: %s"), c->hostname, strerror(errno)); goto begin; } @@ -414,8 +331,7 @@ void setup_outgoing_connection(outgoing_t *outgoing) if(n) if(n->connection) { - if(debug_lvl >= DEBUG_CONNECTIONS) - syslog(LOG_INFO, _("Already connected to %s"), outgoing->name); + ifdebug(CONNECTIONS) logger(LOG_INFO, _("Already connected to %s"), outgoing->name); n->connection->outgoing = outgoing; return; @@ -434,7 +350,7 @@ void setup_outgoing_connection(outgoing_t *outgoing) outgoing->cfg = lookup_config(c->config_tree, "Address"); if(!outgoing->cfg) { - syslog(LOG_ERR, _("No address specified for %s"), c->name); + logger(LOG_ERR, _("No address specified for %s"), c->name); free_connection(c); free(outgoing->name); free(outgoing); @@ -453,7 +369,7 @@ void setup_outgoing_connection(outgoing_t *outgoing) accept a new tcp connect and create a new connection */ -int handle_new_meta_connection(int sock) +bool handle_new_meta_connection(int sock) { connection_t *c; sockaddr_t sa; @@ -464,9 +380,9 @@ int handle_new_meta_connection(int sock) fd = accept(sock, &sa.sa, &len); if(fd < 0) { - syslog(LOG_ERR, _("Accepting a new connection failed: %s"), + logger(LOG_ERR, _("Accepting a new connection failed: %s"), strerror(errno)); - return -1; + return false; } sockaddrunmap(&sa); @@ -482,15 +398,14 @@ int handle_new_meta_connection(int sock) c->socket = fd; c->last_ping_time = now; - if(debug_lvl >= DEBUG_CONNECTIONS) - syslog(LOG_NOTICE, _("Connection from %s"), c->hostname); + ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection from %s"), c->hostname); connection_add(c); c->allow_request = ID; send_id(c); - return 0; + return true; } void try_outgoing_connections(void) @@ -505,8 +420,8 @@ void try_outgoing_connections(void) cfg = lookup_config_next(config_tree, cfg)) { get_config_string(cfg, &name); - if(check_id(name)) { - syslog(LOG_ERR, + if(!check_id(name)) { + logger(LOG_ERR, _("Invalid name for outgoing connection in %s line %d"), cfg->file, cfg->line); free(name);