* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
*/
#include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
-#include "socket.h"
-#include "xline.h"
-#include "transport.h"
-#include "m_hash.h"
-#include "socketengine.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 "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "link.h"
+#include "treesocket.h"
+#include "resolvers.h"
+#include "handshaketimer.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 */
-bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> ¶ms)
+bool TreeSocket::ParseUID(const std::string &source, parameterlist ¶ms)
{
/** Do we have enough parameters:
* 0 1 2 3 4 5 6 7 8 9 (n-1)
*/
if (params.size() < 10)
{
- if (!params.empty())
- this->WriteLine(std::string(":")+this->ServerInstance->Config->GetSID()+" KILL "+params[0]+" :Invalid client introduction ("+params[0]+" with only "+
- ConvToStr(params.size())+" of 10 or more parameters?)");
- return true;
+ 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]);
if (!remoteserver)
{
- this->WriteLine(std::string(":")+this->ServerInstance->Config->GetSID()+" KILL "+params[0]+" :Invalid client introduction (Unknown server "+source+")");
- return true;
+ this->SendError("Invalid client introduction (Unknown server "+source+")");
+ return false;
}
-
/* Check parameters for validity before introducing the client, discovered by dmb */
- if (!age_t)
+ else if (!age_t)
+ {
+ this->SendError("Invalid client introduction (Invalid TS?)");
+ return false;
+ }
+ else if (!signon)
{
- this->WriteLine(std::string(":")+this->ServerInstance->Config->GetSID()+" KILL "+params[0]+" :Invalid client introduction (Invalid TS?)");
- return true;
+ this->SendError("Invalid client introduction (Invalid signon?)");
+ return false;
+ }
+ else if (params[8][0] != '+')
+ {
+ this->SendError("Invalid client introduction (Malformed MODE sequence?)");
+ return false;
}
/* check for collision */
/*
* Nick collision.
*/
- ServerInstance->Logs->Log("m_spanningtree",DEBUG,"*** Collision on %s", params[2].c_str());
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);
- if (collide == 2)
+ if (collide != 1)
{
/* remote client changed, make sure we change their nick for the hash too */
params[2] = params[0];
}
catch (...)
{
- SendError("Protocol violation - Duplicate UUID '" + params[0] + "' on introduction of new user");
+ this->SendError("Protocol violation - Duplicate UUID '" + params[0] + "' on introduction of new user");
return false;
}
(*(this->ServerInstance->Users->clientlist))[params[2]] = _new;
{
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
- ServerInstance->Logs->Log("m_spanningtree", DEBUG, "Warning: Broken UID command, expected a parameter for user mode '%c' but there aren't enough parameters in the command!", *v);
+ {
+ 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);
mh->ChangeCount(1);
}
else
- ServerInstance->Logs->Log("m_spanningtree", DEBUG, "Warning: Broken UID command, unknown user mode '%c' in the mode string!", *v);
+ {
+ this->SendError(std::string("Warning: Broken UID command, unknown user mode '")+(*v)+"' in the mode string! (mismatched module?)");
+ return false;
+ }
}
- //_new->ProcessNoticeMasks(params[7].c_str());
-
/* 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);