Fixed bug in port-share that could cause port share process to

crash with output like this:

TCP connection established with 85.190.0.3:41781
85.190.0.3:41781 SIGTERM[soft,port-share-redirect] received, client-instance exiting
MANAGEMENT: TCP recv error: Socket operation on non-socket
MANAGEMENT: Client disconnected
MANAGEMENT: Triggering management exit
Exiting due to fatal error
EVENT: epoll_ctl EPOLL_CTL_MOD failed, sd=6: Bad file descriptor (errno=9)

Then an error like this for every incoming connection that should be
proxied:

76.120.71.74:55302 PORT SHARE: sendmsg failed -- unable to communicate with background process (6,8,-1,-1): Connection refused (errno=111)

Version 2.1.3s

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

diff --git a/ps.c b/ps.c
index 5b1792a1fa7f0853dc79fa7b950b44a9281da1ac..4cdac3cacc3b5676026a5ac6d60e9b5d18491856 100644 (file)
--- a/ps.c
+++ b/ps.c
@@ -872,6 +872,9 @@ port_share_open (const char *host,
       /* Let msg know that we forked */
       msg_forked ();
 
+      /* Don't interact with management interface */
+      management = NULL;
+
       /* close all parent fds except our socket back to parent */
       close_fds_except (fd[1]);
 

diff --git a/version.m4 b/version.m4
index 97447b7fdbea96a5d718a75c39b348634ff7c8ef..12ce62720d277b0cb21fb7822829c011960a4606 100644 (file)
--- a/version.m4
+++ b/version.m4
@@ -1,5 +1,5 @@
 dnl define the OpenVPN version
-define(PRODUCT_VERSION,[2.1.3r])
+define(PRODUCT_VERSION,[2.1.3s])
 dnl define the TAP version
 define(PRODUCT_TAP_ID,[tap0901])
 define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9])