X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_spanningtree%2Fuid.cpp;h=da75eebec27f3b78244e28a9a8726d405cc9ec24;hb=b14ebbccf08ec34a73e1ba271e67da80d9fe805c;hp=4bcc2d9b2bae7690faa783032c747ef0e5bcac47;hpb=d9d99cd02dadf34bfcc220734ba0c422f0acb3e6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 4bcc2d9b2..da75eebec 100644
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -25,9 +25,8 @@
 #include "utils.h"
 #include "treeserver.h"
 
-CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
+CmdResult CommandUID::Handle(User* serversrc, std::vector<std::string>& params)
 {
-	SpanningTreeUtilities* Utils = ((ModuleSpanningTree*)(Module*)creator)->Utils;
 	/** Do we have enough parameters:
 	 *      0    1    2    3    4    5        6        7     8        9       (n-1)
 	 * UID uuid age nick host dhost ident ip.string signon +modes (modepara) :gecos
@@ -51,7 +50,6 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 		return CMD_INVALID;
 	if (modestr[0] != '+')
 		return CMD_INVALID;
-	TreeSocket* sock = remoteserver->GetRoute()->GetSocket();
 
 	/* check for collision */
 	user_hash::iterator iter = ServerInstance->Users->clientlist->find(params[2]);
@@ -61,17 +59,13 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 		/*
 		 * Nick collision.
 		 */
-		int collide = sock->DoCollision(iter->second, age_t, params[5], params[6], params[0]);
-		ServerInstance->Logs->Log("m_spanningtree", LOG_DEBUG, "*** Collision on %s, collide=%d", params[2].c_str(), collide);
+		int collide = Utils->DoCollision(iter->second, 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)
 		{
-			/* remote client lost, make sure we change their nick for the hash too
-			 *
-			 * This alters the line that will be sent to other servers, which
-			 * commands normally shouldn't do; hence the required const_cast.
-			 */
-			const_cast<parameterlist&>(params)[2] = params[0];
+			// Remote client lost, make sure we change their nick for the hash too
+			params[2] = params[0];
 		}
 	}
 
@@ -85,7 +79,7 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 	}
 	catch (...)
 	{
-		ServerInstance->Logs->Log("m_spanningtree", LOG_DEFAULT, "Duplicate UUID %s in client introduction", params[0].c_str());
+		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;
@@ -110,7 +104,7 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 		ModeHandler* mh = ServerInstance->Modes->FindMode(*v, MODETYPE_USER);
 		if (!mh)
 		{
-			ServerInstance->Logs->Log("m_spanningtree", LOG_DEFAULT, "Unrecognised mode '%c' for a user in UID, dropping link", *v);
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Unrecognised mode '%c' for a user in UID, dropping link", *v);
 			return CMD_INVALID;
 		}
 
@@ -132,7 +126,7 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 		}
 		else
 			mh->OnModeChange(_new, _new, NULL, empty, true);
-		_new->SetMode(*v, true);
+		_new->SetMode(mh, true);
 	}
 
 	_new->SetClientIP(params[6].c_str());
@@ -148,32 +142,32 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 	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());
 
-	FOREACH_MOD(I_OnPostConnect,OnPostConnect(_new));
+	FOREACH_MOD(OnPostConnect, (_new));
 
 	return CMD_SUCCESS;
 }
 
-CmdResult CommandFHost::Handle(const parameterlist &params, User* src)
+CmdResult CommandFHost::Handle(User* src, std::vector<std::string>& params)
 {
 	if (IS_SERVER(src))
 		return CMD_FAILURE;
-	src->ChangeDisplayedHost(params[0].c_str());
+	src->ChangeDisplayedHost(params[0]);
 	return CMD_SUCCESS;
 }
 
-CmdResult CommandFIdent::Handle(const parameterlist &params, User* src)
+CmdResult CommandFIdent::Handle(User* src, std::vector<std::string>& params)
 {
 	if (IS_SERVER(src))
 		return CMD_FAILURE;
-	src->ChangeIdent(params[0].c_str());
+	src->ChangeIdent(params[0]);
 	return CMD_SUCCESS;
 }
 
-CmdResult CommandFName::Handle(const parameterlist &params, User* src)
+CmdResult CommandFName::Handle(User* src, std::vector<std::string>& params)
 {
 	if (IS_SERVER(src))
 		return CMD_FAILURE;
-	src->ChangeName(params[0].c_str());
+	src->ChangeName(params[0]);
 	return CMD_SUCCESS;
 }