X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree.cpp;h=b0530442b4e90cf08483ab5d0baa5ed93da7f913;hb=1383dba43e463f292aea094d01f62f355946049d;hp=9fed5da6075491ca5beca6665d1a03e8a547f070;hpb=f1a3fd1d46db7ac33637336e6ba479f1d3c55a17;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp index 9fed5da60..b0530442b 100644 --- a/src/modules/m_spanningtree.cpp +++ b/src/modules/m_spanningtree.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2005 ChatSpike-Dev. + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. * E-mail: * * @@ -31,6 +31,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" +#include "commands.h" #include "socket.h" #include "helperfuncs.h" #include "inspircd.h" @@ -38,6 +39,9 @@ using namespace std; #include "hashcomp.h" #include "message.h" #include "xline.h" +#include "typedefs.h" +#include "cull_list.h" +#include "aes.h" #ifdef GCC3 #define nspace __gnu_cxx @@ -69,6 +73,8 @@ using namespace std; class ModuleSpanningTree; static ModuleSpanningTree* TreeProtocolModule; +extern ServerConfig* Config; + extern std::vector modules; extern std::vector factory; extern int MODCOUNT; @@ -91,8 +97,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 */ -typedef nspace::hash_map, irc::StrHashComp> user_hash; -typedef nspace::hash_map, irc::StrHashComp> chan_hash; extern user_hash clientlist; extern chan_hash chanlist; @@ -105,6 +109,8 @@ class TreeSocket; */ TreeServer *TreeRoot; +Server* Srv; + /* This hash_map holds the hash equivalent of the server * tree, used for rapid linear lookups. */ @@ -112,10 +118,10 @@ typedef nspace::hash_map server_hash; server_hash serverlist; /* More forward declarations */ -bool DoOneToOne(std::string prefix, std::string command, std::deque params, std::string target); -bool DoOneToAllButSender(std::string prefix, std::string command, std::deque params, std::string omit); -bool DoOneToMany(std::string prefix, std::string command, std::deque params); -bool DoOneToAllButSenderRaw(std::string data,std::string omit, std::string prefix,std::string command,std::deque params); +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); +bool DoOneToMany(std::string prefix, std::string command, std::deque ¶ms); +bool DoOneToAllButSenderRaw(std::string data, std::string omit, std::string prefix, std::string command, std::deque ¶ms); void ReadConfiguration(bool rebind); /* Imported from xline.cpp for use during netburst */ @@ -124,7 +130,11 @@ extern std::vector glines; extern std::vector zlines; extern std::vector qlines; extern std::vector elines; - +extern std::vector pklines; +extern std::vector pglines; +extern std::vector pzlines; +extern std::vector pqlines; +extern std::vector pelines; /* Each server in the tree is represented by one class of * type TreeServer. A locally connected TreeServer can @@ -167,7 +177,7 @@ class TreeServer ServerDesc = ""; VersionString = ""; UserCount = OperCount = 0; - VersionString = GetVersionString(); + VersionString = Srv->GetVersion(); } /* We use this constructor only to create the 'root' item, TreeRoot, which @@ -179,8 +189,9 @@ class TreeServer Parent = NULL; VersionString = ""; UserCount = OperCount = 0; - VersionString = GetVersionString(); + VersionString = Srv->GetVersion(); Route = NULL; + Socket = NULL; /* Fix by brain */ AddHashEntry(); } @@ -192,7 +203,7 @@ class TreeServer { VersionString = ""; UserCount = OperCount = 0; - this->SetNextPingTime(time(NULL) + 60); + this->SetNextPingTime(time(NULL) + 120); this->SetPingFlag(); /* find the 'route' for this server (e.g. the one directly connected @@ -284,17 +295,17 @@ class TreeServer std::string GetName() { - return this->ServerName; + return ServerName; } std::string GetDesc() { - return this->ServerDesc; + return ServerDesc; } std::string GetVersion() { - return this->VersionString; + return VersionString; } void SetNextPingTime(time_t t) @@ -305,7 +316,7 @@ class TreeServer time_t NextPingTime() { - return this->NextPing; + return NextPing; } bool AnsweredLastPing() @@ -320,22 +331,32 @@ class TreeServer int GetUserCount() { - return this->UserCount; + return UserCount; + } + + void AddUserCount() + { + UserCount++; + } + + void DelUserCount() + { + UserCount--; } int GetOperCount() { - return this->OperCount; + return OperCount; } TreeSocket* GetSocket() { - return this->Socket; + return Socket; } TreeServer* GetParent() { - return this->Parent; + return Parent; } void SetVersion(std::string Version) @@ -430,6 +451,7 @@ class Link std::string RecvPass; unsigned long AutoConnect; time_t NextConnectTime; + std::string EncryptionKey; }; /* The usual stuff for inspircd modules, @@ -437,7 +459,6 @@ class Link * use to store the tags from the config * file. */ -Server *Srv; ConfigReader *Conf; std::vector LinkBlocks; @@ -527,6 +548,10 @@ class TreeSocket : public InspSocket int num_lost_servers; time_t NextPing; bool LastPingWasGood; + bool bursting; + AES* ctx_in; + AES* ctx_out; + unsigned int keylength; public: @@ -540,6 +565,8 @@ class TreeSocket : public InspSocket { myhost = host; this->LinkState = LISTENER; + this->ctx_in = NULL; + this->ctx_out = NULL; } TreeSocket(std::string host, int port, bool listening, unsigned long maxtime, std::string ServerName) @@ -547,6 +574,8 @@ class TreeSocket : public InspSocket { myhost = ServerName; this->LinkState = CONNECTING; + this->ctx_in = NULL; + this->ctx_out = NULL; } /* When a listening socket gives us a new file descriptor, @@ -557,6 +586,42 @@ class TreeSocket : public InspSocket : InspSocket(newfd, ip) { this->LinkState = WAIT_AUTH_1; + this->ctx_in = NULL; + this->ctx_out = NULL; + this->SendCapabilities(); + } + + ~TreeSocket() + { + if (ctx_in) + delete ctx_in; + if (ctx_out) + delete ctx_out; + } + + void InitAES(std::string key,std::string SName) + { + if (key == "") + return; + + ctx_in = new AES(); + ctx_out = new AES(); + log(DEBUG,"Initialized AES key %s",key.c_str()); + // key must be 16, 24, 32 etc bytes (multiple of 8) + 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!"); + 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()); + 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\ + \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); + } } /* When an outbound connection finishes connecting, we receive @@ -575,6 +640,19 @@ class TreeSocket : public InspSocket { if (x->Name == this->myhost) { + 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."); + } + else + { + this->WriteLine("AES "+Srv->GetServerName()); + this->InitAES(x->EncryptionKey,x->Name); + } + } /* found who we're supposed to be connecting to, send the neccessary gubbins. */ this->WriteLine("SERVER "+Srv->GetServerName()+" "+x->SendPass+" 0 :"+Srv->GetServerDescription()); return true; @@ -631,13 +709,63 @@ 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]); + } + sort(modlist.begin(),modlist.end()); + for (unsigned int i = 0; i < modlist.size(); i++) + { + if (i) + capabilities = capabilities + ","; + capabilities = capabilities + modlist[i]; + } + return capabilities; + } + + void SendCapabilities() + { + this->WriteLine("CAPAB "+MyCapabilities()); + } + + bool Capab(std::deque params) + { + if (params.size() != 1) + { + this->WriteLine("ERROR :Invalid number of parameters for CAPAB"); + return false; + } + if (params[0] != this->MyCapabilities()) + { + std::string quitserver = this->myhost; + if (this->InboundServerName != "") + { + 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."); + this->WriteLine("ERROR :CAPAB mismatch; My capabilities: '"+this->MyCapabilities()+"'"); + return false; + } + return true; + } + /* This function forces this server to quit, removing this server * and any users on it (and servers and users below that, etc etc). * It's very slow and pretty clunky, but luckily unless your network * is having a REAL bad hair day, this function shouldnt be called * too many times a month ;-) */ - void SquitServer(TreeServer* Current) + void SquitServer(TreeServer* Current, CullList* Goners) { /* recursively squit the servers attached to 'Current'. * We're going backwards so we don't remove users @@ -646,29 +774,17 @@ class TreeSocket : public InspSocket for (unsigned int q = 0; q < Current->ChildCount(); q++) { TreeServer* recursive_server = Current->GetChild(q); - this->SquitServer(recursive_server); + this->SquitServer(recursive_server,Goners); } /* Now we've whacked the kids, whack self */ num_lost_servers++; - bool quittingpeople = true; - while (quittingpeople) - { - /* Yup i know, "ew". We cant continue to loop through the - * iterator if we modify it, so whenever we modify it with a - * QUIT we have to start alllll over again. If anyone knows - * a better faster way of *safely* doing this, please let me - * know! - */ - quittingpeople = false; - for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) + for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) + { + if (!strcasecmp(u->second->server,Current->GetName().c_str())) { - if (!strcasecmp(u->second->server,Current->GetName().c_str())) - { - Srv->QuitUser(u->second,Current->GetName()+" "+std::string(Srv->GetServerName())); - num_lost_users++; - quittingpeople = true; - break; - } + std::string qreason = Current->GetName()+" "+std::string(Srv->GetServerName()); + Goners->AddItem(u->second,qreason); + num_lost_users++; } } } @@ -679,7 +795,7 @@ class TreeSocket : public InspSocket */ void Squit(TreeServer* Current,std::string reason) { - if (Current) + if ((Current) && (Current != TreeRoot)) { std::deque params; params.push_back(Current->GetName()); @@ -695,10 +811,13 @@ class TreeSocket : public InspSocket } num_lost_servers = 0; num_lost_users = 0; - SquitServer(Current); + CullList* Goners = new CullList(); + SquitServer(Current, Goners); + Goners->Apply(); Current->Tidy(); Current->GetParent()->DelChild(Current); delete Current; + delete Goners; WriteOpers("Netsplit complete, lost \002%d\002 users on \002%d\002 servers.", num_lost_users, num_lost_servers); } else @@ -808,55 +927,61 @@ class TreeSocket : public InspSocket { /* process one channel at a time, applying modes. */ char* usr = (char*)params[usernum].c_str(); - char permissions = *usr; - switch (permissions) - { - case '@': - usr++; - mode_users[modectr++] = usr; - strlcat(modestring,"o",MAXBUF); - break; - case '%': - usr++; - mode_users[modectr++] = usr; - strlcat(modestring,"h",MAXBUF); - break; - case '+': - usr++; - mode_users[modectr++] = usr; - strlcat(modestring,"v",MAXBUF); - break; - } - who = Srv->FindNick(usr); - if (who) + /* Safety check just to make sure someones not sent us an FJOIN full of spaces + * (is this even possible?) */ + if (usr && *usr) { - Srv->JoinUserToChannel(who,channel,key); - if (modectr >= (MAXMODES-1)) + char permissions = *usr; + switch (permissions) { - /* theres a mode for this user. push them onto the mode queue, and flush it - * if there are more than MAXMODES to go. - */ - if (ourTS >= TS) - { - log(DEBUG,"Our our channel newer than theirs, accepting their modes"); - Srv->SendMode(mode_users,modectr,who); - } - else + case '@': + usr++; + mode_users[modectr++] = usr; + strlcat(modestring,"o",MAXBUF); + break; + case '%': + usr++; + mode_users[modectr++] = usr; + strlcat(modestring,"h",MAXBUF); + break; + case '+': + usr++; + mode_users[modectr++] = usr; + strlcat(modestring,"v",MAXBUF); + break; + } + who = Srv->FindNick(usr); + if (who) + { + Srv->JoinUserToChannel(who,channel,key); + if (modectr >= (MAXMODES-1)) { - log(DEBUG,"Their channel newer than ours, bouncing their modes"); - /* bouncy bouncy! */ - std::deque params; - /* modes are now being UNSET... */ - *mode_users[1] = '-'; - for (unsigned int x = 0; x < modectr; x++) + /* theres a mode for this user. push them onto the mode queue, and flush it + * if there are more than MAXMODES to go. + */ + if ((ourTS >= TS) || (Srv->IsUlined(who->server))) { - params.push_back(mode_users[x]); + /* 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); } - // tell everyone to bounce the modes. bad modes, bad! - DoOneToMany(Srv->GetServerName(),"FMODE",params); + else + { + log(DEBUG,"Their channel newer than ours, bouncing their modes"); + /* bouncy bouncy! */ + std::deque params; + /* modes are now being UNSET... */ + *mode_users[1] = '-'; + for (unsigned int x = 0; x < modectr; x++) + { + params.push_back(mode_users[x]); + } + // tell everyone to bounce the modes. bad modes, bad! + DoOneToMany(Srv->GetServerName(),"FMODE",params); + } + strcpy(mode_users[1],"+"); + modectr = 2; } - strcpy(mode_users[1],"+"); - modectr = 2; } } } @@ -931,13 +1056,26 @@ class TreeSocket : public InspSocket clientlist[tempnick]->signon = age; strlcpy(clientlist[tempnick]->modes, modes.c_str(),53); strlcpy(clientlist[tempnick]->ip,ip.c_str(),16); + + ucrec a; + a.channel = NULL; + a.uc_modes = 0; for (int i = 0; i < MAXCHANS; i++) + clientlist[tempnick]->chans.push_back(a); + + if (!this->bursting) { - clientlist[tempnick]->chans[i].channel = NULL; - clientlist[tempnick]->chans[i].uc_modes = 0; + WriteOpers("*** Client connecting at %s: %s!%s@%s [%s]",clientlist[tempnick]->server,clientlist[tempnick]->nick,clientlist[tempnick]->ident,clientlist[tempnick]->host,clientlist[tempnick]->ip); } params[7] = ":" + params[7]; DoOneToAllButSender(source,"NICK",params,source); + + // Increment the Source Servers User Count.. + TreeServer* SourceServer = FindServer(source); + if (SourceServer) { + SourceServer->AddUserCount(); + } + return true; } @@ -947,24 +1085,27 @@ class TreeSocket : public InspSocket */ void SendFJoins(TreeServer* Current, chanrec* c) { + log(DEBUG,"Sending FJOINs to other server for %s",c->name); char list[MAXBUF]; snprintf(list,MAXBUF,":%s FJOIN %s %lu",Srv->GetServerName().c_str(),c->name,(unsigned long)c->age); - std::vector *ulist = c->GetUsers(); - for (unsigned int i = 0; i < ulist->size(); i++) + std::map *ulist = c->GetUsers(); + for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) { - char* o = (*ulist)[i]; + char* o = i->second; userrec* otheruser = (userrec*)o; strlcat(list," ",MAXBUF); strlcat(list,cmode(otheruser,c),MAXBUF); strlcat(list,otheruser->nick,MAXBUF); if (strlen(list)>(480-NICKMAX)) { + log(DEBUG,"FJOIN line wrapped"); this->WriteLine(list); snprintf(list,MAXBUF,":%s FJOIN %s %lu",Srv->GetServerName().c_str(),c->name,(unsigned long)c->age); } } if (list[strlen(list)-1] != ':') { + log(DEBUG,"Final FJOIN line"); this->WriteLine(list); } } @@ -994,12 +1135,33 @@ class TreeSocket : public InspSocket snprintf(data,MAXBUF,":%s ADDLINE E %s %s %lu %lu :%s",Srv->GetServerName().c_str(),i->hostmask,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); this->WriteLine(data); } + for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) + { + snprintf(data,MAXBUF,":%s ADDLINE Z %s %s %lu %lu :%s",Srv->GetServerName().c_str(),i->ipaddr,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); + this->WriteLine(data); + } + for (std::vector::iterator i = pqlines.begin(); i != pqlines.end(); i++) + { + snprintf(data,MAXBUF,":%s ADDLINE Q %s %s %lu %lu :%s",Srv->GetServerName().c_str(),i->nick,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); + this->WriteLine(data); + } + for (std::vector::iterator i = pglines.begin(); i != pglines.end(); i++) + { + snprintf(data,MAXBUF,":%s ADDLINE G %s %s %lu %lu :%s",Srv->GetServerName().c_str(),i->hostmask,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); + this->WriteLine(data); + } + for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) + { + snprintf(data,MAXBUF,":%s ADDLINE E %s %s %lu %lu :%s",Srv->GetServerName().c_str(),i->hostmask,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); + this->WriteLine(data); + } } /* Send channel modes and topics */ void SendChannelModes(TreeServer* Current) { char data[MAXBUF]; + std::deque list; for (chan_hash::iterator c = chanlist.begin(); c != chanlist.end(); c++) { SendFJoins(Current, c->second); @@ -1015,7 +1177,13 @@ class TreeSocket : public InspSocket snprintf(data,MAXBUF,":%s FMODE %s +b %s",Srv->GetServerName().c_str(),c->second->name,b->data); this->WriteLine(data); } - FOREACH_MOD OnSyncChannel(c->second,(Module*)TreeProtocolModule,(void*)this); + FOREACH_MOD(I_OnSyncChannel,OnSyncChannel(c->second,(Module*)TreeProtocolModule,(void*)this)); + list.clear(); + c->second->GetExtList(list); + for (unsigned int j = 0; j < list.size(); j++) + { + FOREACH_MOD(I_OnSyncChannelMetaData,OnSyncChannelMetaData(c->second,(Module*)TreeProtocolModule,(void*)this,list[j])); + } } } @@ -1023,6 +1191,7 @@ class TreeSocket : public InspSocket void SendUsers(TreeServer* Current) { char data[MAXBUF]; + std::deque list; for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) { if (u->second->registered == 7) @@ -1033,12 +1202,13 @@ class TreeSocket : public InspSocket { this->WriteLine(":"+std::string(u->second->nick)+" OPERTYPE "+std::string(u->second->oper)); } - //char* chl = chlist(u->second,u->second); - //if (*chl) - //{ - // this->WriteLine(":"+std::string(u->second->nick)+" FJOIN "+std::string(chl)); - //} - FOREACH_MOD OnSyncUser(u->second,(Module*)TreeProtocolModule,(void*)this); + FOREACH_MOD(I_OnSyncUser,OnSyncUser(u->second,(Module*)TreeProtocolModule,(void*)this)); + list.clear(); + u->second->GetExtList(list); + for (unsigned int j = 0; j < list.size(); j++) + { + FOREACH_MOD(I_OnSyncUserMetaData,OnSyncUserMetaData(u->second,(Module*)TreeProtocolModule,(void*)this,list[j])); + } } } } @@ -1053,7 +1223,7 @@ class TreeSocket : public InspSocket Srv->SendOpers("*** Bursting to \2"+s->GetName()+"\2."); this->WriteLine("BURST"); /* send our version string */ - this->WriteLine(":"+Srv->GetServerName()+" VERSION :"+GetVersionString()); + this->WriteLine(":"+Srv->GetServerName()+" VERSION :"+Srv->GetVersion()); /* Send server tree */ this->SendServers(TreeRoot,s,1); /* Send users and their oper status */ @@ -1076,7 +1246,8 @@ class TreeSocket : public InspSocket virtual bool OnDataReady() { char* data = this->Read(); - if (data) + /* Check that the data read is a valid pointer and it has some content */ + if (data && *data) { this->in_buffer += data; /* While there is at least one new line in the buffer, @@ -1088,7 +1259,8 @@ class TreeSocket : public InspSocket std::string ret = ""; while ((*line != '\n') && (strlen(line))) { - ret = ret + *line; + if ((*line != '\r') && (*line != '\n')) + ret = ret + *line; line++; } if ((*line == '\n') || (*line == '\r')) @@ -1097,17 +1269,64 @@ class TreeSocket : public InspSocket /* Process this one, abort if it * didnt return true. */ + if (this->ctx_in) + { + char out[1024]; + char result[1024]; + memset(result,0,1024); + memset(out,0,1024); + log(DEBUG,"Original string '%s'",ret.c_str()); + /* ERROR + CAPAB is still allowed unencryped */ + if ((ret.substr(0,7) != "ERROR :") && (ret.substr(0,6) != "CAPAB ")) + { + int nbytes = from64tobits(out, ret.c_str(), 1024); + if ((nbytes > 0) && (nbytes < 1024)) + { + log(DEBUG,"m_spanningtree: decrypt %d bytes",nbytes); + ctx_in->Decrypt(out, result, nbytes, 1); + for (int t = 0; t < nbytes; t++) + if (result[t] == '\7') result[t] = 0; + ret = result; + } + } + } if (!this->ProcessLine(ret)) { return false; } } } + /* EAGAIN returns an empty but non-NULL string, so this + * evaluates to TRUE for EAGAIN but to FALSE for EOF. + */ return (data != NULL); } int WriteLine(std::string line) { + log(DEBUG,"OUT: %s",line.c_str()); + if (this->ctx_out) + { + log(DEBUG,"AES context"); + char result[10240]; + char result64[10240]; + if (this->keylength) + { + while (line.length() % this->keylength != 0) + { + // pad it to be a multiple of the key length + line = line + "\7"; + } + } + unsigned int ll = line.length(); + log(DEBUG,"Plaintext line with padding = %d chars",ll); + ctx_out->Encrypt(line.c_str(), result, ll, 1); + log(DEBUG,"Encrypted."); + to64frombits((unsigned char*)result64,(unsigned char*)result,ll); + line = result64; + log(DEBUG,"Encrypted: %s",line.c_str()); + //int from64tobits(char *out, const char *in, int maxlen); + } return this->Write(line + "\r\n"); } @@ -1131,7 +1350,7 @@ class TreeSocket : public InspSocket /* Because the core won't let users or even SERVERS set +o, * we use the OPERTYPE command to do this. */ - bool OperType(std::string prefix, std::deque params) + bool OperType(std::string prefix, std::deque ¶ms) { if (params.size() != 1) return true; @@ -1152,7 +1371,7 @@ class TreeSocket : public InspSocket /* Because Andy insists that services-compatible servers must * implement SVSNICK and SVSJOIN, that's exactly what we do :p */ - bool ForceNick(std::string prefix, std::deque params) + bool ForceNick(std::string prefix, std::deque ¶ms) { if (params.size() < 3) return true; @@ -1166,7 +1385,7 @@ class TreeSocket : public InspSocket return true; } - bool ServiceJoin(std::string prefix, std::deque params) + bool ServiceJoin(std::string prefix, std::deque ¶ms) { if (params.size() < 2) return true; @@ -1179,10 +1398,10 @@ class TreeSocket : public InspSocket return true; } - bool RemoteRehash(std::string prefix, std::deque params) + bool RemoteRehash(std::string prefix, std::deque ¶ms) { if (params.size() < 1) - return true; + return false; std::string servermask = params[0]; if (Srv->MatchText(Srv->GetServerName(),servermask)) { @@ -1194,7 +1413,7 @@ class TreeSocket : public InspSocket return true; } - bool RemoteKill(std::string prefix, std::deque params) + bool RemoteKill(std::string prefix, std::deque ¶ms) { if (params.size() != 2) return true; @@ -1203,24 +1422,25 @@ class TreeSocket : public InspSocket userrec* who = Srv->FindNick(nick); if (who) { - /* Append kill source, if we don't have one */ - if (*(params[1].c_str()) != '[') - { - params[1] = "[" + std::string(u->server) + "] Killed (" + params[1] +")"; - } + /* Prepend kill source, if we don't have one */ std::string sourceserv = prefix; if (u) { sourceserv = u->server; } + if (*(params[1].c_str()) != '[') + { + params[1] = "[" + sourceserv + "] Killed (" + params[1] +")"; + } + std::string reason = params[1]; params[1] = ":" + params[1]; DoOneToAllButSender(prefix,"KILL",params,sourceserv); - Srv->QuitUser(who,params[1]); + Srv->QuitUser(who,reason); } return true; } - bool LocalPong(std::string prefix, std::deque params) + bool LocalPong(std::string prefix, std::deque ¶ms) { if (params.size() < 1) return true; @@ -1231,8 +1451,37 @@ class TreeSocket : public InspSocket } return true; } + + bool MetaData(std::string prefix, std::deque ¶ms) + { + if (params.size() < 3) + return true; + TreeServer* ServerSource = FindServer(prefix); + if (ServerSource) + { + if (*(params[0].c_str()) == '#') + { + chanrec* c = Srv->FindChannel(params[0]); + if (c) + { + FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(TYPE_CHANNEL,c,params[1],params[2])); + } + } + else + { + userrec* u = Srv->FindNick(params[0]); + if (u) + { + FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(TYPE_USER,u,params[1],params[2])); + } + } + } + params[2] = ":" + params[2]; + DoOneToAllButSender(prefix,"METADATA",params,prefix); + return true; + } - bool ServerVersion(std::string prefix, std::deque params) + bool ServerVersion(std::string prefix, std::deque ¶ms) { if (params.size() < 1) return true; @@ -1246,7 +1495,7 @@ class TreeSocket : public InspSocket return true; } - bool ChangeHost(std::string prefix, std::deque params) + bool ChangeHost(std::string prefix, std::deque ¶ms) { if (params.size() < 1) return true; @@ -1259,7 +1508,7 @@ class TreeSocket : public InspSocket return true; } - bool AddLine(std::string prefix, std::deque params) + bool AddLine(std::string prefix, std::deque ¶ms) { if (params.size() < 6) return true; @@ -1274,15 +1523,19 @@ class TreeSocket : public InspSocket { case 'Z': add_zline(atoi(duration.c_str()), source.c_str(), reason.c_str(), mask.c_str()); + zline_set_creation_time((char*)mask.c_str(), atoi(settime.c_str())); break; case 'Q': add_qline(atoi(duration.c_str()), source.c_str(), reason.c_str(), mask.c_str()); + qline_set_creation_time((char*)mask.c_str(), atoi(settime.c_str())); break; case 'E': add_eline(atoi(duration.c_str()), source.c_str(), reason.c_str(), mask.c_str()); + eline_set_creation_time((char*)mask.c_str(), atoi(settime.c_str())); break; case 'G': add_gline(atoi(duration.c_str()), source.c_str(), reason.c_str(), mask.c_str()); + gline_set_creation_time((char*)mask.c_str(), atoi(settime.c_str())); break; case 'K': add_kline(atoi(duration.c_str()), source.c_str(), reason.c_str(), mask.c_str()); @@ -1298,7 +1551,7 @@ class TreeSocket : public InspSocket return true; } - bool ChangeName(std::string prefix, std::deque params) + bool ChangeName(std::string prefix, std::deque ¶ms) { if (params.size() < 1) return true; @@ -1311,8 +1564,67 @@ class TreeSocket : public InspSocket } return true; } + + bool Whois(std::string prefix, std::deque ¶ms) + { + if (params.size() < 1) + return true; + log(DEBUG,"In IDLE command"); + userrec* u = Srv->FindNick(prefix); + if (u) + { + log(DEBUG,"USER EXISTS: %s",u->nick); + // an incoming request + if (params.size() == 1) + { + userrec* x = Srv->FindNick(params[0]); + if ((x) && (x->fd > -1)) + { + userrec* x = Srv->FindNick(params[0]); + log(DEBUG,"Got IDLE"); + char signon[MAXBUF]; + char idle[MAXBUF]; + log(DEBUG,"Sending back IDLE 3"); + snprintf(signon,MAXBUF,"%lu",(unsigned long)x->signon); + snprintf(idle,MAXBUF,"%lu",(unsigned long)abs((x->idle_lastmsg)-time(NULL))); + std::deque par; + par.push_back(prefix); + par.push_back(signon); + par.push_back(idle); + // ours, we're done, pass it BACK + DoOneToOne(params[0],"IDLE",par,u->server); + } + else + { + // not ours pass it on + DoOneToOne(prefix,"IDLE",params,x->server); + } + } + 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)) + { + 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()); + } + else + { + // not ours, pass it on + DoOneToOne(prefix,"IDLE",params,who_to_send_to->server); + } + } + } + return true; + } - bool LocalPing(std::string prefix, std::deque params) + bool LocalPing(std::string prefix, std::deque ¶ms) { if (params.size() < 1) return true; @@ -1321,7 +1633,7 @@ class TreeSocket : public InspSocket return true; } - bool RemoteServer(std::string prefix, std::deque params) + bool RemoteServer(std::string prefix, std::deque ¶ms) { if (params.size() < 4) return false; @@ -1339,6 +1651,7 @@ class TreeSocket : public InspSocket 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()); return false; } TreeServer* Node = new TreeServer(servername,description,ParentOfThis,NULL); @@ -1349,7 +1662,7 @@ class TreeSocket : public InspSocket return true; } - bool Outbound_Reply_Server(std::deque params) + bool Outbound_Reply_Server(std::deque ¶ms) { if (params.size() < 4) return false; @@ -1359,6 +1672,7 @@ class TreeSocket : public InspSocket if (hops) { this->WriteLine("ERROR :Server too far away for authentication"); + Srv->SendOpers("*** Server connection from \2"+servername+"\2 denied, server is too far away for authentication"); return false; } std::string description = params[3]; @@ -1370,6 +1684,7 @@ class TreeSocket : public InspSocket 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()); return false; } // Begin the sync here. this kickstarts the @@ -1384,15 +1699,17 @@ class TreeSocket : public InspSocket TreeRoot->AddChild(Node); params[3] = ":" + params[3]; DoOneToAllButSender(TreeRoot->GetName(),"SERVER",params,servername); + this->bursting = true; this->DoBurst(Node); return true; } } this->WriteLine("ERROR :Invalid credentials"); + Srv->SendOpers("*** Server connection from \2"+servername+"\2 denied, invalid link credentials"); return false; } - bool Inbound_Server(std::deque params) + bool Inbound_Server(std::deque ¶ms) { if (params.size() < 4) return false; @@ -1402,6 +1719,7 @@ class TreeSocket : public InspSocket if (hops) { this->WriteLine("ERROR :Server too far away for authentication"); + Srv->SendOpers("*** Server connection from \2"+servername+"\2 denied, server is too far away for authentication"); return false; } std::string description = params[3]; @@ -1413,6 +1731,17 @@ class TreeSocket : public InspSocket 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()); + return false; + } + /* If the config says this link is encrypted, but the remote side + * hasnt bothered to send the AES command before SERVER, then we + * boot them off as we MUST have this connection encrypted. + */ + 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"+servername+"\2 denied, remote server did not enable AES."); return false; } Srv->SendOpers("*** Verified incoming server connection from \002"+servername+"\002["+this->GetIP()+"] ("+description+")"); @@ -1427,16 +1756,16 @@ class TreeSocket : public InspSocket } } this->WriteLine("ERROR :Invalid credentials"); + Srv->SendOpers("*** Server connection from \2"+servername+"\2 denied, invalid link credentials"); return false; } - std::deque Split(std::string line, bool stripcolon) + void Split(std::string line, bool stripcolon, std::deque &n) { - std::deque n; if (!strchr(line.c_str(),' ')) { n.push_back(line); - return n; + return; } std::stringstream s(line); std::string param = ""; @@ -1478,7 +1807,7 @@ class TreeSocket : public InspSocket { n.push_back(param); } - return n; + return; } bool ProcessLine(std::string line) @@ -1489,8 +1818,10 @@ class TreeSocket : public InspSocket line = l; if (line == "") return true; - Srv->Log(DEBUG,"IN: '"+line+"'"); - std::deque params = this->Split(line,true); + Srv->Log(DEBUG,"IN: "+line); + + std::deque params; + this->Split(line,true,params); std::string command = ""; std::string prefix = ""; if (((params[0].c_str())[0] == ':') && (params.size() > 1)) @@ -1508,7 +1839,24 @@ class TreeSocket : public InspSocket command = params[0]; params.pop_front(); } - + + if ((!this->ctx_in) && (command == "AES")) + { + std::string sserv = params[0]; + for (std::vector::iterator x = LinkBlocks.begin(); x < LinkBlocks.end(); x++) + { + if ((x->EncryptionKey != "") && (x->Name == sserv)) + { + this->InitAES(x->EncryptionKey,sserv); + } + } + return true; + } + 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()); + } + switch (this->LinkState) { TreeServer* Node; @@ -1519,7 +1867,11 @@ class TreeSocket : public InspSocket // replies with theirs if its happy, then if the initiator is happy, // it starts to send its net sync, which starts the merge, otherwise // it sends an ERROR. - if (command == "SERVER") + if (command == "PASS") + { + /* Silently ignored */ + } + else if (command == "SERVER") { return this->Inbound_Server(params); } @@ -1527,6 +1879,25 @@ class TreeSocket : public InspSocket { return this->Error(params); } + else if (command == "USER") + { + this->WriteLine("ERROR :Client connections to this port are prohibited."); + return false; + } + else if (command == "CAPAB") + { + return this->Capab(params); + } + else if ((command == "U") || (command == "S")) + { + this->WriteLine("ERROR :Cannot use the old-style mesh linking protocol with m_spanningtree.so!"); + return false; + } + else + { + this->WriteLine("ERROR :Invalid command in negotiation phase."); + return false; + } break; case WAIT_AUTH_2: // Waiting for start of other side's netmerge to say they liked our @@ -1537,6 +1908,11 @@ class TreeSocket : public InspSocket // silently ignore. return true; } + else if ((command == "U") || (command == "S")) + { + this->WriteLine("ERROR :Cannot use the old-style mesh linking protocol with m_spanningtree.so!"); + return false; + } else if (command == "BURST") { this->LinkState = CONNECTED; @@ -1548,12 +1924,17 @@ class TreeSocket : public InspSocket params.push_back("1"); params.push_back(":"+InboundDescription); DoOneToAllButSender(TreeRoot->GetName(),"SERVER",params,InboundServerName); + this->bursting = true; this->DoBurst(Node); } else if (command == "ERROR") { return this->Error(params); } + else if (command == "CAPAB") + { + return this->Capab(params); + } break; case LISTENER: @@ -1579,6 +1960,31 @@ class TreeSocket : public InspSocket // This is the 'authenticated' state, when all passwords // have been exchanged and anything past this point is taken // as gospel. + + if (prefix != "") + { + std::string direction = prefix; + userrec* t = Srv->FindNick(prefix); + if (t) + { + direction = t->server; + } + TreeServer* route_back_again = BestRouteTo(direction); + if ((!route_back_again) || (route_back_again->GetSocket() != this)) + { + if (route_back_again) + log(DEBUG,"Protocol violation: Fake direction in command '%s' from connection '%s'",line.c_str(),this->GetName().c_str()); + return true; + } + + /* Fix by brain: + * When there is activity on the socket, reset the ping counter so + * that we're not wasting bandwidth pinging an active server. + */ + route_back_again->SetNextPingTime(time(NULL) + 120); + route_back_again->SetPingFlag(); + } + if (command == "SVSMODE") { /* Services expects us to implement @@ -1627,6 +2033,10 @@ class TreeSocket : public InspSocket { return this->RemoteRehash(prefix,params); } + else if (command == "METADATA") + { + return this->MetaData(prefix,params); + } else if (command == "PING") { return this->LocalPing(prefix,params); @@ -1659,6 +2069,10 @@ class TreeSocket : public InspSocket } return this->ForceNick(prefix,params); } + else if (command == "IDLE") + { + return this->Whois(prefix,params); + } else if (command == "SVSJOIN") { if (prefix == "") @@ -1675,6 +2089,11 @@ class TreeSocket : public InspSocket } return true; } + else if (command == "ENDBURST") + { + this->bursting = false; + return true; + } else { // not a special inter-server command. @@ -1752,6 +2171,7 @@ class TreeSocket : public InspSocket { Squit(s,"Remote host closed the connection"); } + WriteOpers("Server '\2%s\2[%s]' closed the connection.",quitserver.c_str(),this->GetIP().c_str()); } virtual int OnIncomingConnection(int newsock, char* ip) @@ -1777,13 +2197,12 @@ void AddThisServer(TreeServer* server, std::deque &list) // returns a list of DIRECT servernames for a specific channel void GetListOfServersForChannel(chanrec* c, std::deque &list) { - std::vector *ulist = c->GetUsers(); - unsigned int ucount = ulist->size(); - for (unsigned int i = 0; i < ucount; i++) + std::map *ulist = c->GetUsers(); + for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) { - char* o = (*ulist)[i]; + char* o = i->second; userrec* otheruser = (userrec*)o; - if (std::string(otheruser->server) != Srv->GetServerName()) + if (otheruser->fd < 0) { TreeServer* best = BestRouteTo(otheruser->server); if (best) @@ -1793,7 +2212,7 @@ void GetListOfServersForChannel(chanrec* c, std::deque &list) return; } -bool DoOneToAllButSenderRaw(std::string data,std::string omit,std::string prefix,std::string command,std::deque params) +bool DoOneToAllButSenderRaw(std::string data, std::string omit, std::string prefix, std::string command, std::deque ¶ms) { TreeServer* omitroute = BestRouteTo(omit); if ((command == "NOTICE") || (command == "PRIVMSG")) @@ -1850,7 +2269,7 @@ bool DoOneToAllButSenderRaw(std::string data,std::string omit,std::string prefix return true; } -bool DoOneToAllButSender(std::string prefix, std::string command, std::deque params, std::string omit) +bool DoOneToAllButSender(std::string prefix, std::string command, std::deque ¶ms, std::string omit) { TreeServer* omitroute = BestRouteTo(omit); std::string FullLine = ":" + prefix + " " + command; @@ -1876,7 +2295,7 @@ bool DoOneToAllButSender(std::string prefix, std::string command, std::deque params) +bool DoOneToMany(std::string prefix, std::string command, std::deque ¶ms) { std::string FullLine = ":" + prefix + " " + command; unsigned int words = params.size(); @@ -1897,7 +2316,7 @@ bool DoOneToMany(std::string prefix, std::string command, std::deque params, std::string target) +bool DoOneToOne(std::string prefix, std::string command, std::deque ¶ms, std::string target) { TreeServer* Route = BestRouteTo(target); if (Route) @@ -1925,6 +2344,7 @@ std::vector Bindings; void ReadConfiguration(bool rebind) { + Conf = new ConfigReader; if (rebind) { for (int j =0; j < Conf->Enumerate("bind"); j++) @@ -1963,10 +2383,35 @@ void ReadConfiguration(bool rebind) L.SendPass = Conf->ReadValue("link","sendpass",j); L.RecvPass = Conf->ReadValue("link","recvpass",j); L.AutoConnect = Conf->ReadInteger("link","autoconnect",j,true); + L.EncryptionKey = Conf->ReadValue("link","encryptionkey",j); L.NextConnectTime = time(NULL) + L.AutoConnect; - 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); + /* Bugfix by brain, do not allow people to enter bad configurations */ + if ((L.RecvPass != "") && (L.SendPass != "") && (L.Name != "") && (L.Port)) + { + 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); + } + else + { + if (L.RecvPass == "") + { + log(DEFAULT,"Invalid configuration for server '%s', recvpass not defined!",L.Name.c_str()); + } + else if (L.SendPass == "") + { + log(DEFAULT,"Invalid configuration for server '%s', sendpass not defined!",L.Name.c_str()); + } + else if (L.Name == "") + { + log(DEFAULT,"Invalid configuration, link tag without a name!"); + } + else if (!L.Port) + { + log(DEFAULT,"Invalid configuration for server '%s', no port specified!",L.Name.c_str()); + } + } } + delete Conf; } @@ -1978,10 +2423,10 @@ class ModuleSpanningTree : public Module public: - ModuleSpanningTree() + ModuleSpanningTree(Server* Me) + : Module::Module(Me) { - Srv = new Server; - Conf = new ConfigReader; + Srv = Me; Bindings.clear(); // Create the root of the tree @@ -2009,20 +2454,9 @@ class ModuleSpanningTree : public Module return TreeRoot->ChildCount(); } - void CountServsRecursive(TreeServer* Current) - { - NumServers++; - for (unsigned int q = 0; q < Current->ChildCount(); q++) - { - CountServsRecursive(Current->GetChild(q)); - } - } - int CountServs() { - NumServers = 0; - CountServsRecursive(TreeRoot); - return NumServers; + return serverlist.size(); } void HandleLinks(char** parameters, int pcnt, userrec* user) @@ -2052,7 +2486,32 @@ class ModuleSpanningTree : public Module { matrix[line][t] = ' '; } - strlcpy(&matrix[line][depth],Current->GetName().c_str(),80); + + // For Aligning, we need to work out exactly how deep this thing is, and produce + // a 'Spacer' String to compensate. + char spacer[40]; + + memset(spacer,' ',40); + if ((40 - Current->GetName().length() - depth) > 1) { + spacer[40 - Current->GetName().length() - depth] = '\0'; + } + else + { + spacer[5] = '\0'; + } + + float percent; + char text[80]; + if (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; + } + snprintf(text, 80, "%s %s%5d [%5.2f%%]", Current->GetName().c_str(), spacer, Current->GetUserCount(), percent); + strlcpy(&matrix[line][depth],text,80); line++; for (unsigned int q = 0; q < Current->ChildCount(); q++) { @@ -2127,12 +2586,18 @@ class ModuleSpanningTree : public Module 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]); + 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); sock->Squit(s,"Server quit by "+std::string(user->nick)+"!"+std::string(user->ident)+"@"+std::string(user->host)); - sock->Close(); + Srv->RemoveSocket(sock); } else { @@ -2146,6 +2611,28 @@ class ModuleSpanningTree : public Module return 1; } + int HandleRemoteWhois(char** parameters, int pcnt, userrec* user) + { + if ((user->fd > -1) && (pcnt > 1)) + { + userrec* remote = Srv->FindNick(parameters[1]); + if ((remote) && (remote->fd < 0)) + { + std::deque params; + params.push_back(parameters[1]); + DoOneToOne(user->nick,"IDLE",params,remote->server); + return 1; + } + 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]); + return 1; + } + } + return 0; + } + void DoPingChecks(time_t curtime) { for (unsigned int j = 0; j < TreeRoot->ChildCount(); j++) @@ -2154,22 +2641,23 @@ class ModuleSpanningTree : public Module TreeSocket* sock = serv->GetSocket(); if (sock) { - if (curtime >= serv->NextPingTime()) - { - if (serv->AnsweredLastPing()) - { - sock->WriteLine(":"+Srv->GetServerName()+" PING "+serv->GetName()); - serv->SetNextPingTime(curtime + 60); - } - else - { - // they didnt answer, boot them - WriteOpers("*** Server \002%s\002 pinged out",serv->GetName().c_str()); - sock->Squit(serv,"Ping timeout"); - sock->Close(); - return; - } - } + if (curtime >= serv->NextPingTime()) + { + if (serv->AnsweredLastPing()) + { + sock->WriteLine(":"+Srv->GetServerName()+" PING "+serv->GetName()); + serv->SetNextPingTime(curtime + 120); + } + else + { + // they didnt answer, boot them + WriteOpers("*** Server \002%s\002 pinged out",serv->GetName().c_str()); + sock->Squit(serv,"Ping timeout"); + Srv->RemoveSocket(sock); + return; + } + } + } } } @@ -2202,6 +2690,25 @@ class ModuleSpanningTree : public Module { std::string Version = found->GetVersion(); WriteServ(user->fd,"351 %s :%s",user->nick,Version.c_str()); + if (found == TreeRoot) + { + std::stringstream out(Config->data005); + std::string token = ""; + std::string line5 = ""; + int token_counter = 0; + while (!out.eof()) + { + out >> token; + line5 = line5 + token + " "; + token_counter++; + if ((token_counter >= 13) || (out.eof() == true)) + { + WriteServ(user->fd,"005 %s %s:are supported by this server",user->nick,line5.c_str()); + line5 = ""; + token_counter = 0; + } + } + } } else { @@ -2235,8 +2742,28 @@ class ModuleSpanningTree : public Module return 1; } - virtual int OnPreCommand(std::string command, char **parameters, int pcnt, userrec *user) + virtual int OnStats(char statschar, userrec* user) { + 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].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()); + } + 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); + return 1; + } + return 0; + } + + virtual int OnPreCommand(std::string command, 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) + return 0; + if (command == "CONNECT") { return this->HandleConnect(parameters,pcnt,user); @@ -2260,6 +2787,14 @@ class ModuleSpanningTree : public Module this->HandleLinks(parameters,pcnt,user); return 1; } + else if (command == "WHOIS") + { + if (pcnt > 1) + { + // remote whois + return this->HandleRemoteWhois(parameters,pcnt,user); + } + } else if ((command == "VERSION") && (pcnt > 0)) { this->HandleVersion(parameters,pcnt,user); @@ -2301,7 +2836,7 @@ class ModuleSpanningTree : public Module virtual void OnUserInvite(userrec* source,userrec* dest,chanrec* channel) { - if (std::string(source->server) == Srv->GetServerName()) + if (source->fd > -1) { std::deque params; params.push_back(dest->nick); @@ -2320,7 +2855,7 @@ class ModuleSpanningTree : public Module virtual void OnWallops(userrec* user, std::string text) { - if (std::string(user->server) == Srv->GetServerName()) + if (user->fd > -1) { std::deque params; params.push_back(":"+text); @@ -2333,7 +2868,7 @@ class ModuleSpanningTree : public Module if (target_type == TYPE_USER) { userrec* d = (userrec*)dest; - if ((std::string(d->server) != Srv->GetServerName()) && (std::string(user->server) == Srv->GetServerName())) + if ((d->fd < 0) && (user->fd > -1)) { std::deque params; params.clear(); @@ -2344,7 +2879,7 @@ class ModuleSpanningTree : public Module } else { - if (std::string(user->server) == Srv->GetServerName()) + if (user->fd > -1) { chanrec *c = (chanrec*)dest; std::deque list; @@ -2367,7 +2902,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 ((std::string(d->server) != Srv->GetServerName()) && (std::string(user->server) == Srv->GetServerName())) + if ((d->fd < 0) && (user->fd > -1)) { std::deque params; params.clear(); @@ -2378,7 +2913,7 @@ class ModuleSpanningTree : public Module } else { - if (std::string(user->server) == Srv->GetServerName()) + if (user->fd > -1) { chanrec *c = (chanrec*)dest; std::deque list; @@ -2403,7 +2938,7 @@ class ModuleSpanningTree : public Module virtual void OnUserJoin(userrec* user, chanrec* channel) { // Only do this for local users - if (std::string(user->server) == Srv->GetServerName()) + if (user->fd > -1) { std::deque params; params.clear(); @@ -2436,6 +2971,8 @@ class ModuleSpanningTree : public Module virtual void OnChangeHost(userrec* user, std::string newhost) { // only occurs for local clients + if (user->registered != 7) + return; std::deque params; params.push_back(newhost); DoOneToMany(user->nick,"FHOST",params); @@ -2444,6 +2981,8 @@ class ModuleSpanningTree : public Module virtual void OnChangeName(userrec* user, std::string gecos) { // only occurs for local clients + if (user->registered != 7) + return; std::deque params; params.push_back(gecos); DoOneToMany(user->nick,"FNAME",params); @@ -2451,7 +2990,7 @@ class ModuleSpanningTree : public Module virtual void OnUserPart(userrec* user, chanrec* channel) { - if (std::string(user->server) == Srv->GetServerName()) + if (user->fd > -1) { std::deque params; params.push_back(channel->name); @@ -2462,7 +3001,7 @@ class ModuleSpanningTree : public Module virtual void OnUserConnect(userrec* user) { char agestr[MAXBUF]; - if (std::string(user->server) == Srv->GetServerName()) + if (user->fd > -1) { std::deque params; snprintf(agestr,MAXBUF,"%lu",(unsigned long)user->age); @@ -2475,22 +3014,35 @@ class ModuleSpanningTree : public Module params.push_back(user->ip); params.push_back(":"+std::string(user->fullname)); DoOneToMany(Srv->GetServerName(),"NICK",params); + + // User is Local, change needs to be reflected! + TreeServer* SourceServer = FindServer(user->server); + if (SourceServer) { + SourceServer->AddUserCount(); + } + } } virtual void OnUserQuit(userrec* user, std::string reason) { - if (std::string(user->server) == Srv->GetServerName()) + if ((user->fd > -1) && (user->registered == 7)) { std::deque params; params.push_back(":"+reason); DoOneToMany(user->nick,"QUIT",params); } + // Regardless, We need to modify the user Counts.. + TreeServer* SourceServer = FindServer(user->server); + if (SourceServer) { + SourceServer->DelUserCount(); + } + } virtual void OnUserPostNick(userrec* user, std::string oldnick) { - if (std::string(user->server) == Srv->GetServerName()) + if (user->fd > -1) { std::deque params; params.push_back(user->nick); @@ -2500,7 +3052,7 @@ class ModuleSpanningTree : public Module virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, std::string reason) { - if (std::string(source->server) == Srv->GetServerName()) + if (source->fd > -1) { std::deque params; params.push_back(chan->name); @@ -2540,7 +3092,7 @@ class ModuleSpanningTree : public Module // locally. virtual void OnOper(userrec* user, std::string opertype) { - if (std::string(user->server) == Srv->GetServerName()) + if (user->fd > -1) { std::deque params; params.push_back(opertype); @@ -2550,7 +3102,7 @@ class ModuleSpanningTree : public Module void OnLine(userrec* source, std::string host, bool adding, char linetype, long duration, std::string reason) { - if (std::string(source->server) == Srv->GetServerName()) + if (source->fd > -1) { char type[8]; snprintf(type,8,"%cLINE",linetype); @@ -2616,7 +3168,7 @@ class ModuleSpanningTree : public Module virtual void OnMode(userrec* user, void* dest, int target_type, std::string text) { - if (std::string(user->server) == Srv->GetServerName()) + if ((user->fd > -1) && (user->registered == 7)) { if (target_type == TYPE_USER) { @@ -2655,15 +3207,55 @@ class ModuleSpanningTree : public Module } } + virtual void ProtoSendMetaData(void* opaque, int target_type, void* target, std::string extname, std::string extdata) + { + TreeSocket* s = (TreeSocket*)opaque; + if (target) + { + if (target_type == TYPE_USER) + { + userrec* u = (userrec*)target; + s->WriteLine(":"+Srv->GetServerName()+" METADATA "+u->nick+" "+extname+" :"+extdata); + } + else + { + chanrec* c = (chanrec*)target; + s->WriteLine(":"+Srv->GetServerName()+" METADATA "+c->name+" "+extname+" :"+extdata); + } + } + } + virtual ~ModuleSpanningTree() { - delete Srv; } virtual Version GetVersion() { return Version(1,0,0,0,VF_STATIC|VF_VENDOR); } + + void Implements(char* List) + { + List[I_OnPreCommand] = List[I_OnGetServerDescription] = List[I_OnUserInvite] = List[I_OnPostLocalTopicChange] = 1; + List[I_OnWallops] = List[I_OnUserNotice] = List[I_OnUserMessage] = List[I_OnBackgroundTimer] = 1; + List[I_OnUserJoin] = List[I_OnChangeHost] = List[I_OnChangeName] = List[I_OnUserPart] = List[I_OnUserConnect] = 1; + List[I_OnUserQuit] = List[I_OnUserPostNick] = List[I_OnUserKick] = List[I_OnRemoteKill] = List[I_OnRehash] = 1; + List[I_OnOper] = List[I_OnAddGLine] = List[I_OnAddZLine] = List[I_OnAddQLine] = List[I_OnAddELine] = 1; + List[I_OnDelGLine] = List[I_OnDelZLine] = List[I_OnDelQLine] = List[I_OnDelELine] = List[I_ProtoSendMode] = List[I_OnMode] = 1; + List[I_OnStats] = List[I_ProtoSendMetaData] = 1; + } + + /* It is IMPORTANT that m_spanningtree is the last module in the chain + * so that any activity it sees is FINAL, e.g. we arent going to send out + * a NICK message before m_cloaking has finished putting the +x on the user, + * etc etc. + * Therefore, we return PRIORITY_LAST to make sure we end up at the END of + * the module call queue. + */ + Priority Prioritize() + { + return PRIORITY_LAST; + } }; @@ -2678,9 +3270,9 @@ class ModuleSpanningTreeFactory : public ModuleFactory { } - virtual Module * CreateModule() + virtual Module * CreateModule(Server* Me) { - TreeProtocolModule = new ModuleSpanningTree; + TreeProtocolModule = new ModuleSpanningTree(Me); return TreeProtocolModule; }