X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fuid.cpp;h=4204737cac5d187d3134b945a64b86d82313638b;hb=36f93c0e7f8a980943237b0b28138ade86f5e573;hp=8a74e2f934240fc221bf6fb1ee95579f5ec77b80;hpb=aaabf27f44960be687688cf814a08a0ab032fadc;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 8a74e2f93..4204737ca 100644
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -23,10 +23,7 @@
 #include "commands.h"
 
 #include "utils.h"
-#include "link.h"
-#include "treesocket.h"
 #include "treeserver.h"
-#include "resolvers.h"
 
 CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 {
@@ -65,7 +62,7 @@ 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);
+		ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "*** Collision on %s, collide=%d", params[2].c_str(), collide);
 
 		if (collide != 1)
 		{
@@ -88,7 +85,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;
@@ -103,41 +100,45 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 
 	unsigned int paramptr = 9;
 
-	// Accept more '+' chars, for now
-	std::string::size_type pos = modestr.find_first_not_of('+');
-	for (std::string::const_iterator v = modestr.begin()+pos; v != modestr.end(); ++v)
+	for (std::string::const_iterator v = modestr.begin(); v != modestr.end(); ++v)
 	{
-		/* For each mode thats set, increase counter */
+		// Accept more '+' chars, for now
+		if (*v == '+')
+			continue;
+
+		/* For each mode thats set, find the mode handler and set it on the new user */
 		ModeHandler* mh = ServerInstance->Modes->FindMode(*v, MODETYPE_USER);
+		if (!mh)
+		{
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Unrecognised mode '%c' for a user in UID, dropping link", *v);
+			return CMD_INVALID;
+		}
 
-		if (mh)
+		if (mh->GetNumParams(true))
 		{
-			if (mh->GetNumParams(true))
-			{
-				if (paramptr >= params.size() - 1)
-					return CMD_INVALID;
-				std::string mp = params[paramptr++];
-				/* IMPORTANT NOTE:
-				 * All modes are assumed to succeed here as they are being set by a remote server.
-				 * Modes CANNOT FAIL here. If they DO fail, then the failure is ignored. This is important
-				 * to note as all but one modules currently cannot ever fail in this situation, except for
-				 * m_servprotect which specifically works this way to prevent the mode being set ANYWHERE
-				 * but here, at client introduction. You may safely assume this behaviour is standard and
-				 * will not change in future versions if you want to make use of this protective behaviour
-				 * yourself.
-				 */
-				mh->OnModeChange(_new, _new, NULL, mp, true);
-			}
-			else
-				mh->OnModeChange(_new, _new, NULL, empty, true);
-			_new->SetMode(*v, true);
+			if (paramptr >= params.size() - 1)
+				return CMD_INVALID;
+			std::string mp = params[paramptr++];
+			/* IMPORTANT NOTE:
+			 * All modes are assumed to succeed here as they are being set by a remote server.
+			 * Modes CANNOT FAIL here. If they DO fail, then the failure is ignored. This is important
+			 * to note as all but one modules currently cannot ever fail in this situation, except for
+			 * m_servprotect which specifically works this way to prevent the mode being set ANYWHERE
+			 * but here, at client introduction. You may safely assume this behaviour is standard and
+			 * will not change in future versions if you want to make use of this protective behaviour
+			 * yourself.
+			 */
+			mh->OnModeChange(_new, _new, NULL, mp, true);
 		}
+		else
+			mh->OnModeChange(_new, _new, NULL, empty, true);
+		_new->SetMode(mh, true);
 	}
 
 	_new->SetClientIP(params[6].c_str());
 
 	ServerInstance->Users->AddGlobalClone(_new);
-	remoteserver->SetUserCount(1); // increment by 1
+	remoteserver->UserCount++;
 
 	bool dosend = true;