X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flistensocket.cpp;h=823cb9ecacdf45565798c3869ce0ede9a8f779ef;hb=0145d909d207e0117c0d10ee2195b53b4b823fb4;hp=663f912e63ec2b86fd14dd841668d5e83d88203f;hpb=c4cb1f9477b1fbf8662bedb1c36f84ff6f87e1f3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index 663f912e6..823cb9eca 100644
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -25,19 +25,40 @@ ListenSocketBase::ListenSocketBase(InspIRCd* Instance, int port, const std::stri
 {
 	irc::sockets::sockaddrs bind_to;
 
-	bind_addr = addr;
-	bind_port = port;
-
 	// canonicalize address if it is defined
-	if (!addr.empty() && irc::sockets::aptosa(addr.c_str(), port, &bind_to))
+	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->SetFd(irc::sockets::OpenTCPSocket(bind_addr.c_str()));
-	if (this->GetFd() > -1)
+		this->fd = irc::sockets::OpenTCPSocket(bind_addr.c_str());
+	}
+
+	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);
+		}
 	}
 }