Do not set the buffer size by default but rely on the operation system default.

Also remove SOCKET_SND_RCV_BUF_MAX since limiting the buffer to 1000k is
arbitrary and all OSes impose a maximum that can be set anyway.

closes trac ticket #461

V2: SOCKET_SND_RCV_BUF_MAX removal

Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1444919918-4525-1-git-send-email-arne@rfc2549.org>
URL: http://article.gmane.org/gmane.network.openvpn.devel/10280

Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit f0b64e5dc00f35e3b0fe8c53a316ee74c9cbf15f)

diff --git a/doc/openvpn.8 b/doc/openvpn.8
index 203dd465f82a534fbf50b4cf5d698da329a3b4c6..330626635e63122ba24edbe959b99313cf329b6d 100644 (file)
--- a/doc/openvpn.8
+++ b/doc/openvpn.8
@@ -1412,12 +1412,12 @@ connection problems) with the following options:
 .TP
 .B \-\-sndbuf size
 Set the TCP/UDP socket send buffer size.
-Currently defaults to 65536 bytes.
+Defaults to operation system default.
 .\"*********************************************************
 .TP
 .B \-\-rcvbuf size
 Set the TCP/UDP socket receive buffer size.
-Currently defaults to 65536 bytes.
+Defaults to operation system default.
 .\"*********************************************************
 .TP
 .B \-\-mark value

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 5b6af827b39a19be4abb0ef4765df1ebb0e8d5f1..59e47c64123ea2a8b1a20aa9f1f219a57f95805b 100644 (file)
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -800,10 +800,6 @@ init_options (struct options *o, const bool init_gc)
 #ifdef ENABLE_FEATURE_TUN_PERSIST
   o->persist_mode = 1;
 #endif
-#ifndef WIN32
-  o->rcvbuf = 65536;
-  o->sndbuf = 65536;
-#endif
 #ifdef TARGET_LINUX
   o->tuntap_options.txqueuelen = 100;
 #endif

diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c
index 0424c0ba4f4d3123799ebce7d907dc287b31fab6..a143853e1239d8e6426f8edd81636a090036d70a 100644 (file)
--- a/src/openvpn/socket.c
+++ b/src/openvpn/socket.c
@@ -494,12 +494,9 @@ static void
 socket_set_sndbuf (int sd, int size)
 {
 #if defined(HAVE_SETSOCKOPT) && defined(SOL_SOCKET) && defined(SO_SNDBUF)
-  if (size > 0 && size < SOCKET_SND_RCV_BUF_MAX)
+  if (setsockopt (sd, SOL_SOCKET, SO_SNDBUF, (void *) &size, sizeof (size)) != 0)
     {
-      if (setsockopt (sd, SOL_SOCKET, SO_SNDBUF, (void *) &size, sizeof (size)) != 0)
-       {
-         msg (M_WARN, "NOTE: setsockopt SO_SNDBUF=%d failed", size);
-       }
+      msg (M_WARN, "NOTE: setsockopt SO_SNDBUF=%d failed", size);
     }
 #endif
 }
@@ -523,13 +520,10 @@ static bool
 socket_set_rcvbuf (int sd, int size)
 {
 #if defined(HAVE_SETSOCKOPT) && defined(SOL_SOCKET) && defined(SO_RCVBUF)
-  if (size > 0 && size < SOCKET_SND_RCV_BUF_MAX)
+  if (setsockopt (sd, SOL_SOCKET, SO_RCVBUF, (void *) &size, sizeof (size)) != 0)
     {
-      if (setsockopt (sd, SOL_SOCKET, SO_RCVBUF, (void *) &size, sizeof (size)) != 0)
-       {
-         msg (M_WARN, "NOTE: setsockopt SO_RCVBUF=%d failed", size);
-         return false;
-       }
+      msg (M_WARN, "NOTE: setsockopt SO_RCVBUF=%d failed", size);
+      return false;
     }
   return true;
 #endif

diff --git a/src/openvpn/socket.h b/src/openvpn/socket.h
index 793cd9fa25774c694f3767bf4ec7f2a4f31f4fe3..aec029e1ad475ad39d69f09ddd1f4e37ce8ea716 100644 (file)
--- a/src/openvpn/socket.h
+++ b/src/openvpn/socket.h
@@ -41,11 +41,6 @@
  */
 #define OPENVPN_PORT 1194
 
-/*
- * Maximum size passed passed to setsockopt SNDBUF/RCVBUF
- */
-#define SOCKET_SND_RCV_BUF_MAX 1000000
-
 /*
  * Number of seconds that "resolv-retry infinite"
  * represents.