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

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index 663f912e6..e0a18a043 100644
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -21,23 +21,44 @@
 irc::sockets::sockaddrs ListenSocketBase::client;
 irc::sockets::sockaddrs ListenSocketBase::server;
 
-ListenSocketBase::ListenSocketBase(InspIRCd* Instance, int port, const std::string &addr) : ServerInstance(Instance), desc("plaintext")
+ListenSocketBase::ListenSocketBase(int port, const std::string &addr, const std::string &Type, const std::string &Hook)
+	: type(Type), hook(Hook), bind_port(port)
 {
 	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))
-		irc::sockets::satoap(&bind_to, bind_addr, bind_port);
+	if (!irc::sockets::aptosa(addr, port, &bind_to))
+	{
+		// malformed address
+		bind_addr = addr;
+		bind_desc = addr + ":" + ConvToStr(port);
+		this->fd = -1;
+	}
+	else
+	{
+		irc::sockets::satoap(&bind_to, bind_addr, 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);
+	}
+
+	if (this->fd > -1)
 	{
-		if (!Instance->BindSocket(this->fd,port,bind_addr.c_str()))
+		int rv = ServerInstance->SE->Bind(this->fd, &bind_to.sa, sizeof(bind_to));
+		if (rv >= 0)
+			rv = ServerInstance->SE->Listen(this->fd, ServerInstance->Config->MaxConn);
+
+		if (rv < 0)
+		{
+			ServerInstance->SE->Shutdown(this, 2);
+			ServerInstance->SE->Close(this);
 			this->fd = -1;
-		Instance->SE->AddFd(this);
+		}
+		else
+		{
+			ServerInstance->SE->NonBlocking(this->fd);
+			ServerInstance->SE->AddFd(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
+		}
 	}
 }
 
@@ -148,5 +169,5 @@ void ListenSocketBase::HandleEvent(EventType e, int err)
 
 void ClientListenSocket::OnAcceptReady(int nfd)
 {
-	ServerInstance->Users->AddUser(ServerInstance, nfd, this, &client, &server);
+	ServerInstance->Users->AddUser(nfd, this, &client, &server);
 }