X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fuid.cpp;h=e5061489f014a046a8eb6b4d46d02e0912aa3f44;hb=72286cca740b374661a03d8544ca28d9237875ad;hp=a41fe408d990a3525cd6d97863a878f2720a4c64;hpb=19f0c09aa783cc3b945c880d509c1da8bc8e0275;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index a41fe408d..e5061489f 100644
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -1,9 +1,13 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2017-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Adam <Adam@anope.org>
+ *   Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008, 2010 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -26,11 +30,11 @@
 #include "treeserver.h"
 #include "remoteuser.h"
 
-CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::string>& params)
+CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params& params)
 {
 	/**
 	 *      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
+	 * UID uuid age nick host dhost ident ip.string signon +modes (modepara) :real
 	 */
 	time_t age_t = ServerCommand::ExtractTS(params[1]);
 	time_t signon = ServerCommand::ExtractTS(params[7]);
@@ -38,7 +42,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
 	const std::string& modestr = params[8];
 
 	// Check if the length of the uuid is correct and confirm the sid portion of the uuid matches the sid of the server introducing the user
-	if (params[0].length() != UIDGenerator::UUID_LENGTH || params[0].compare(0, 3, remoteserver->GetID()))
+	if (params[0].length() != UIDGenerator::UUID_LENGTH || params[0].compare(0, 3, remoteserver->GetId()))
 		throw ProtocolException("Bogus UUID");
 	// Sanity check on mode string: must begin with '+'
 	if (modestr[0] != '+')
@@ -50,12 +54,8 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
 	{
 		// User that the incoming user is colliding with is not fully registered, we force nick change the
 		// unregistered user to their uuid and tell them what happened
-		collideswith->WriteFrom(collideswith, "NICK %s", collideswith->uuid.c_str());
-		collideswith->WriteNumeric(ERR_NICKNAMEINUSE, collideswith->nick, "Nickname overruled.");
-
-		// Clear the bit before calling User::ChangeNick() to make it NOT run the OnUserPostNick() hook
-		collideswith->registered &= ~REG_NICK;
-		collideswith->ChangeNick(collideswith->uuid);
+		LocalUser* const localuser = static_cast<LocalUser*>(collideswith);
+		localuser->OverruleNick();
 	}
 	else if (collideswith)
 	{
@@ -77,10 +77,10 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
 	RemoteUser* _new = new SpanningTree::RemoteUser(params[0], remoteserver);
 	ServerInstance->Users->clientlist[params[2]] = _new;
 	_new->nick = params[2];
-	_new->host = params[3];
-	_new->dhost = params[4];
+	_new->ChangeRealHost(params[3], false);
+	_new->ChangeDisplayedHost(params[4]);
 	_new->ident = params[5];
-	_new->fullname = params.back();
+	_new->ChangeRealName(params.back());
 	_new->registered = REG_ALL;
 	_new->signon = signon;
 	_new->age = age_t;
@@ -119,7 +119,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
 		_new->SetMode(mh, true);
 	}
 
-	_new->SetClientIP(params[6].c_str());
+	_new->SetClientIP(params[6]);
 
 	ServerInstance->Users->AddClone(_new);
 	remoteserver->UserCount++;
@@ -130,42 +130,42 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
 		dosend = false;
 
 	if (dosend)
-		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());
+		ServerInstance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s (%s) [%s]", remoteserver->GetName().c_str(), _new->GetFullRealHost().c_str(), _new->GetIPString().c_str(), _new->GetRealName().c_str());
 
 	FOREACH_MOD(OnPostConnect, (_new));
 
 	return CMD_SUCCESS;
 }
 
-CmdResult CommandFHost::HandleRemote(RemoteUser* src, std::vector<std::string>& params)
+CmdResult CommandFHost::HandleRemote(RemoteUser* src, Params& params)
 {
 	src->ChangeDisplayedHost(params[0]);
 	return CMD_SUCCESS;
 }
 
-CmdResult CommandFIdent::HandleRemote(RemoteUser* src, std::vector<std::string>& params)
+CmdResult CommandFIdent::HandleRemote(RemoteUser* src, Params& params)
 {
 	src->ChangeIdent(params[0]);
 	return CMD_SUCCESS;
 }
 
-CmdResult CommandFName::HandleRemote(RemoteUser* src, std::vector<std::string>& params)
+CmdResult CommandFName::HandleRemote(RemoteUser* src, Params& params)
 {
-	src->ChangeName(params[0]);
+	src->ChangeRealName(params[0]);
 	return CMD_SUCCESS;
 }
 
 CommandUID::Builder::Builder(User* user)
-	: CmdBuilder(TreeServer::Get(user)->GetID(), "UID")
+	: CmdBuilder(TreeServer::Get(user), "UID")
 {
 	push(user->uuid);
 	push_int(user->age);
 	push(user->nick);
-	push(user->host);
-	push(user->dhost);
+	push(user->GetRealHost());
+	push(user->GetDisplayedHost());
 	push(user->ident);
 	push(user->GetIPString());
 	push_int(user->signon);
-	push('+').push_raw(user->FormatModes(true));
-	push_last(user->fullname);
+	push(user->GetModeLetters(true));
+	push_last(user->GetRealName());
 }