X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=7f07bc69ffcc35c635ab6c2c7a29a6bc086fa588;hb=87dd84a97265843cfe19f20c207c1c72f38a4f2d;hp=ecbd683b77b181210896504ee7e669db084dd912;hpb=29eea851b2daa68d57aeb0d00b82273414fc44d6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index ecbd683b7..7f07bc69f 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -18,7 +18,7 @@
 #include "bancache.h"
 
 /* add a client connection to the sockets list */
-void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip, const std::string &targetip)
+void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip, const std::string &targetip)
 {
 	/* NOTE: Calling this one parameter constructor for User automatically
 	 * allocates a new UUID and places it in the hash_map.
@@ -63,27 +63,22 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 
 	Instance->Logs->Log("USERS", DEBUG,"New user fd: %d", socket);
 
-	int j = 0;
-
 	this->unregistered_count++;
 
 	(*(this->clientlist))[New->uuid] = New;
 
 	/* The users default nick is their UUID */
-	strlcpy(New->nick, New->uuid, NICKMAX - 1);
+	New->nick.assign(New->uuid, 0, NICKMAX - 1);
 
 	New->server = Instance->FindServerNamePtr(Instance->Config->ServerName);
-	/* We don't need range checking here, we KNOW 'unknown\0' will fit into the ident field. */
-	strcpy(New->ident, "unknown");
+	New->ident.assign("unknown");
 
 	New->registered = REG_NONE;
 	New->signon = Instance->Time() + Instance->Config->dns_timeout;
 	New->lastping = 1;
 
 	/* Smarter than your average bear^H^H^H^Hset of strlcpys. */
-	for (const char* temp = New->GetIPString(); *temp && j < 64; temp++, j++)
-		New->dhost[j] = New->host[j] = *temp;
-	New->dhost[j] = New->host[j] = 0;
+	New->dhost.assign(New->host.assign(New->GetIPString(), 64));
 
 	Instance->Users->AddLocalClone(New);
 	Instance->Users->AddGlobalClone(New);
@@ -96,7 +91,7 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 
 	if (!i)
 	{
-		User::QuitUser(Instance, New, "Access denied by configuration");
+		this->QuitUser(New, "Access denied by configuration");
 		return;
 	}
 
@@ -111,7 +106,7 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 	if ((this->local_users.size() > Instance->Config->SoftLimit) || (this->local_users.size() >= (unsigned int)Instance->SE->GetMaxFds()))
 	{
 		Instance->SNO->WriteToSnoMask('A', "Warning: softlimit value has been reached: %d clients", Instance->Config->SoftLimit);
-		User::QuitUser(Instance, New,"No more connections allowed");
+		this->QuitUser(New,"No more connections allowed");
 		return;
 	}
 
@@ -127,7 +122,7 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 	 */
 	if (socket >= Instance->SE->GetMaxFds())
 	{
-		User::QuitUser(Instance, New, "Server is full");
+		this->QuitUser(New, "Server is full");
 		return;
 	}
 
@@ -145,8 +140,8 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 			/* user banned */
 			Instance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Positive hit for ") + New->GetIPString());
 			if (*Instance->Config->MoronBanner)
-				New->WriteServ("NOTICE %s :*** %s", New->nick, Instance->Config->MoronBanner);
-			User::QuitUser(Instance, New, b->Reason);
+				New->WriteServ("NOTICE %s :*** %s", New->nick.c_str(), Instance->Config->MoronBanner);
+			this->QuitUser(New, b->Reason);
 			return;
 		}
 		else
@@ -171,7 +166,7 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 	if (!Instance->SE->AddFd(New))
 	{
 		Instance->Logs->Log("USERS", DEBUG,"Internal error on new connection");
-		User::QuitUser(Instance, New, "Internal error handling connection");
+		this->QuitUser(New, "Internal error handling connection");
 	}
 
 	/* NOTE: even if dns lookups are *off*, we still need to display this.
@@ -181,6 +176,7 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 
 	if (Instance->Config->NoUserDns)
 	{
+		New->WriteServ("NOTICE %s :*** Skipping host resolution (disabled by server administrator)", New->nick.c_str());
 		New->dns_done = true;
 	}
 	else
@@ -189,6 +185,22 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 	}
 }
 
+void UserManager::QuitUser(User *user, const std::string &quitreason, const char* operreason)
+{
+	ServerInstance->Logs->Log("USERS", DEBUG,"QuitUser: %s '%s'", 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->quietquit = false;
+	user->quitmsg = quitreason;
+
+	if (!*operreason)
+		user->operquitmsg = quitreason;
+	else
+		user->operquitmsg = operreason;
+
+	ServerInstance->GlobalCulls.AddItem(user);
+}
+
+
 void UserManager::AddLocalClone(User *user)
 {
 	clonemap::iterator x = local_clones.find(user->GetIPString());
@@ -360,7 +372,7 @@ void UserManager::WriteMode(const char* modes, int flags, const char* text, ...)
 			}
 			if (send_to_user)
 			{
-				t->WriteServ("NOTICE %s :%s", t->nick, textbuffer);
+				t->WriteServ("NOTICE %s :%s", t->nick.c_str(), textbuffer);
 			}
 		}
 	}
@@ -382,7 +394,7 @@ void UserManager::WriteMode(const char* modes, int flags, const char* text, ...)
 
 			if (send_to_user)
 			{
-				t->WriteServ("NOTICE %s :%s", t->nick, textbuffer);
+				t->WriteServ("NOTICE %s :%s", t->nick.c_str(), textbuffer);
 			}
 		}
 	}