Remove Command and ModeHandler objects in their destructors; fixes possible pointer...

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

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index a8c7139598b84f158e0ab90ba9f694ed4ab8b278..e0a18a043fab7a86bafe734fa8f463e1c28ccb73 100644 (file)
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -21,25 +21,25 @@
 irc::sockets::sockaddrs ListenSocketBase::client;
 irc::sockets::sockaddrs ListenSocketBase::server;
 
-ListenSocketBase::ListenSocketBase(int port, const std::string &addr) : 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))
        {
                // 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);
+               irc::sockets::satoap(&bind_to, bind_addr, port);
                bind_desc = irc::sockets::satouser(&bind_to);
 
-               this->fd = irc::sockets::OpenTCPSocket(bind_addr.c_str());
+               this->fd = irc::sockets::OpenTCPSocket(bind_addr);
        }
 
        if (this->fd > -1)