Add support for CAP to this via multi-prefix. NOTE, the OnNamesList for this and...

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

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index f0e8dfbb224a4015f82bf7f019194adfe4f9ee0d..41f40dc2bef696380d690db94b1817e9b1e58c48 100644 (file)
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -116,7 +116,7 @@ BufferedSocket::BufferedSocket(InspIRCd* SI, const std::string &ipaddr, int apor
                }
                if (!ipvalid)
                {
-                       this->Instance->Log(DEBUG,"BUG: Hostname passed to BufferedSocket, rather than an IP address!");
+                       this->Instance->Logs->Log("SOCKET", DEBUG,"BUG: Hostname passed to BufferedSocket, rather than an IP address!");
                        this->OnError(I_ERR_CONNECT);
                        this->Close();
                        this->fd = -1;
@@ -178,10 +178,10 @@ bool BufferedSocket::BindAddr(const std::string &ip)
        int j = 0;
        while (j < Conf.Enumerate("bind") || (!ip.empty()))
        {
-               std::string IP = ip.empty() ? Conf.ReadValue("bind","address",j) : ip;
+               std::string sIP = ip.empty() ? Conf.ReadValue("bind","address",j) : ip;
                if (!ip.empty() || Conf.ReadValue("bind","type",j) == "servers")
                {
-                       if (!ip.empty() || ((IP != "*") && (IP != "127.0.0.1") && (!IP.empty()) && (IP != "::1")))
+                       if (!ip.empty() || ((sIP != "*") && (sIP != "127.0.0.1") && (!sIP.empty()) && (sIP != "::1")))
                        {
                                /* The [2] is required because we may write a sockaddr_in6 here, and sockaddr_in6 is larger than sockaddr, where sockaddr_in4 is not. */
                                sockaddr* s = new sockaddr[2];
@@ -189,7 +189,7 @@ bool BufferedSocket::BindAddr(const std::string &ip)
                                if (v6)
                                {
                                        in6_addr n;
-                                       if (inet_pton(AF_INET6, IP.c_str(), &n) > 0)
+                                       if (inet_pton(AF_INET6, sIP.c_str(), &n) > 0)
                                        {
                                                memcpy(&((sockaddr_in6*)s)->sin6_addr, &n, sizeof(sockaddr_in6));
                                                ((sockaddr_in6*)s)->sin6_port = 0;
@@ -207,7 +207,7 @@ bool BufferedSocket::BindAddr(const std::string &ip)
 #endif
                                {
                                        in_addr n;
-                                       if (inet_aton(IP.c_str(), &n) > 0)
+                                       if (inet_aton(sIP.c_str(), &n) > 0)
                                        {
                                                ((sockaddr_in*)s)->sin_addr = n;
                                                ((sockaddr_in*)s)->sin_port = 0;
@@ -236,7 +236,7 @@ bool BufferedSocket::BindAddr(const std::string &ip)
                }
                j++;
        }
-       Instance->Log(DEBUG,"nothing in the config to bind()!");
+       Instance->Logs->Log("SOCKET", DEBUG,"nothing in the config to bind()!");
        return true;
 }
 
@@ -345,7 +345,7 @@ bool BufferedSocket::DoConnect()
                this->SetQueues(this->fd);
        }
 
-       Instance->Log(DEBUG,"BufferedSocket::DoConnect success");
+       Instance->Logs->Log("SOCKET", DEBUG,"BufferedSocket::DoConnect success");
        return true;
 }
 
@@ -367,7 +367,7 @@ void BufferedSocket::Close()
                        }
                        catch (CoreException& modexcept)
                        {
-                               Instance->Log(DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+                               Instance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
                        }
                }
                Instance->SE->Shutdown(this, 2);
@@ -385,7 +385,7 @@ std::string BufferedSocket::GetIP()
        return this->IP;
 }
 
-char* BufferedSocket::Read()
+const char* BufferedSocket::Read()
 {
        if (!Instance->SE->BoundsCheckFd(this))
                return NULL;
@@ -402,7 +402,7 @@ char* BufferedSocket::Read()
                }
                catch (CoreException& modexcept)
                {
-                       Instance->Log(DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+                       Instance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
                }
                if (MOD_RESULT < 0)
                {
@@ -470,7 +470,7 @@ bool BufferedSocket::FlushWriteBuffer()
                                }
                                catch (CoreException& modexcept)
                                {
-                                       Instance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+                                       Instance->Logs->Log("SOCKET", DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
                                        return true;
                                }
                        }
@@ -536,7 +536,7 @@ bool BufferedSocket::FlushWriteBuffer()
 
 void SocketTimeout::Tick(time_t)
 {
-       ServerInstance->Log(DEBUG,"SocketTimeout::Tick");
+       ServerInstance->Logs->Log("SOCKET", DEBUG,"SocketTimeout::Tick");
 
        if (ServerInstance->SE->GetRef(this->sfd) != this->sock)
                return;
@@ -594,14 +594,14 @@ bool BufferedSocket::Poll()
 
                        if (Instance->Config->GetIOHook(this))
                        {
-                               Instance->Log(DEBUG,"Hook for raw connect");
+                               Instance->Logs->Log("SOCKET",DEBUG,"Hook for raw connect");
                                try
                                {
                                        Instance->Config->GetIOHook(this)->OnRawSocketConnect(this->fd);
                                }
                                catch (CoreException& modexcept)
                                {
-                                       Instance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+                                       Instance->Logs->Log("SOCKET",DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
                                }
                        }
                        return this->OnConnected();
@@ -625,9 +625,14 @@ bool BufferedSocket::Poll()
                        }
                        else
 #endif
+                       {
+                               // FIX: we were doing this for IPv6 connections as well, which was fucking recvip..
+                               // Add brackets to make this a bit clearer. -- w00t (Jan 15, 2008)
+                               recvip = inet_ntoa(((sockaddr_in*)client)->sin_addr);
+                       }
+
                        Instance->SE->NonBlocking(incoming);
 
-                       recvip = inet_ntoa(((sockaddr_in*)client)->sin_addr);
                        this->OnIncomingConnection(incoming, (char*)recvip.c_str());
 
                        if (this->IsIOHooked)
@@ -638,7 +643,7 @@ bool BufferedSocket::Poll()
                                }
                                catch (CoreException& modexcept)
                                {
-                                       Instance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+                                       Instance->Logs->Log("SOCKET",DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
                                }
                        }