X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree.cpp;h=19a21717802a88afeda6984629427df772d0d553;hb=dafc021be4f3ad34ca37953de6a0109a161dd165;hp=23ad4b8205fe6c160e79900af59a5a6493e2c8dd;hpb=b1cbabb6da0779606e24498f8058cbc199c48d23;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp index 23ad4b820..19a217178 100644 --- a/src/modules/m_spanningtree.cpp +++ b/src/modules/m_spanningtree.cpp @@ -23,15 +23,14 @@ using namespace std; #include #include "globals.h" #include "inspircd_config.h" -#ifdef GCC3 -#include -#else -#include -#endif +#include "hash_map.h" +#include "configreader.h" #include "users.h" #include "channels.h" #include "modules.h" #include "commands.h" +#include "commands/cmd_whois.h" +#include "commands/cmd_stats.h" #include "socket.h" #include "helperfuncs.h" #include "inspircd.h" @@ -43,11 +42,7 @@ using namespace std; #include "cull_list.h" #include "aes.h" -#ifdef GCC3 #define nspace __gnu_cxx -#else -#define nspace std -#endif /* * The server list in InspIRCd is maintained as two structures @@ -70,11 +65,13 @@ using namespace std; * we can resort to recursion to walk the tree structure. */ +using irc::sockets::MatchCIDR; + class ModuleSpanningTree; static ModuleSpanningTree* TreeProtocolModule; -extern ServerConfig* Config; extern InspIRCd* ServerInstance; + extern std::vector modules; extern std::vector factory; extern int MODCOUNT; @@ -96,10 +93,6 @@ extern int MODCOUNT; */ enum ServerState { LISTENER, CONNECTING, WAIT_AUTH_1, WAIT_AUTH_2, CONNECTED }; -/* We need to import these from the core for use in netbursts */ -extern user_hash clientlist; -extern chan_hash chanlist; - /* Foward declarations */ class TreeServer; class TreeSocket; @@ -117,6 +110,9 @@ static Server* Srv; typedef nspace::hash_map, irc::StrHashComp> server_hash; server_hash serverlist; +typedef nspace::hash_map uid_hash; +typedef nspace::hash_map sid_hash; + /* More forward declarations */ bool DoOneToOne(std::string prefix, std::string command, std::deque ¶ms, std::string target); bool DoOneToAllButSender(std::string prefix, std::string command, std::deque ¶ms, std::string omit); @@ -141,6 +137,56 @@ extern std::vector pzlines; extern std::vector pqlines; extern std::vector pelines; +std::vector ValidIPs; + +class UserManager : public classbase +{ + uid_hash uids; + sid_hash sids; + public: + UserManager() + { + uids.clear(); + sids.clear(); + } + + std::string UserToUID(userrec* user) + { + return ""; + } + + std::string UIDToUser(const std::string &UID) + { + return ""; + } + + std::string CreateAndAdd(userrec* user) + { + return ""; + } + + std::string CreateAndAdd(const std::string &servername) + { + return ""; + } + + std::string ServerToSID(const std::string &servername) + { + return ""; + } + + std::string SIDToServer(const std::string &SID) + { + return ""; + } + + userrec* FindByID(const std::string &UID) + { + return NULL; + } +}; + + /* Each server in the tree is represented by one class of * type TreeServer. A locally connected TreeServer can * have a class of type TreeSocket associated with it, for @@ -156,7 +202,7 @@ extern std::vector pelines; * are created and destroyed. */ -class TreeServer +class TreeServer : public classbase { TreeServer* Parent; /* Parent entry */ TreeServer* Route; /* Route entry */ @@ -169,7 +215,6 @@ class TreeServer TreeSocket* Socket; /* For directly connected servers this points at the socket object */ time_t NextPing; /* After this time, the server should be PINGed*/ bool LastPingWasGood; /* True if the server responded to the last PING with a PONG */ - std::map Users; /* Users on this server */ public: @@ -183,7 +228,7 @@ class TreeServer ServerDesc = ""; VersionString = ""; UserCount = OperCount = 0; - VersionString = Srv->GetVersion(); + VersionString = ServerInstance->GetVersionString(); } /* We use this constructor only to create the 'root' item, TreeRoot, which @@ -195,7 +240,7 @@ class TreeServer Parent = NULL; VersionString = ""; UserCount = OperCount = 0; - VersionString = Srv->GetVersion(); + VersionString = ServerInstance->GetVersionString(); Route = NULL; Socket = NULL; /* Fix by brain */ AddHashEntry(); @@ -266,36 +311,26 @@ class TreeServer this->AddHashEntry(); } - void AddUser(userrec* user) - { - log(DEBUG,"Add user %s to server %s",user->nick,this->ServerName.c_str()); - std::map::iterator iter; - iter = Users.find(user); - if (iter == Users.end()) - Users[user] = user; - } - - void DelUser(userrec* user) - { - log(DEBUG,"Remove user %s from server %s",user->nick,this->ServerName.c_str()); - std::map::iterator iter; - iter = Users.find(user); - if (iter != Users.end()) - Users.erase(iter); - } - int QuitUsers(const std::string &reason) { - int x = Users.size(); log(DEBUG,"Removing all users from server %s",this->ServerName.c_str()); const char* reason_s = reason.c_str(); - for (std::map::iterator n = Users.begin(); n != Users.end(); n++) + std::vector time_to_die; + for (user_hash::iterator n = ServerInstance->clientlist.begin(); n != ServerInstance->clientlist.end(); n++) { - log(DEBUG,"Kill %s",n->second->nick); - kill_link(n->second,reason_s); + if (!strcmp(n->second->server, this->ServerName.c_str())) + { + time_to_die.push_back(n->second); + } + } + for (std::vector::iterator n = time_to_die.begin(); n != time_to_die.end(); n++) + { + userrec* a = (userrec*)*n; + log(DEBUG,"Kill %s fd=%d",a->nick,a->fd); + if (!IS_LOCAL(a)) + userrec::QuitUser(ServerInstance,a,reason_s); } - Users.clear(); - return x; + return time_to_die.size(); } /* This method is used to add the structure to the @@ -457,7 +492,7 @@ class TreeServer TreeServer* s = (TreeServer*)*a; s->Tidy(); Children.erase(a); - delete s; + DELETE(s); stillchildren = true; break; } @@ -479,7 +514,7 @@ class TreeServer * of them, and populate the list on rehash/load. */ -class Link +class Link : public classbase { public: irc::string Name; @@ -572,17 +607,18 @@ class cmd_rconnect : public command_t cmd_rconnect (Module* Callback) : command_t("RCONNECT", 'o', 2), Creator(Callback) { this->source = "m_spanningtree.so"; - } + syntax = " "; + } - void Handle (char **parameters, int pcnt, userrec *user) + void Handle (const char** parameters, int pcnt, userrec *user) { - WriteServ(user->fd,"NOTICE %s :*** RCONNECT: Sending remote connect to \002%s\002 to connect server \002%s\002.",user->nick,parameters[0],parameters[1]); + user->WriteServ("NOTICE %s :*** RCONNECT: Sending remote connect to \002%s\002 to connect server \002%s\002.",user->nick,parameters[0],parameters[1]); /* Is this aimed at our server? */ if (Srv->MatchText(Srv->GetServerName(),parameters[0])) { /* Yes, initiate the given connect */ - WriteOpers("*** Remote CONNECT from %s matching \002%s\002, connecting server \002%s\002",user->nick,parameters[0],parameters[1]); - char* para[1]; + ServerInstance->WriteOpers("*** Remote CONNECT from %s matching \002%s\002, connecting server \002%s\002",user->nick,parameters[0],parameters[1]); + const char* para[1]; para[0] = parameters[1]; Creator->OnPreCommand("CONNECT", para, 1, user, true); } @@ -626,8 +662,8 @@ class TreeSocket : public InspSocket * most of the action, and append a few of our own values * to it. */ - TreeSocket(std::string host, int port, bool listening, unsigned long maxtime) - : InspSocket(host, port, listening, maxtime) + TreeSocket(InspIRCd* SI, std::string host, int port, bool listening, unsigned long maxtime) + : InspSocket(SI, host, port, listening, maxtime) { myhost = host; this->LinkState = LISTENER; @@ -635,8 +671,8 @@ class TreeSocket : public InspSocket this->ctx_out = NULL; } - TreeSocket(std::string host, int port, bool listening, unsigned long maxtime, std::string ServerName) - : InspSocket(host, port, listening, maxtime) + TreeSocket(InspIRCd* SI, std::string host, int port, bool listening, unsigned long maxtime, std::string ServerName) + : InspSocket(SI, host, port, listening, maxtime) { myhost = ServerName; this->LinkState = CONNECTING; @@ -648,8 +684,8 @@ class TreeSocket : public InspSocket * we must associate it with a socket without creating a new * connection. This constructor is used for this purpose. */ - TreeSocket(int newfd, char* ip) - : InspSocket(newfd, ip) + TreeSocket(InspIRCd* SI, int newfd, char* ip) + : InspSocket(SI, newfd, ip) { this->LinkState = WAIT_AUTH_1; this->ctx_in = NULL; @@ -660,9 +696,9 @@ class TreeSocket : public InspSocket ~TreeSocket() { if (ctx_in) - delete ctx_in; + DELETE(ctx_in); if (ctx_out) - delete ctx_out; + DELETE(ctx_out); } void InitAES(std::string key,std::string SName) @@ -677,12 +713,12 @@ class TreeSocket : public InspSocket keylength = key.length(); if (!(keylength == 16 || keylength == 24 || keylength == 32)) { - WriteOpers("*** \2ERROR\2: Key length for encryptionkey is not 16, 24 or 32 bytes in length!"); + ServerInstance->WriteOpers("*** \2ERROR\2: Key length for encryptionkey is not 16, 24 or 32 bytes in length!"); log(DEBUG,"Key length not 16, 24 or 32 characters!"); } else { - WriteOpers("*** \2AES\2: Initialized %d bit encryption to server %s",keylength*8,SName.c_str()); + ServerInstance->WriteOpers("*** \2AES\2: Initialized %d bit encryption to server %s",keylength*8,SName.c_str()); ctx_in->MakeKey(key.c_str(), "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\ \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", keylength, keylength); ctx_out->MakeKey(key.c_str(), "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\ @@ -705,13 +741,13 @@ class TreeSocket : public InspSocket { if (x->Name == this->myhost) { - Srv->SendOpers("*** Connection to \2"+myhost+"\2["+(x->HiddenFromStats ? "" : this->GetIP())+"] established."); + ServerInstance->WriteOpers("*** Connection to \2"+myhost+"\2["+(x->HiddenFromStats ? "" : this->GetIP())+"] established."); this->SendCapabilities(); if (x->EncryptionKey != "") { if (!(x->EncryptionKey.length() == 16 || x->EncryptionKey.length() == 24 || x->EncryptionKey.length() == 32)) { - WriteOpers("\2WARNING\2: Your encryption key is NOT 16, 24 or 32 characters in length, encryption will \2NOT\2 be enabled."); + ServerInstance->WriteOpers("\2WARNING\2: Your encryption key is NOT 16, 24 or 32 characters in length, encryption will \2NOT\2 be enabled."); } else { @@ -730,7 +766,7 @@ class TreeSocket : public InspSocket * If that happens the connection hangs here until it's closed. Unlikely * and rather harmless. */ - Srv->SendOpers("*** Connection to \2"+myhost+"\2 lost link tag(!)"); + ServerInstance->WriteOpers("*** Connection to \2"+myhost+"\2 lost link tag(!)"); return true; } @@ -740,6 +776,10 @@ class TreeSocket : public InspSocket * dirty work is done in OnClose() (see below) * which is still called on error conditions too. */ + if (e == I_ERR_CONNECT) + { + ServerInstance->WriteOpers("*** Connection failed: Connection refused"); + } } virtual int OnDisconnect() @@ -778,14 +818,13 @@ class TreeSocket : public InspSocket std::string MyCapabilities() { - ServerConfig* Config = Srv->GetConfig(); std::vector modlist; std::string capabilities = ""; for (int i = 0; i <= MODCOUNT; i++) { if ((modules[i]->GetVersion().Flags & VF_STATIC) || (modules[i]->GetVersion().Flags & VF_COMMON)) - modlist.push_back(Config->module_names[i]); + modlist.push_back(ServerInstance->Config->module_names[i]); } sort(modlist.begin(),modlist.end()); for (unsigned int i = 0; i < modlist.size(); i++) @@ -818,10 +857,10 @@ class TreeSocket : public InspSocket quitserver = this->InboundServerName; } - WriteOpers("*** \2ERROR\2: Server '%s' does not have the same set of modules loaded, cannot link!",quitserver.c_str()); - WriteOpers("*** Our networked module set is: '%s'",this->MyCapabilities().c_str()); - WriteOpers("*** Other server's networked module set is: '%s'",params[0].c_str()); - WriteOpers("*** These lists must match exactly on both servers. Please correct these errors, and try again."); + ServerInstance->WriteOpers("*** \2ERROR\2: Server '%s' does not have the same set of modules loaded, cannot link!",quitserver.c_str()); + ServerInstance->WriteOpers("*** Our networked module set is: '%s'",this->MyCapabilities().c_str()); + ServerInstance->WriteOpers("*** Other server's networked module set is: '%s'",params[0].c_str()); + ServerInstance->WriteOpers("*** These lists must match exactly on both servers. Please correct these errors, and try again."); this->WriteLine("ERROR :CAPAB mismatch; My capabilities: '"+this->MyCapabilities()+"'"); return false; } @@ -849,14 +888,6 @@ class TreeSocket : public InspSocket /* Now we've whacked the kids, whack self */ num_lost_servers++; num_lost_users += Current->QuitUsers(from); - /*for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) - { - if (!strcasecmp(u->second->server,Current->GetName().c_str())) - { - Goners->AddItem(u->second,from); - num_lost_users++; - } - }*/ } /* This is a wrapper function for SquitServer above, which @@ -873,11 +904,11 @@ class TreeSocket : public InspSocket DoOneToAllButSender(Current->GetParent()->GetName(),"SQUIT",params,Current->GetName()); if (Current->GetParent() == TreeRoot) { - Srv->SendOpers("Server \002"+Current->GetName()+"\002 split: "+reason); + ServerInstance->WriteOpers("Server \002"+Current->GetName()+"\002 split: "+reason); } else { - Srv->SendOpers("Server \002"+Current->GetName()+"\002 split from server \002"+Current->GetParent()->GetName()+"\002 with reason: "+reason); + ServerInstance->WriteOpers("Server \002"+Current->GetName()+"\002 split from server \002"+Current->GetParent()->GetName()+"\002 with reason: "+reason); } num_lost_servers = 0; num_lost_users = 0; @@ -885,8 +916,8 @@ class TreeSocket : public InspSocket SquitServer(from, Current); Current->Tidy(); Current->GetParent()->DelChild(Current); - delete Current; - WriteOpers("Netsplit complete, lost \002%d\002 users on \002%d\002 servers.", num_lost_users, num_lost_servers); + DELETE(Current); + ServerInstance->WriteOpers("Netsplit complete, lost \002%d\002 users on \002%d\002 servers.", num_lost_users, num_lost_servers); } else { @@ -894,22 +925,387 @@ class TreeSocket : public InspSocket } } - /* FMODE command */ + /* FMODE command - server mode with timestamp checks */ bool ForceMode(std::string source, std::deque ¶ms) { - if (params.size() < 2) - return true; - userrec* who = new userrec(); - who->fd = FD_MAGIC_NUMBER; - char* modelist[64]; + /* Chances are this is a 1.0 FMODE without TS */ + if (params.size() < 3) + { + this->WriteLine("ERROR :Version 1.0 FMODE sent to version 1.1 server"); + return false; + } + + bool smode = false; + std::string sourceserv; + + /* Are we dealing with an FMODE from a user, or from a server? */ + userrec* who = ServerInstance->FindNick(source); + if (who) + { + /* FMODE from a user, set sourceserv to the users server name */ + sourceserv = who->server; + } + else + { + /* FMODE from a server, create a fake user to receive mode feedback */ + who = new userrec(ServerInstance); + who->fd = FD_MAGIC_NUMBER; + smode = true; /* Setting this flag tells us we should free the userrec later */ + sourceserv = source; /* Set sourceserv to the actual source string */ + } + const char* modelist[64]; + time_t TS = 0; + int n = 0; memset(&modelist,0,sizeof(modelist)); - for (unsigned int q = 0; q < params.size(); q++) + for (unsigned int q = 0; (q < params.size()) && (q < 64); q++) + { + if (q == 1) + { + /* The timestamp is in this position. + * We don't want to pass that up to the + * server->client protocol! + */ + TS = atoi(params[q].c_str()); + } + else + { + /* Everything else is fine to append to the modelist */ + modelist[n++] = params[q].c_str(); + } + + } + /* Extract the TS value of the object, either userrec or chanrec */ + userrec* dst = ServerInstance->FindNick(params[0]); + chanrec* chan = NULL; + time_t ourTS = 0; + if (dst) + { + ourTS = dst->age; + } + else + { + chan = ServerInstance->FindChan(params[0]); + if (chan) + { + ourTS = chan->age; + } + } + + /* TS is equal: Merge the mode changes, use voooodoooooo on modes + * with parameters. + */ + if (TS == ourTS) + { + log(DEBUG,"Entering TS equality check"); + ModeHandler* mh = NULL; + unsigned long paramptr = 3; + std::string to_bounce = ""; + std::string to_keep = ""; + std::vector params_to_keep; + std::string params_to_bounce = ""; + bool adding = true; + char cur_change = 1; + char old_change = 0; + char old_bounce_change = 0; + /* Merge modes, basically do special stuff to mode with params */ + for (std::string::iterator x = params[2].begin(); x != params[2].end(); x++) + { + switch (*x) + { + case '-': + adding = false; + break; + case '+': + adding = true; + break; + default: + if (adding) + { + /* We only care about whats being set, + * not whats being unset + */ + mh = ServerInstance->ModeGrok->FindMode(*x, chan ? MODETYPE_CHANNEL : MODETYPE_USER); + + if ((mh) && (mh->GetNumParams(adding) > 0) && (!mh->IsListMode())) + { + /* We only want to do special things to + * modes with parameters, we are going to rewrite + * those parameters + */ + ModePair ret; + adding ? cur_change = '+' : cur_change = '-'; + + ret = mh->ModeSet(smode ? NULL : who, dst, chan, params[paramptr]); + + /* The mode is set here, check which we should keep */ + if (ret.first) + { + bool which_to_keep = mh->CheckTimeStamp(TS, ourTS, params[paramptr], ret.second, chan); + + if (which_to_keep == true) + { + /* Keep ours, bounce theirs: + * Send back ours to them and + * drop their mode changs + */ + adding ? cur_change = '+' : cur_change = '-'; + if (cur_change != old_bounce_change) + to_bounce += cur_change; + to_bounce += *x; + old_bounce_change = cur_change; + + if ((mh->GetNumParams(adding) > 0) && (paramptr < params.size())) + params_to_bounce.append(" ").append(ret.second); + } + else + { + /* Keep theirs: Accept their mode change, + * do nothing else + */ + adding ? cur_change = '+' : cur_change = '-'; + if (cur_change != old_change) + to_keep += cur_change; + to_keep += *x; + old_change = cur_change; + + if ((mh->GetNumParams(adding) > 0) && (paramptr < params.size())) + params_to_keep.push_back(params[paramptr]); + } + } + else + { + /* Mode isnt set here, we want it */ + adding ? cur_change = '+' : cur_change = '-'; + if (cur_change != old_change) + to_keep += cur_change; + to_keep += *x; + old_change = cur_change; + + if ((mh->GetNumParams(adding) > 0) && (paramptr < params.size())) + params_to_keep.push_back(params[paramptr]); + } + + paramptr++; + } + else + { + mh = ServerInstance->ModeGrok->FindMode(*x, chan ? MODETYPE_CHANNEL : MODETYPE_USER); + + if (mh) + { + adding ? cur_change = '+' : cur_change = '-'; + + /* Just keep this, safe to merge with no checks + * it has no parameters + */ + + if (cur_change != old_change) + to_keep += cur_change; + to_keep += *x; + old_change = cur_change; + + if ((mh->GetNumParams(adding) > 0) && (paramptr < params.size())) + { + log(DEBUG,"Mode removal %d %d",adding, mh->GetNumParams(adding)); + params_to_keep.push_back(params[paramptr++]); + } + } + } + } + else + { + mh = ServerInstance->ModeGrok->FindMode(*x, chan ? MODETYPE_CHANNEL : MODETYPE_USER); + + if (mh) + { + /* Taking a mode away */ + adding ? cur_change = '+' : cur_change = '-'; + + if (cur_change != old_change) + to_keep += cur_change; + to_keep += *x; + old_change = cur_change; + + if ((mh->GetNumParams(adding) > 0) && (paramptr < params.size())) + params_to_keep.push_back(params[paramptr++]); + } + } + break; + } + } + + if (to_bounce.length()) + { + std::deque newparams; + newparams.push_back(params[0]); + newparams.push_back(ConvToStr(ourTS)); + newparams.push_back(to_bounce+params_to_bounce); + DoOneToOne(Srv->GetServerName(),"FMODE",newparams,sourceserv); + } + + if (to_keep.length()) + { + unsigned int n = 2; + unsigned int q = 0; + modelist[0] = params[0].c_str(); + modelist[1] = to_keep.c_str(); + + if (params_to_keep.size() > 2) + { + for (q = 2; (q < params_to_keep.size()) && (q < 64); q++) + { + log(DEBUG,"Item %d of %d", q, params_to_keep.size()); + modelist[n++] = params_to_keep[q].c_str(); + } + } + + if (smode) + { + log(DEBUG,"Send mode"); + Srv->SendMode(modelist, n+2, who); + } + else + { + log(DEBUG,"Send mode client"); + Srv->CallCommandHandler("MODE", modelist, n+2, who); + } + + /* HOT POTATO! PASS IT ON! */ + DoOneToAllButSender(source,"FMODE",params,sourceserv); + } + } + else + /* U-lined servers always win regardless of their TS */ + if ((TS > ourTS) && (!Srv->IsUlined(source))) + { + /* Bounce the mode back to its sender.* We use our lower TS, so the other end + * SHOULD accept it, if its clock is right. + * + * NOTE: We should check that we arent bouncing anything thats already set at this end. + * If we are, bounce +ourmode to 'reinforce' it. This prevents desyncs. + * e.g. They send +l 50, we have +l 10 set. rather than bounce -l 50, we bounce +l 10. + * + * Thanks to jilles for pointing out this one-hell-of-an-issue before i even finished + * writing the code. It took me a while to come up with this solution. + * + * XXX: BE SURE YOU UNDERSTAND THIS CODE FULLY BEFORE YOU MESS WITH IT. + */ + + std::deque newparams; /* New parameter list we send back */ + newparams.push_back(params[0]); /* Target, user or channel */ + newparams.push_back(ConvToStr(ourTS)); /* Timestamp value of the target */ + newparams.push_back(""); /* This contains the mode string. For now + * it's empty, we fill it below. + */ + + /* Intelligent mode bouncing. Don't just invert, reinforce any modes which are already + * set to avoid a desync here. + */ + std::string modebounce = ""; + bool adding = true; + unsigned int t = 3; + ModeHandler* mh = NULL; + char cur_change = 1; + char old_change = 0; + for (std::string::iterator x = params[2].begin(); x != params[2].end(); x++) + { + /* Iterate over all mode chars in the sent set */ + switch (*x) + { + /* Adding or subtracting modes? */ + case '-': + adding = false; + break; + case '+': + adding = true; + break; + default: + /* Find the mode handler for this mode */ + mh = ServerInstance->ModeGrok->FindMode(*x, chan ? MODETYPE_CHANNEL : MODETYPE_USER); + + /* Got a mode handler? + * This also prevents us bouncing modes we have no handler for. + */ + if (mh) + { + ModePair ret; + std::string p = ""; + + /* Does the mode require a parameter right now? + * If it does, fetch it if we can + */ + if ((mh->GetNumParams(adding) > 0) && (t < params.size())) + p = params[t++]; + + /* Call the ModeSet method to determine if its set with the + * given parameter here or not. + */ + ret = mh->ModeSet(smode ? NULL : who, dst, chan, p); + + /* XXX: Really. Dont ask. + * Determine from if its set combined with what the current + * 'state' is (adding or not) as to wether we should 'invert' + * or 'reinforce' the mode change + */ + (!ret.first ? (adding ? cur_change = '-' : cur_change = '+') : (!adding ? cur_change = '-' : cur_change = '+')); + + /* Quickly determine if we have 'flipped' from + to -, + * or - to +, to prevent unneccessary +/- chars in the + * output string that waste bandwidth + */ + if (cur_change != old_change) + modebounce += cur_change; + old_change = cur_change; + + /* Add the mode character to the output string */ + modebounce += mh->GetModeChar(); + + /* We got a parameter back from ModeHandler::ModeSet, + * are we supposed to be sending one out right now? + */ + if (ret.second.length()) + { + if (mh->GetNumParams(cur_change == '+') > 0) + /* Yes we're supposed to be sending out + * the parameter. Make sure it goes + */ + newparams.push_back(ret.second); + } + + } + break; + } + } + + /* Update the parameters for FMODE with the new 'bounced' string */ + newparams[2] = modebounce; + /* Only send it back the way it came, no need to send it anywhere else */ + DoOneToOne(Srv->GetServerName(),"FMODE",newparams,sourceserv); + log(DEBUG,"FMODE bounced intelligently, our TS less than theirs and the other server is NOT a uline."); + } + else { - modelist[q] = (char*)params[q].c_str(); + log(DEBUG,"Allow modes, TS lower for sender"); + /* The server was ulined, but something iffy is up with the TS. + * Sound the alarm bells! + */ + if ((Srv->IsUlined(sourceserv)) && (TS > ourTS)) + { + ServerInstance->WriteOpers("\2WARNING!\2 U-Lined server '%s' has bad TS for '%s' (accepted change): \2SYNC YOUR CLOCKS\2 to avoid this notice",sourceserv.c_str(),params[0].c_str()); + } + /* Allow the mode, route it to either server or user command handling */ + if (smode) + Srv->SendMode(modelist,n,who); + else + Srv->CallCommandHandler("MODE", modelist, n, who); + + /* HOT POTATO! PASS IT ON! */ + DoOneToAllButSender(source,"FMODE",params,sourceserv); } - Srv->SendMode(modelist,params.size(),who); - DoOneToAllButSender(source,"FMODE",params,source); - delete who; + /* Are we supposed to free the userrec? */ + if (smode) + DELETE(who); + return true; } @@ -921,7 +1317,7 @@ class TreeSocket : public InspSocket time_t ts = atoi(params[1].c_str()); std::string nsource = source; - chanrec* c = Srv->FindChannel(params[0]); + chanrec* c = ServerInstance->FindChan(params[0]); if (c) { if ((ts >= c->topicset) || (!*c->topic)) @@ -936,14 +1332,14 @@ class TreeSocket : public InspSocket */ if (oldtopic != params[3]) { - userrec* user = Srv->FindNick(source); + userrec* user = ServerInstance->FindNick(source); if (!user) { - WriteChannelWithServ((char*)source.c_str(), c, "TOPIC %s :%s", c->name, c->topic); + c->WriteChannelWithServ(source.c_str(), "TOPIC %s :%s", c->name, c->topic); } else { - WriteChannel(c, user, "TOPIC %s :%s", c->name, c->topic); + c->WriteChannel(user, "TOPIC %s :%s", c->name, c->topic); nsource = user->server; } /* all done, send it on its way */ @@ -969,7 +1365,7 @@ class TreeSocket : public InspSocket memset(&mode_users,0,sizeof(mode_users)); mode_users[0] = first; mode_users[1] = modestring; - strcpy(mode_users[1],"+"); + strcpy(modestring,"+"); unsigned int modectr = 2; userrec* who = NULL; @@ -977,7 +1373,7 @@ class TreeSocket : public InspSocket time_t TS = atoi(params[1].c_str()); char* key = ""; - chanrec* chan = Srv->FindChannel(channel); + chanrec* chan = ServerInstance->FindChan(channel); if (chan) { key = chan->key; @@ -988,7 +1384,7 @@ class TreeSocket : public InspSocket * channel will let the other side apply their modes. */ time_t ourTS = time(NULL)+600; - chanrec* us = Srv->FindChannel(channel); + chanrec* us = ServerInstance->FindChan(channel); if (us) { ourTS = us->age; @@ -1028,10 +1424,10 @@ class TreeSocket : public InspSocket strlcat(modestring,"v",MAXBUF); break; } - who = Srv->FindNick(usr); + who = ServerInstance->FindNick(usr); if (who) { - Srv->JoinUserToChannel(who,channel,key); + chanrec::JoinUser(this->Instance, who, channel.c_str(), true, key); if (modectr >= (MAXMODES-1)) { /* theres a mode for this user. push them onto the mode queue, and flush it @@ -1041,7 +1437,13 @@ class TreeSocket : public InspSocket { /* We also always let u-lined clients win, no matter what the TS value */ log(DEBUG,"Our our channel newer than theirs, accepting their modes"); - Srv->SendMode(mode_users,modectr,who); + Srv->SendMode((const char**)mode_users,modectr,who); + if (ourTS != TS) + { + log(DEFAULT,"Channel TS for %s changed from %lu to %lu",us->name,ourTS,TS); + us->age = TS; + ourTS = TS; + } } else { @@ -1052,7 +1454,12 @@ class TreeSocket : public InspSocket *mode_users[1] = '-'; for (unsigned int x = 0; x < modectr; x++) { + if (x == 1) + { + params.push_back(ConvToStr(us->age)); + } params.push_back(mode_users[x]); + } // tell everyone to bounce the modes. bad modes, bad! DoOneToMany(Srv->GetServerName(),"FMODE",params); @@ -1066,12 +1473,18 @@ class TreeSocket : public InspSocket /* there werent enough modes built up to flush it during FJOIN, * or, there are a number left over. flush them out. */ - if ((modectr > 2) && (who)) + if ((modectr > 2) && (who) && (us)) { if (ourTS >= TS) { log(DEBUG,"Our our channel newer than theirs, accepting their modes"); - Srv->SendMode(mode_users,modectr,who); + Srv->SendMode((const char**)mode_users,modectr,who); + if (ourTS != TS) + { + log(DEFAULT,"Channel TS for %s changed from %lu to %lu",us->name,ourTS,TS); + us->age = TS; + ourTS = TS; + } } else { @@ -1080,6 +1493,10 @@ class TreeSocket : public InspSocket *mode_users[1] = '-'; for (unsigned int x = 0; x < modectr; x++) { + if (x == 1) + { + params.push_back(ConvToStr(us->age)); + } params.push_back(mode_users[x]); } DoOneToMany(Srv->GetServerName(),"FMODE",params); @@ -1088,6 +1505,26 @@ class TreeSocket : public InspSocket return true; } + bool SyncChannelTS(std::string source, std::deque ¶ms) + { + if (params.size() >= 2) + { + chanrec* c = ServerInstance->FindChan(params[0]); + if (c) + { + time_t theirTS = atoi(params[1].c_str()); + time_t ourTS = c->age; + if (ourTS >= theirTS) + { + log(DEBUG,"Updating timestamp for %s, our timestamp was %lu and theirs is %lu",c->name,ourTS,theirTS); + c->age = theirTS; + } + } + } + DoOneToAllButSender(Srv->GetServerName(),"SYNCTS",params,source); + return true; + } + /* NICK command */ bool IntroduceClient(std::string source, std::deque ¶ms) { @@ -1099,21 +1536,20 @@ class TreeSocket : public InspSocket return true; } // NICK age nick host dhost ident +modes ip :gecos - // 0 123 4 56 7 + // 0 1 2 3 4 5 6 7 time_t age = atoi(params[0].c_str()); - std::string modes = params[5]; - while (*(modes.c_str()) == '+') - { - char* m = (char*)modes.c_str(); - m++; - modes = m; - } - char* tempnick = (char*)params[1].c_str(); + + /* This used to have a pretty craq'y loop doing the same thing, + * now we just let the STL do the hard work (more efficiently) + */ + params[5] = params[5].substr(params[5].find_first_not_of('+')); + + const char* tempnick = params[1].c_str(); log(DEBUG,"Introduce client %s!%s@%s",tempnick,params[4].c_str(),params[2].c_str()); - user_hash::iterator iter; - iter = clientlist.find(tempnick); - if (iter != clientlist.end()) + user_hash::iterator iter = this->Instance->clientlist.find(tempnick); + + if (iter != this->Instance->clientlist.end()) { // nick collision log(DEBUG,"Nick collision on %s!%s@%s: %lu %lu",tempnick,params[4].c_str(),params[2].c_str(),(unsigned long)age,(unsigned long)iter->second->age); @@ -1121,37 +1557,27 @@ class TreeSocket : public InspSocket return true; } - clientlist[tempnick] = new userrec(); - clientlist[tempnick]->fd = FD_MAGIC_NUMBER; - strlcpy(clientlist[tempnick]->nick, tempnick,NICKMAX-1); - strlcpy(clientlist[tempnick]->host, params[2].c_str(),63); - strlcpy(clientlist[tempnick]->dhost, params[3].c_str(),63); - clientlist[tempnick]->server = (char*)FindServerNamePtr(source.c_str()); - strlcpy(clientlist[tempnick]->ident, params[4].c_str(),IDENTMAX); - strlcpy(clientlist[tempnick]->fullname, params[7].c_str(),MAXGECOS); - clientlist[tempnick]->registered = 7; - clientlist[tempnick]->signon = age; - strlcpy(clientlist[tempnick]->modes, modes.c_str(),53); - for (char *v = clientlist[tempnick]->modes; *v; v++) - { - switch (*v) - { - case 'i': - clientlist[tempnick]->modebits |= UM_INVISIBLE; - break; - case 'w': - clientlist[tempnick]->modebits |= UM_WALLOPS; - break; - case 's': - clientlist[tempnick]->modebits |= UM_SERVERNOTICE; - break; - default: - break; - } - } - inet_aton(params[6].c_str(),&clientlist[tempnick]->ip4); + userrec* _new = new userrec(this->Instance); + this->Instance->clientlist[tempnick] = _new; + _new->fd = FD_MAGIC_NUMBER; + strlcpy(_new->nick, tempnick,NICKMAX-1); + strlcpy(_new->host, params[2].c_str(),63); + strlcpy(_new->dhost, params[3].c_str(),63); + _new->server = this->Instance->FindServerNamePtr(source.c_str()); + strlcpy(_new->ident, params[4].c_str(),IDENTMAX); + strlcpy(_new->fullname, params[7].c_str(),MAXGECOS); + _new->registered = REG_ALL; + _new->signon = age; + + for (std::string::iterator v = params[5].begin(); v != params[5].end(); v++) + _new->modes[(*v)-65] = 1; + + if (params[6].find_first_of(":") != std::string::npos) + _new->SetSockAddr(AF_INET6, params[6].c_str(), 0); + else + _new->SetSockAddr(AF_INET, params[6].c_str(), 0); - WriteOpers("*** Client connecting at %s: %s!%s@%s [%s]",clientlist[tempnick]->server,clientlist[tempnick]->nick,clientlist[tempnick]->ident,clientlist[tempnick]->host,(char*)inet_ntoa(clientlist[tempnick]->ip4)); + ServerInstance->WriteOpers("*** Client connecting at %s: %s!%s@%s [%s]",_new->server,_new->nick,_new->ident,_new->host, _new->GetIPString()); params[7] = ":" + params[7]; DoOneToAllButSender(source,"NICK",params,source); @@ -1160,7 +1586,7 @@ class TreeSocket : public InspSocket TreeServer* SourceServer = FindServer(source); if (SourceServer) { - SourceServer->AddUser(clientlist[tempnick]); + log(DEBUG,"Found source server of %s",_new->nick); SourceServer->AddUserCount(); } @@ -1175,7 +1601,7 @@ class TreeSocket : public InspSocket { log(DEBUG,"Sending FJOINs to other server for %s",c->name); char list[MAXBUF]; - std::string individual_halfops = ":"+Srv->GetServerName()+" FMODE "+c->name; + std::string individual_halfops = ":"+Srv->GetServerName()+" FMODE "+c->name+" "+ConvToStr(c->age); size_t dlen, curlen; dlen = curlen = snprintf(list,MAXBUF,":%s FJOIN %s %lu",Srv->GetServerName().c_str(),c->name,(unsigned long)c->age); @@ -1185,10 +1611,12 @@ class TreeSocket : public InspSocket CUList *ulist = c->GetUsers(); std::vector specific_halfop; std::vector specific_voice; + std::string modes = ""; + std::string params = ""; for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - int x = cflags(i->second,c); + int x = c->GetStatusFlags(i->second); if ((x & UCMODE_HOP) && (x & UCMODE_OP)) { specific_halfop.push_back(i->second); @@ -1228,11 +1656,15 @@ class TreeSocket : public InspSocket numusers = 0; for (unsigned int y = 0; y < specific_voice.size(); y++) { - this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" +v "+specific_voice[y]->nick); + modes.append("v"); + params.append(specific_voice[y]->nick).append(" "); + //this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" "+ConvToStr(c->age)+" +v "+specific_voice[y]->nick); } for (unsigned int y = 0; y < specific_halfop.size(); y++) { - this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" +h "+specific_halfop[y]->nick); + modes.append("h"); + params.append(specific_halfop[y]->nick).append(" "); + //this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" "+ConvToStr(c->age)+" +h "+specific_halfop[y]->nick); } } } @@ -1241,13 +1673,27 @@ class TreeSocket : public InspSocket this->WriteLine(list); for (unsigned int y = 0; y < specific_voice.size(); y++) { - this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" +v "+specific_voice[y]->nick); + modes.append("v"); + params.append(specific_voice[y]->nick).append(" "); + //this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" "+ConvToStr(c->age)+" +v "+specific_voice[y]->nick); } for (unsigned int y = 0; y < specific_halfop.size(); y++) { - this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" +h "+specific_halfop[y]->nick); + modes.append("h"); + params.append(specific_halfop[y]->nick).append(" "); + //this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" "+ConvToStr(c->age)+" +h "+specific_halfop[y]->nick); } } + //std::string modes = ""; + //std::string params = ""; + for (BanList::iterator b = c->bans.begin(); b != c->bans.end(); b++) + { + modes.append("b"); + params.append(b->data).append(" "); + } + /* XXX: Send each channel mode and its params -- we'll need a method for this in ModeHandler? */ + //FOREACH_MOD(I_OnSyncChannel,OnSyncChannel(c->second,(Module*)TreeProtocolModule,(void*)this)); + this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" "+ConvToStr(c->age)+" +"+c->ChanModes(true)+modes+" "+params); } /* Send G, Q, Z and E lines */ @@ -1308,21 +1754,14 @@ class TreeSocket : public InspSocket int iterations = 0; std::string n = Srv->GetServerName(); const char* sn = n.c_str(); - for (chan_hash::iterator c = chanlist.begin(); c != chanlist.end(); c++, iterations++) + for (chan_hash::iterator c = this->Instance->chanlist.begin(); c != this->Instance->chanlist.end(); c++, iterations++) { SendFJoins(Current, c->second); - snprintf(data,MAXBUF,":%s FMODE %s +%s",sn,c->second->name,chanmodes(c->second,true)); - this->WriteLine(data); if (*c->second->topic) { snprintf(data,MAXBUF,":%s FTOPIC %s %lu %s :%s",sn,c->second->name,(unsigned long)c->second->topicset,c->second->setby,c->second->topic); this->WriteLine(data); } - for (BanList::iterator b = c->second->bans.begin(); b != c->second->bans.end(); b++) - { - snprintf(data,MAXBUF,":%s FMODE %s +b %s",sn,c->second->name,b->data); - this->WriteLine(data); - } FOREACH_MOD(I_OnSyncChannel,OnSyncChannel(c->second,(Module*)TreeProtocolModule,(void*)this)); list.clear(); c->second->GetExtList(list); @@ -1339,11 +1778,11 @@ class TreeSocket : public InspSocket char data[MAXBUF]; std::deque list; int iterations = 0; - for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++, iterations++) + for (user_hash::iterator u = this->Instance->clientlist.begin(); u != this->Instance->clientlist.end(); u++, iterations++) { - if (u->second->registered == 7) + 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->modes,(char*)inet_ntoa(u->second->ip4),u->second->fullname); + 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); this->WriteLine(data); if (*u->second->oper) { @@ -1371,18 +1810,14 @@ class TreeSocket : public InspSocket */ void DoBurst(TreeServer* s) { - /* The calls here to ServerInstance-> yield the processing - * back to the core so that a large burst is split into at least 6 sections - * (possibly more) - */ std::string burst = "BURST "+ConvToStr(time(NULL)); std::string endburst = "ENDBURST"; // Because by the end of the netburst, it could be gone! std::string name = s->GetName(); - Srv->SendOpers("*** Bursting to \2"+name+"\2."); + ServerInstance->WriteOpers("*** Bursting to \2"+name+"\2."); this->WriteLine(burst); /* send our version string */ - this->WriteLine(":"+Srv->GetServerName()+" VERSION :"+Srv->GetVersion()); + this->WriteLine(":"+Srv->GetServerName()+" VERSION :"+this->Instance->GetVersionString()); /* Send server tree */ this->SendServers(TreeRoot,s,1); /* Send users and their oper status */ @@ -1392,7 +1827,7 @@ class TreeSocket : public InspSocket this->SendXLines(s); FOREACH_MOD(I_OnSyncOtherMetaData,OnSyncOtherMetaData((Module*)TreeProtocolModule,(void*)this)); this->WriteLine(endburst); - Srv->SendOpers("*** Finished bursting to \2"+name+"\2."); + ServerInstance->WriteOpers("*** Finished bursting to \2"+name+"\2."); } /* This function is called when we receive data from a remote @@ -1405,7 +1840,6 @@ class TreeSocket : public InspSocket */ virtual bool OnDataReady() { - int iterations = 0; char* data = this->Read(); /* Check that the data read is a valid pointer and it has some content */ if (data && *data) @@ -1489,11 +1923,48 @@ class TreeSocket : public InspSocket { if (params.size() < 1) return false; - WriteOpers("*** ERROR from %s: %s",(InboundServerName != "" ? InboundServerName.c_str() : myhost.c_str()),params[0].c_str()); + ServerInstance->WriteOpers("*** ERROR from %s: %s",(InboundServerName != "" ? InboundServerName.c_str() : myhost.c_str()),params[0].c_str()); /* we will return false to cause the socket to close. */ return false; } + bool Stats(std::string prefix, std::deque ¶ms) + { + /* Get the reply to a STATS query if it matches this servername, + * and send it back as a load of PUSH queries + */ + if (params.size() > 1) + { + if (Srv->MatchText(Srv->GetServerName(), params[1])) + { + /* It's for our server */ + string_list results; + userrec* source = ServerInstance->FindNick(prefix); + if (source) + { + std::deque par; + par.push_back(prefix); + par.push_back(""); + DoStats(*(params[0].c_str()), source, results); + for (size_t i = 0; i < results.size(); i++) + { + par[1] = "::" + results[i]; + DoOneToOne(Srv->GetServerName(), "PUSH",par, source->server); + } + } + } + else + { + /* Pass it on */ + userrec* source = ServerInstance->FindNick(prefix); + if (source) + DoOneToOne(prefix, "STATS", params, params[1]); + } + } + return true; + } + + /* Because the core won't let users or even SERVERS set +o, * we use the OPERTYPE command to do this. */ @@ -1505,14 +1976,11 @@ class TreeSocket : public InspSocket return true; } std::string opertype = params[0]; - userrec* u = Srv->FindNick(prefix); + userrec* u = ServerInstance->FindNick(prefix); if (u) { + u->modes[UM_OPERATOR] = 1; strlcpy(u->oper,opertype.c_str(),NICKMAX-1); - if (!strchr(u->modes,'o')) - { - strcat(u->modes,"o"); - } DoOneToAllButSender(u->nick,"OPERTYPE",params,u->server); } return true; @@ -1526,7 +1994,7 @@ class TreeSocket : public InspSocket if (params.size() < 3) return true; - userrec* u = Srv->FindNick(params[0]); + userrec* u = ServerInstance->FindNick(params[0]); if (u) { @@ -1535,8 +2003,14 @@ class TreeSocket : public InspSocket { std::deque par; par.push_back(params[1]); - DoOneToMany(u->nick,"NICK",par); - Srv->ChangeUserNick(u,params[1]); + /* This is not required as one is sent in OnUserPostNick below + */ + //DoOneToMany(u->nick,"NICK",par); + if (!u->ForceNickChange(params[1].c_str())) + { + userrec::QuitUser(this->Instance, u, "Nickname collision"); + return true; + } u->age = atoi(params[2].c_str()); } } @@ -1548,11 +2022,11 @@ class TreeSocket : public InspSocket if (params.size() < 2) return true; - userrec* u = Srv->FindNick(params[0]); + userrec* u = ServerInstance->FindNick(params[0]); if (u) { - Srv->JoinUserToChannel(u,params[1],""); + chanrec::JoinUser(this->Instance, u, params[1].c_str(), false); DoOneToAllButSender(prefix,"SVSJOIN",params,prefix); } return true; @@ -1567,7 +2041,7 @@ class TreeSocket : public InspSocket if (Srv->MatchText(Srv->GetServerName(),servermask)) { - Srv->SendOpers("*** Remote rehash initiated from server \002"+prefix+"\002."); + ServerInstance->WriteOpers("*** Remote rehash initiated from server \002"+prefix+"\002."); Srv->RehashServer(); ReadConfiguration(false); } @@ -1581,8 +2055,8 @@ class TreeSocket : public InspSocket return true; std::string nick = params[0]; - userrec* u = Srv->FindNick(prefix); - userrec* who = Srv->FindNick(nick); + userrec* u = ServerInstance->FindNick(prefix); + userrec* who = ServerInstance->FindNick(nick); if (who) { @@ -1599,7 +2073,8 @@ class TreeSocket : public InspSocket std::string reason = params[1]; params[1] = ":" + params[1]; DoOneToAllButSender(prefix,"KILL",params,sourceserv); - Srv->QuitUser(who,reason); + who->Write(":%s KILL %s :%s (%s)", sourceserv.c_str(), who->nick, sourceserv.c_str(), reason.c_str()); + userrec::QuitUser(this->Instance,who,reason); } return true; } @@ -1628,11 +2103,11 @@ class TreeSocket : public InspSocket * dump the PONG reply back to their fd. If its a server, do nowt. * Services might want to send these s->s, but we dont need to yet. */ - userrec* u = Srv->FindNick(prefix); + userrec* u = ServerInstance->FindNick(prefix); if (u) { - WriteServ(u->fd,"PONG %s %s",params[0].c_str(),params[1].c_str()); + u->WriteServ("PONG %s %s",params[0].c_str(),params[1].c_str()); } } else @@ -1660,7 +2135,7 @@ class TreeSocket : public InspSocket } else if (*(params[0].c_str()) == '#') { - chanrec* c = Srv->FindChannel(params[0]); + chanrec* c = ServerInstance->FindChan(params[0]); if (c) { FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(TYPE_CHANNEL,c,params[1],params[2])); @@ -1668,7 +2143,7 @@ class TreeSocket : public InspSocket } else if (*(params[0].c_str()) != '#') { - userrec* u = Srv->FindNick(params[0]); + userrec* u = ServerInstance->FindNick(params[0]); if (u) { FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(TYPE_USER,u,params[1],params[2])); @@ -1702,11 +2177,11 @@ class TreeSocket : public InspSocket if (params.size() < 1) return true; - userrec* u = Srv->FindNick(prefix); + userrec* u = ServerInstance->FindNick(prefix); if (u) { - Srv->ChangeHost(u,params[0]); + u->ChangeDisplayedHost(params[0].c_str()); DoOneToAllButSender(prefix,"FHOST",params,u->server); } return true; @@ -1723,26 +2198,26 @@ class TreeSocket : public InspSocket { case 'Z': propogate = add_zline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str()); - zline_set_creation_time((char*)params[1].c_str(), atoi(params[3].c_str())); + zline_set_creation_time(params[1].c_str(), atoi(params[3].c_str())); break; case 'Q': propogate = add_qline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str()); - qline_set_creation_time((char*)params[1].c_str(), atoi(params[3].c_str())); + qline_set_creation_time(params[1].c_str(), atoi(params[3].c_str())); break; case 'E': propogate = add_eline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str()); - eline_set_creation_time((char*)params[1].c_str(), atoi(params[3].c_str())); + eline_set_creation_time(params[1].c_str(), atoi(params[3].c_str())); break; case 'G': propogate = add_gline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str()); - gline_set_creation_time((char*)params[1].c_str(), atoi(params[3].c_str())); + gline_set_creation_time(params[1].c_str(), atoi(params[3].c_str())); break; case 'K': propogate = add_kline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str()); break; default: /* Just in case... */ - Srv->SendOpers("*** \2WARNING\2: Invalid xline type '"+params[0]+"' sent by server "+prefix+", ignored!"); + ServerInstance->WriteOpers("*** \2WARNING\2: Invalid xline type '"+params[0]+"' sent by server "+prefix+", ignored!"); propogate = false; break; } @@ -1752,11 +2227,11 @@ class TreeSocket : public InspSocket { if (atoi(params[4].c_str())) { - WriteOpers("*** %s Added %cLINE on %s to expire in %lu seconds (%s).",prefix.c_str(),*(params[0].c_str()),params[1].c_str(),atoi(params[4].c_str()),params[5].c_str()); + ServerInstance->WriteOpers("*** %s Added %cLINE on %s to expire in %lu seconds (%s).",prefix.c_str(),*(params[0].c_str()),params[1].c_str(),atoi(params[4].c_str()),params[5].c_str()); } else { - WriteOpers("*** %s Added permenant %cLINE on %s (%s).",prefix.c_str(),*(params[0].c_str()),params[1].c_str(),params[5].c_str()); + ServerInstance->WriteOpers("*** %s Added permenant %cLINE on %s (%s).",prefix.c_str(),*(params[0].c_str()),params[1].c_str(),params[5].c_str()); } params[5] = ":" + params[5]; DoOneToAllButSender(prefix,"ADDLINE",params,prefix); @@ -1774,11 +2249,11 @@ class TreeSocket : public InspSocket if (params.size() < 1) return true; - userrec* u = Srv->FindNick(prefix); + userrec* u = ServerInstance->FindNick(prefix); if (u) { - Srv->ChangeGECOS(u,params[0]); + u->ChangeName(params[0].c_str()); params[0] = ":" + params[0]; DoOneToAllButSender(prefix,"FNAME",params,u->server); } @@ -1791,7 +2266,7 @@ class TreeSocket : public InspSocket return true; log(DEBUG,"In IDLE command"); - userrec* u = Srv->FindNick(prefix); + userrec* u = ServerInstance->FindNick(prefix); if (u) { @@ -1799,10 +2274,10 @@ class TreeSocket : public InspSocket // an incoming request if (params.size() == 1) { - userrec* x = Srv->FindNick(params[0]); - if ((x) && (x->fd > -1)) + userrec* x = ServerInstance->FindNick(params[0]); + if ((x) && (IS_LOCAL(x))) { - userrec* x = Srv->FindNick(params[0]); + userrec* x = ServerInstance->FindNick(params[0]); log(DEBUG,"Got IDLE"); char signon[MAXBUF]; char idle[MAXBUF]; @@ -1825,16 +2300,16 @@ class TreeSocket : public InspSocket else if (params.size() == 3) { std::string who_did_the_whois = params[0]; - userrec* who_to_send_to = Srv->FindNick(who_did_the_whois); - if ((who_to_send_to) && (who_to_send_to->fd > -1)) + userrec* who_to_send_to = ServerInstance->FindNick(who_did_the_whois); + if ((who_to_send_to) && (IS_LOCAL(who_to_send_to))) { log(DEBUG,"Got final IDLE"); // an incoming reply to a whois we sent out std::string nick_whoised = prefix; unsigned long signon = atoi(params[1].c_str()); unsigned long idle = atoi(params[2].c_str()); - if ((who_to_send_to) && (who_to_send_to->fd > -1)) - do_whois(who_to_send_to,u,signon,idle,(char*)nick_whoised.c_str()); + if ((who_to_send_to) && (IS_LOCAL(who_to_send_to))) + do_whois(who_to_send_to,u,signon,idle,nick_whoised.c_str()); } else { @@ -1851,19 +2326,14 @@ class TreeSocket : public InspSocket if (params.size() < 2) return true; - userrec* u = Srv->FindNick(params[0]); + userrec* u = ServerInstance->FindNick(params[0]); + + if (!u) + return true; if (IS_LOCAL(u)) { - // push the raw to the user - if (Srv->IsUlined(prefix)) - { - ::Write(u->fd,"%s",params[1].c_str()); - } - else - { - log(DEBUG,"PUSH from non-ulined server dropped into the bit-bucket: :%s PUSH %s :%s",prefix.c_str(),params[0].c_str(),params[1].c_str()); - } + u->Write(params[1]); } else { @@ -1883,7 +2353,7 @@ class TreeSocket : public InspSocket // someone querying our time? if (Srv->GetServerName() == params[0]) { - userrec* u = Srv->FindNick(params[1]); + userrec* u = ServerInstance->FindNick(params[1]); if (u) { char curtime[256]; @@ -1896,7 +2366,7 @@ class TreeSocket : public InspSocket else { // not us, pass it on - userrec* u = Srv->FindNick(params[1]); + userrec* u = ServerInstance->FindNick(params[1]); if (u) DoOneToOne(prefix,"TIME",params,params[0]); } @@ -1904,7 +2374,7 @@ class TreeSocket : public InspSocket else if (params.size() == 3) { // a response to a previous TIME - userrec* u = Srv->FindNick(params[1]); + userrec* u = ServerInstance->FindNick(params[1]); if ((u) && (IS_LOCAL(u))) { time_t rawtime = atol(params[2].c_str()); @@ -1913,7 +2383,7 @@ class TreeSocket : public InspSocket char tms[26]; snprintf(tms,26,"%s",asctime(timeinfo)); tms[24] = 0; - WriteServ(u->fd,"391 %s %s :%s",u->nick,prefix.c_str(),tms); + u->WriteServ("391 %s %s :%s",u->nick,prefix.c_str(),tms); } else { @@ -1973,15 +2443,15 @@ class TreeSocket : public InspSocket TreeServer* CheckDupe = FindServer(servername); if (CheckDupe) { - this->WriteLine("ERROR :Server "+servername+" already exists on server "+CheckDupe->GetParent()->GetName()+"!"); - Srv->SendOpers("*** Server connection from \2"+servername+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName()); + this->WriteLine("ERROR :Server "+servername+" already exists!"); + ServerInstance->WriteOpers("*** Server connection from \2"+servername+"\2 denied, already exists"); return false; } TreeServer* Node = new TreeServer(servername,description,ParentOfThis,NULL); ParentOfThis->AddChild(Node); params[3] = ":" + params[3]; DoOneToAllButSender(prefix,"SERVER",params,prefix); - Srv->SendOpers("*** Server \002"+prefix+"\002 introduced server \002"+servername+"\002 ("+description+")"); + ServerInstance->WriteOpers("*** Server \002"+prefix+"\002 introduced server \002"+servername+"\002 ("+description+")"); return true; } @@ -1998,7 +2468,7 @@ class TreeSocket : public InspSocket if (hops) { this->WriteLine("ERROR :Server too far away for authentication"); - Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, server is too far away for authentication"); + ServerInstance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, server is too far away for authentication"); return false; } std::string description = params[3]; @@ -2010,7 +2480,7 @@ class TreeSocket : public InspSocket if (CheckDupe) { this->WriteLine("ERROR :Server "+sname+" already exists on server "+CheckDupe->GetParent()->GetName()+"!"); - Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName()); + ServerInstance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName()); return false; } // Begin the sync here. this kickstarts the @@ -2031,7 +2501,7 @@ class TreeSocket : public InspSocket } } this->WriteLine("ERROR :Invalid credentials"); - Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, invalid link credentials"); + ServerInstance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, invalid link credentials"); return false; } @@ -2048,7 +2518,7 @@ class TreeSocket : public InspSocket if (hops) { this->WriteLine("ERROR :Server too far away for authentication"); - Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, server is too far away for authentication"); + ServerInstance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, server is too far away for authentication"); return false; } std::string description = params[3]; @@ -2060,7 +2530,7 @@ class TreeSocket : public InspSocket if (CheckDupe) { this->WriteLine("ERROR :Server "+sname+" already exists on server "+CheckDupe->GetParent()->GetName()+"!"); - Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName()); + ServerInstance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName()); return false; } /* If the config says this link is encrypted, but the remote side @@ -2070,10 +2540,10 @@ class TreeSocket : public InspSocket if ((x->EncryptionKey != "") && (!this->ctx_in)) { this->WriteLine("ERROR :This link requires AES encryption to be enabled. Plaintext connection refused."); - Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, remote server did not enable AES."); + ServerInstance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, remote server did not enable AES."); return false; } - Srv->SendOpers("*** Verified incoming server connection from \002"+sname+"\002["+(x->HiddenFromStats ? "" : this->GetIP())+"] ("+description+")"); + ServerInstance->WriteOpers("*** Verified incoming server connection from \002"+sname+"\002["+(x->HiddenFromStats ? "" : this->GetIP())+"] ("+description+")"); this->InboundServerName = sname; this->InboundDescription = description; // this is good. Send our details: Our server name and description and hopcount of 0, @@ -2085,112 +2555,44 @@ class TreeSocket : public InspSocket } } this->WriteLine("ERROR :Invalid credentials"); - Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, invalid link credentials"); + ServerInstance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, invalid link credentials"); return false; } - void Split(std::string line, bool stripcolon, std::deque &n) + void Split(std::string line, std::deque &n) { - // we don't do anything with a line > 2048 - if (line.length() > 2048) - { - log(DEBUG,"Line too long!"); - return; - } - if (!strchr(line.c_str(),' ')) - { - n.push_back(line); - return; - } - std::stringstream s(line); - int count = 0; - char param[1024]; - char* pptr = param; - n.clear(); - int item = 0; - while (!s.eof()) - { - char c = 0; - s.get(c); - if (c == ' ') - { - *pptr = 0; - if (*param) - n.push_back(param); - *param = count = 0; - pptr = param; - item++; - } - else - { - if (!s.eof()) - { - *pptr++ = c; - count++; - } - if ((*param == ':') && (count == 1) && (item > 0)) - { - *param = count = 0; - pptr = param; - while (!s.eof()) - { - s.get(c); - if (!s.eof()) - { - *pptr++ = c; - count++; - } - } - *pptr = 0; - n.push_back(param); - *param = count = 0; - pptr = param; - } - } - } - *pptr = 0; - if (*param) - { + irc::tokenstream tokens(line); + std::string param; + while ((param = tokens.GetToken()) != "") n.push_back(param); - } - return; } bool ProcessLine(std::string line) { - char* l = (char*)line.c_str(); - for (char* x = l; *x; x++) - { - if ((*x == '\r') || (*x == '\n')) - *x = 0; - } - if (!*l) - return true; - - log(DEBUG,"IN: %s",l); - std::deque params; - this->Split(l,true,params); - irc::string command = ""; - std::string prefix = ""; - if (((params[0].c_str())[0] == ':') && (params.size() > 1)) - { - prefix = params[0]; - command = params[1].c_str(); - char* pref = (char*)prefix.c_str(); - prefix = ++pref; - params.pop_front(); - params.pop_front(); - } - else + irc::string command; + std::string prefix; + + if (line.empty()) + return true; + + line = line.substr(0, line.find_first_of("\r\n")); + + log(DEBUG,"IN: %s", line.c_str()); + + this->Split(line.c_str(),params); + + if ((params[0][0] == ':') && (params.size() > 1)) { - prefix = ""; - command = params[0].c_str(); + prefix = params[0].substr(1); params.pop_front(); } + command = params[0].c_str(); + params.pop_front(); + if ((!this->ctx_in) && (command == "AES")) { std::string sserv = params[0]; @@ -2206,7 +2608,7 @@ class TreeSocket : public InspSocket } else if ((this->ctx_in) && (command == "AES")) { - WriteOpers("*** \2AES\2: Encryption already enabled on this connection yet %s is trying to enable it twice!",params[0].c_str()); + ServerInstance->WriteOpers("*** \2AES\2: Encryption already enabled on this connection yet %s is trying to enable it twice!",params[0].c_str()); } switch (this->LinkState) @@ -2274,13 +2676,13 @@ class TreeSocket : public InspSocket long delta = THEM-time(NULL); if ((delta < -600) || (delta > 600)) { - WriteOpers("*** \2ERROR\2: Your clocks are out by %d seconds (this is more than ten minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",abs(delta)); + ServerInstance->WriteOpers("*** \2ERROR\2: Your clocks are out by %d seconds (this is more than ten minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",abs(delta)); this->WriteLine("ERROR :Your clocks are out by "+ConvToStr(abs(delta))+" seconds (this is more than ten minutes). Link aborted, PLEASE SYNC YOUR CLOCKS!"); return false; } else if ((delta < -60) || (delta > 60)) { - WriteOpers("*** \2WARNING\2: Your clocks are out by %d seconds, please consider synching your clocks.",abs(delta)); + ServerInstance->WriteOpers("*** \2WARNING\2: Your clocks are out by %d seconds, please consider synching your clocks.",abs(delta)); } } this->LinkState = CONNECTED; @@ -2332,7 +2734,7 @@ class TreeSocket : public InspSocket if (prefix != "") { std::string direction = prefix; - userrec* t = Srv->FindNick(prefix); + userrec* t = ServerInstance->FindNick(prefix); if (t) { direction = t->server; @@ -2373,6 +2775,10 @@ class TreeSocket : public InspSocket { return this->ForceJoin(prefix,params); } + else if (command == "STATS") + { + return this->Stats(prefix, params); + } else if (command == "SERVER") { return this->RemoteServer(prefix,params); @@ -2482,11 +2888,13 @@ class TreeSocket : public InspSocket std::string sourceserv = this->myhost; if (params.size() == 3) { - userrec* user = Srv->FindNick(params[1]); - chanrec* chan = Srv->FindChannel(params[0]); + userrec* user = ServerInstance->FindNick(params[1]); + chanrec* chan = ServerInstance->FindChan(params[0]); if (user && chan) { - server_kick_channel(user,chan,(char*)params[2].c_str(),false); + if (!chan->ServerKickUser(user, params[2].c_str(), false)) + /* Yikes, the channels gone! */ + delete chan; } } if (this->InboundServerName != "") @@ -2520,7 +2928,7 @@ class TreeSocket : public InspSocket { sourceserv = this->InboundServerName; } - WriteOpers("*** Received end of netburst from \2%s\2",sourceserv.c_str()); + ServerInstance->WriteOpers("*** Received end of netburst from \2%s\2",sourceserv.c_str()); return true; } else @@ -2528,7 +2936,7 @@ class TreeSocket : public InspSocket // not a special inter-server command. // Emulate the actual user doing the command, // this saves us having a huge ugly parser. - userrec* who = Srv->FindNick(prefix); + userrec* who = ServerInstance->FindNick(prefix); std::string sourceserv = this->myhost; if (this->InboundServerName != "") { @@ -2536,22 +2944,14 @@ class TreeSocket : public InspSocket } if (who) { - if (command == "QUIT") - { - TreeServer* s = FindServer(who->server); - if (s) - { - s->DelUser(who); - } - } - else if ((command == "NICK") && (params.size() > 0)) + if ((command == "NICK") && (params.size() > 0)) { /* On nick messages, check that the nick doesnt * already exist here. If it does, kill their copy, * and our copy. */ - userrec* x = Srv->FindNick(params[0]); - if (x) + userrec* x = ServerInstance->FindNick(params[0]); + if ((x) && (x != who)) { std::deque p; p.push_back(params[0]); @@ -2561,21 +2961,21 @@ class TreeSocket : public InspSocket p.push_back(prefix); p.push_back("Nickname collision"); DoOneToMany(Srv->GetServerName(),"KILL",p); - Srv->QuitUser(x,"Nickname collision ("+prefix+" -> "+params[0]+")"); - userrec* y = Srv->FindNick(prefix); + userrec::QuitUser(this->Instance,x,"Nickname collision ("+prefix+" -> "+params[0]+")"); + userrec* y = ServerInstance->FindNick(prefix); if (y) { - Srv->QuitUser(y,"Nickname collision"); + userrec::QuitUser(this->Instance,y,"Nickname collision"); } return DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params); } } // its a user target = who->server; - char* strparams[127]; + const char* strparams[127]; for (unsigned int q = 0; q < params.size(); q++) { - strparams[q] = (char*)params[q].c_str(); + strparams[q] = params[q].c_str(); } if (!Srv->CallCommandHandler(command.c_str(), strparams, params.size(), who)) { @@ -2619,7 +3019,7 @@ class TreeSocket : public InspSocket { if (this->LinkState == CONNECTING) { - Srv->SendOpers("*** CONNECT: Connection to \002"+myhost+"\002 timed out."); + ServerInstance->WriteOpers("*** CONNECT: Connection to \002"+myhost+"\002 timed out."); } } @@ -2638,17 +3038,109 @@ class TreeSocket : public InspSocket { Squit(s,"Remote host closed the connection"); } - WriteOpers("Server '\2%s\2' closed the connection.",quitserver.c_str()); + ServerInstance->WriteOpers("Server '\2%s\2' closed the connection.",quitserver.c_str()); } virtual int OnIncomingConnection(int newsock, char* ip) { - TreeSocket* s = new TreeSocket(newsock, ip); + /* To prevent anyone from attempting to flood opers/DDoS by connecting to the server port, + * or discovering if this port is the server port, we don't allow connections from any + * IPs for which we don't have a link block. + */ + bool found = false; + + found = (std::find(ValidIPs.begin(), ValidIPs.end(), ip) != ValidIPs.end()); + if (!found) + { + for (vector::iterator i = ValidIPs.begin(); i != ValidIPs.end(); i++) + if (MatchCIDR(ip, (*i).c_str())) + found = true; + + if (!found) + { + ServerInstance->WriteOpers("Server connection from %s denied (no link blocks with that IP address)", ip); + close(newsock); + return false; + } + } + TreeSocket* s = new TreeSocket(this->Instance, newsock, ip); Srv->AddSocket(s); return true; } }; +/** This class is used to resolve server hostnames during /connect and autoconnect. + * As of 1.1, the resolver system is seperated out from InspSocket, so we must do this + * resolver step first ourselves if we need it. This is totally nonblocking, and will + * callback to OnLookupComplete or OnError when completed. Once it has completed we + * will have an IP address which we can then use to continue our connection. + */ +class ServernameResolver : public Resolver +{ + private: + /** A copy of the Link tag info for what we're connecting to. + * We take a copy, rather than using a pointer, just in case the + * admin takes the tag away and rehashes while the domain is resolving. + */ + Link MyLink; + public: + ServernameResolver(InspIRCd* Instance, const std::string &hostname, Link x) : Resolver(Instance, hostname, DNS_QUERY_FORWARD), MyLink(x) + { + /* Nothing in here, folks */ + } + + void OnLookupComplete(const std::string &result) + { + /* Initiate the connection, now that we have an IP to use. + * Passing a hostname directly to InspSocket causes it to + * just bail and set its FD to -1. + */ + TreeServer* CheckDupe = FindServer(MyLink.Name.c_str()); + if (!CheckDupe) /* Check that nobody tried to connect it successfully while we were resolving */ + { + TreeSocket* newsocket = new TreeSocket(ServerInstance, result,MyLink.Port,false,10,MyLink.Name.c_str()); + if (newsocket->GetFd() > -1) + { + /* We're all OK */ + Srv->AddSocket(newsocket); + } + else + { + /* Something barfed, show the opers */ + ServerInstance->WriteOpers("*** CONNECT: Error connecting \002%s\002: %s.",MyLink.Name.c_str(),strerror(errno)); + delete newsocket; + } + } + } + + void OnError(ResolverError e, const std::string &errormessage) + { + /* Ooops! */ + ServerInstance->WriteOpers("*** CONNECT: Error connecting \002%s\002: Unable to resolve hostname - %s",MyLink.Name.c_str(),errormessage.c_str()); + } +}; + +class SecurityIPResolver : public Resolver +{ + private: + Link MyLink; + public: + SecurityIPResolver(InspIRCd* Instance, const std::string &hostname, Link x) : Resolver(Instance, hostname, DNS_QUERY_FORWARD), MyLink(x) + { + } + + void OnLookupComplete(const std::string &result) + { + log(DEBUG,"Security IP cache: Adding IP address '%s' for Link '%s'",result.c_str(),MyLink.Name.c_str()); + ValidIPs.push_back(result); + } + + void OnError(ResolverError e, const std::string &errormessage) + { + log(DEBUG,"Could not resolve IP associated with Link '%s': %s",MyLink.Name.c_str(),errormessage.c_str()); + } +}; + void AddThisServer(TreeServer* server, std::deque &list) { for (unsigned int c = 0; c < list.size(); c++) @@ -2682,17 +3174,17 @@ bool DoOneToAllButSenderRaw(std::string data, std::string omit, std::string pref TreeServer* omitroute = BestRouteTo(omit); if ((command == "NOTICE") || (command == "PRIVMSG")) { - if ((params.size() >= 2) && (*(params[0].c_str()) != '$')) + if (params.size() >= 2) { /* Prefixes */ if ((*(params[0].c_str()) == '@') || (*(params[0].c_str()) == '%') || (*(params[0].c_str()) == '+')) { params[0] = params[0].substr(1, params[0].length()-1); } - if (*(params[0].c_str()) != '#') + if ((*(params[0].c_str()) != '#') && (*(params[0].c_str()) != '$')) { // special routing for private messages/notices - userrec* d = Srv->FindNick(params[0]); + userrec* d = ServerInstance->FindNick(params[0]); if (d) { std::deque par; @@ -2702,10 +3194,18 @@ bool DoOneToAllButSenderRaw(std::string data, std::string omit, std::string pref return true; } } + else if (*(params[0].c_str()) == '$') + { + std::deque par; + par.push_back(params[0]); + par.push_back(":"+params[1]); + DoOneToAllButSender(prefix,command.c_str(),par,omitroute->GetName()); + return true; + } else { log(DEBUG,"Channel privmsg going to chan %s",params[0].c_str()); - chanrec* c = Srv->FindChannel(params[0]); + chanrec* c = ServerInstance->FindChan(params[0]); if (c) { std::deque list; @@ -2828,7 +3328,7 @@ void ReadConfiguration(bool rebind) { IP = ""; } - TreeSocket* listener = new TreeSocket(IP.c_str(),Port,true,10); + TreeSocket* listener = new TreeSocket(ServerInstance, IP.c_str(),Port,true,10); if (listener->GetState() == I_LISTENING) { Srv->AddSocket(listener); @@ -2838,7 +3338,7 @@ void ReadConfiguration(bool rebind) { log(DEFAULT,"m_spanningtree: Warning: Failed to bind server port %d",Port); listener->Close(); - delete listener; + DELETE(listener); } } } @@ -2846,9 +3346,11 @@ void ReadConfiguration(bool rebind) FlatLinks = Conf->ReadFlag("options","flatlinks",0); HideULines = Conf->ReadFlag("options","hideulines",0); LinkBlocks.clear(); + ValidIPs.clear(); for (int j =0; j < Conf->Enumerate("link"); j++) { Link L; + std::string Allow = Conf->ReadValue("link","allowmask",j); L.Name = (Conf->ReadValue("link","name",j)).c_str(); L.IPAddr = Conf->ReadValue("link","ipaddr",j); L.Port = Conf->ReadInteger("link","port",j,true); @@ -2861,6 +3363,26 @@ void ReadConfiguration(bool rebind) /* Bugfix by brain, do not allow people to enter bad configurations */ if ((L.IPAddr != "") && (L.RecvPass != "") && (L.SendPass != "") && (L.Name != "") && (L.Port)) { + ValidIPs.push_back(L.IPAddr); + + if (Allow.length()) + ValidIPs.push_back(Allow); + + /* Needs resolving */ + insp_inaddr binip; + if (insp_aton(L.IPAddr.c_str(), &binip) < 1) + { + try + { + SecurityIPResolver* sr = new SecurityIPResolver(ServerInstance, L.IPAddr, L); + Srv->AddResolver(sr); + } + catch (ModuleException& e) + { + log(DEBUG,"Error in resolver: %s",e.GetReason()); + } + } + LinkBlocks.push_back(L); log(DEBUG,"m_spanningtree: Read server %s with host %s:%d",L.Name.c_str(),L.IPAddr.c_str(),L.Port); } @@ -2888,7 +3410,7 @@ void ReadConfiguration(bool rebind) } } } - delete Conf; + DELETE(Conf); } @@ -2942,7 +3464,7 @@ class ModuleSpanningTree : public Module /* Don't display the line if its a uline, hide ulines is on, and the user isnt an oper */ if ((HideULines) && (Srv->IsUlined(Current->GetName())) && (!*user->oper)) return; - WriteServ(user->fd,"364 %s %s %s :%d %s",user->nick,Current->GetName().c_str(),(FlatLinks && (!*user->oper)) ? Srv->GetServerName().c_str() : Parent.c_str(),(FlatLinks && (!*user->oper)) ? 0 : hops,Current->GetDesc().c_str()); + user->WriteServ("364 %s %s %s :%d %s",user->nick,Current->GetName().c_str(),(FlatLinks && (!*user->oper)) ? Srv->GetServerName().c_str() : Parent.c_str(),(FlatLinks && (!*user->oper)) ? 0 : hops,Current->GetDesc().c_str()); } int CountLocalServs() @@ -2955,30 +3477,33 @@ class ModuleSpanningTree : public Module return serverlist.size(); } - void HandleLinks(char** parameters, int pcnt, userrec* user) + void HandleLinks(const char** parameters, int pcnt, userrec* user) { ShowLinks(TreeRoot,user,0); - WriteServ(user->fd,"365 %s * :End of /LINKS list.",user->nick); + user->WriteServ("365 %s * :End of /LINKS list.",user->nick); return; } - void HandleLusers(char** parameters, int pcnt, userrec* user) + void HandleLusers(const char** parameters, int pcnt, userrec* user) { - unsigned int n_users = usercnt(); + unsigned int n_users = ServerInstance->usercnt(); /* Only update these when someone wants to see them, more efficient */ - if ((unsigned int)local_count() > max_local) - max_local = local_count(); + if ((unsigned int)ServerInstance->local_count() > max_local) + max_local = ServerInstance->local_count(); if (n_users > max_global) max_global = n_users; - WriteServ(user->fd,"251 %s :There are %d users and %d invisible on %d servers",user->nick,n_users-usercount_invisible(),usercount_invisible(),this->CountServs()); - WriteServ(user->fd,"252 %s %d :operator(s) online",user->nick,usercount_opers()); - WriteServ(user->fd,"253 %s %d :unknown connections",user->nick,usercount_unknown()); - WriteServ(user->fd,"254 %s %d :channels formed",user->nick,chancount()); - WriteServ(user->fd,"254 %s :I have %d clients and %d servers",user->nick,local_count(),this->CountLocalServs()); - WriteServ(user->fd,"265 %s :Current Local Users: %d Max: %d",user->nick,local_count(),max_local); - WriteServ(user->fd,"266 %s :Current Global Users: %d Max: %d",user->nick,n_users,max_global); + user->WriteServ("251 %s :There are %d users and %d invisible on %d servers",user->nick,n_users-ServerInstance->usercount_invisible(),ServerInstance->usercount_invisible(),this->CountServs()); + if (ServerInstance->usercount_opers()) + user->WriteServ("252 %s %d :operator(s) online",user->nick,ServerInstance->usercount_opers()); + if (ServerInstance->usercount_unknown()) + user->WriteServ("253 %s %d :unknown connections",user->nick,ServerInstance->usercount_unknown()); + if (ServerInstance->chancount()) + user->WriteServ("254 %s %d :channels formed",user->nick,ServerInstance->chancount()); + user->WriteServ("254 %s :I have %d clients and %d servers",user->nick,ServerInstance->local_count(),this->CountLocalServs()); + user->WriteServ("265 %s :Current Local Users: %d Max: %d",user->nick,ServerInstance->local_count(),max_local); + user->WriteServ("266 %s :Current Global Users: %d Max: %d",user->nick,n_users,max_global); return; } @@ -3008,13 +3533,13 @@ class ModuleSpanningTree : public Module float percent; char text[80]; - if (clientlist.size() == 0) { + if (ServerInstance->clientlist.size() == 0) { // If there are no users, WHO THE HELL DID THE /MAP?!?!?! percent = 0; } else { - percent = ((float)Current->GetUserCount() / (float)clientlist.size()) * 100; + percent = ((float)Current->GetUserCount() / (float)ServerInstance->clientlist.size()) * 100; } snprintf(text, 80, "%s %s%5d [%5.2f%%]", Current->GetName().c_str(), spacer, Current->GetUserCount(), percent); totusers += Current->GetUserCount(); @@ -3038,6 +3563,30 @@ class ModuleSpanningTree : public Module } } + int HandleStats(const char** parameters, int pcnt, userrec* user) + { + if (pcnt > 1) + { + /* Remote STATS, the server is within the 2nd parameter */ + std::deque params; + params.push_back(parameters[0]); + params.push_back(parameters[1]); + /* Send it out remotely, generate no reply yet */ + TreeServer* s = FindServerMask(parameters[1]); + if (s) + { + params[1] = s->GetName(); + DoOneToOne(user->nick, "STATS", params, s->GetName()); + } + else + { + user->WriteServ( "402 %s %s :No such server", user->nick, parameters[0]); + } + return 1; + } + return 0; + } + // Ok, prepare to be confused. // After much mulling over how to approach this, it struck me that // the 'usual' way of doing a /MAP isnt the best way. Instead of @@ -3047,7 +3596,7 @@ class ModuleSpanningTree : public Module // (a character matrix), then draw the branches as a series of "L" shapes // from the nodes. This is not only friendlier on CPU it uses less stack. - void HandleMap(char** parameters, int pcnt, userrec* user) + void HandleMap(const char** parameters, int pcnt, userrec* user) { // This array represents a virtual screen which we will // "scratch" draw to, as the console device of an irc @@ -3095,47 +3644,47 @@ class ModuleSpanningTree : public Module // dump the whole lot to the user. This is the easy bit, honest. for (int t = 0; t < line; t++) { - WriteServ(user->fd,"006 %s :%s",user->nick,&matrix[t][0]); + user->WriteServ("006 %s :%s",user->nick,&matrix[t][0]); } float avg_users = totusers / totservers; - WriteServ(user->fd,"270 %s :%.0f server%s and %.0f user%s, average %.2f users per server",user->nick,totservers,(totservers > 1 ? "s" : ""),totusers,(totusers > 1 ? "s" : ""),avg_users); - WriteServ(user->fd,"007 %s :End of /MAP",user->nick); + user->WriteServ("270 %s :%.0f server%s and %.0f user%s, average %.2f users per server",user->nick,totservers,(totservers > 1 ? "s" : ""),totusers,(totusers > 1 ? "s" : ""),avg_users); + user->WriteServ("007 %s :End of /MAP",user->nick); return; } - int HandleSquit(char** parameters, int pcnt, userrec* user) + int HandleSquit(const char** parameters, int pcnt, userrec* user) { TreeServer* s = FindServerMask(parameters[0]); if (s) { if (s == TreeRoot) { - WriteServ(user->fd,"NOTICE %s :*** SQUIT: Foolish mortal, you cannot make a server SQUIT itself! (%s matches local server name)",user->nick,parameters[0]); + user->WriteServ("NOTICE %s :*** SQUIT: Foolish mortal, you cannot make a server SQUIT itself! (%s matches local server name)",user->nick,parameters[0]); return 1; } TreeSocket* sock = s->GetSocket(); if (sock) { log(DEBUG,"Splitting server %s",s->GetName().c_str()); - WriteOpers("*** SQUIT: Server \002%s\002 removed from network by %s",parameters[0],user->nick); + ServerInstance->WriteOpers("*** SQUIT: Server \002%s\002 removed from network by %s",parameters[0],user->nick); sock->Squit(s,"Server quit by "+std::string(user->nick)+"!"+std::string(user->ident)+"@"+std::string(user->host)); Srv->RemoveSocket(sock); } else { - WriteServ(user->fd,"NOTICE %s :*** SQUIT: The server \002%s\002 is not directly connected.",user->nick,parameters[0]); + user->WriteServ("NOTICE %s :*** SQUIT: The server \002%s\002 is not directly connected.",user->nick,parameters[0]); } } else { - WriteServ(user->fd,"NOTICE %s :*** SQUIT: The server \002%s\002 does not exist on the network.",user->nick,parameters[0]); + user->WriteServ("NOTICE %s :*** SQUIT: The server \002%s\002 does not exist on the network.",user->nick,parameters[0]); } return 1; } - int HandleTime(char** parameters, int pcnt, userrec* user) + int HandleTime(const char** parameters, int pcnt, userrec* user) { - if ((user->fd > -1) && (pcnt)) + if ((IS_LOCAL(user)) && (pcnt)) { TreeServer* found = FindServerMask(parameters[0]); if (found) @@ -3151,17 +3700,17 @@ class ModuleSpanningTree : public Module } else { - WriteServ(user->fd,"402 %s %s :No such server",user->nick,parameters[0]); + user->WriteServ("402 %s %s :No such server",user->nick,parameters[0]); } } return 1; } - int HandleRemoteWhois(char** parameters, int pcnt, userrec* user) + int HandleRemoteWhois(const char** parameters, int pcnt, userrec* user) { - if ((user->fd > -1) && (pcnt > 1)) + if ((IS_LOCAL(user)) && (pcnt > 1)) { - userrec* remote = Srv->FindNick(parameters[1]); + userrec* remote = ServerInstance->FindNick(parameters[1]); if ((remote) && (remote->fd < 0)) { std::deque params; @@ -3171,8 +3720,8 @@ class ModuleSpanningTree : public Module } else if (!remote) { - WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[1]); - WriteServ(user->fd,"318 %s %s :End of /WHOIS list.",user->nick, parameters[1]); + user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[1]); + user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, parameters[1]); return 1; } } @@ -3197,7 +3746,7 @@ class ModuleSpanningTree : public Module else { // they didnt answer, boot them - WriteOpers("*** Server \002%s\002 pinged out",serv->GetName().c_str()); + ServerInstance->WriteOpers("*** Server \002%s\002 pinged out",serv->GetName().c_str()); sock->Squit(serv,"Ping timeout"); Srv->RemoveSocket(sock); return; @@ -3219,33 +3768,53 @@ class ModuleSpanningTree : public Module if (!CheckDupe) { // an autoconnected server is not connected. Check if its time to connect it - WriteOpers("*** AUTOCONNECT: Auto-connecting server \002%s\002 (%lu seconds until next attempt)",x->Name.c_str(),x->AutoConnect); - TreeSocket* newsocket = new TreeSocket(x->IPAddr,x->Port,false,10,x->Name.c_str()); - if (newsocket->GetState() != I_ERROR) + ServerInstance->WriteOpers("*** AUTOCONNECT: Auto-connecting server \002%s\002 (%lu seconds until next attempt)",x->Name.c_str(),x->AutoConnect); + + insp_inaddr binip; + + /* Do we already have an IP? If so, no need to resolve it. */ + if (insp_aton(x->IPAddr.c_str(), &binip) > 0) { - Srv->AddSocket(newsocket); + TreeSocket* newsocket = new TreeSocket(ServerInstance, x->IPAddr,x->Port,false,10,x->Name.c_str()); + if (newsocket->GetFd() > -1) + { + Srv->AddSocket(newsocket); + } + else + { + ServerInstance->WriteOpers("*** AUTOCONNECT: Error autoconnecting \002%s\002: %s.",x->Name.c_str(),strerror(errno)); + delete newsocket; + } } else { - WriteOpers("*** AUTOCONNECT: Error autoconnecting \002%s\002.",x->Name.c_str()); - delete newsocket; + try + { + ServernameResolver* snr = new ServernameResolver(ServerInstance,x->IPAddr, *x); + Srv->AddResolver(snr); + } + catch (ModuleException& e) + { + log(DEBUG,"Error in resolver: %s",e.GetReason()); + } } + } } } } - int HandleVersion(char** parameters, int pcnt, userrec* user) + int HandleVersion(const char** parameters, int pcnt, userrec* user) { // we've already checked if pcnt > 0, so this is safe TreeServer* found = FindServerMask(parameters[0]); if (found) { std::string Version = found->GetVersion(); - WriteServ(user->fd,"351 %s :%s",user->nick,Version.c_str()); + user->WriteServ("351 %s :%s",user->nick,Version.c_str()); if (found == TreeRoot) { - std::stringstream out(Config->data005); + std::stringstream out(ServerInstance->Config->data005); std::string token = ""; std::string line5 = ""; int token_counter = 0; @@ -3258,7 +3827,7 @@ class ModuleSpanningTree : public Module if ((token_counter >= 13) || (out.eof() == true)) { - WriteServ(user->fd,"005 %s %s:are supported by this server",user->nick,line5.c_str()); + user->WriteServ("005 %s %s:are supported by this server",user->nick,line5.c_str()); line5 = ""; token_counter = 0; } @@ -3267,12 +3836,12 @@ class ModuleSpanningTree : public Module } else { - WriteServ(user->fd,"402 %s %s :No such server",user->nick,parameters[0]); + user->WriteServ("402 %s %s :No such server",user->nick,parameters[0]); } return 1; } - int HandleConnect(char** parameters, int pcnt, userrec* user) + int HandleConnect(const char** parameters, int pcnt, userrec* user) { for (std::vector::iterator x = LinkBlocks.begin(); x < LinkBlocks.end(); x++) { @@ -3281,47 +3850,65 @@ class ModuleSpanningTree : public Module TreeServer* CheckDupe = FindServer(x->Name.c_str()); if (!CheckDupe) { - WriteServ(user->fd,"NOTICE %s :*** CONNECT: Connecting to server: \002%s\002 (%s:%d)",user->nick,x->Name.c_str(),(x->HiddenFromStats ? "" : x->IPAddr.c_str()),x->Port); - TreeSocket* newsocket = new TreeSocket(x->IPAddr,x->Port,false,10,x->Name.c_str()); - if (newsocket->GetState() != I_ERROR) + user->WriteServ("NOTICE %s :*** CONNECT: Connecting to server: \002%s\002 (%s:%d)",user->nick,x->Name.c_str(),(x->HiddenFromStats ? "" : x->IPAddr.c_str()),x->Port); + insp_inaddr binip; + + /* Do we already have an IP? If so, no need to resolve it. */ + if (insp_aton(x->IPAddr.c_str(), &binip) > 0) { - Srv->AddSocket(newsocket); + TreeSocket* newsocket = new TreeSocket(ServerInstance,x->IPAddr,x->Port,false,10,x->Name.c_str()); + if (newsocket->GetFd() > -1) + { + Srv->AddSocket(newsocket); + } + else + { + ServerInstance->WriteOpers("*** CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno)); + delete newsocket; + } } else { - WriteServ(user->fd,"NOTICE %s :*** CONNECT: Error connecting \002%s\002.",user->nick,x->Name.c_str()); - delete newsocket; + try + { + ServernameResolver* snr = new ServernameResolver(ServerInstance, x->IPAddr, *x); + Srv->AddResolver(snr); + } + catch (ModuleException& e) + { + log(DEBUG,"Error in resolver: %s",e.GetReason()); + } } return 1; } else { - WriteServ(user->fd,"NOTICE %s :*** CONNECT: Server \002%s\002 already exists on the network and is connected via \002%s\002",user->nick,x->Name.c_str(),CheckDupe->GetParent()->GetName().c_str()); + user->WriteServ("NOTICE %s :*** CONNECT: Server \002%s\002 already exists on the network and is connected via \002%s\002",user->nick,x->Name.c_str(),CheckDupe->GetParent()->GetName().c_str()); return 1; } } } - WriteServ(user->fd,"NOTICE %s :*** CONNECT: No server matching \002%s\002 could be found in the config file.",user->nick,parameters[0]); + user->WriteServ("NOTICE %s :*** CONNECT: No server matching \002%s\002 could be found in the config file.",user->nick,parameters[0]); return 1; } - virtual int OnStats(char statschar, userrec* user) + virtual int OnStats(char statschar, userrec* user, string_list &results) { if (statschar == 'c') { for (unsigned int i = 0; i < LinkBlocks.size(); i++) { - WriteServ(user->fd,"213 %s C *@%s * %s %d 0 %c%c%c",user->nick,(LinkBlocks[i].HiddenFromStats ? "" : LinkBlocks[i].IPAddr).c_str(),LinkBlocks[i].Name.c_str(),LinkBlocks[i].Port,(LinkBlocks[i].EncryptionKey != "" ? 'e' : '-'),(LinkBlocks[i].AutoConnect ? 'a' : '-'),'s'); - WriteServ(user->fd,"244 %s H * * %s",user->nick,LinkBlocks[i].Name.c_str()); + results.push_back(Srv->GetServerName()+" 213 "+user->nick+" C *@"+(LinkBlocks[i].HiddenFromStats ? "" : LinkBlocks[i].IPAddr)+" * "+LinkBlocks[i].Name.c_str()+" "+ConvToStr(LinkBlocks[i].Port)+" "+(LinkBlocks[i].EncryptionKey != "" ? 'e' : '-')+(LinkBlocks[i].AutoConnect ? 'a' : '-')+'s'); + results.push_back(Srv->GetServerName()+" 244 "+user->nick+" H * * "+LinkBlocks[i].Name.c_str()); } - WriteServ(user->fd,"219 %s %c :End of /STATS report",user->nick,statschar); - WriteOpers("*** Notice: Stats '%c' requested by %s (%s@%s)",statschar,user->nick,user->ident,user->host); + results.push_back(Srv->GetServerName()+" 219 "+user->nick+" "+statschar+" :End of /STATS report"); + ServerInstance->WriteOpers("*** Notice: %s '%c' requested by %s (%s@%s)",(!strcmp(user->server,ServerInstance->Config->ServerName) ? "Stats" : "Remote stats"),statschar,user->nick,user->ident,user->host); return 1; } return 0; } - virtual int OnPreCommand(const std::string &command, char **parameters, int pcnt, userrec *user, bool validated) + virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated) { /* If the command doesnt appear to be valid, we dont want to mess with it. */ if (!validated) @@ -3331,6 +3918,10 @@ class ModuleSpanningTree : public Module { return this->HandleConnect(parameters,pcnt,user); } + else if (command == "STATS") + { + return this->HandleStats(parameters,pcnt,user); + } else if (command == "SQUIT") { return this->HandleSquit(parameters,pcnt,user); @@ -3404,7 +3995,7 @@ class ModuleSpanningTree : public Module virtual void OnUserInvite(userrec* source,userrec* dest,chanrec* channel) { - if (source->fd > -1) + if (IS_LOCAL(source)) { std::deque params; params.push_back(dest->nick); @@ -3423,7 +4014,7 @@ class ModuleSpanningTree : public Module virtual void OnWallops(userrec* user, const std::string &text) { - if (user->fd > -1) + if (IS_LOCAL(user)) { std::deque params; params.push_back(":"+text); @@ -3436,7 +4027,7 @@ class ModuleSpanningTree : public Module if (target_type == TYPE_USER) { userrec* d = (userrec*)dest; - if ((d->fd < 0) && (user->fd > -1)) + if ((d->fd < 0) && (IS_LOCAL(user))) { std::deque params; params.clear(); @@ -3445,9 +4036,9 @@ class ModuleSpanningTree : public Module DoOneToOne(user->nick,"NOTICE",params,d->server); } } - else + else if (target_type == TYPE_CHANNEL) { - if (user->fd > -1) + if (IS_LOCAL(user)) { chanrec *c = (chanrec*)dest; std::string cname = c->name; @@ -3464,6 +4055,17 @@ class ModuleSpanningTree : public Module } } } + else if (target_type == TYPE_SERVER) + { + if (IS_LOCAL(user)) + { + char* target = (char*)dest; + std::deque par; + par.push_back(target); + par.push_back(":"+text); + DoOneToMany(user->nick,"NOTICE",par); + } + } } virtual void OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status) @@ -3473,7 +4075,7 @@ class ModuleSpanningTree : public Module // route private messages which are targetted at clients only to the server // which needs to receive them userrec* d = (userrec*)dest; - if ((d->fd < 0) && (user->fd > -1)) + if ((d->fd < 0) && (IS_LOCAL(user))) { std::deque params; params.clear(); @@ -3482,9 +4084,9 @@ class ModuleSpanningTree : public Module DoOneToOne(user->nick,"PRIVMSG",params,d->server); } } - else + else if (target_type == TYPE_CHANNEL) { - if (user->fd > -1) + if (IS_LOCAL(user)) { chanrec *c = (chanrec*)dest; std::string cname = c->name; @@ -3501,6 +4103,17 @@ class ModuleSpanningTree : public Module } } } + else if (target_type == TYPE_SERVER) + { + if (IS_LOCAL(user)) + { + char* target = (char*)dest; + std::deque par; + par.push_back(target); + par.push_back(":"+text); + DoOneToMany(user->nick,"PRIVMSG",par); + } + } } virtual void OnBackgroundTimer(time_t curtime) @@ -3512,16 +4125,12 @@ class ModuleSpanningTree : public Module virtual void OnUserJoin(userrec* user, chanrec* channel) { // Only do this for local users - if (user->fd > -1) + if (IS_LOCAL(user)) { std::deque params; params.clear(); params.push_back(channel->name); - if (*channel->key) - { - // if the channel has a key, force the join by emulating the key. - params.push_back(channel->key); - } + if (channel->GetUserCounter() > 1) { // not the first in the channel @@ -3545,7 +4154,7 @@ class ModuleSpanningTree : public Module virtual void OnChangeHost(userrec* user, const std::string &newhost) { // only occurs for local clients - if (user->registered != 7) + if (user->registered != REG_ALL) return; std::deque params; params.push_back(newhost); @@ -3555,7 +4164,7 @@ class ModuleSpanningTree : public Module virtual void OnChangeName(userrec* user, const std::string &gecos) { // only occurs for local clients - if (user->registered != 7) + if (user->registered != REG_ALL) return; std::deque params; params.push_back(gecos); @@ -3564,7 +4173,7 @@ class ModuleSpanningTree : public Module virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage) { - if (user->fd > -1) + if (IS_LOCAL(user)) { std::deque params; params.push_back(channel->name); @@ -3577,7 +4186,7 @@ class ModuleSpanningTree : public Module virtual void OnUserConnect(userrec* user) { char agestr[MAXBUF]; - if (user->fd > -1) + if (IS_LOCAL(user)) { std::deque params; snprintf(agestr,MAXBUF,"%lu",(unsigned long)user->age); @@ -3586,8 +4195,8 @@ class ModuleSpanningTree : public Module params.push_back(user->host); params.push_back(user->dhost); params.push_back(user->ident); - params.push_back("+"+std::string(user->modes)); - params.push_back((char*)inet_ntoa(user->ip4)); + params.push_back("+"+std::string(user->FormatModes())); + params.push_back(user->GetIPString()); params.push_back(":"+std::string(user->fullname)); DoOneToMany(Srv->GetServerName(),"NICK",params); @@ -3603,7 +4212,7 @@ class ModuleSpanningTree : public Module virtual void OnUserQuit(userrec* user, const std::string &reason) { - if ((user->fd > -1) && (user->registered == 7)) + if ((IS_LOCAL(user)) && (user->registered == REG_ALL)) { std::deque params; params.push_back(":"+reason); @@ -3620,7 +4229,7 @@ class ModuleSpanningTree : public Module virtual void OnUserPostNick(userrec* user, const std::string &oldnick) { - if (user->fd > -1) + if (IS_LOCAL(user)) { std::deque params; params.push_back(user->nick); @@ -3630,7 +4239,7 @@ class ModuleSpanningTree : public Module virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) { - if ((source) && (source->fd > -1)) + if ((source) && (IS_LOCAL(source))) { std::deque params; params.push_back(chan->name); @@ -3666,7 +4275,7 @@ class ModuleSpanningTree : public Module // check for self if (Srv->MatchText(Srv->GetServerName(),parameter)) { - Srv->SendOpers("*** Remote rehash initiated from server \002"+Srv->GetServerName()+"\002."); + ServerInstance->WriteOpers("*** Remote rehash initiated from server \002"+Srv->GetServerName()+"\002."); Srv->RehashServer(); } } @@ -3678,7 +4287,7 @@ class ModuleSpanningTree : public Module // locally. virtual void OnOper(userrec* user, const std::string &opertype) { - if (user->fd > -1) + if (IS_LOCAL(user)) { std::deque params; params.push_back(opertype); @@ -3688,7 +4297,7 @@ class ModuleSpanningTree : public Module void OnLine(userrec* source, const std::string &host, bool adding, char linetype, long duration, const std::string &reason) { - if (source->fd > -1) + if (IS_LOCAL(source)) { char type[8]; snprintf(type,8,"%cLINE",linetype); @@ -3754,7 +4363,7 @@ class ModuleSpanningTree : public Module virtual void OnMode(userrec* user, void* dest, int target_type, const std::string &text) { - if ((user->fd > -1) && (user->registered == 7)) + if ((IS_LOCAL(user)) && (user->registered == REG_ALL)) { if (target_type == TYPE_USER) { @@ -3803,12 +4412,12 @@ class ModuleSpanningTree : public Module if (target_type == TYPE_USER) { userrec* u = (userrec*)target; - s->WriteLine(":"+Srv->GetServerName()+" FMODE "+u->nick+" "+modeline); + s->WriteLine(":"+Srv->GetServerName()+" FMODE "+u->nick+" "+ConvToStr(u->age)+" "+modeline); } else { chanrec* c = (chanrec*)target; - s->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" "+modeline); + s->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" "+ConvToStr(c->age)+" "+modeline); } } } @@ -3845,6 +4454,29 @@ class ModuleSpanningTree : public Module (*params)[2] = ":" + (*params)[2]; DoOneToMany(Srv->GetServerName(),"METADATA",*params); } + else if (event->GetEventID() == "send_mode") + { + std::deque* params = (std::deque*)event->GetData(); + if (params->size() < 2) + return; + // Insert the TS value of the object, either userrec or chanrec + time_t ourTS = 0; + userrec* a = ServerInstance->FindNick((*params)[0]); + if (a) + { + ourTS = a->age; + } + else + { + chanrec* a = ServerInstance->FindChan((*params)[0]); + if (a) + { + ourTS = a->age; + } + } + params->insert(params->begin() + 1,ConvToStr(ourTS)); + DoOneToMany(Srv->GetServerName(),"FMODE",*params); + } } virtual ~ModuleSpanningTree()