X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flistensocket.cpp;h=823cb9ecacdf45565798c3869ce0ede9a8f779ef;hb=3841c4b04a96389a4661535d12d5215a621d8736;hp=df252f18bd8aa27d8505f09720303c991db64192;hpb=06e0d5c7f0f78c489090fe5f0c18a91e8cb41ae8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index df252f18b..823cb9eca 100644
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -26,24 +26,39 @@ ListenSocketBase::ListenSocketBase(InspIRCd* Instance, int port, const std::stri
 	irc::sockets::sockaddrs bind_to;
 
 	// canonicalize address if it is defined
-	if (irc::sockets::aptosa(addr.c_str(), port, &bind_to))
-	{
-		irc::sockets::satoap(&bind_to, bind_addr, bind_port);
-		bind_desc = irc::sockets::satouser(&bind_to);
-	}
-	else
+	if (!irc::sockets::aptosa(addr.c_str(), port, &bind_to))
 	{
+		// malformed address
 		bind_addr = addr;
 		bind_port = port;
 		bind_desc = addr + ":" + ConvToStr(port);
+		this->fd = -1;
+	}
+	else
+	{
+		irc::sockets::satoap(&bind_to, bind_addr, bind_port);
+		bind_desc = irc::sockets::satouser(&bind_to);
+
+		this->fd = irc::sockets::OpenTCPSocket(bind_addr.c_str());
 	}
 
-	this->SetFd(irc::sockets::OpenTCPSocket(bind_addr.c_str()));
-	if (this->GetFd() > -1)
+	if (this->fd > -1)
 	{
-		if (!Instance->BindSocket(this->fd,port,bind_addr.c_str()))
+		int rv = Instance->SE->Bind(this->fd, &bind_to.sa, sizeof(bind_to));
+		if (rv >= 0)
+			rv = Instance->SE->Listen(this->fd, Instance->Config->MaxConn);
+
+		if (rv < 0)
+		{
+			Instance->SE->Shutdown(this, 2);
+			Instance->SE->Close(this);
 			this->fd = -1;
-		Instance->SE->AddFd(this);
+		}
+		else
+		{
+			Instance->SE->NonBlocking(this->fd);
+			Instance->SE->AddFd(this);
+		}
 	}
 }