Set socket buffers (SO_SNDBUF and SO_RCVBUF) immediately after

socket is created rather than waiting until after connect/listen.

Version 2.1.1d

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@5514 e7ae566f-a301-0410-adde-c780ea21d3b5

diff --git a/socket.c b/socket.c
index fecc39837b0353cfa31564518ee034bdb625185f..65fbcd7746595209334dd3053701cf8e972c0c5f 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -1291,6 +1291,10 @@ link_socket_init_phase1 (struct link_socket *sock,
   else if (mode != LS_MODE_TCP_ACCEPT_FROM)
     {
       create_socket (sock);
+
+      /* set socket buffers based on --sndbuf and --rcvbuf options */
+      socket_set_buffers (sock->sd, &sock->socket_buffer_sizes);
+
       resolve_bind_local (sock);
       resolve_remote (sock, 1, NULL, NULL);
     }
@@ -1493,9 +1497,6 @@ link_socket_init_phase2 (struct link_socket *sock,
        }
     }
 
-  /* set socket buffers based on --sndbuf and --rcvbuf options */
-  socket_set_buffers (sock->sd, &sock->socket_buffer_sizes);
-
   /* set misc socket parameters */
   socket_set_flags (sock->sd, sock->sockflags);
 

diff --git a/version.m4 b/version.m4
index 81834e2e28431daa7260c886f809f13a942a7cf9..826720b3608038c850d44d558484303bb53ad08c 100644 (file)
--- a/version.m4
+++ b/version.m4
@@ -1,5 +1,5 @@
 dnl define the OpenVPN version
-define(PRODUCT_VERSION,[2.1.1c])
+define(PRODUCT_VERSION,[2.1.1d])
 dnl define the TAP version
 define(PRODUCT_TAP_ID,[tap0901])
 define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9])