-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * 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
+ * License as published by the Free Software Foundation, version 2.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "inspircd.h"
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/handshaketimer.h"
+#include "inspircd.h"
+#include "commands.h"
-/* $ModDep: m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_hash.h m_spanningtree/handshaketimer.h */
+#include "utils.h"
+#include "treeserver.h"
-bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> ¶ms)
+CmdResult CommandUID::Handle(const parameterlist ¶ms, User* serversrc)
{
+ 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
*/
- if (params.size() < 10)
- {
- this->SendError("Invalid client introduction (wanted 10 or more parameters, got " + (params.empty() ? "0" : ConvToStr(params.size())) + "!)");
- return false;
- }
-
time_t age_t = ConvToInt(params[1]);
time_t signon = ConvToInt(params[7]);
std::string empty;
+ const std::string& modestr = params[8];
- TreeServer* remoteserver = Utils->FindServer(source);
+ TreeServer* remoteserver = Utils->FindServer(serversrc->server);
if (!remoteserver)
- {
- this->SendError("Invalid client introduction (Unknown server "+source+")");
- return false;
- }
+ return CMD_INVALID;
+ /* Is this a valid UID, and not misrouted? */
+ if (params[0].length() != 9 || params[0].substr(0,3) != serversrc->uuid)
+ return CMD_INVALID;
/* Check parameters for validity before introducing the client, discovered by dmb */
- else if (!age_t)
- {
- this->SendError("Invalid client introduction (Invalid TS?)");
- return false;
- }
- else if (!signon)
- {
- this->SendError("Invalid client introduction (Invalid signon?)");
- return false;
- }
- else if (params[8][0] != '+')
- {
- this->SendError("Invalid client introduction (Malformed MODE sequence?)");
- return false;
- }
+ if (!age_t)
+ return CMD_INVALID;
+ if (!signon)
+ return CMD_INVALID;
+ if (modestr[0] != '+')
+ return CMD_INVALID;
+ TreeSocket* sock = remoteserver->GetRoute()->GetSocket();
/* check for collision */
- user_hash::iterator iter = this->ServerInstance->Users->clientlist->find(params[2]);
+ user_hash::iterator iter = ServerInstance->Users->clientlist->find(params[2]);
- if (iter != this->ServerInstance->Users->clientlist->end())
+ if (iter != ServerInstance->Users->clientlist->end())
{
/*
* Nick collision.
*/
- int collide = this->DoCollision(iter->second, age_t, params[5], params[8], params[0]);
- ServerInstance->Logs->Log("m_spanningtree",DEBUG,"*** Collision on %s, collide=%d", params[2].c_str(), collide);
+ int collide = sock->DoCollision(iter->second, 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 changed, make sure we change their nick for the hash too */
- params[2] = params[0];
+ /* 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];
}
}
User* _new = NULL;
try
{
- _new = new User(this->ServerInstance, params[0]);
+ _new = new RemoteUser(params[0], remoteserver->GetName());
}
catch (...)
{
- this->SendError("Protocol violation - Duplicate UUID '" + params[0] + "' on introduction of new user");
- return false;
+ ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Duplicate UUID %s in client introduction", params[0].c_str());
+ return CMD_INVALID;
}
- (*(this->ServerInstance->Users->clientlist))[params[2]] = _new;
- _new->SetFd(FD_MAGIC_NUMBER);
- _new->nick.assign(params[2], 0, MAXBUF);
- _new->host.assign(params[3], 0, 64);
- _new->dhost.assign(params[4], 0, 64);
- _new->server = this->ServerInstance->FindServerNamePtr(remoteserver->GetName().c_str());
- _new->ident.assign(params[5], 0, MAXBUF);
- _new->fullname.assign(params[params.size() - 1], 0, MAXBUF);
+ (*(ServerInstance->Users->clientlist))[params[2]] = _new;
+ _new->nick = params[2];
+ _new->host = params[3];
+ _new->dhost = params[4];
+ _new->ident = params[5];
+ _new->fullname = params[params.size() - 1];
_new->registered = REG_ALL;
_new->signon = signon;
_new->age = age_t;
- /* we need to remove the + from the modestring, so we can do our stuff */
- std::string::size_type pos_after_plus = params[8].find_first_not_of('+');
- if (pos_after_plus != std::string::npos)
- params[8] = params[8].substr(pos_after_plus);
-
unsigned int paramptr = 9;
- for (std::string::iterator v = params[8].begin(); v != params[8].end(); v++)
+
+ for (std::string::const_iterator v = modestr.begin(); v != modestr.end(); ++v)
{
+ // Accept more '+' chars, for now
if (*v == '+')
continue;
- /* For each mode thats set, increase counter */
+ /* 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)
+ if (!mh)
{
- if (mh->GetNumParams(true))
- {
- /* 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.
- */
- if (paramptr < params.size() - 1)
- mh->OnModeChange(_new, _new, NULL, params[paramptr++], true);
- else
- {
- this->SendError(std::string("Broken UID command, expected a parameter for user mode '")+(*v)+"' but there aren't enough parameters in the command!");
- return false;
- }
- }
- else
- mh->OnModeChange(_new, _new, NULL, empty, true);
- _new->SetMode(*v, true);
- mh->ChangeCount(1);
+ ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Unrecognised mode '%c' for a user in UID, dropping link", *v);
+ return CMD_INVALID;
}
- else
+
+ if (mh->GetNumParams(true))
{
- this->SendError(std::string("Warning: Broken UID command, unknown user mode '")+(*v)+"' in the mode string! (mismatched module?)");
- return false;
+ 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);
}
- /* now we've done with modes processing, put the + back for remote servers */
- if (params[8][0] != '+')
- params[8] = "+" + params[8];
-
-#ifdef SUPPORT_IP6LINKS
- if (params[6].find_first_of(":") != std::string::npos)
- _new->SetSockAddr(AF_INET6, params[6].c_str(), 0);
- else
-#endif
- _new->SetSockAddr(AF_INET, params[6].c_str(), 0);
+ _new->SetClientIP(params[6].c_str());
ServerInstance->Users->AddGlobalClone(_new);
+ remoteserver->UserCount++;
bool dosend = true;
- if ((this->Utils->quiet_bursts && remoteserver->bursting) || this->ServerInstance->SilentULine(_new->server))
+ if ((Utils->quiet_bursts && remoteserver->bursting) || ServerInstance->SilentULine(_new->server))
dosend = false;
if (dosend)
- this->ServerInstance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s!%s@%s [%s] [%s]", _new->server, _new->nick.c_str(), _new->ident.c_str(), _new->host.c_str(), _new->GetIPString(), _new->fullname.c_str());
+ 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(OnPostConnect, (_new));
- params[params.size() - 1] = ":" + params[params.size() - 1];
- Utils->DoOneToAllButSender(source, "UID", params, source);
+ return CMD_SUCCESS;
+}
- ServerInstance->PI->Introduce(_new);
- FOREACH_MOD_I(ServerInstance,I_OnPostConnect,OnPostConnect(_new));
+CmdResult CommandFHost::Handle(const parameterlist ¶ms, User* src)
+{
+ if (IS_SERVER(src))
+ return CMD_FAILURE;
+ src->ChangeDisplayedHost(params[0].c_str());
+ return CMD_SUCCESS;
+}
- return true;
+CmdResult CommandFIdent::Handle(const parameterlist ¶ms, User* src)
+{
+ if (IS_SERVER(src))
+ return CMD_FAILURE;
+ src->ChangeIdent(params[0].c_str());
+ return CMD_SUCCESS;
+}
+
+CmdResult CommandFName::Handle(const parameterlist ¶ms, User* src)
+{
+ if (IS_SERVER(src))
+ return CMD_FAILURE;
+ src->ChangeName(params[0].c_str());
+ return CMD_SUCCESS;
}
projects / user / henk / code / inspircd.git / blobdiff