From a5a4d2b865879b8694760c0a5b5909c9a3675027 Mon Sep 17 00:00:00 2001
From: Guus Sliepen <guus@tinc-vpn.org>
Date: Fri, 13 Jan 2006 11:21:59 +0000
Subject: [PATCH] Apply patch from Scott Lamb unifying configuration of TCP
socket options.
---
THANKS | 1 +
src/net_socket.c | 95 ++++++++++++++++++------------------------------
2 files changed, 37 insertions(+), 59 deletions(-)
diff --git a/THANKS b/THANKS
index 95c84d13..02cd090c 100644
--- a/THANKS
+++ b/THANKS
@@ -23,6 +23,7 @@ We would like to thank the following people for their contributions to tinc:
* Nick Patavalis
* Paul Littlefield
* Robert van der Meulen
+* Scott Lamb
* Teemu Kiviniemi
* Tonnerre Lombard
* Wessel Dankers
diff --git a/src/net_socket.c b/src/net_socket.c
index c691780e..ab2d79d2 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -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;
@@ -48,6 +53,31 @@ int listen_sockets;
/* Setup sockets */
+static void configure_tcp(connection_t *c)
+{
+ int option;
+
+#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
+
+#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 +94,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)
@@ -237,19 +245,13 @@ 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);
-#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;
@@ -314,25 +316,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 */
@@ -407,6 +391,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);
@@ -437,15 +422,7 @@ 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);
--
2.39.5