X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flistensocket.cpp;h=01bc36cc5ea6c08d6c7874b6a140c9493ebe6033;hb=f3f8eae2cd68d8ce2c57f5df58db5833fb659cf5;hp=20cbe51ac8d21098182e4b0d8ec85cee990f3433;hpb=d9d99cd02dadf34bfcc220734ba0c422f0acb3e6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index 20cbe51ac..01bc36cc5 100644
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -22,15 +22,16 @@
 #include "socket.h"
 #include "socketengine.h"
 
-#ifdef USE_TCP_DEFER_ACCEPT
+#ifndef _WIN32
 #include <netinet/tcp.h>
 #endif
 
 ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_to)
 	: bind_tag(tag)
+	, iohookprov(NULL, std::string())
 {
 	irc::sockets::satoap(bind_to, bind_addr, bind_port);
-	bind_desc = irc::sockets::satouser(bind_to);
+	bind_desc = bind_to.str();
 
 	fd = socket(bind_to.sa.sa_family, SOCK_STREAM, 0);
 
@@ -63,9 +64,9 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
 	int timeout = tag->getInt("defer", 0);
 	if (timeout && !rv)
 	{
-#ifdef USE_TCP_DEFER_ACCEPT
+#if defined TCP_DEFER_ACCEPT
 		setsockopt(fd, IPPROTO_TCP, TCP_DEFER_ACCEPT, &timeout, sizeof(timeout));
-#elif defined USE_SO_ACCEPTFILTER
+#elif defined SO_ACCEPTFILTER
 		struct accept_filter_arg afa;
 		memset(&afa, 0, sizeof(afa));
 		strcpy(afa.af_name, "dataready");
@@ -85,6 +86,8 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
 	{
 		ServerInstance->SE->NonBlocking(this->fd);
 		ServerInstance->SE->AddFd(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
+
+		this->ResetIOHookProvider();
 	}
 }
 
@@ -214,3 +217,16 @@ void ListenSocket::HandleEvent(EventType e, int err)
 			break;
 	}
 }
+
+bool ListenSocket::ResetIOHookProvider()
+{
+	std::string provname = bind_tag->getString("ssl");
+	if (!provname.empty())
+		provname.insert(0, "ssl/");
+
+	// Set the new provider name, dynref handles the rest
+	iohookprov.SetProvider(provname);
+
+	// Return true if no provider was set, or one was set and it was also found
+	return (provname.empty() || iohookprov);
+}