Remove the -Dssize_t declaration now its typedeffed.

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

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index df252f18bd8aa27d8505f09720303c991db64192..e0a18a043fab7a86bafe734fa8f463e1c28ccb73 100644 (file)
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -21,29 +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;
 
        // canonicalize address if it is defined
-       if (irc::sockets::aptosa(addr.c_str(), port, &bind_to))
+       if (!irc::sockets::aptosa(addr, port, &bind_to))
        {
-               irc::sockets::satoap(&bind_to, bind_addr, bind_port);
-               bind_desc = irc::sockets::satouser(&bind_to);
+               // malformed address
+               bind_addr = addr;
+               bind_desc = addr + ":" + ConvToStr(port);
+               this->fd = -1;
        }
        else
        {
-               bind_addr = addr;
-               bind_port = port;
-               bind_desc = addr + ":" + ConvToStr(port);
+               irc::sockets::satoap(&bind_to, bind_addr, port);
+               bind_desc = irc::sockets::satouser(&bind_to);
+
+               this->fd = irc::sockets::OpenTCPSocket(bind_addr);
        }
 
-       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 = 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);
+               }
        }
 }
 
@@ -154,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);
 }