diff options
| author | Adam <Adam@anope.org> | 2013-04-29 22:47:15 -0400 |
|---|---|---|
| committer | attilamolnar <attilamolnar@hush.com> | 2013-05-02 23:37:38 +0200 |
| commit | 9bee202b74abbf63b59963369deebaa3efdd551f (patch) | |
| tree | 33df293bde2e77e7d7d93688c8b7439380ab9232 /src | |
| parent | 51c302cbb52cc2770404a7f790884cd2cdb2c72f (diff) | |
Fix disabling IPV6_V6ONLY on sockets, issue #511
Diffstat (limited to 'src')
| -rw-r--r-- | src/listensocket.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/listensocket.cpp b/src/listensocket.cpp index 07ae491e0..ae11c3b48 100644 --- a/src/listensocket.cpp +++ b/src/listensocket.cpp @@ -33,11 +33,6 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t if (this->fd == -1) return; - ServerInstance->SE->SetReuse(fd); - int rv = ServerInstance->SE->Bind(this->fd, bind_to); - if (rv >= 0) - rv = ServerInstance->SE->Listen(this->fd, ServerInstance->Config->MaxConn); - #ifdef IPV6_V6ONLY /* This OS supports IPv6 sockets that can also listen for IPv4 * connections. If our address is "*" or empty, enable both v4 and v6 to @@ -48,12 +43,19 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t if (bind_to.sa.sa_family == AF_INET6) { std::string addr = tag->getString("address"); - const char enable = (addr.empty() || addr == "*") ? 0 : 1; - setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &enable, sizeof(enable)); + /* This must be >= sizeof(DWORD) on Windows */ + const int enable = (addr.empty() || addr == "*") ? 0 : 1; + /* This must be before bind() */ + setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, reinterpret_cast<const char *>(&enable), sizeof(enable)); // errors ignored intentionally } #endif + ServerInstance->SE->SetReuse(fd); + int rv = ServerInstance->SE->Bind(this->fd, bind_to); + if (rv >= 0) + rv = ServerInstance->SE->Listen(this->fd, ServerInstance->Config->MaxConn); + if (rv < 0) { int errstore = errno; |