]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_spanningtree/treesocket1.cpp
Nick collision handling with TS rules. This probably doesn't work yet.
[user/henk/code/inspircd.git] / src / modules / m_spanningtree / treesocket1.cpp
index b858061cb0e1970e550950db32850c78b39be228..5809fb6b82c50750738e972ae25eaae63d5b31bc 100644 (file)
@@ -11,6 +11,7 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "configreader.h"
 #include "users.h"
 #include "channels.h"
@@ -18,7 +19,6 @@
 #include "commands/cmd_whois.h"
 #include "commands/cmd_stats.h"
 #include "socket.h"
-#include "inspircd.h"
 #include "wildcard.h"
 #include "xline.h"
 #include "transport.h"
@@ -46,7 +46,8 @@ TreeSocket::TreeSocket(SpanningTreeUtilities* Util, InspIRCd* SI, std::string ho
 {
        myhost = host;
        this->LinkState = LISTENER;
-       theirchallenge = ourchallenge = "";
+       theirchallenge.clear();
+       ourchallenge.clear();
        if (listening && Hook)
                InspSocketHookRequest(this, (Module*)Utils->Creator, Hook).Send();
 }
@@ -55,7 +56,8 @@ TreeSocket::TreeSocket(SpanningTreeUtilities* Util, InspIRCd* SI, std::string ho
        : InspSocket(SI, host, port, listening, maxtime, bindto), Utils(Util), Hook(HookMod)
 {
        myhost = ServerName;
-       theirchallenge = ourchallenge = "";
+       theirchallenge.clear();
+       ourchallenge.clear();
        this->LinkState = CONNECTING;
        if (Hook)
                InspSocketHookRequest(this, (Module*)Utils->Creator, Hook).Send();
@@ -69,7 +71,9 @@ TreeSocket::TreeSocket(SpanningTreeUtilities* Util, InspIRCd* SI, int newfd, cha
        : InspSocket(SI, newfd, ip), Utils(Util), Hook(HookMod)
 {
        this->LinkState = WAIT_AUTH_1;
-       theirchallenge = ourchallenge = "";
+       theirchallenge.clear();
+       ourchallenge.clear();
+       sentcapab = false;
        /* If we have a transport module hooked to the parent, hook the same module to this
         * socket, and set a timer waiting for handshake before we send CAPAB etc.
         */
@@ -176,13 +180,15 @@ bool TreeSocket::OnConnected()
                {
                        if (x->Name == this->myhost)
                        {
-                               this->Instance->SNO->WriteToSnoMask('l',"Connection to \2"+myhost+"\2["+(x->HiddenFromStats ? "<hidden>" : this->GetIP())+"] started.");
+                               Utils->Creator->RemoteMessage(NULL,"Connection to \2%s\2[%s] started.", myhost.c_str(), (x->HiddenFromStats ? "<hidden>" : this->GetIP().c_str()));
                                if (Hook)
                                {
                                        InspSocketHookRequest(this, (Module*)Utils->Creator, Hook).Send();
-                                       this->Instance->SNO->WriteToSnoMask('l',"Connection to \2"+myhost+"\2["+(x->HiddenFromStats ? "<hidden>" : this->GetIP())+"] using transport \2"+x->Hook+"\2");
+                                       Utils->Creator->RemoteMessage(NULL,"Connection to \2%s\2[%s] using transport \2%s\2", myhost.c_str(), (x->HiddenFromStats ? "<hidden>" : this->GetIP().c_str()),
+                                                       x->Hook.c_str());
                                }
                                this->OutboundPass = x->SendPass;
+                               sentcapab = false;
 
                                /* found who we're supposed to be connecting to, send the neccessary gubbins. */
                                if (this->GetHook())
@@ -199,7 +205,7 @@ bool TreeSocket::OnConnected()
         * If that happens the connection hangs here until it's closed. Unlikely
         * and rather harmless.
         */
-       this->Instance->SNO->WriteToSnoMask('l',"Connection to \2"+myhost+"\2 lost link tag(!)");
+       this->Utils->Creator->RemoteMessage(NULL,"Connection to \2%s\2 lost link tag(!)", myhost.c_str());
        return true;
 }
 
@@ -207,32 +213,32 @@ void TreeSocket::OnError(InspSocketError e)
 {
        Link* MyLink;
 
+       if (this->LinkState == LISTENER)
+               return;
+
        switch (e)
        {
                case I_ERR_CONNECT:
-                       this->Instance->SNO->WriteToSnoMask('l',"Connection failed: Connection to \002"+myhost+"\002 refused");
+                       Utils->Creator->RemoteMessage(NULL,"Connection failed: Connection to \002%s\002 refused", myhost.c_str());
                        MyLink = Utils->FindLink(myhost);
                        if (MyLink)
                                Utils->DoFailOver(MyLink);
                break;
                case I_ERR_SOCKET:
-                       this->Instance->SNO->WriteToSnoMask('l',"Connection failed: Could not create socket");
+                       Utils->Creator->RemoteMessage(NULL,"Connection failed: Could not create socket");
                break;
                case I_ERR_BIND:
-                       this->Instance->SNO->WriteToSnoMask('l',"Connection failed: Error binding socket to address or port");
+                       Utils->Creator->RemoteMessage(NULL,"Connection failed: Error binding socket to address or port");
                break;
                case I_ERR_WRITE:
-                       this->Instance->SNO->WriteToSnoMask('l',"Connection failed: I/O error on connection");
+                       Utils->Creator->RemoteMessage(NULL,"Connection failed: I/O error on connection");
                break;
                case I_ERR_NOMOREFDS:
-                       this->Instance->SNO->WriteToSnoMask('l',"Connection failed: Operating system is out of file descriptors!");
+                       Utils->Creator->RemoteMessage(NULL,"Connection failed: Operating system is out of file descriptors!");
                break;
                default:
                        if ((errno) && (errno != EINPROGRESS) && (errno != EAGAIN))
-                       {
-                               std::string errstr = strerror(errno);
-                               this->Instance->SNO->WriteToSnoMask('l',"Connection to \002"+myhost+"\002 failed with OS error: " + errstr);
-                       }
+                               Utils->Creator->RemoteMessage(NULL,"Connection to \002%s\002 failed with OS error: %s", myhost.c_str(), strerror(errno));
                break;
        }
 }
@@ -274,7 +280,7 @@ void TreeSocket::SendServers(TreeServer* Current, TreeServer* s, int hops)
 std::string TreeSocket::MyCapabilities()
 {
        std::vector<std::string> modlist;
-       std::string capabilities = "";
+       std::string capabilities;
        for (int i = 0; i <= this->Instance->GetModuleCount(); i++)
        {
                if (this->Instance->modules[i]->GetVersion().Flags & VF_COMMON)
@@ -294,12 +300,18 @@ std::string TreeSocket::RandString(unsigned int length)
 {
        char* randombuf = new char[length+1];
        std::string out;
+#ifdef WINDOWS
+       int fd = -1;
+#else
        int fd = open("/dev/urandom", O_RDONLY, 0);
+#endif
 
        if (fd >= 0)
        {
+#ifndef WINDOWS
                read(fd, randombuf, length);
                close(fd);
+#endif
        }
        else
        {
@@ -319,13 +331,17 @@ std::string TreeSocket::RandString(unsigned int length)
 
 void TreeSocket::SendCapabilities()
 {
+       if (sentcapab)
+               return;
+
+       sentcapab = true;
        irc::commasepstream modulelist(MyCapabilities());
        this->WriteLine("CAPAB START");
 
        /* Send module names, split at 509 length */
-       std::string item = "*";
+       std::string item;
        std::string line = "CAPAB MODULES ";
-       while ((item = modulelist.GetToken()) != "")
+       while (modulelist.GetToken(item))
        {
                if (line.length() + item.length() + 1 > 509)
                {
@@ -357,7 +373,7 @@ void TreeSocket::SendCapabilities()
                extra = " CHALLENGE=" + this->GetOurChallenge();
        }
 
-       this->WriteLine("CAPAB CAPABILITIES :NICKMAX="+ConvToStr(NICKMAX)+" HALFOP="+ConvToStr(this->Instance->Config->AllowHalfop)+" CHANMAX="+ConvToStr(CHANMAX)+" MAXMODES="+ConvToStr(MAXMODES)+" IDENTMAX="+ConvToStr(IDENTMAX)+" MAXQUIT="+ConvToStr(MAXQUIT)+" MAXTOPIC="+ConvToStr(MAXTOPIC)+" MAXKICK="+ConvToStr(MAXKICK)+" MAXGECOS="+ConvToStr(MAXGECOS)+" MAXAWAY="+ConvToStr(MAXAWAY)+" IP6NATIVE="+ConvToStr(ip6)+" IP6SUPPORT="+ConvToStr(ip6support)+" PROTOCOL="+ConvToStr(ProtocolVersion)+extra);
+       this->WriteLine("CAPAB CAPABILITIES :NICKMAX="+ConvToStr(NICKMAX)+" HALFOP="+ConvToStr(this->Instance->Config->AllowHalfop)+" CHANMAX="+ConvToStr(CHANMAX)+" MAXMODES="+ConvToStr(MAXMODES)+" IDENTMAX="+ConvToStr(IDENTMAX)+" MAXQUIT="+ConvToStr(MAXQUIT)+" MAXTOPIC="+ConvToStr(MAXTOPIC)+" MAXKICK="+ConvToStr(MAXKICK)+" MAXGECOS="+ConvToStr(MAXGECOS)+" MAXAWAY="+ConvToStr(MAXAWAY)+" IP6NATIVE="+ConvToStr(ip6)+" IP6SUPPORT="+ConvToStr(ip6support)+" PROTOCOL="+ConvToStr(ProtocolVersion)+extra+" PREFIX="+Instance->Modes->BuildPrefixes()+" CHANMODES="+Instance->Modes->ChanModes());
 
        this->WriteLine("CAPAB END");
 }
@@ -366,8 +382,9 @@ void TreeSocket::SendCapabilities()
 bool TreeSocket::HasItem(const std::string &list, const std::string &item)
 {
        irc::commasepstream seplist(list);
-       std::string item2 = "*";
-       while ((item2 = seplist.GetToken()) != "")
+       std::string item2;
+
+       while (seplist.GetToken(item2))
        {
                if (item2 == item)
                        return true;
@@ -379,9 +396,9 @@ bool TreeSocket::HasItem(const std::string &list, const std::string &item)
 std::string TreeSocket::ListDifference(const std::string &one, const std::string &two)
 {
        irc::commasepstream list_one(one);
-       std::string item = "*";
-       std::string result = "";
-       while ((item = list_one.GetToken()) != "")
+       std::string item;
+       std::string result;
+       while (list_one.GetToken(item))
        {
                if (!HasItem(two, item))
                {
@@ -396,7 +413,7 @@ void TreeSocket::SendError(const std::string &errormessage)
 {
        /* Display the error locally as well as sending it remotely */
        this->WriteLine("ERROR :"+errormessage);
-       this->Instance->SNO->WriteToSnoMask('l',"Sent \2ERROR\2 to "+this->InboundServerName+": "+errormessage);
+       Utils->Creator->RemoteMessage(NULL, "Sent \2ERROR\2 to %s: %s", (this->InboundServerName.empty() ? "<unknown>" : this->InboundServerName.c_str()), errormessage.c_str());
        /* One last attempt to make sure the error reaches its target */
        this->FlushWriteBuffer();
 }
@@ -410,12 +427,12 @@ bool TreeSocket::Capab(const std::deque<std::string> &params)
        }
        if (params[0] == "START")
        {
-               this->ModuleList = "";
+               this->ModuleList.clear();
                this->CapKeys.clear();
        }
        else if (params[0] == "END")
        {
-               std::string reason = "";
+               std::string reason;
                int ip6support = 0;
 #ifdef SUPPORT_IP6LINKS
                ip6support = 1;
@@ -465,6 +482,9 @@ bool TreeSocket::Capab(const std::deque<std::string> &params)
                                reason = "Protocol version not specified";
                }
 
+               if(this->CapKeys.find("PREFIX") != this->CapKeys.end() && this->CapKeys.find("PREFIX")->second != this->Instance->Modes->BuildPrefixes())
+                       reason = "One or more of the prefixes on the remote server are invalid on this server.";
+
                if (((this->CapKeys.find("HALFOP") == this->CapKeys.end()) && (Instance->Config->AllowHalfop)) || ((this->CapKeys.find("HALFOP") != this->CapKeys.end()) && (this->CapKeys.find("HALFOP")->second != ConvToStr(Instance->Config->AllowHalfop))))
                        reason = "We don't both have halfop support enabled/disabled identically";
 
@@ -658,6 +678,13 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
                        return true;
        }
 
+       if (!TS)
+       {
+               Instance->Log(DEFAULT,"*** BUG? *** TS of 0 sent to FMODE. Are some services authors smoking craq, or is it 1970 again?. Dropped.");
+               Instance->SNO->WriteToSnoMask('d', "WARNING: The server %s is sending FMODE with a TS of zero. Total craq. Mode was dropped.", sourceserv.c_str());
+               return true;
+       }
+
        /* TS is equal or less: Merge the mode changes into ours and pass on.
         */
        if (TS <= ourTS)
@@ -781,6 +808,13 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque<std::string> &p
        params[2] = ":" + params[2];
        Utils->DoOneToAllButSender(source,"FJOIN",params,source);
 
+        if (!TS)
+       {
+               Instance->Log(DEFAULT,"*** BUG? *** TS of 0 sent to FJOIN. Are some services authors smoking craq, or is it 1970 again?. Dropped.");
+               Instance->SNO->WriteToSnoMask('d', "WARNING: The server %s is sending FJOIN with a TS of zero. Total craq. Command was dropped.", source.c_str());
+               return true;
+       }
+
        /* If our TS is less than theirs, we dont accept their modes */
        if (ourTS < TS)
                apply_other_sides_modes = false;
@@ -826,7 +860,7 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque<std::string> &p
                        usr++;
                        
                        /* Check the user actually exists */
-                       who = this->Instance->FindNick(usr);
+                       who = this->Instance->FindUUID(usr);
                        if (who)
                        {
                                /* Check that the user's 'direction' is correct */
@@ -852,7 +886,7 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque<std::string> &p
        if (apply_other_sides_modes)
        {
                std::deque<std::string> stackresult;
-               const char* mode_junk[MAXMODES+1];
+               const char* mode_junk[MAXMODES+2];
                userrec* n = new userrec(Instance);
                n->SetFd(FD_MAGIC_NUMBER);
                mode_junk[0] = channel.c_str();
@@ -872,93 +906,174 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque<std::string> &p
        return true;
 }
 
-/** NICK command */
-bool TreeSocket::IntroduceClient(const std::string &source, std::deque<std::string> &params)
+bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &params)
 {
        /** Do we have enough parameters:
-        * NICK age nick host dhost ident +modes ip :gecos
+        * UID uuid age nick host dhost ident +modestr ip.string :gecos
         */
-       if (params.size() != 8)
+       if (params.size() != 9)
        {
-               this->WriteLine(std::string(":")+this->Instance->Config->ServerName+" KILL "+params[1]+" :Invalid client introduction ("+params[1]+"?)");
+               this->WriteLine(std::string(":")+this->Instance->Config->ServerName+" KILL "+params[0]+" :Invalid client introduction ("+params[0]+"?)");
                return true;
        }
 
-       time_t age = ConvToInt(params[0]);
-       const char* tempnick = params[1].c_str();
+       time_t age = ConvToInt(params[1]);
+       const char* tempnick = params[2].c_str();
+       std::string empty;
 
-       cmd_validation valid[] = { {"Nickname", 1, NICKMAX}, {"Hostname", 2, 64}, {"Displayed hostname", 3, 64}, {"Ident", 4, IDENTMAX}, {"GECOS", 7, MAXGECOS}, {"", 0, 0} };
+       /* XXX probably validate UID length too -- w00t */
+       cmd_validation valid[] = { {"Nickname", 2, NICKMAX}, {"Hostname", 3, 64}, {"Displayed hostname", 4, 64}, {"Ident", 5, IDENTMAX}, {"GECOS", 7, MAXGECOS}, {"", 0, 0} };
 
        TreeServer* remoteserver = Utils->FindServer(source);
+
        if (!remoteserver)
        {
-               this->WriteLine(std::string(":")+this->Instance->Config->ServerName+" KILL "+params[1]+" :Invalid client introduction (Unknown server "+source+")");
+               this->WriteLine(std::string(":")+this->Instance->Config->ServerName+" KILL "+params[0]+" :Invalid client introduction (Unknown server "+source+")");
+               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)
        {
-               this->WriteLine(std::string(":")+this->Instance->Config->ServerName+" KILL "+params[1]+" :Invalid client introduction (Invalid TS?)");
+               this->WriteLine(std::string(":")+this->Instance->Config->ServerName+" KILL "+params[0]+" :Invalid client introduction (Invalid TS?)");
                return true;
        }
+
        for (size_t x = 0; valid[x].length; ++x)
        {
                if (params[valid[x].param].length() > valid[x].length)
                {
-                       this->WriteLine(std::string(":")+this->Instance->Config->ServerName+" KILL "+params[1]+" :Invalid client introduction (" + valid[x].item + " > " + ConvToStr(valid[x].length) + ")");
+                       this->WriteLine(std::string(":")+this->Instance->Config->ServerName+" KILL "+params[0]+" :Invalid client introduction (" + valid[x].item + " > " + ConvToStr(valid[x].length) + ")");
                        return true;
                }
        }
 
-       /** 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())
        {
-               /* nick collision */
-               this->WriteLine(std::string(":")+this->Instance->Config->ServerName+" KILL "+tempnick+" :Nickname collision");
-               userrec::QuitUser(this->Instance, iter->second, "Nickname collision");
-               return true;
+               /*
+                * Nick collision.
+                *  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.
+                *
+                * Note that remote clients MUST be dealt with also to remove desyncs.
+                *  XXX we don't do this yet.
+                *
+                * This stops abusive use of collisions, simplifies problems with loops, and so on.
+                *   -- w00t
+                */
+               Instance->Log(DEBUG,"*** Collision on %s", tempnick);
+
+               if (age == iter->second->signon)
+               {
+                       /* TS equal, do both */
+                       Instance->Log(DEBUG,"*** TS EQUAL, colliding both");
+                       iter->second->ForceNickChange(iter->second->uuid);
+                       this->WriteLine(std::string(":")+this->Instance->Config->ServerName+" SVSNICK "+params[0]+" " + params[0]);
+                       /* also, don't trample on the hash - use their UID as nick */
+                       tempnick = params[0].c_str();
+               }
+               else
+               {
+                       /* default to FNC newer (more likely that ident@ip will differ) */
+                       bool bFNCNewer = true;
+
+                       if (
+                               strcmp(iter->second->ident, params[5].c_str()) == 0 &&
+                               strcmp(iter->second->GetIPString(), params[7].c_str()) == 0
+                          )
+                       {
+                               /* ident@ip same, FNC older client */
+                               bFNCNewer = false;
+                       }
+
+                       if (age > iter->second->signon) /* It will never be equal here */
+                       {
+                               if (bFNCNewer)
+                               {
+                                       /* incoming client "lost" - for now, send SVSNICK to them .. XXX use SAVE*/
+                                       this->WriteLine(std::string(":")+this->Instance->Config->ServerName+" SVSNICK "+params[0]+" " + params[0]);
+
+                                       /* also, don't trample on the hash - use their UID as nick */
+                                       tempnick = params[0].c_str();
+                                       Instance->Log(DEBUG,"*** INCOMING client lost, changed theirs");
+                               }
+                               else
+                               {
+                                       /* we "lost", change us */
+                                       iter->second->ForceNickChange(iter->second->uuid);
+                                       Instance->Log(DEBUG,"*** OUR client lost, changing ours");
+                               }
+                       }
+               }
        }
 
-       userrec* _new = new userrec(this->Instance);
+       /* IMPORTANT NOTE: For remote users, we pass the UUID in the constructor. This automatically
+        * sets it up in the UUID hash for us.
+        * TODO: Make this throw an exception maybe, on UUID collision?
+        */
+       userrec* _new = new userrec(this->Instance, params[0]);
        (*(this->Instance->clientlist))[tempnick] = _new;
        _new->SetFd(FD_MAGIC_NUMBER);
-       strlcpy(_new->nick, tempnick,NICKMAX-1);
-       strlcpy(_new->host, params[2].c_str(),64);
-       strlcpy(_new->dhost, params[3].c_str(),64);
+       strlcpy(_new->nick, tempnick, NICKMAX - 1);
+       strlcpy(_new->host, params[3].c_str(),64);
+       strlcpy(_new->dhost, params[4].c_str(),64);
        _new->server = this->Instance->FindServerNamePtr(source.c_str());
-       strlcpy(_new->ident, params[4].c_str(),IDENTMAX);
-       strlcpy(_new->fullname, params[7].c_str(),MAXGECOS);
+       strlcpy(_new->ident, params[5].c_str(),IDENTMAX);
+       strlcpy(_new->fullname, params[8].c_str(),MAXGECOS);
        _new->registered = REG_ALL;
        _new->signon = age;
 
        /* we need to remove the + from the modestring, so we can do our stuff */
-       std::string::size_type pos_after_plus = params[5].find_first_not_of('+');
+       std::string::size_type pos_after_plus = params[6].find_first_not_of('+');
        if (pos_after_plus != std::string::npos)
-       params[5] = params[5].substr(pos_after_plus);
+       params[6] = params[6].substr(pos_after_plus);
 
-       for (std::string::iterator v = params[5].begin(); v != params[5].end(); v++)
+       for (std::string::iterator v = params[6].begin(); v != params[6].end(); v++)
        {
-               _new->modes[(*v)-65] = 1;
                /* For each mode thats set, increase counter */
                ModeHandler* mh = Instance->Modes->FindMode(*v, MODETYPE_USER);
+
                if (mh)
+               {
+                       mh->OnModeChange(_new, _new, NULL, empty, true);
+                       _new->SetMode(*v, true);
                        mh->ChangeCount(1);
+               }
        }
 
        /* now we've done with modes processing, put the + back for remote servers */
-       params[5] = "+" + params[5];
+       params[6] = "+" + params[6];
 
 #ifdef SUPPORT_IP6LINKS
-       if (params[6].find_first_of(":") != std::string::npos)
-               _new->SetSockAddr(AF_INET6, params[6].c_str(), 0);
+       if (params[7].find_first_of(":") != std::string::npos)
+               _new->SetSockAddr(AF_INET6, params[7].c_str(), 0);
        else
 #endif
-               _new->SetSockAddr(AF_INET, params[6].c_str(), 0);
+               _new->SetSockAddr(AF_INET, params[7].c_str(), 0);
 
        Instance->AddGlobalClone(_new);
 
@@ -967,8 +1082,8 @@ bool TreeSocket::IntroduceClient(const std::string &source, std::deque<std::stri
        if (dosend)
                this->Instance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s!%s@%s [%s] [%s]",_new->server,_new->nick,_new->ident,_new->host, _new->GetIPString(), _new->fullname);
 
-       params[7] = ":" + params[7];
-       Utils->DoOneToAllButSender(source,"NICK", params, source);
+       params[8] = ":" + params[8];
+       Utils->DoOneToAllButSender(source, "UID", params, source);
 
        // Increment the Source Servers User Count..
        TreeServer* SourceServer = Utils->FindServer(source);
@@ -992,21 +1107,19 @@ void TreeSocket::SendFJoins(TreeServer* Current, chanrec* c)
        char list[MAXBUF];
        std::string individual_halfops = std::string(":")+this->Instance->Config->ServerName+" FMODE "+c->name+" "+ConvToStr(c->age);
 
-       Instance->Log(DEBUG,"Sending FJOINs for %s", c->name);
-
        size_t dlen, curlen;
        dlen = curlen = snprintf(list,MAXBUF,":%s FJOIN %s %lu",this->Instance->Config->ServerName,c->name,(unsigned long)c->age);
        int numusers = 0;
        char* ptr = list + dlen;
 
        CUList *ulist = c->GetUsers();
-       std::string modes = "";
-       std::string params = "";
+       std::string modes;
+       std::string params;
 
        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
        {
                // The first parameter gets a : before it
-               size_t ptrlen = snprintf(ptr, MAXBUF, " %s%s,%s", !numusers ? ":" : "", c->GetAllPrefixChars(i->first), i->first->nick);
+               size_t ptrlen = snprintf(ptr, MAXBUF, " %s%s,%s", !numusers ? ":" : "", c->GetAllPrefixChars(i->first), i->first->uuid);
 
                curlen += ptrlen;
                ptr += ptrlen;
@@ -1015,7 +1128,6 @@ void TreeSocket::SendFJoins(TreeServer* Current, chanrec* c)
 
                if (curlen > (480-NICKMAX))
                {
-                       Instance->Log(DEBUG,"Flushing FJOIN buffer: %s", list);
                        buffer.append(list).append("\r\n");
                        dlen = curlen = snprintf(list,MAXBUF,":%s FJOIN %s %lu",this->Instance->Config->ServerName,c->name,(unsigned long)c->age);
                        ptr = list + dlen;
@@ -1024,13 +1136,8 @@ void TreeSocket::SendFJoins(TreeServer* Current, chanrec* c)
                }
        }
 
-       Instance->Log(DEBUG,"%d users remaining to be flushed", list);
-
        if (numusers)
-       {
-               Instance->Log(DEBUG,"Flushing final FJOIN buffer: %s", list);
                buffer.append(list).append("\r\n");
-       }
 
        buffer.append(":").append(this->Instance->Config->ServerName).append(" FMODE ").append(c->name).append(" ").append(ConvToStr(c->age)).append(" +").append(c->ChanModes(true)).append("\r\n");
 
@@ -1049,8 +1156,8 @@ void TreeSocket::SendFJoins(TreeServer* Current, chanrec* c)
                {
                        /* Wrap at MAXMODES */
                        buffer.append(":").append(this->Instance->Config->ServerName).append(" FMODE ").append(c->name).append(" ").append(ConvToStr(c->age)).append(" +").append(modes).append(params).append("\r\n");
-                       modes = "";
-                       params = "";
+                       modes.clear();
+                       params.clear();
                        linesize = 1;
                }
        }
@@ -1151,20 +1258,21 @@ void TreeSocket::SendUsers(TreeServer* Current)
        {
                if (u->second->registered == REG_ALL)
                {
-                       snprintf(data,MAXBUF,":%s NICK %lu %s %s %s %s +%s %s :%s",u->second->server,(unsigned long)u->second->age,u->second->nick,u->second->host,u->second->dhost,u->second->ident,u->second->FormatModes(),u->second->GetIPString(),u->second->fullname);
+                       snprintf(data,MAXBUF,":%s UID %s %lu %s %s %s %s +%s %s :%s", u->second->server, u->second->uuid, (unsigned long)u->second->age,u->second->nick,u->second->host,u->second->dhost,u->second->ident,u->second->FormatModes(),u->second->GetIPString(),u->second->fullname);
                        this->WriteLine(data);
                        if (*u->second->oper)
                        {
-                               snprintf(data,MAXBUF,":%s OPERTYPE %s", u->second->nick, u->second->oper);
+                               snprintf(data,MAXBUF,":%s OPERTYPE %s", u->second->uuid, u->second->oper);
                                this->WriteLine(data);
                        }
                        if (*u->second->awaymsg)
                        {
-                               snprintf(data,MAXBUF,":%s AWAY :%s", u->second->nick, u->second->awaymsg);
+                               snprintf(data,MAXBUF,":%s AWAY :%s", u->second->uuid, u->second->awaymsg);
                                this->WriteLine(data);
                        }
                }
        }
+
        for (user_hash::iterator u = this->Instance->clientlist->begin(); u != this->Instance->clientlist->end(); u++)
        {
                FOREACH_MOD_I(this->Instance,I_OnSyncUser,OnSyncUser(u->second,(Module*)Utils->Creator,(void*)this));