Automatically apply +P to all permanent channels.

[user/henk/code/inspircd.git] / src / listensocket.cpp

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index fb9f2a0eff6e313ef01caced913462fa1033d6e1..d09f5e62436ea60ca1a70c33c2ea699b13c255f8 100644 (file)
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -54,12 +54,27 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
        }
 #endif
 
+       if (tag->getBool("free"))
+       {
+               socklen_t enable = 1;
+#if defined IP_FREEBIND // Linux 2.4+
+               setsockopt(fd, SOL_IP, IP_FREEBIND, &enable, sizeof(enable));
+#elif defined IP_BINDANY // FreeBSD
+               setsockopt(fd, IPPROTO_IP, IP_BINDANY, &enable, sizeof(enable));
+#elif defined SO_BINDANY // NetBSD/OpenBSD
+               setsockopt(fd, SOL_SOCKET, SO_BINDANY, &enable, sizeof(enable));
+#else
+               (void)enable;
+#endif
+       }
+
        SocketEngine::SetReuse(fd);
        int rv = SocketEngine::Bind(this->fd, bind_to);
        if (rv >= 0)
                rv = SocketEngine::Listen(this->fd, ServerInstance->Config->MaxConn);
 
-       int timeout = tag->getInt("defer", 0);
+       // Default defer to on for TLS listeners because in TLS the client always speaks first
+       int timeout = tag->getInt("defer", (tag->getString("ssl").empty() ? 0 : 3));
        if (timeout && !rv)
        {
 #if defined TCP_DEFER_ACCEPT