Some AddMode fixes

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

diff --git a/src/users.cpp b/src/users.cpp
index 04424dd9b4d0aa399a6bf211fdd3ee19f14af86b..fec5694a4dceb80ad83d9e3e21c036dfbbc69ca9 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -11,6 +11,8 @@
  * ---------------------------------------------------
  */
 
+/* $Core: libIRCDusers */
+
 #include "inspircd.h"
 #include <stdarg.h>
 #include "socketengine.h"
@@ -175,9 +177,10 @@ User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance
        server = (char*)Instance->FindServerNamePtr(Instance->Config->ServerName);
        reset_due = ServerInstance->Time();
        age = ServerInstance->Time(true);
+       Penalty = 0;
        lines_in = lastping = signon = idle_lastmsg = nping = registered = 0;
        ChannelCount = timeout = flood = bytes_in = bytes_out = cmds_in = cmds_out = 0;
-       muted = exempt = haspassed = dns_done = false;
+       OverPenalty = ExemptFromPenalty = muted = exempt = haspassed = dns_done = false;
        fd = -1;
        recvq.clear();
        sendq.clear();
@@ -515,7 +518,7 @@ std::string User::GetBuffer()
 {
        try
        {
-               if (!recvq.length())
+               if (recvq.empty())
                        return "";
 
                /* Strip any leading \r or \n off the string.
@@ -700,7 +703,8 @@ void User::UnOper()
 
 void User::QuitUser(InspIRCd* Instance, User *user, const std::string &quitreason, const char* operreason)
 {
-       user->Write("ERROR :Closing link (%s@%s) [%s]", user->ident, user->host, operreason);
+       Instance->Log(DEBUG,"QuitUser: %s '%s'", user->nick, quitreason.c_str());
+       user->Write("ERROR :Closing link (%s@%s) [%s]", user->ident, user->host, *operreason ? operreason : quitreason.c_str());
        user->muted = true;
        Instance->GlobalCulls.AddItem(user, quitreason.c_str(), operreason);
 }
@@ -735,6 +739,8 @@ void User::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, in
                return;
        }
 
+       Instance->Log(DEBUG,"New user fd: %d", socket);
+
        int j = 0;
 
        Instance->unregistered_count++;
@@ -835,6 +841,7 @@ void User::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, in
         {
                 if (!Instance->SE->AddFd(New))
                 {
+                       Instance->Log(DEBUG,"Internal error on new connection");
                        User::QuitUser(Instance, New, "Internal error handling connection");
                 }
         }
@@ -843,6 +850,15 @@ void User::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, in
         * BOPM and other stuff requires it.
         */
        New->WriteServ("NOTICE Auth :*** Looking up your hostname...");
+
+       if (Instance->Config->NoUserDns)
+       {
+               New->dns_done = true;
+       }
+       else
+       {
+               New->StartDNSLookup();
+       }
 }
 
 unsigned long User::GlobalCloneCount()
@@ -973,8 +989,8 @@ void User::FullConnect()
                ServerInstance->CallCommandHandler("LUSERS", NULL, 0, this);
 
        /*
-        * fix 3 by brain, move registered = 7 below these so that spurious modes and host
-        * changes dont go out onto the network and produce 'fake direction'.
+        * We don't set REG_ALL until triggering OnUserConnect, so some module events don't spew out stuff
+        * for a user that doesn't exist yet.
         */
        FOREACH_MOD(I_OnUserConnect,OnUserConnect(this));
 
@@ -1098,7 +1114,7 @@ void User::SetSockAddr(int protocol_family, const char* ip, int port)
                }
                break;
                default:
-                       ServerInstance->Log(DEBUG,"Ut oh, I dont know protocol %d to be set on '%s'!", protocol_family, this->nick);
+                       ServerInstance->Log(DEBUG,"Uh oh, I dont know protocol %d to be set on '%s'!", protocol_family, this->nick);
                break;
        }
 }
@@ -1139,6 +1155,10 @@ int User::GetProtocolFamily()
        return sin->sin_family;
 }
 
+/*
+ * XXX the duplication here is horrid..
+ * do we really need two methods doing essentially the same thing?
+ */
 const char* User::GetIPString()
 {
        static char buf[1024];
@@ -1179,48 +1199,6 @@ const char* User::GetIPString()
        return "";
 }
 
-const char* User::GetIPString(char* buf)
-{
-       if (this->ip == NULL)
-       {
-               *buf = 0;
-               return buf;
-       }
-
-       switch (this->GetProtocolFamily())
-       {
-#ifdef SUPPORT_IP6LINKS
-               case AF_INET6:
-               {
-                       static char temp[1024];
-
-                       sockaddr_in6* sin = (sockaddr_in6*)this->ip;
-                       inet_ntop(sin->sin6_family, &sin->sin6_addr, buf, sizeof(buf));
-                       /* IP addresses starting with a : on irc are a Bad Thing (tm) */
-                       if (*buf == ':')
-                       {
-                               strlcpy(&temp[1], buf, sizeof(temp) - 1);
-                               *temp = '0';
-                               strlcpy(buf, temp, sizeof(temp));
-                       }
-                       return buf;
-               }
-               break;
-#endif
-               case AF_INET:
-               {
-                       sockaddr_in* sin = (sockaddr_in*)this->ip;
-                       inet_ntop(sin->sin_family, &sin->sin_addr, buf, sizeof(buf));
-                       return buf;
-               }
-               break;
-
-               default:
-               break;
-       }
-       return "";
-}
-
 /** NOTE: We cannot pass a const reference to this method.
  * The string is changed by the workings of the method,
  * so that if we pass const ref, we end up copying it to
@@ -1879,6 +1857,16 @@ const char* User::GetOperQuit()
        return operquit ? operquit : "";
 }
 
+void User::IncreasePenalty(int increase)
+{
+       this->Penalty += increase;
+}
+
+void User::DecreasePenalty(int decrease)
+{
+       this->Penalty -= decrease;
+}
+
 VisData::VisData()
 {
 }