X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_socket.c;h=1b55c9423e74744a37390167e44218d4de42b5ed;hb=6ea1dfc995f386b3a9406c7935642524dc755c51;hp=c691780e800f1a063d84cc531086a7b010ac2ae6;hpb=df3220a1549f992cbf4a9b6e67c1e67b69896c7d;p=tinc diff --git a/src/net_socket.c b/src/net_socket.c index c691780e..1b55c942 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-2005 Guus Sliepen + Copyright (C) 1998-2005 Ivo Timmermans, + 2000-2007 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 @@ -25,7 +25,7 @@ #include "avl_tree.h" #include "conf.h" #include "connection.h" -#include "event.h" +#include "tevent.h" #include "logger.h" #include "meta.h" #include "net.h" @@ -38,16 +38,49 @@ #define EINPROGRESS WSAEINPROGRESS #endif +/* Needed on Mac OS/X */ +#ifndef SOL_TCP +#define SOL_TCP IPPROTO_TCP +#endif + int addressfamily = AF_UNSPEC; int maxtimeout = 900; int seconds_till_retry = 5; -bool blockingtcp = false; listen_socket_t listen_socket[MAXSOCKETS]; int listen_sockets; /* Setup sockets */ +static void configure_tcp(connection_t *c) +{ + int option; + +#ifdef O_NONBLOCK + int flags = fcntl(c->socket, F_GETFL); + + if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0) { + logger(LOG_ERR, _("fcntl for %s: %s"), c->hostname, strerror(errno)); + } +#elif defined(WIN32) + unsigned long arg = 1; + + if(ioctlsocket(c->socket, FIONBIO, &arg) != 0) { + logger(LOG_ERR, _("ioctlsocket for %s: WSA error %d"), c->hostname, WSAGetLastError()); + } +#endif + +#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) && defined(IPTOS_LOWDELAY) + option = IPTOS_LOWDELAY; + setsockopt(c->socket, SOL_IP, IP_TOS, &option, sizeof(option)); +#endif +} + int setup_listen_socket(const sockaddr_t *sa) { int nfd; @@ -64,33 +97,11 @@ int setup_listen_socket(const sockaddr_t *sa) return -1; } -#ifdef O_NONBLOCK - { - int flags = fcntl(nfd, F_GETFL); - - if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) { - closesocket(nfd); - logger(LOG_ERR, _("System call `%s' failed: %s"), "fcntl", - strerror(errno)); - return -1; - } - } -#endif - /* Optimize TCP settings */ option = 1; setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option)); -#if defined(SOL_TCP) && defined(TCP_NODELAY) - setsockopt(nfd, SOL_TCP, TCP_NODELAY, &option, sizeof(option)); -#endif - -#if defined(SOL_IP) && defined(IP_TOS) && defined(IPTOS_LOWDELAY) - option = IPTOS_LOWDELAY; - setsockopt(nfd, SOL_IP, IP_TOS, &option, sizeof(option)); -#endif - if(get_config_string (lookup_config(config_tree, "BindToInterface"), &iface)) { #if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE) @@ -155,6 +166,16 @@ int setup_vpn_in_socket(const sockaddr_t *sa) return -1; } } +#elif defined(WIN32) + { + unsigned long arg = 1; + if(ioctlsocket(nfd, FIONBIO, &arg) != 0) { + closesocket(nfd); + logger(LOG_ERR, _("Call to `%s' failed: WSA error %d"), "ioctlsocket", + WSAGetLastError()); + return -1; + } + } #endif option = 1; @@ -215,7 +236,7 @@ int setup_vpn_in_socket(const sockaddr_t *sa) void retry_outgoing(outgoing_t *outgoing) { - event_t *event; + tevent_t *event; cp(); @@ -224,11 +245,11 @@ void retry_outgoing(outgoing_t *outgoing) if(outgoing->timeout > maxtimeout) outgoing->timeout = maxtimeout; - event = new_event(); + event = new_tevent(); event->handler = (event_handler_t) setup_outgoing_connection; event->time = now + outgoing->timeout; event->data = outgoing; - event_add(event); + tevent_add(event); ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), @@ -241,15 +262,7 @@ void finish_connecting(connection_t *c) ifdebug(CONNECTIONS) logger(LOG_INFO, _("Connected to %s (%s)"), c->name, c->hostname); -#ifdef O_NONBLOCK - if(blockingtcp) { - int flags = fcntl(c->socket, F_GETFL); - - if(fcntl(c->socket, F_SETFL, flags & ~O_NONBLOCK) < 0) { - logger(LOG_ERR, _("fcntl for %s: %s"), c->hostname, strerror(errno)); - } - } -#endif + configure_tcp(c); c->last_ping_time = now; @@ -259,7 +272,7 @@ void finish_connecting(connection_t *c) void do_outgoing_connection(connection_t *c) { char *address, *port; - int option, result, flags; + int result; cp(); @@ -314,32 +327,18 @@ begin: /* 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 - - /* Non-blocking */ - -#ifdef O_NONBLOCK - flags = fcntl(c->socket, F_GETFL); - - if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0) { - logger(LOG_ERR, _("fcntl for %s: %s"), c->hostname, strerror(errno)); - } -#endif + configure_tcp(c); /* Connect */ result = connect(c->socket, &c->address.sa, SALEN(c->address.sa)); if(result == -1) { - if(errno == EINPROGRESS) { + if(errno == EINPROGRESS +#if defined(WIN32) && !defined(O_NONBLOCK) + || WSAGetLastError() == WSAEWOULDBLOCK +#endif + ) { c->status.connecting = true; return; } @@ -405,11 +404,12 @@ void setup_outgoing_connection(outgoing_t *outgoing) accept a new tcp connect and create a new connection */ -bool handle_new_meta_connection(int sock) +void handle_new_meta_connection(int sock, short events, void *data) { connection_t *c; sockaddr_t sa; - int fd, len = sizeof(sa); + int fd; + socklen_t len = sizeof(sa); cp(); @@ -418,13 +418,12 @@ bool handle_new_meta_connection(int sock) if(fd < 0) { logger(LOG_ERR, _("Accepting a new connection failed: %s"), strerror(errno)); - return false; } sockaddrunmap(&sa); c = new_connection(); - c->name = NULL; + c->name = xstrdup(""); c->outcipher = myself->connection->outcipher; c->outdigest = myself->connection->outdigest; c->outmaclength = myself->connection->outmaclength; @@ -437,22 +436,12 @@ bool handle_new_meta_connection(int sock) ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection from %s"), c->hostname); -#ifdef O_NONBLOCK - if(blockingtcp) { - int flags = fcntl(c->socket, F_GETFL); - - if(fcntl(c->socket, F_SETFL, flags & ~O_NONBLOCK) < 0) { - logger(LOG_ERR, _("fcntl for %s: %s"), c->hostname, strerror(errno)); - } - } -#endif + configure_tcp(c); connection_add(c); c->allow_request = ID; send_id(c); - - return true; } void try_outgoing_connections(void)