3party/mongoose
0
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2024-12-28 23:49:44 +08:00
Code Issues Projects Releases Wiki Activity

Fix #2089 - allow to bind v4 and v6 sockets on the same port

Browse Source
This commit is contained in:
cpq 2023-04-17 14:35:27 +01:00
parent cacd9c7f95
commit 9ade464c2e
2 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mongoose.c
View File

@ -4294,28 +4294,32 @@ bool mg_open_listener(struct mg_connection *c, const char *url) {
if ((fd = socket(af, type, proto)) == MG_INVALID_SOCKET) { if ((fd = socket(af, type, proto)) == MG_INVALID_SOCKET) {
MG_ERROR(("socket: %d", MG_SOCK_ERR(-1))); MG_ERROR(("socket: %d", MG_SOCK_ERR(-1)));
#if ((MG_ARCH == MG_ARCH_WIN32) || (MG_ARCH == MG_ARCH_UNIX) || \ #if defined(SO_REUSEADDR) && (!defined(LWIP_SOCKET) || SO_REUSE)
(defined(LWIP_SOCKET) && SO_REUSE == 1))
} else if ((rc = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *) &on, } else if ((rc = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *) &on,
sizeof(on))) != 0) { sizeof(on))) != 0) {
// 1. SO_RESUSEADDR is not enabled on Windows because the semantics of // 1. SO_RESUSEADDR semantics on UNIX and Windows is different. On
// SO_REUSEADDR on UNIX and Windows is different. On Windows, // Windows, SO_REUSEADDR allows to bind a socket to a port without error
// SO_REUSEADDR allows to bind a socket to a port without error even // even if the port is already open by another program. This is not the
// if the port is already open by another program. This is not the // behavior SO_REUSEADDR was designed for, and leads to hard-to-track
// behavior SO_REUSEADDR was designed for, and leads to hard-to-track // failure scenarios.
// failure scenarios. Therefore, SO_REUSEADDR was disabled on Windows //
// unless SO_EXCLUSIVEADDRUSE is supported and set on a socket. // 2. For LWIP, SO_REUSEADDR should be explicitly enabled by defining
// 2. In case of LWIP, SO_REUSEADDR should be explicitly enabled, by // SO_REUSE = 1 in lwipopts.h, otherwise the code below will compile but
// defining // won't work! (setsockopt will return EINVAL)
// SO_REUSE (in lwipopts.h), otherwise the code below will compile MG_ERROR(("setsockopt(SO_REUSEADDR): %d", MG_SOCK_ERR(rc)));
// but won't work! (setsockopt will return EINVAL)
MG_ERROR(("reuseaddr: %d", MG_SOCK_ERR(rc)));
#endif #endif
#if MG_ARCH == MG_ARCH_WIN32 && !defined(SO_EXCLUSIVEADDRUSE) && !defined(WINCE) #if defined(SO_EXCLUSIVEADDRUSE)
} else if ((rc = setsockopt(fd, SOL_SOCKET, SO_EXCLUSIVEADDRUSE, } else if ((rc = setsockopt(fd, SOL_SOCKET, SO_EXCLUSIVEADDRUSE,
(char *) &on, sizeof(on))) != 0) { (char *) &on, sizeof(on))) != 0) {
// "Using SO_REUSEADDR and SO_EXCLUSIVEADDRUSE" // "Using SO_REUSEADDR and SO_EXCLUSIVEADDRUSE"
MG_ERROR(("exclusiveaddruse: %d", MG_SOCK_ERR(rc))); MG_ERROR(("setsockopt(SO_EXCLUSIVEADDRUSE): %d", MG_SOCK_ERR(rc)));
#endif
#if defined(IPV6_V6ONLY)
} else if (c->loc.is_ip6 &&
(rc = setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (char *) &on,
sizeof(on))) != 0) {
// See #2089. Allow to bind v4 and v6 sockets on the same port
MG_ERROR(("setsockopt(IPV6_V6ONLY): %d", MG_SOCK_ERR(rc)));
#endif #endif
} else if ((rc = bind(fd, &usa.sa, slen)) != 0) { } else if ((rc = bind(fd, &usa.sa, slen)) != 0) {
MG_ERROR(("bind: %d", MG_SOCK_ERR(rc))); MG_ERROR(("bind: %d", MG_SOCK_ERR(rc)));

36
src/sock.c
View File

@ -193,28 +193,32 @@ bool mg_open_listener(struct mg_connection *c, const char *url) {
if ((fd = socket(af, type, proto)) == MG_INVALID_SOCKET) { if ((fd = socket(af, type, proto)) == MG_INVALID_SOCKET) {
MG_ERROR(("socket: %d", MG_SOCK_ERR(-1))); MG_ERROR(("socket: %d", MG_SOCK_ERR(-1)));
#if ((MG_ARCH == MG_ARCH_WIN32) || (MG_ARCH == MG_ARCH_UNIX) || \ #if defined(SO_REUSEADDR) && (!defined(LWIP_SOCKET) || SO_REUSE)
(defined(LWIP_SOCKET) && SO_REUSE == 1))
} else if ((rc = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *) &on, } else if ((rc = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *) &on,
sizeof(on))) != 0) { sizeof(on))) != 0) {
// 1. SO_RESUSEADDR is not enabled on Windows because the semantics of // 1. SO_REUSEADDR semantics on UNIX and Windows is different. On
// SO_REUSEADDR on UNIX and Windows is different. On Windows, // Windows, SO_REUSEADDR allows to bind a socket to a port without error
// SO_REUSEADDR allows to bind a socket to a port without error even // even if the port is already open by another program. This is not the
// if the port is already open by another program. This is not the // behavior SO_REUSEADDR was designed for, and leads to hard-to-track
// behavior SO_REUSEADDR was designed for, and leads to hard-to-track // failure scenarios.
// failure scenarios. Therefore, SO_REUSEADDR was disabled on Windows //
// unless SO_EXCLUSIVEADDRUSE is supported and set on a socket. // 2. For LWIP, SO_REUSEADDR should be explicitly enabled by defining
// 2. In case of LWIP, SO_REUSEADDR should be explicitly enabled, by // SO_REUSE = 1 in lwipopts.h, otherwise the code below will compile but
// defining // won't work! (setsockopt will return EINVAL)
// SO_REUSE (in lwipopts.h), otherwise the code below will compile MG_ERROR(("setsockopt(SO_REUSEADDR): %d", MG_SOCK_ERR(rc)));
// but won't work! (setsockopt will return EINVAL)
MG_ERROR(("reuseaddr: %d", MG_SOCK_ERR(rc)));
#endif #endif
#if MG_ARCH == MG_ARCH_WIN32 && !defined(SO_EXCLUSIVEADDRUSE) && !defined(WINCE) #if defined(SO_EXCLUSIVEADDRUSE)
} else if ((rc = setsockopt(fd, SOL_SOCKET, SO_EXCLUSIVEADDRUSE, } else if ((rc = setsockopt(fd, SOL_SOCKET, SO_EXCLUSIVEADDRUSE,
(char *) &on, sizeof(on))) != 0) { (char *) &on, sizeof(on))) != 0) {
// "Using SO_REUSEADDR and SO_EXCLUSIVEADDRUSE" // "Using SO_REUSEADDR and SO_EXCLUSIVEADDRUSE"
MG_ERROR(("exclusiveaddruse: %d", MG_SOCK_ERR(rc))); MG_ERROR(("setsockopt(SO_EXCLUSIVEADDRUSE): %d", MG_SOCK_ERR(rc)));
#endif
#if defined(IPV6_V6ONLY)
} else if (c->loc.is_ip6 &&
(rc = setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (char *) &on,
sizeof(on))) != 0) {
// See #2089. Allow to bind v4 and v6 sockets on the same port
MG_ERROR(("setsockopt(IPV6_V6ONLY): %d", MG_SOCK_ERR(rc)));
#endif #endif
} else if ((rc = bind(fd, &usa.sa, slen)) != 0) { } else if ((rc = bind(fd, &usa.sa, slen)) != 0) {
MG_ERROR(("bind: %d", MG_SOCK_ERR(rc))); MG_ERROR(("bind: %d", MG_SOCK_ERR(rc)));