Fix some Windows-related problems.

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

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 605bc1f698657e032d15cf979ebbefc45bc44d83..1d1a05fa2e269febbaeb993e1a54d396422765ec 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -73,7 +73,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
                }
                catch (CoreException& modexcept)
                {
-                       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+                       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "%s threw an exception: %s", modexcept.GetSource().c_str(), modexcept.GetReason().c_str());
                }
        }
 
@@ -129,8 +129,8 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
                {
                        /* user banned */
                        ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCache: Positive hit for " + New->GetIPString());
-                       if (!ServerInstance->Config->MoronBanner.empty())
-                               New->WriteNotice("*** " +  ServerInstance->Config->MoronBanner);
+                       if (!ServerInstance->Config->XLineMessage.empty())
+                               New->WriteNotice("*** " +  ServerInstance->Config->XLineMessage);
                        this->QuitUser(New, b->Reason);
                        return;
                }
@@ -337,3 +337,71 @@ bool UserManager::AllModulesReportReady(LocalUser* user)
        FIRST_MOD_RESULT(OnCheckReady, res, (user));
        return (res == MOD_RES_PASSTHRU);
 }
+
+/**
+ * This function is called once a second from the mainloop.
+ * It is intended to do background checking on all the user structs, e.g.
+ * stuff like ping checks, registration timeouts, etc.
+ */
+void UserManager::DoBackgroundUserStuff()
+{
+       /*
+        * loop over all local users..
+        */
+       for (LocalUserList::iterator i = local_users.begin(); i != local_users.end(); ++i)
+       {
+               LocalUser* curr = *i;
+
+               if (curr->quitting)
+                       continue;
+
+               if (curr->CommandFloodPenalty || curr->eh.getSendQSize())
+               {
+                       unsigned int rate = curr->MyClass->GetCommandRate();
+                       if (curr->CommandFloodPenalty > rate)
+                               curr->CommandFloodPenalty -= rate;
+                       else
+                               curr->CommandFloodPenalty = 0;
+                       curr->eh.OnDataReady();
+               }
+
+               switch (curr->registered)
+               {
+                       case REG_ALL:
+                               if (ServerInstance->Time() > curr->nping)
+                               {
+                                       // This user didn't answer the last ping, remove them
+                                       if (!curr->lastping)
+                                       {
+                                               time_t time = ServerInstance->Time() - (curr->nping - curr->MyClass->GetPingTime());
+                                               const std::string message = "Ping timeout: " + ConvToStr(time) + (time == 1 ? " seconds" : " second");
+                                               this->QuitUser(curr, message);
+                                               continue;
+                                       }
+
+                                       curr->Write("PING :" + ServerInstance->Config->ServerName);
+                                       curr->lastping = 0;
+                                       curr->nping = ServerInstance->Time() + curr->MyClass->GetPingTime();
+                               }
+                               break;
+                       case REG_NICKUSER:
+                               if (AllModulesReportReady(curr))
+                               {
+                                       /* User has sent NICK/USER, modules are okay, DNS finished. */
+                                       curr->FullConnect();
+                                       continue;
+                               }
+                               break;
+               }
+
+               if (curr->registered != REG_ALL && (ServerInstance->Time() > (curr->age + curr->MyClass->GetRegTimeout())))
+               {
+                       /*
+                        * registration timeout -- didnt send USER/NICK/HOST
+                        * in the time specified in their connection class.
+                        */
+                       this->QuitUser(curr, "Registration timeout");
+                       continue;
+               }
+       }
+}