Apply patch from Scott Lamb adding an output buffer for the TCP sockets.

[tinc] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index 3d1be21..fb776f8 100644 (file)
--- 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-2003 Ivo Timmermans <ivo@o2w.nl>,
-                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1998-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
 
     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,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.38 2003/12/22 11:04:16 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -38,6 +38,11 @@
 #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;
@@ -47,6 +52,29 @@ 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));
+       }
+#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;
@@ -63,33 +91,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)
@@ -236,10 +242,14 @@ void retry_outgoing(outgoing_t *outgoing)
 
 void finish_connecting(connection_t *c)
 {
+       int option;
+
        cp();
 
        ifdebug(CONNECTIONS) logger(LOG_INFO, _("Connected to %s (%s)"), c->name, c->hostname);
 
+       configure_tcp(c);
+
        c->last_ping_time = now;
 
        send_id(c);
@@ -303,25 +313,7 @@ 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 */
 
@@ -396,6 +388,7 @@ void setup_outgoing_connection(outgoing_t *outgoing)
 */
 bool handle_new_meta_connection(int sock)
 {
+       int option;
        connection_t *c;
        sockaddr_t sa;
        int fd, len = sizeof(sa);
@@ -413,6 +406,7 @@ bool handle_new_meta_connection(int sock)
        sockaddrunmap(&sa);
 
        c = new_connection();
+       c->name = NULL;
        c->outcipher = myself->connection->outcipher;
        c->outdigest = myself->connection->outdigest;
        c->outmaclength = myself->connection->outmaclength;
@@ -425,6 +419,8 @@ bool handle_new_meta_connection(int sock)
 
        ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection from %s"), c->hostname);
 
+       configure_tcp(c);
+
        connection_add(c);
 
        c->allow_request = ID;
@@ -441,8 +437,7 @@ void try_outgoing_connections(void)
 
        cp();
 
-       for(cfg = lookup_config(config_tree, "ConnectTo"); cfg;
-               cfg = lookup_config_next(config_tree, cfg)) {
+       for(cfg = lookup_config(config_tree, "ConnectTo"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
                get_config_string(cfg, &name);
 
                if(!check_id(name)) {