From f93b1334e087dd7af1b87f475b2d398fdd4d56ab Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Fri, 1 Mar 2002 13:18:54 +0000 Subject: [PATCH] Create/bind TCP and UDP listening sockets in pairs. --- src/net.c | 26 +++++++++++------------ src/net.h | 5 ++--- src/net_setup.c | 54 ++++++++++++++++-------------------------------- src/net_socket.c | 5 ++--- 4 files changed, 35 insertions(+), 55 deletions(-) diff --git a/src/net.c b/src/net.c index fb70dee4..5632727a 100644 --- a/src/net.c +++ b/src/net.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: net.c,v 1.35.4.158 2002/02/26 23:26:41 guus Exp $ + $Id: net.c,v 1.35.4.159 2002/03/01 13:18:54 guus Exp $ */ #include "config.h" @@ -90,11 +90,11 @@ cp FD_SET(c->socket, fs); } - for(i = 0; i < tcp_sockets; i++) - FD_SET(tcp_socket[i], fs); - - for(i = 0; i < udp_sockets; i++) - FD_SET(udp_socket[i], fs); + for(i = 0; i < listen_sockets; i++) + { + FD_SET(tcp_socket[i], fs); + FD_SET(udp_socket[i], fs); + } FD_SET(device_fd, fs); cp @@ -286,9 +286,13 @@ cp route_outgoing(&packet); } - for(i = 0; i < udp_sockets; i++) - if(FD_ISSET(udp_socket[i], f)) - handle_incoming_vpn_data(udp_socket[i]); + for(i = 0; i < listen_sockets; i++) + { + if(FD_ISSET(udp_socket[i], f)) + handle_incoming_vpn_data(udp_socket[i]); + if(FD_ISSET(tcp_socket[i], f)) + handle_new_meta_connection(tcp_socket[i]); + } for(node = connection_tree->head; node; node = node->next) { @@ -321,10 +325,6 @@ cp } } } - - for(i = 0; i < tcp_sockets; i++) - if(FD_ISSET(tcp_socket[i], f)) - handle_new_meta_connection(tcp_socket[i]); cp } diff --git a/src/net.h b/src/net.h index 0dc81817..6a981186 100644 --- a/src/net.h +++ b/src/net.h @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: net.h,v 1.9.4.44 2002/03/01 12:26:56 guus Exp $ + $Id: net.h,v 1.9.4.45 2002/03/01 13:18:54 guus Exp $ */ #ifndef __TINC_NET_H__ @@ -109,8 +109,7 @@ extern char *status_text[]; extern int tcp_socket[MAXSOCKETS]; extern int udp_socket[MAXSOCKETS]; -extern int tcp_sockets; -extern int udp_sockets; +extern int listen_sockets; extern int keyexpires; extern int keylifetime; extern int do_prune; diff --git a/src/net_setup.c b/src/net_setup.c index 6278f5d6..6887fe34 100644 --- a/src/net_setup.c +++ b/src/net_setup.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: net_setup.c,v 1.1.2.6 2002/03/01 12:25:58 guus Exp $ + $Id: net_setup.c,v 1.1.2.7 2002/03/01 13:18:54 guus Exp $ */ #include "config.h" @@ -221,7 +221,7 @@ int setup_myself(void) subnet_t *subnet; char *name, *hostname, *mode, *afname, *cipher, *digest; struct addrinfo hint, *ai, *aip; - int choice, err, sock; + int choice, err; cp myself = new_node(); myself->connection = new_connection(); @@ -477,52 +477,33 @@ cp return -1; } - tcp_sockets = 0; - for(aip = ai; aip; aip = aip->ai_next) { - if((sock = setup_listen_socket((sockaddr_t *)aip->ai_addr)) < 0) + if((tcp_socket[listen_sockets] = setup_listen_socket((sockaddr_t *)aip->ai_addr)) < 0) + continue; + + if((udp_socket[listen_sockets] = setup_vpn_in_socket((sockaddr_t *)aip->ai_addr)) < 0) continue; - tcp_socket[tcp_sockets++] = sock; if(debug_lvl >= DEBUG_CONNECTIONS) { hostname = sockaddr2hostname((sockaddr_t *)aip->ai_addr); - syslog(LOG_NOTICE, _("Listening on %s/tcp"), hostname); + syslog(LOG_NOTICE, _("Listening on %s"), hostname); free(hostname); } + + listen_sockets++; } freeaddrinfo(ai); - hint.ai_socktype = SOCK_DGRAM; - hint.ai_protocol = IPPROTO_UDP; - - if((err = getaddrinfo(NULL, myport, &hint, &ai)) || !ai) + if(listen_sockets) + syslog(LOG_NOTICE, _("Ready")); + else { - syslog(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", gai_strerror(err)); + syslog(LOG_ERR, _("Unable to create any listening socket!")); return -1; } - - udp_sockets = 0; - - for(aip = ai; aip; aip = aip->ai_next) - { - if((sock = setup_vpn_in_socket((sockaddr_t *)aip->ai_addr)) < 0) - continue; - - udp_socket[udp_sockets++] = sock; - if(debug_lvl >= DEBUG_CONNECTIONS) - { - hostname = sockaddr2hostname((sockaddr_t *)aip->ai_addr); - syslog(LOG_NOTICE, _("Listening on %s/udp"), hostname); - free(hostname); - } - } - - freeaddrinfo(ai); - - syslog(LOG_NOTICE, _("Ready")); cp return 0; } @@ -584,10 +565,11 @@ cp if(myself && myself->connection) terminate_connection(myself->connection, 0); - for(i = 0; i < udp_sockets; i++) - close(udp_socket[i]); - for(i = 0; i < tcp_sockets; i++) - close(tcp_socket[i]); + for(i = 0; i < listen_sockets; i++) + { + close(udp_socket[i]); + close(tcp_socket[i]); + } exit_events(); exit_edges(); diff --git a/src/net_socket.c b/src/net_socket.c index fdeac79a..39bbbaa8 100644 --- a/src/net_socket.c +++ b/src/net_socket.c @@ -17,7 +17,7 @@ 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.5 2002/03/01 11:18:34 guus Exp $ + $Id: net_socket.c,v 1.1.2.6 2002/03/01 13:18:54 guus Exp $ */ #include "config.h" @@ -72,8 +72,7 @@ int seconds_till_retry = 5; int tcp_socket[MAXSOCKETS]; int udp_socket[MAXSOCKETS]; -int tcp_sockets = 0; -int udp_sockets = 0; +int listen_sockets = 0; /* Setup sockets */ -- 2.20.1