Merge pull request #2389 from cesanta/ipv6

Address discussions/2305 - bind to v6 only / v6 and v4
This commit is contained in:
Sergey Lyubka authored and GitHub committed 2023-09-21 13:37:29 +01:00
commit b7a32069b1
4 files changed
+12 -2

No files matched your search

+2 -1
View File
@@ -6062,7 +6062,8 @@ bool mg_open_listener(struct mg_connection *c, const char *url) {
// won't work! (setsockopt will return EINVAL)
MG_ERROR(("setsockopt(SO_REUSEADDR): %d", MG_SOCK_ERR(rc)));
#endif
#if defined(IPV6_V6ONLY)
#if MG_IPV6_V6ONLY
// Bind only to the V6 address, not V4 address on this port
} else if (c->loc.is_ip6 &&
(rc = setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (char *) &on,
sizeof(on))) != 0) {
+4
View File
@@ -709,6 +709,10 @@ struct timeval {
#define MG_ENABLE_IPV6 0
#endif
#ifndef MG_IPV6_V6ONLY
#define MG_IPV6_V6ONLY 0 // IPv6 socket binds only to V6, not V4 address
#endif
#ifndef MG_ENABLE_MD5
#define MG_ENABLE_MD5 1
#endif
+4
View File
@@ -44,6 +44,10 @@
#define MG_ENABLE_IPV6 0
#endif
#ifndef MG_IPV6_V6ONLY
#define MG_IPV6_V6ONLY 0 // IPv6 socket binds only to V6, not V4 address
#endif
#ifndef MG_ENABLE_MD5
#define MG_ENABLE_MD5 1
#endif
+2 -1
View File
@@ -212,7 +212,8 @@ bool mg_open_listener(struct mg_connection *c, const char *url) {
// won't work! (setsockopt will return EINVAL)
MG_ERROR(("setsockopt(SO_REUSEADDR): %d", MG_SOCK_ERR(rc)));
#endif
#if defined(IPV6_V6ONLY)
#if MG_IPV6_V6ONLY
// Bind only to the V6 address, not V4 address on this port
} else if (c->loc.is_ip6 &&
(rc = setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (char *) &on,
sizeof(on))) != 0) {