diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2019-03-06 06:29:19 +0100 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2019-03-06 06:29:46 +0100 |
| commit | e3ddf1269368db5f476e0980e9b5127c7034d9fd (patch) | |
| tree | cea43de83e77b2dc9893018df30667cbb0c7647b /thirdparty/libwebsockets | |
| parent | 90210c48627692d281554d6185b5db17a86c852a (diff) | |
Add fix to libwebsocket to disable V6ONLY.
This was enabled by default on some systems (e.g. Windows).
Diffstat (limited to 'thirdparty/libwebsockets')
| -rw-r--r-- | thirdparty/libwebsockets/ipv6_fixes.diff | 32 | ||||
| -rw-r--r-- | thirdparty/libwebsockets/lib/plat/unix/unix-sockets.c | 5 | ||||
| -rw-r--r-- | thirdparty/libwebsockets/lib/plat/windows/windows-sockets.c | 5 |
3 files changed, 42 insertions, 0 deletions
diff --git a/thirdparty/libwebsockets/ipv6_fixes.diff b/thirdparty/libwebsockets/ipv6_fixes.diff new file mode 100644 index 0000000000..5fa1e5c520 --- /dev/null +++ b/thirdparty/libwebsockets/ipv6_fixes.diff @@ -0,0 +1,32 @@ +diff --git a/thirdparty/libwebsockets/lib/plat/unix/unix-sockets.c b/thirdparty/libwebsockets/lib/plat/unix/unix-sockets.c +index 693efd28e..192dddee6 100644 +--- a/thirdparty/libwebsockets/lib/plat/unix/unix-sockets.c ++++ b/thirdparty/libwebsockets/lib/plat/unix/unix-sockets.c +@@ -73,6 +73,11 @@ lws_plat_set_socket_options(struct lws_vhost *vhost, int fd, int unix_skt) + int optval = 1; + socklen_t optlen = sizeof(optval); + ++#ifdef LWS_WITH_IPV6 ++ optval = 0; ++ setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (const void*)&optval, optlen); ++#endif ++ + #if defined(__APPLE__) || \ + defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \ + defined(__NetBSD__) || \ +diff --git a/thirdparty/libwebsockets/lib/plat/windows/windows-sockets.c b/thirdparty/libwebsockets/lib/plat/windows/windows-sockets.c +index bf0935057..62a0a4984 100644 +--- a/thirdparty/libwebsockets/lib/plat/windows/windows-sockets.c ++++ b/thirdparty/libwebsockets/lib/plat/windows/windows-sockets.c +@@ -56,6 +56,11 @@ lws_plat_set_socket_options(struct lws_vhost *vhost, lws_sockfd_type fd, + struct protoent *tcp_proto; + #endif + ++#ifdef LWS_WITH_IPV6 ++ optval = 0; ++ setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (const void*)&optval, optlen); ++#endif ++ + if (vhost->ka_time) { + /* enable keepalive on this socket */ + optval = 1; diff --git a/thirdparty/libwebsockets/lib/plat/unix/unix-sockets.c b/thirdparty/libwebsockets/lib/plat/unix/unix-sockets.c index 693efd28e6..192dddee63 100644 --- a/thirdparty/libwebsockets/lib/plat/unix/unix-sockets.c +++ b/thirdparty/libwebsockets/lib/plat/unix/unix-sockets.c @@ -73,6 +73,11 @@ lws_plat_set_socket_options(struct lws_vhost *vhost, int fd, int unix_skt) int optval = 1; socklen_t optlen = sizeof(optval); +#ifdef LWS_WITH_IPV6 + optval = 0; + setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (const void*)&optval, optlen); +#endif + #if defined(__APPLE__) || \ defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \ defined(__NetBSD__) || \ diff --git a/thirdparty/libwebsockets/lib/plat/windows/windows-sockets.c b/thirdparty/libwebsockets/lib/plat/windows/windows-sockets.c index bf0935057a..62a0a49846 100644 --- a/thirdparty/libwebsockets/lib/plat/windows/windows-sockets.c +++ b/thirdparty/libwebsockets/lib/plat/windows/windows-sockets.c @@ -56,6 +56,11 @@ lws_plat_set_socket_options(struct lws_vhost *vhost, lws_sockfd_type fd, struct protoent *tcp_proto; #endif +#ifdef LWS_WITH_IPV6 + optval = 0; + setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (const void*)&optval, optlen); +#endif + if (vhost->ka_time) { /* enable keepalive on this socket */ optval = 1; |