*/
#include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "commands/cmd_whois.h"
#include "commands/cmd_stats.h"
#include "socket.h"
TreeServer* recursive_server = Current->GetChild(q);
if (recursive_server != s)
{
- snprintf(command,1024,":%s SERVER %s * %d :%s",Current->GetName().c_str(),recursive_server->GetName().c_str(),hops,recursive_server->GetDesc().c_str());
+ snprintf(command,1024,":%s SERVER %s * %d %s :%s",Current->GetName().c_str(),recursive_server->GetName().c_str(),hops,
+ recursive_server->GetID().c_str(),
+ recursive_server->GetDesc().c_str());
this->WriteLine(command);
this->WriteLine(":"+recursive_server->GetName()+" VERSION :"+recursive_server->GetVersion());
/* down to next level */
}
else if (params[0] == "END")
{
+ std::string OurSID;
+
+ OurSID += (char)((Instance->Config->sid / 100) + 48);
+ OurSID += (char)((Instance->Config->sid / 10) % 10 + 48);
+ OurSID += (char)(Instance->Config->sid % 10 + 48);
+
std::string reason;
int ip6support = 0;
#ifdef SUPPORT_IP6LINKS
this->SetTheirChallenge(n->second);
if (!this->GetTheirChallenge().empty() && (this->LinkState == CONNECTING))
{
- this->WriteLine(std::string("SERVER ")+this->Instance->Config->ServerName+" "+this->MakePass(OutboundPass, this->GetTheirChallenge())+" 0 :"+this->Instance->Config->ServerDesc);
+ this->WriteLine(std::string("SERVER ")+this->Instance->Config->ServerName+" "+this->MakePass(OutboundPass, this->GetTheirChallenge())+" 0 "+
+ OurSID+" :"+this->Instance->Config->ServerDesc);
}
}
else
{
/* They didnt specify a challenge or we don't have m_sha256.so, we use plaintext */
if (this->LinkState == CONNECTING)
- this->WriteLine(std::string("SERVER ")+this->Instance->Config->ServerName+" "+OutboundPass+" 0 :"+this->Instance->Config->ServerDesc);
+ this->WriteLine(std::string("SERVER ")+this->Instance->Config->ServerName+" "+OutboundPass+" 0 "+OurSID+" :"+this->Instance->Config->ServerDesc);
}
if (reason.length())
}
else
{
- /* FMODE from a server, create a fake user to receive mode feedback */
- who = new userrec(this->Instance);
- who->SetFd(FD_MAGIC_NUMBER);
+ /* FMODE from a server, use a fake user to receive mode feedback */
+ who = this->Instance->FakeClient;
smode = true; /* Setting this flag tells us we should free the userrec later */
sourceserv = source; /* Set sourceserv to the actual source string */
}
}
/* If the TS is greater than ours, we drop the mode and dont pass it anywhere.
*/
-
- if (smode)
- DELETE(who);
-
return true;
}
{
std::deque<std::string> stackresult;
const char* mode_junk[MAXMODES+2];
- userrec* n = new userrec(Instance);
- n->SetFd(FD_MAGIC_NUMBER);
mode_junk[0] = channel.c_str();
while (modestack.GetStackedLine(stackresult))
{
mode_junk[j+1] = stackresult[j].c_str();
}
- Instance->SendMode(mode_junk, stackresult.size() + 1, n);
+ Instance->SendMode(mode_junk, stackresult.size() + 1, Instance->FakeClient);
}
-
- delete n;
}
return true;
}
+/*
+ * Yes, this function looks a little ugly.
+ * However, in some circumstances we may not have a userrec, so we need to do things this way.
+ * Returns 1 if colliding local client, 2 if colliding remote, 3 if colliding both.
+ * Sends SVSNICKs as appropriate and forces nickchanges too.
+ */
+int TreeSocket::DoCollision(userrec *u, time_t remotets, const char *remoteident, const char *remoteip, const char *remoteuid)
+{
+ /*
+ * Under old protocol rules, we would have had to kill both clients.
+ * Really, this sucks.
+ * These days, we have UID. And, so what we do is, force nick change client(s)
+ * involved according to timestamp rules.
+ *
+ * RULES:
+ * user@ip equal:
+ * Force nick change on OLDER timestamped client
+ * user@ip differ:
+ * Force nick change on NEWER timestamped client
+ * TS EQUAL:
+ * FNC both.
+ *
+ * This stops abusive use of collisions, simplifies problems with loops, and so on.
+ * -- w00t
+ */
+ bool bChangeLocal = true;
+ bool bChangeRemote = true;
+
+ /* for brevity, don't use the userrec */
+ time_t localts = u->age;
+ const char *localident = u->ident;
+ const char *localip = u->GetIPString();
+
+ /* mmk. let's do this again. */
+ if (remotets == localts)
+ {
+ /* equal. fuck them both! do nada, let the handler at the bottom figure this out. */
+ }
+ else
+ {
+ /* fuck. now it gets complex. */
+
+ /* first, let's see if ident@host matches. */
+ bool SamePerson = strcmp(localident, remoteident)
+ && !strcmp(localip, remoteip);
+
+ /*
+ * if ident@ip is equal, and theirs is newer, or
+ * ident@ip differ, and ours is newer
+ */
+ if((SamePerson && remotets < localts) ||
+ (!SamePerson && remotets > localts))
+ {
+ /* remote needs to change */
+ bChangeLocal = false;
+ }
+ else
+ {
+ /* ours needs to change */
+ bChangeRemote = false;
+ }
+ }
+
+
+ if (bChangeLocal)
+ {
+ u->ForceNickChange(u->uuid);
+
+ if (!bChangeRemote)
+ return 1;
+ }
+ if (bChangeRemote)
+ {
+ /*
+ * Cheat a little here. Instead of a dedicated command to change UID,
+ * use SVSNICK and accept their client with it's UID (as we know the SVSNICK will
+ * not fail under any circumstances -- UIDs are netwide exclusive).
+ *
+ * This means that each side of a collide will generate one extra NICK back to where
+ * they have just linked (and where it got the SVSNICK from), however, it will
+ * be dropped harmlessly as it will come in as :928AAAB NICK 928AAAB, and we already
+ * have 928AAAB's nick set to that.
+ * -- w00t
+ */
+ userrec *remote = this->Instance->FindUUID(remoteuid);
+
+ if (remote)
+ {
+ /* buh.. nick change collide. force change their nick. */
+ remote->ForceNickChange(remote->uuid);
+ }
+ else
+ {
+ /* user has not been introduced yet, just inform their server */
+ this->WriteLine(std::string(":")+this->Instance->Config->ServerName+" SVSNICK "+remoteuid+" " + remoteuid);
+ }
+
+ if (!bChangeRemote)
+ return 2;
+ }
+
+ return 3;
+}
+
bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> ¶ms)
{
/** Do we have enough parameters:
return true;
}
- userrec *u = this->Instance->FindUUID(params[0]);
-
- if (u)
- {
- /* barf! */
- userrec::QuitUser(this->Instance, u, "UID collision (?!)");
- this->WriteLine(std::string(":")+this->Instance->Config->ServerName+" KILL "+params[0]+" :Invalid client introduction (UID collision (?!))");
- return true;
- }
-
/* Check parameters for validity before introducing the client, discovered by dmb */
if (!age)
{
}
}
- /** Our client looks ok, lets introduce it now
- */
- Instance->Log(DEBUG,"New remote client %s", tempnick);
+
+ /* check for collision */
user_hash::iterator iter = this->Instance->clientlist->find(tempnick);
if (iter != this->Instance->clientlist->end())
{
/*
- * Uh oh, nick collision. Under old rules, we'd kill both. These days now we have UUID,
- * we force both clients to change nick to their UUID. Just change ours, and the other
- * server will change theirs when they see the collide. Problem solved! -- w00t
+ * Nick collision.
*/
- iter->second->ForceNickChange(iter->second->uuid);
+ Instance->Log(DEBUG,"*** Collision on %s", tempnick);
+ int collide = this->DoCollision(iter->second, age, params[5].c_str(), params[7].c_str(), params[0].c_str());
- /* also reassign tempnick so we don't trample the hash - important! */
- tempnick = params[0].c_str();
+ if (collide == 2)
+ {
+ /* remote client changed, make sure we change their nick for the hash too */
+ tempnick = params[0].c_str();
+ }
}
- userrec* _new = new userrec(this->Instance, params[0]);
+ /* IMPORTANT NOTE: For remote users, we pass the UUID in the constructor. This automatically
+ * sets it up in the UUID hash for us.
+ */
+ userrec* _new = NULL;
+ try
+ {
+ _new = new userrec(this->Instance, params[0]);
+ }
+ catch (CoreException &e)
+ {
+ /** TODO: SQUIT the server here, the remote server is fucking with us
+ * and has sent us the same UID twice!
+ */
+ }
(*(this->Instance->clientlist))[tempnick] = _new;
_new->SetFd(FD_MAGIC_NUMBER);
strlcpy(_new->nick, tempnick, NICKMAX - 1);
projects / user / henk / code / inspircd.git / blobdiff