diff options
| author | Gert Doering <gert@greenie.muc.de> | 2014-11-17 21:58:23 +0100 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2014-11-18 11:23:38 +0100 |
| commit | 188a65153fb304db873694eaab21599e37ead908 (patch) | |
| tree | 578d6b6d675e56f816239bd3273426359eabece4 /src/openvpn/socket.c | |
| parent | a2466d9e6c78c57d579a1fa99c8554eabb9dbe44 (diff) | |
| download | openvpn-188a65153fb304db873694eaab21599e37ead908.tar.gz openvpn-188a65153fb304db873694eaab21599e37ead908.tar.xz openvpn-188a65153fb304db873694eaab21599e37ead908.zip | |
Fix windows build on older mingw versions.
Add missing #define for IPV6_V6ONLY sockopt.
Fix last remaining fallout of dual-stack patch set in connect() call
for "not CONNECT_NONBLOCK" case.
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Acked-by: Arne Schwabe <arne@rfc2549.org>
Message-Id: <1416257903-24629-1-git-send-email-gert@greenie.muc.de>
URL: http://article.gmane.org/gmane.network.openvpn.devel/9246
Diffstat (limited to 'src/openvpn/socket.c')
| -rw-r--r-- | src/openvpn/socket.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c index 2499ab0..29f9958 100644 --- a/src/openvpn/socket.c +++ b/src/openvpn/socket.c @@ -1081,6 +1081,14 @@ socket_listen_accept (socket_descriptor_t sd, return new_sd; } +/* older mingw versions and WinXP do not have this define, + * but Vista and up support the functionality - just define it here + */ +#ifdef WIN32 +# ifndef IPV6_V6ONLY +# define IPV6_V6ONLY 27 +# endif +#endif void socket_bind (socket_descriptor_t sd, struct addrinfo *local, @@ -1211,7 +1219,7 @@ openvpn_connect (socket_descriptor_t sd, } } #else - status = connect (sd, &remote->addr.sa, af_addr_size(remote->addr.sa.sa_family)); + status = connect (sd, remote, af_addr_size(remote->sa_family)); if (status) status = openvpn_errno (); #endif |