X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fuid.cpp;h=f248b3860743880d0e2720d8c9852e0faac5ba5d;hb=ea590a5d80741c3bc030cb0a2fcb3c59da4fd078;hp=55a6e3939b59562965b9926923dcbee5a9804b6e;hpb=d9d9cbe025f94523265daa72de7596467d71f5c8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 55a6e3939..f248b3860 100644
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -48,14 +48,13 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
 		return CMD_INVALID;
 
 	/* check for collision */
-	user_hash::iterator iter = ServerInstance->Users->clientlist->find(params[2]);
-
-	if (iter != ServerInstance->Users->clientlist->end())
+	User* collideswith = ServerInstance->FindNickOnly(params[2]);
+	if (collideswith)
 	{
 		/*
 		 * Nick collision.
 		 */
-		int collide = Utils->DoCollision(iter->second, remoteserver, age_t, params[5], params[6], params[0]);
+		int collide = Utils->DoCollision(collideswith, remoteserver, age_t, params[5], params[6], params[0]);
 		ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "*** Collision on %s, collide=%d", params[2].c_str(), collide);
 
 		if (collide != 1)
@@ -71,14 +70,14 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
 	User* _new = NULL;
 	try
 	{
-		_new = new RemoteUser(params[0], remoteserver->GetName());
+		_new = new RemoteUser(params[0], remoteserver);
 	}
 	catch (...)
 	{
 		ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Duplicate UUID %s in client introduction", params[0].c_str());
 		return CMD_INVALID;
 	}
-	(*(ServerInstance->Users->clientlist))[params[2]] = _new;
+	ServerInstance->Users->clientlist[params[2]] = _new;
 	_new->nick = params[2];
 	_new->host = params[3];
 	_new->dhost = params[4];
@@ -132,11 +131,11 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
 
 	bool dosend = true;
 
-	if ((Utils->quiet_bursts && remoteserver->bursting) || ServerInstance->SilentULine(_new->server))
+	if ((Utils->quiet_bursts && remoteserver->bursting) || _new->server->IsSilentULine())
 		dosend = false;
 
 	if (dosend)
-		ServerInstance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s (%s) [%s]", _new->server.c_str(), _new->GetFullRealHost().c_str(), _new->GetIPString().c_str(), _new->fullname.c_str());
+		ServerInstance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s (%s) [%s]", remoteserver->GetName().c_str(), _new->GetFullRealHost().c_str(), _new->GetIPString().c_str(), _new->fullname.c_str());
 
 	FOREACH_MOD(OnPostConnect, (_new));
 
@@ -161,3 +160,17 @@ CmdResult CommandFName::HandleRemote(RemoteUser* src, std::vector<std::string>&
 	return CMD_SUCCESS;
 }
 
+CommandUID::Builder::Builder(User* user)
+	: CmdBuilder(TreeServer::Get(user)->GetID(), "UID")
+{
+	push(user->uuid);
+	push_int(user->age);
+	push(user->nick);
+	push(user->host);
+	push(user->dhost);
+	push(user->ident);
+	push(user->GetIPString());
+	push_int(user->signon);
+	push('+').push_raw(user->FormatModes(true));
+	push_last(user->fullname);
+}