X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=745934fd4467efc78db9c0b325d068aa7f98cc83;hb=e244cb2c63b1ac1d85bdbb4691f7b1bd940ae804;hp=605bc1f698657e032d15cf979ebbefc45bc44d83;hpb=8710724b5518ae9858309e548514f76e620a8459;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 605bc1f69..745934fd4 100644
--- 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;
 		}
@@ -169,7 +169,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 	FOREACH_MOD(OnUserInit, (New));
 }
 
-void UserManager::QuitUser(User *user, const std::string &quitreason, const char* operreason)
+void UserManager::QuitUser(User* user, const std::string& quitreason, const std::string* operreason)
 {
 	if (user->quitting)
 	{
@@ -186,57 +186,31 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 	user->quitting = true;
 
 	ServerInstance->Logs->Log("USERS", LOG_DEBUG, "QuitUser: %s=%s '%s'", user->uuid.c_str(), user->nick.c_str(), quitreason.c_str());
-	user->Write("ERROR :Closing link: (%s@%s) [%s]", user->ident.c_str(), user->host.c_str(), *operreason ? operreason : quitreason.c_str());
+	user->Write("ERROR :Closing link: (%s@%s) [%s]", user->ident.c_str(), user->host.c_str(), operreason ? operreason->c_str() : quitreason.c_str());
 
 	std::string reason;
-	std::string oper_reason;
 	reason.assign(quitreason, 0, ServerInstance->Config->Limits.MaxQuit);
-	if (operreason && *operreason)
-		oper_reason.assign(operreason, 0, ServerInstance->Config->Limits.MaxQuit);
-	else
-		oper_reason = quitreason;
+	if (!operreason)
+		operreason = &reason;
 
 	ServerInstance->GlobalCulls.AddItem(user);
 
 	if (user->registered == REG_ALL)
 	{
-		FOREACH_MOD(OnUserQuit, (user, reason, oper_reason));
-		user->WriteCommonQuit(reason, oper_reason);
+		FOREACH_MOD(OnUserQuit, (user, reason, *operreason));
+		user->WriteCommonQuit(reason, *operreason);
 	}
-
-	if (user->registered != REG_ALL)
-		if (ServerInstance->Users->unregistered_count)
-			ServerInstance->Users->unregistered_count--;
+	else
+		unregistered_count--;
 
 	if (IS_LOCAL(user))
 	{
 		LocalUser* lu = IS_LOCAL(user);
 		FOREACH_MOD(OnUserDisconnect, (lu));
 		lu->eh.Close();
-	}
 
-	/*
-	 * this must come before the ServerInstance->SNO->WriteToSnoMaskso that it doesnt try to fill their buffer with anything
-	 * if they were an oper with +s +qQ.
-	 */
-	if (user->registered == REG_ALL)
-	{
-		if (IS_LOCAL(user))
-		{
-			if (!user->quietquit)
-			{
-				ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s (%s) [%s]",
-					user->GetFullRealHost().c_str(), user->GetIPString().c_str(), oper_reason.c_str());
-			}
-		}
-		else
-		{
-			if ((!ServerInstance->SilentULine(user->server)) && (!user->quietquit))
-			{
-				ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s (%s) [%s]",
-					user->server.c_str(), user->GetFullRealHost().c_str(), user->GetIPString().c_str(), oper_reason.c_str());
-			}
-		}
+		if (lu->registered == REG_ALL)
+			ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s (%s) [%s]", user->GetFullRealHost().c_str(), user->GetIPString().c_str(), operreason->c_str());
 	}
 
 	user_hash::iterator iter = this->clientlist->find(user->nick);
@@ -246,7 +220,7 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 	else
 		ServerInstance->Logs->Log("USERS", LOG_DEFAULT, "ERROR: Nick not found in clientlist, cannot remove: " + user->nick);
 
-	ServerInstance->Users->uuidlist->erase(user->uuid);
+	uuidlist->erase(user->uuid);
 }
 
 void UserManager::AddLocalClone(User *user)
@@ -337,3 +311,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;
+		}
+	}
+}