X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree.cpp;h=22c9e92461acb262156cff05da6f2b3806363209;hb=c4458ecc70025aeac7ca87115ed0a698e7bbcdad;hp=1374c88a2e9f839573ec3bc8367d81856a82ad42;hpb=bbbf55dfcadf02784dced07c5b5c72581dff66a2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp index 1374c88a2..22c9e9246 100644 --- a/src/modules/m_spanningtree.cpp +++ b/src/modules/m_spanningtree.cpp @@ -23,15 +23,13 @@ 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 "socket.h" #include "helperfuncs.h" #include "inspircd.h" @@ -43,11 +41,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 @@ -74,7 +68,7 @@ class ModuleSpanningTree; static ModuleSpanningTree* TreeProtocolModule; extern ServerConfig* Config; - +extern InspIRCd* ServerInstance; extern std::vector modules; extern std::vector factory; extern int MODCOUNT; @@ -109,19 +103,19 @@ class TreeSocket; */ TreeServer *TreeRoot; -Server* Srv; +static Server* Srv; /* This hash_map holds the hash equivalent of the server * tree, used for rapid linear lookups. */ -typedef nspace::hash_map server_hash; +typedef nspace::hash_map, irc::StrHashComp> server_hash; server_hash serverlist; /* 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); 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); +bool DoOneToAllButSenderRaw(std::string data, std::string omit, std::string prefix, irc::string command, std::deque ¶ms); void ReadConfiguration(bool rebind); /* Flatten links and /MAP for non-opers */ @@ -151,17 +145,17 @@ extern std::vector pelines; * constructors below), and also a dynamic list of pointers * to its children which can be iterated recursively * if required. Creating or deleting objects of type - * TreeServer automatically maintains the hash_map of + i* TreeServer automatically maintains the hash_map of * TreeServer items, deleting and inserting them as they * are created and destroyed. */ -class TreeServer +class TreeServer : public classbase { TreeServer* Parent; /* Parent entry */ TreeServer* Route; /* Route entry */ std::vector Children; /* List of child objects */ - std::string ServerName; /* Server's name */ + irc::string ServerName; /* Server's name */ std::string ServerDesc; /* Server's description */ std::string VersionString; /* Version string or empty string */ int UserCount; /* Not used in this version */ @@ -189,7 +183,7 @@ class TreeServer * represents our own server. Therefore, it has no route, no parent, and * no socket associated with it. Its version string is our own local version. */ - TreeServer(std::string Name, std::string Desc) : ServerName(Name), ServerDesc(Desc) + TreeServer(std::string Name, std::string Desc) : ServerName(Name.c_str()), ServerDesc(Desc) { Parent = NULL; VersionString = ""; @@ -204,7 +198,7 @@ class TreeServer * This constructor initializes the server's Route and Parent, and sets up * its ping counters so that it will be pinged one minute from now. */ - TreeServer(std::string Name, std::string Desc, TreeServer* Above, TreeSocket* Sock) : Parent(Above), ServerName(Name), ServerDesc(Desc), Socket(Sock) + TreeServer(std::string Name, std::string Desc, TreeServer* Above, TreeSocket* Sock) : Parent(Above), ServerName(Name.c_str()), ServerDesc(Desc), Socket(Sock) { VersionString = ""; UserCount = OperCount = 0; @@ -265,6 +259,28 @@ class TreeServer this->AddHashEntry(); } + int QuitUsers(const std::string &reason) + { + log(DEBUG,"Removing all users from server %s",this->ServerName.c_str()); + const char* reason_s = reason.c_str(); + std::vector time_to_die; + for (user_hash::iterator n = clientlist.begin(); n != clientlist.end(); n++) + { + 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)) + kill_link(a,reason_s); + } + return time_to_die.size(); + } + /* This method is used to add the structure to the * hash_map for linear searches. It is only called * by the constructors. @@ -272,9 +288,9 @@ class TreeServer void AddHashEntry() { server_hash::iterator iter; - iter = serverlist.find(this->ServerName); + iter = serverlist.find(this->ServerName.c_str()); if (iter == serverlist.end()) - serverlist[this->ServerName] = this; + serverlist[this->ServerName.c_str()] = this; } /* This method removes the reference to this object @@ -284,7 +300,7 @@ class TreeServer void DelHashEntry() { server_hash::iterator iter; - iter = serverlist.find(this->ServerName); + iter = serverlist.find(this->ServerName.c_str()); if (iter != serverlist.end()) serverlist.erase(iter); } @@ -300,7 +316,7 @@ class TreeServer std::string GetName() { - return ServerName; + return ServerName.c_str(); } std::string GetDesc() @@ -424,7 +440,7 @@ class TreeServer TreeServer* s = (TreeServer*)*a; s->Tidy(); Children.erase(a); - delete s; + DELETE(s); stillchildren = true; break; } @@ -446,10 +462,10 @@ class TreeServer * of them, and populate the list on rehash/load. */ -class Link +class Link : public classbase { public: - std::string Name; + irc::string Name; std::string IPAddr; int Port; std::string SendPass; @@ -477,7 +493,7 @@ std::vector LinkBlocks; TreeServer* FindServer(std::string ServerName) { server_hash::iterator iter; - iter = serverlist.find(ServerName); + iter = serverlist.find(ServerName.c_str()); if (iter != serverlist.end()) { return iter->second; @@ -519,7 +535,7 @@ TreeServer* FindServerMask(std::string ServerName) { for (server_hash::iterator i = serverlist.begin(); i != serverlist.end(); i++) { - if (Srv->MatchText(i->first,ServerName)) + if (Srv->MatchText(i->first.c_str(),ServerName)) return i->second; } return NULL; @@ -539,9 +555,9 @@ class cmd_rconnect : public command_t cmd_rconnect (Module* Callback) : command_t("RCONNECT", 'o', 2), Creator(Callback) { this->source = "m_spanningtree.so"; - } + } - 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]); /* Is this aimed at our server? */ @@ -549,7 +565,7 @@ class cmd_rconnect : public command_t { /* 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]; + const char* para[1]; para[0] = parameters[1]; Creator->OnPreCommand("CONNECT", para, 1, user, true); } @@ -627,9 +643,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) @@ -683,7 +699,7 @@ class TreeSocket : public InspSocket else { this->WriteLine("AES "+Srv->GetServerName()); - this->InitAES(x->EncryptionKey,x->Name); + this->InitAES(x->EncryptionKey,x->Name.c_str()); } } /* found who we're supposed to be connecting to, send the neccessary gubbins. */ @@ -707,6 +723,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) + { + Srv->SendOpers("*** Connection failed: Connection refused"); + } } virtual int OnDisconnect() @@ -802,7 +822,7 @@ class TreeSocket : public InspSocket * is having a REAL bad hair day, this function shouldnt be called * too many times a month ;-) */ - void SquitServer(TreeServer* Current, CullList* Goners) + void SquitServer(std::string &from, TreeServer* Current) { /* recursively squit the servers attached to 'Current'. * We're going backwards so we don't remove users @@ -811,19 +831,19 @@ class TreeSocket : public InspSocket for (unsigned int q = 0; q < Current->ChildCount(); q++) { TreeServer* recursive_server = Current->GetChild(q); - this->SquitServer(recursive_server,Goners); + this->SquitServer(from,recursive_server); } /* Now we've whacked the kids, whack self */ num_lost_servers++; - for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) + 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())) { - std::string qreason = Current->GetName()+" "+std::string(Srv->GetServerName()); - Goners->AddItem(u->second,qreason); + Goners->AddItem(u->second,from); num_lost_users++; } - } + }*/ } /* This is a wrapper function for SquitServer above, which @@ -848,13 +868,11 @@ class TreeSocket : public InspSocket } num_lost_servers = 0; num_lost_users = 0; - CullList* Goners = new CullList(); - SquitServer(Current, Goners); - Goners->Apply(); + std::string from = Current->GetParent()->GetName()+" "+Current->GetName(); + SquitServer(from, Current); Current->Tidy(); Current->GetParent()->DelChild(Current); - delete Current; - delete Goners; + DELETE(Current); WriteOpers("Netsplit complete, lost \002%d\002 users on \002%d\002 servers.", num_lost_users, num_lost_servers); } else @@ -864,25 +882,26 @@ class TreeSocket : public InspSocket } /* FMODE command */ - bool ForceMode(std::string source, std::deque params) + bool ForceMode(std::string source, std::deque ¶ms) { - userrec* who = new userrec; - who->fd = FD_MAGIC_NUMBER; if (params.size() < 2) return true; - char* modelist[255]; + userrec* who = new userrec(); + who->fd = FD_MAGIC_NUMBER; + const char* modelist[64]; + memset(&modelist,0,sizeof(modelist)); for (unsigned int q = 0; q < params.size(); q++) { modelist[q] = (char*)params[q].c_str(); } Srv->SendMode(modelist,params.size(),who); DoOneToAllButSender(source,"FMODE",params,source); - delete who; + DELETE(who); return true; } /* FTOPIC command */ - bool ForceTopic(std::string source, std::deque params) + bool ForceTopic(std::string source, std::deque ¶ms) { if (params.size() != 4) return true; @@ -907,27 +926,26 @@ class TreeSocket : public InspSocket userrec* user = Srv->FindNick(source); if (!user) { - WriteChannelWithServ((char*)source.c_str(), c, "TOPIC %s :%s", c->name, c->topic); + WriteChannelWithServ(source.c_str(), c, "TOPIC %s :%s", c->name, c->topic); } else { WriteChannel(c, user, "TOPIC %s :%s", c->name, c->topic); nsource = user->server; } + /* all done, send it on its way */ + params[3] = ":" + params[3]; + DoOneToAllButSender(source,"FTOPIC",params,nsource); } } } - - /* all done, send it on its way */ - params[3] = ":" + params[3]; - DoOneToAllButSender(source,"FTOPIC",params,nsource); return true; } /* FJOIN, similar to unreal SJOIN */ - bool ForceJoin(std::string source, std::deque params) + bool ForceJoin(std::string source, std::deque ¶ms) { if (params.size() < 3) return true; @@ -935,9 +953,10 @@ class TreeSocket : public InspSocket char first[MAXBUF]; char modestring[MAXBUF]; char* mode_users[127]; + memset(&mode_users,0,sizeof(mode_users)); mode_users[0] = first; mode_users[1] = modestring; - strcpy(mode_users[1],"+"); + strcpy(first,"+"); unsigned int modectr = 2; userrec* who = NULL; @@ -1009,7 +1028,7 @@ 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); } else { @@ -1039,7 +1058,7 @@ class TreeSocket : public InspSocket 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); } else { @@ -1056,8 +1075,28 @@ class TreeSocket : public InspSocket return true; } + bool SyncChannelTS(std::string source, std::deque ¶ms) + { + if (params.size() == 2) + { + chanrec* c = Srv->FindChannel(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 params) + bool IntroduceClient(std::string source, std::deque ¶ms) { if (params.size() < 8) return true; @@ -1069,18 +1108,17 @@ class TreeSocket : public InspSocket // NICK age nick host dhost ident +modes ip :gecos // 0 123 4 56 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); + user_hash::iterator iter = clientlist.find(tempnick); + if (iter != clientlist.end()) { // nick collision @@ -1092,26 +1130,22 @@ class TreeSocket : public InspSocket 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(),160); - strlcpy(clientlist[tempnick]->dhost, params[3].c_str(),160); - clientlist[tempnick]->server = (char*)FindServerNamePtr(source.c_str()); + strlcpy(clientlist[tempnick]->host, params[2].c_str(),63); + strlcpy(clientlist[tempnick]->dhost, params[3].c_str(),63); + clientlist[tempnick]->server = 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 (std::string::iterator v = params[5].begin(); v != params[5].end(); v++) + { + clientlist[tempnick]->modes[(*v)-65] = 1; + } inet_aton(params[6].c_str(),&clientlist[tempnick]->ip4); - ucrec a; - a.channel = NULL; - a.uc_modes = 0; - for (int i = 0; i < MAXCHANS; i++) - clientlist[tempnick]->chans.push_back(a); + WriteOpers("*** Client connecting at %s: %s!%s@%s [%s]",clientlist[tempnick]->server,clientlist[tempnick]->nick,clientlist[tempnick]->ident,clientlist[tempnick]->host, inet_ntoa(clientlist[tempnick]->ip4)); - if (!this->bursting) - { - 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)); - } params[7] = ":" + params[7]; DoOneToAllButSender(source,"NICK",params,source); @@ -1119,6 +1153,7 @@ class TreeSocket : public InspSocket TreeServer* SourceServer = FindServer(source); if (SourceServer) { + log(DEBUG,"Found source server of %s",clientlist[tempnick]->nick); SourceServer->AddUserCount(); } @@ -1134,26 +1169,29 @@ 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; - snprintf(list,MAXBUF,":%s FJOIN %s %lu",Srv->GetServerName().c_str(),c->name,(unsigned long)c->age); - std::map *ulist = c->GetUsers(); + + size_t dlen, curlen; + dlen = curlen = snprintf(list,MAXBUF,":%s FJOIN %s %lu",Srv->GetServerName().c_str(),c->name,(unsigned long)c->age); + int numusers = 0; + char* ptr = list + dlen; + + CUList *ulist = c->GetUsers(); std::vector specific_halfop; std::vector specific_voice; - for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) + + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - char* o = i->second; - userrec* otheruser = (userrec*)o; - strlcat(list," ",MAXBUF); - int x = cflags(otheruser,c); + int x = cflags(i->second,c); if ((x & UCMODE_HOP) && (x & UCMODE_OP)) { - specific_halfop.push_back(otheruser); + specific_halfop.push_back(i->second); } if (((x & UCMODE_HOP) || (x & UCMODE_OP)) && (x & UCMODE_VOICE)) { - specific_voice.push_back(otheruser); + specific_voice.push_back(i->second); } - char* n = ""; + const char* n = ""; if (x & UCMODE_OP) { n = "@"; @@ -1167,13 +1205,20 @@ class TreeSocket : public InspSocket n = "+"; } - strlcat(list,n,MAXBUF); - strlcat(list,otheruser->nick,MAXBUF); - if (strlen(list)>(480-NICKMAX)) + size_t ptrlen = snprintf(ptr, MAXBUF, " %s%s", n, i->second->nick); + + curlen += ptrlen; + ptr += ptrlen; + + numusers++; + + if (curlen > (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); + dlen = curlen = snprintf(list,MAXBUF,":%s FJOIN %s %lu",Srv->GetServerName().c_str(),c->name,(unsigned long)c->age); + ptr = list + dlen; + ptrlen = 0; + numusers = 0; for (unsigned int y = 0; y < specific_voice.size(); y++) { this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" +v "+specific_voice[y]->nick); @@ -1184,9 +1229,8 @@ class TreeSocket : public InspSocket } } } - if (list[strlen(list)-1] != ':') + if (numusers) { - log(DEBUG,"Final FJOIN line"); this->WriteLine(list); for (unsigned int y = 0; y < specific_voice.size(); y++) { @@ -1197,50 +1241,53 @@ class TreeSocket : public InspSocket this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" +h "+specific_halfop[y]->nick); } } + this->WriteLine(":"+Srv->GetServerName()+" SYNCTS "+c->name+" "+ConvToStr(c->age)); } /* Send G, Q, Z and E lines */ void SendXLines(TreeServer* Current) { char data[MAXBUF]; - const char* sn = Srv->GetServerName().c_str(); + std::string n = Srv->GetServerName(); + const char* sn = n.c_str(); + int iterations = 0; /* Yes, these arent too nice looking, but they get the job done */ - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) + for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++, iterations++) { snprintf(data,MAXBUF,":%s ADDLINE Z %s %s %lu %lu :%s",sn,i->ipaddr,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); this->WriteLine(data); } - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) + for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++, iterations++) { snprintf(data,MAXBUF,":%s ADDLINE Q %s %s %lu %lu :%s",sn,i->nick,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); this->WriteLine(data); } - for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) + for (std::vector::iterator i = glines.begin(); i != glines.end(); i++, iterations++) { snprintf(data,MAXBUF,":%s ADDLINE G %s %s %lu %lu :%s",sn,i->hostmask,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); this->WriteLine(data); } - for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) + for (std::vector::iterator i = elines.begin(); i != elines.end(); i++, iterations++) { snprintf(data,MAXBUF,":%s ADDLINE E %s %s %lu %lu :%s",sn,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++) + for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++, iterations++) { snprintf(data,MAXBUF,":%s ADDLINE Z %s %s %lu %lu :%s",sn,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++) + for (std::vector::iterator i = pqlines.begin(); i != pqlines.end(); i++, iterations++) { snprintf(data,MAXBUF,":%s ADDLINE Q %s %s %lu %lu :%s",sn,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++) + for (std::vector::iterator i = pglines.begin(); i != pglines.end(); i++, iterations++) { snprintf(data,MAXBUF,":%s ADDLINE G %s %s %lu %lu :%s",sn,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++) + for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++, iterations++) { snprintf(data,MAXBUF,":%s ADDLINE E %s %s %lu %lu :%s",sn,i->hostmask,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); this->WriteLine(data); @@ -1252,8 +1299,10 @@ class TreeSocket : public InspSocket { char data[MAXBUF]; std::deque list; - const char* sn = Srv->GetServerName().c_str(); - for (chan_hash::iterator c = chanlist.begin(); c != chanlist.end(); c++) + 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++) { SendFJoins(Current, c->second); snprintf(data,MAXBUF,":%s FMODE %s +%s",sn,c->second->name,chanmodes(c->second,true)); @@ -1283,11 +1332,12 @@ class TreeSocket : public InspSocket { char data[MAXBUF]; std::deque list; - for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) + int iterations = 0; + for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++, iterations++) { if (u->second->registered == 7) { - 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(),inet_ntoa(u->second->ip4),u->second->fullname); this->WriteLine(data); if (*u->second->oper) { @@ -1315,8 +1365,16 @@ class TreeSocket : public InspSocket */ void DoBurst(TreeServer* s) { - Srv->SendOpers("*** Bursting to \2"+s->GetName()+"\2."); - this->WriteLine("BURST"); + /* 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."); + this->WriteLine(burst); /* send our version string */ this->WriteLine(":"+Srv->GetServerName()+" VERSION :"+Srv->GetVersion()); /* Send server tree */ @@ -1325,10 +1383,10 @@ class TreeSocket : public InspSocket this->SendUsers(s); /* Send everything else (channel modes, xlines etc) */ this->SendChannelModes(s); - this->SendXLines(s); + this->SendXLines(s); FOREACH_MOD(I_OnSyncOtherMetaData,OnSyncOtherMetaData((Module*)TreeProtocolModule,(void*)this)); - this->WriteLine("ENDBURST"); - Srv->SendOpers("*** Finished bursting to \2"+s->GetName()+"\2."); + this->WriteLine(endburst); + Srv->SendOpers("*** Finished bursting to \2"+name+"\2."); } /* This function is called when we receive data from a remote @@ -1341,12 +1399,10 @@ class TreeSocket : public InspSocket */ virtual bool OnDataReady() { - log(DEBUG,"TreeSocket::OnDataReady"); char* data = this->Read(); /* Check that the data read is a valid pointer and it has some content */ if (data && *data) { - log(DEBUG,"got some data"); this->in_buffer.append(data); /* While there is at least one new line in the buffer, * do something useful (we hope!) with it. @@ -1374,7 +1430,7 @@ class TreeSocket : public InspSocket if ((nbytes > 0) && (nbytes < 1024)) { log(DEBUG,"m_spanningtree: decrypt %d bytes",nbytes); - ctx_in->Decrypt(out, result, nbytes, 1); + ctx_in->Decrypt(out, result, nbytes, 0); for (int t = 0; t < nbytes; t++) if (result[t] == '\7') result[t] = 0; ret = result; @@ -1387,11 +1443,12 @@ class TreeSocket : public InspSocket return false; } } + return true; } /* EAGAIN returns an empty but non-NULL string, so this * evaluates to TRUE for EAGAIN but to FALSE for EOF. */ - return (data != NULL); + return (data && !*data); } int WriteLine(std::string line) @@ -1412,7 +1469,7 @@ class TreeSocket : public InspSocket } } unsigned int ll = line.length(); - ctx_out->Encrypt(line.c_str(), result, ll, 1); + ctx_out->Encrypt(line.c_str(), result, ll, 0); to64frombits((unsigned char*)result64,(unsigned char*)result,ll); line = result64; //int from64tobits(char *out, const char *in, int maxlen); @@ -1444,11 +1501,8 @@ class TreeSocket : public InspSocket userrec* u = Srv->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; @@ -1471,7 +1525,9 @@ class TreeSocket : public InspSocket { std::deque par; par.push_back(params[1]); - DoOneToMany(u->nick,"NICK",par); + /* This is not required as one is sent in OnUserPostNick below + */ + //DoOneToMany(u->nick,"NICK",par); Srv->ChangeUserNick(u,params[1]); u->age = atoi(params[2].c_str()); } @@ -1535,6 +1591,7 @@ class TreeSocket : public InspSocket std::string reason = params[1]; params[1] = ":" + params[1]; DoOneToAllButSender(prefix,"KILL",params,sourceserv); + ::Write(who->fd, ":%s KILL %s :%s (%s)", sourceserv.c_str(), who->nick, sourceserv.c_str(), reason.c_str()); Srv->QuitUser(who,reason); } return true; @@ -1659,19 +1716,19 @@ 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()); @@ -1686,11 +1743,20 @@ class TreeSocket : public InspSocket /* Send it on its way */ if (propogate) { + 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()); + } + else + { + 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); } if (!this->bursting) { + log(DEBUG,"Applying lines..."); apply_lines(APPLY_ZLINES|APPLY_GLINES|APPLY_QLINES); } return true; @@ -1761,7 +1827,7 @@ class TreeSocket : public InspSocket 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()); + do_whois(who_to_send_to,u,signon,idle,nick_whoised.c_str()); } else { @@ -1780,6 +1846,9 @@ class TreeSocket : public InspSocket userrec* u = Srv->FindNick(params[0]); + if (!u) + return true; + if (IS_LOCAL(u)) { // push the raw to the user @@ -1900,8 +1969,8 @@ 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!"); + Srv->SendOpers("*** Server connection from \2"+servername+"\2 denied, already exists"); return false; } TreeServer* Node = new TreeServer(servername,description,ParentOfThis,NULL); @@ -1917,14 +1986,15 @@ class TreeSocket : public InspSocket if (params.size() < 4) return false; - std::string servername = params[0]; + irc::string servername = params[0].c_str(); + std::string sname = params[0]; std::string password = params[1]; int hops = atoi(params[2].c_str()); 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"); + Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, server is too far away for authentication"); return false; } std::string description = params[3]; @@ -1932,11 +2002,11 @@ class TreeSocket : public InspSocket { if ((x->Name == servername) && (x->RecvPass == password)) { - TreeServer* CheckDupe = FindServer(servername); + TreeServer* CheckDupe = FindServer(sname); 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 "+sname+" already exists on server "+CheckDupe->GetParent()->GetName()+"!"); + Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName()); return false; } // Begin the sync here. this kickstarts the @@ -1947,17 +2017,17 @@ class TreeSocket : public InspSocket // we should add the details of this server now // to the servers tree, as a child of the root // node. - TreeServer* Node = new TreeServer(servername,description,TreeRoot,this); + TreeServer* Node = new TreeServer(sname,description,TreeRoot,this); TreeRoot->AddChild(Node); params[3] = ":" + params[3]; - DoOneToAllButSender(TreeRoot->GetName(),"SERVER",params,servername); + DoOneToAllButSender(TreeRoot->GetName(),"SERVER",params,sname); 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"); + Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, invalid link credentials"); return false; } @@ -1966,14 +2036,15 @@ class TreeSocket : public InspSocket if (params.size() < 4) return false; - std::string servername = params[0]; + irc::string servername = params[0].c_str(); + std::string sname = params[0]; std::string password = params[1]; int hops = atoi(params[2].c_str()); 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"); + Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, server is too far away for authentication"); return false; } std::string description = params[3]; @@ -1981,11 +2052,11 @@ class TreeSocket : public InspSocket { if ((x->Name == servername) && (x->RecvPass == password)) { - TreeServer* CheckDupe = FindServer(servername); + TreeServer* CheckDupe = FindServer(sname); 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 "+sname+" already exists on server "+CheckDupe->GetParent()->GetName()+"!"); + Srv->SendOpers("*** 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 @@ -1995,11 +2066,11 @@ 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"+servername+"\2 denied, remote server did not enable AES."); + Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, remote server did not enable AES."); return false; } - Srv->SendOpers("*** Verified incoming server connection from \002"+servername+"\002["+(x->HiddenFromStats ? "" : this->GetIP())+"] ("+description+")"); - this->InboundServerName = servername; + Srv->SendOpers("*** 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, // along with the sendpass from this block. @@ -2010,91 +2081,103 @@ class TreeSocket : public InspSocket } } this->WriteLine("ERROR :Invalid credentials"); - Srv->SendOpers("*** Server connection from \2"+servername+"\2 denied, invalid link credentials"); + Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, invalid link credentials"); return false; } void Split(std::string line, bool stripcolon, 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); - std::string param = ""; + int count = 0; + char param[1024]; + char* pptr = param; n.clear(); int item = 0; while (!s.eof()) { - char c; + char c = 0; s.get(c); if (c == ' ') { - n.push_back(param); - param = ""; + *pptr = 0; + if (*param) + n.push_back(param); + *param = count = 0; + pptr = param; item++; } else { if (!s.eof()) { - param = param + c; + *pptr++ = c; + count++; } - if ((param == ":") && (item > 0)) + if ((*param == ':') && (count == 1) && (item > 0)) { - param = ""; + *param = count = 0; + pptr = param; while (!s.eof()) { s.get(c); if (!s.eof()) { - param = param + c; + *pptr++ = c; + count++; } } + *pptr = 0; n.push_back(param); - param = ""; + *param = count = 0; + pptr = param; } } } - if (param != "") + *pptr = 0; + if (*param) { n.push_back(param); } + return; } bool ProcessLine(std::string line) { - char* l = (char*)line.c_str(); - while ((strlen(l)) && (l[strlen(l)-1] == '\r') || (l[strlen(l)-1] == '\n')) - l[strlen(l)-1] = '\0'; - line = l; - if (line == "") + std::deque params; + irc::string command; + std::string prefix; + + if (line.empty()) return 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)) - { - prefix = params[0]; - command = params[1]; - char* pref = (char*)prefix.c_str(); - prefix = ++pref; - params.pop_front(); - params.pop_front(); - } - else + line = line.substr(0, line.find_first_of("\r\n")); + + log(DEBUG,"IN: %s", line.c_str()); + + this->Split(line.c_str(),true,params); + + if ((params[0][0] == ':') && (params.size() > 1)) { - prefix = ""; - command = params[0]; + 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]; @@ -2171,6 +2254,22 @@ class TreeSocket : public InspSocket } else if (command == "BURST") { + if (params.size()) + { + /* If a time stamp is provided, try and check syncronization */ + time_t THEM = atoi(params[0].c_str()); + 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)); + 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)); + } + } this->LinkState = CONNECTED; Node = new TreeServer(InboundServerName,InboundDescription,TreeRoot,this); TreeRoot->AddChild(Node); @@ -2261,6 +2360,10 @@ class TreeSocket : public InspSocket { return this->ForceJoin(prefix,params); } + else if (command == "SYNCTS") + { + return this->SyncChannelTS(prefix,params); + } else if (command == "SERVER") { return this->RemoteServer(prefix,params); @@ -2403,6 +2506,12 @@ class TreeSocket : public InspSocket { this->bursting = false; apply_lines(APPLY_ZLINES|APPLY_GLINES|APPLY_QLINES); + std::string sourceserv = this->myhost; + if (this->InboundServerName != "") + { + sourceserv = this->InboundServerName; + } + WriteOpers("*** Received end of netburst from \2%s\2",sourceserv.c_str()); return true; } else @@ -2425,7 +2534,7 @@ class TreeSocket : public InspSocket * and our copy. */ userrec* x = Srv->FindNick(params[0]); - if (x) + if ((x) && (x != who)) { std::deque p; p.push_back(params[0]); @@ -2446,12 +2555,16 @@ class TreeSocket : public InspSocket } // 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)) + { + this->WriteLine("ERROR :Unrecognised command '"+std::string(command.c_str())+"' -- possibly loaded mismatched modules"); + return false; } - Srv->CallCommandHandler(command, strparams, params.size(), who); } else { @@ -2513,6 +2626,38 @@ class TreeSocket : public InspSocket virtual int OnIncomingConnection(int newsock, char* 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; + char resolved_host[MAXBUF]; + vector::iterator i; + for (i = LinkBlocks.begin(); i != LinkBlocks.end(); i++) + { + if (i->IPAddr == ip) + { + found = true; + break; + } + /* XXX: Fixme: blocks for a very short amount of time, + * we should cache these on rehash/startup + */ + if (CleanAndResolve(resolved_host,i->IPAddr.c_str(),true)) + { + if (std::string(resolved_host) == ip) + { + found = true; + break; + } + } + } + if (!found) + { + WriteOpers("Server connection from %s denied (no link blocks with that IP address)", ip); + close(newsock); + return false; + } TreeSocket* s = new TreeSocket(newsock, ip); Srv->AddSocket(s); return true; @@ -2534,14 +2679,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::map *ulist = c->GetUsers(); - for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) + CUList *ulist = c->GetUsers(); + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - char* o = i->second; - userrec* otheruser = (userrec*)o; - if (otheruser->fd < 0) + if (i->second->fd < 0) { - TreeServer* best = BestRouteTo(otheruser->server); + TreeServer* best = BestRouteTo(i->second->server); if (best) AddThisServer(best,list); } @@ -2549,7 +2692,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 ¶ms) +bool DoOneToAllButSenderRaw(std::string data, std::string omit, std::string prefix, irc::string command, std::deque ¶ms) { TreeServer* omitroute = BestRouteTo(omit); if ((command == "NOTICE") || (command == "PRIVMSG")) @@ -2570,7 +2713,7 @@ bool DoOneToAllButSenderRaw(std::string data, std::string omit, std::string pref std::deque par; par.push_back(params[0]); par.push_back(":"+params[1]); - DoOneToOne(prefix,command,par,d->server); + DoOneToOne(prefix,command.c_str(),par,d->server); return true; } } @@ -2710,7 +2853,7 @@ void ReadConfiguration(bool rebind) { log(DEFAULT,"m_spanningtree: Warning: Failed to bind server port %d",Port); listener->Close(); - delete listener; + DELETE(listener); } } } @@ -2721,7 +2864,7 @@ void ReadConfiguration(bool rebind) for (int j =0; j < Conf->Enumerate("link"); j++) { Link L; - L.Name = Conf->ReadValue("link","name",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); L.SendPass = Conf->ReadValue("link","sendpass",j); @@ -2731,14 +2874,18 @@ void ReadConfiguration(bool rebind) L.HiddenFromStats = Conf->ReadFlag("link","hidden",j); L.NextConnectTime = time(NULL) + L.AutoConnect; /* Bugfix by brain, do not allow people to enter bad configurations */ - if ((L.RecvPass != "") && (L.SendPass != "") && (L.Name != "") && (L.Port)) + if ((L.IPAddr != "") && (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 == "") + if (L.IPAddr == "") + { + log(DEFAULT,"Invalid configuration for server '%s', IP address not defined!",L.Name.c_str()); + } + else if (L.RecvPass == "") { log(DEFAULT,"Invalid configuration for server '%s', recvpass not defined!",L.Name.c_str()); } @@ -2756,7 +2903,7 @@ void ReadConfiguration(bool rebind) } } } - delete Conf; + DELETE(Conf); } @@ -2823,28 +2970,30 @@ 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); return; } - void HandleLusers(char** parameters, int pcnt, userrec* user) + void HandleLusers(const char** parameters, int pcnt, userrec* user) { + unsigned int n_users = usercnt(); + /* Only update these when someone wants to see them, more efficient */ if ((unsigned int)local_count() > max_local) max_local = local_count(); - if (clientlist.size() > max_global) - max_global = clientlist.size(); + 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,usercnt()-usercount_invisible(),usercount_invisible(),this->CountServs()); + 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,clientlist.size(),max_global); + WriteServ(user->fd,"266 %s :Current Global Users: %d Max: %d",user->nick,n_users,max_global); return; } @@ -2913,7 +3062,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 @@ -2969,7 +3118,7 @@ class ModuleSpanningTree : public Module 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) @@ -2999,7 +3148,7 @@ class ModuleSpanningTree : public Module return 1; } - int HandleTime(char** parameters, int pcnt, userrec* user) + int HandleTime(const char** parameters, int pcnt, userrec* user) { if ((user->fd > -1) && (pcnt)) { @@ -3023,7 +3172,7 @@ class ModuleSpanningTree : public Module 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)) { @@ -3081,27 +3230,27 @@ class ModuleSpanningTree : public Module { log(DEBUG,"Auto-Connecting %s",x->Name.c_str()); x->NextConnectTime = curtime + x->AutoConnect; - TreeServer* CheckDupe = FindServer(x->Name); + TreeServer* CheckDupe = FindServer(x->Name.c_str()); 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); - if (newsocket->GetState() != I_ERROR) + TreeSocket* newsocket = new TreeSocket(x->IPAddr,x->Port,false,10,x->Name.c_str()); + if (newsocket->GetFd() > -1) { Srv->AddSocket(newsocket); } else { - WriteOpers("*** AUTOCONNECT: Error autoconnecting \002%s\002.",x->Name.c_str()); - delete newsocket; + WriteOpers("*** AUTOCONNECT: Error autoconnecting \002%s\002: %s.",x->Name.c_str(),strerror(errno)); + DELETE(newsocket); } } } } } - 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]); @@ -3138,25 +3287,25 @@ class ModuleSpanningTree : public Module 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++) { if (Srv->MatchText(x->Name.c_str(),parameters[0])) { - TreeServer* CheckDupe = FindServer(x->Name); + 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); - if (newsocket->GetState() != I_ERROR) + TreeSocket* newsocket = new TreeSocket(x->IPAddr,x->Port,false,10,x->Name.c_str()); + if (newsocket->GetFd() > -1) { Srv->AddSocket(newsocket); } else { - WriteServ(user->fd,"NOTICE %s :*** CONNECT: Error connecting \002%s\002.",user->nick,x->Name.c_str()); - delete newsocket; + WriteServ(user->fd,"NOTICE %s :*** CONNECT: Error connecting \002%s\002: %s.",user->nick,x->Name.c_str(),strerror(errno)); + DELETE(newsocket); } return 1; } @@ -3187,7 +3336,7 @@ class ModuleSpanningTree : public Module return 0; } - virtual int OnPreCommand(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) @@ -3259,7 +3408,7 @@ class ModuleSpanningTree : public Module return 0; } - virtual void OnGetServerDescription(std::string servername,std::string &description) + virtual void OnGetServerDescription(const std::string &servername,std::string &description) { TreeServer* s = FindServer(servername); if (s) @@ -3279,7 +3428,7 @@ class ModuleSpanningTree : public Module } } - virtual void OnPostLocalTopicChange(userrec* user, chanrec* chan, std::string topic) + virtual void OnPostLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic) { std::deque params; params.push_back(chan->name); @@ -3287,7 +3436,7 @@ class ModuleSpanningTree : public Module DoOneToMany(user->nick,"TOPIC",params); } - virtual void OnWallops(userrec* user, std::string text) + virtual void OnWallops(userrec* user, const std::string &text) { if (user->fd > -1) { @@ -3297,7 +3446,7 @@ class ModuleSpanningTree : public Module } } - virtual void OnUserNotice(userrec* user, void* dest, int target_type, std::string text, char status) + virtual void OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status) { if (target_type == TYPE_USER) { @@ -3332,7 +3481,7 @@ class ModuleSpanningTree : public Module } } - virtual void OnUserMessage(userrec* user, void* dest, int target_type, std::string text, char status) + virtual void OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status) { if (target_type == TYPE_USER) { @@ -3383,11 +3532,7 @@ class ModuleSpanningTree : public Module 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 @@ -3408,7 +3553,7 @@ class ModuleSpanningTree : public Module } } - virtual void OnChangeHost(userrec* user, std::string newhost) + virtual void OnChangeHost(userrec* user, const std::string &newhost) { // only occurs for local clients if (user->registered != 7) @@ -3418,7 +3563,7 @@ class ModuleSpanningTree : public Module DoOneToMany(user->nick,"FHOST",params); } - virtual void OnChangeName(userrec* user, std::string gecos) + virtual void OnChangeName(userrec* user, const std::string &gecos) { // only occurs for local clients if (user->registered != 7) @@ -3428,7 +3573,7 @@ class ModuleSpanningTree : public Module DoOneToMany(user->nick,"FNAME",params); } - virtual void OnUserPart(userrec* user, chanrec* channel, std::string partmessage) + virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage) { if (user->fd > -1) { @@ -3452,7 +3597,7 @@ 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("+"+std::string(user->FormatModes())); params.push_back((char*)inet_ntoa(user->ip4)); params.push_back(":"+std::string(user->fullname)); DoOneToMany(Srv->GetServerName(),"NICK",params); @@ -3467,7 +3612,7 @@ class ModuleSpanningTree : public Module } } - virtual void OnUserQuit(userrec* user, std::string reason) + virtual void OnUserQuit(userrec* user, const std::string &reason) { if ((user->fd > -1) && (user->registered == 7)) { @@ -3484,7 +3629,7 @@ class ModuleSpanningTree : public Module } - virtual void OnUserPostNick(userrec* user, std::string oldnick) + virtual void OnUserPostNick(userrec* user, const std::string &oldnick) { if (user->fd > -1) { @@ -3494,7 +3639,7 @@ class ModuleSpanningTree : public Module } } - virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, std::string reason) + virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) { if ((source) && (source->fd > -1)) { @@ -3514,7 +3659,7 @@ class ModuleSpanningTree : public Module } } - virtual void OnRemoteKill(userrec* source, userrec* dest, std::string reason) + virtual void OnRemoteKill(userrec* source, userrec* dest, const std::string &reason) { std::deque params; params.push_back(dest->nick); @@ -3522,7 +3667,7 @@ class ModuleSpanningTree : public Module DoOneToMany(source->nick,"KILL",params); } - virtual void OnRehash(std::string parameter) + virtual void OnRehash(const std::string ¶meter) { if (parameter != "") { @@ -3542,7 +3687,7 @@ class ModuleSpanningTree : public Module // note: the protocol does not allow direct umode +o except // via NICK with 8 params. sending OPERTYPE infers +o modechange // locally. - virtual void OnOper(userrec* user, std::string opertype) + virtual void OnOper(userrec* user, const std::string &opertype) { if (user->fd > -1) { @@ -3552,7 +3697,7 @@ class ModuleSpanningTree : public Module } } - void OnLine(userrec* source, std::string host, bool adding, char linetype, long duration, std::string reason) + void OnLine(userrec* source, const std::string &host, bool adding, char linetype, long duration, const std::string &reason) { if (source->fd > -1) { @@ -3578,47 +3723,47 @@ class ModuleSpanningTree : public Module } } - virtual void OnAddGLine(long duration, userrec* source, std::string reason, std::string hostmask) + virtual void OnAddGLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { OnLine(source,hostmask,true,'G',duration,reason); } - virtual void OnAddZLine(long duration, userrec* source, std::string reason, std::string ipmask) + virtual void OnAddZLine(long duration, userrec* source, const std::string &reason, const std::string &ipmask) { OnLine(source,ipmask,true,'Z',duration,reason); } - virtual void OnAddQLine(long duration, userrec* source, std::string reason, std::string nickmask) + virtual void OnAddQLine(long duration, userrec* source, const std::string &reason, const std::string &nickmask) { OnLine(source,nickmask,true,'Q',duration,reason); } - virtual void OnAddELine(long duration, userrec* source, std::string reason, std::string hostmask) + virtual void OnAddELine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { OnLine(source,hostmask,true,'E',duration,reason); } - virtual void OnDelGLine(userrec* source, std::string hostmask) + virtual void OnDelGLine(userrec* source, const std::string &hostmask) { OnLine(source,hostmask,false,'G',0,""); } - virtual void OnDelZLine(userrec* source, std::string ipmask) + virtual void OnDelZLine(userrec* source, const std::string &ipmask) { OnLine(source,ipmask,false,'Z',0,""); } - virtual void OnDelQLine(userrec* source, std::string nickmask) + virtual void OnDelQLine(userrec* source, const std::string &nickmask) { OnLine(source,nickmask,false,'Q',0,""); } - virtual void OnDelELine(userrec* source, std::string hostmask) + virtual void OnDelELine(userrec* source, const std::string &hostmask) { OnLine(source,hostmask,false,'E',0,""); } - virtual void OnMode(userrec* user, void* dest, int target_type, std::string text) + virtual void OnMode(userrec* user, void* dest, int target_type, const std::string &text) { if ((user->fd > -1) && (user->registered == 7)) { @@ -3661,7 +3806,7 @@ class ModuleSpanningTree : public Module } } - virtual void ProtoSendMode(void* opaque, int target_type, void* target, std::string modeline) + virtual void ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline) { TreeSocket* s = (TreeSocket*)opaque; if (target) @@ -3679,7 +3824,7 @@ class ModuleSpanningTree : public Module } } - virtual void ProtoSendMetaData(void* opaque, int target_type, void* target, std::string extname, std::string extdata) + virtual void ProtoSendMetaData(void* opaque, int target_type, void* target, const std::string &extname, const std::string &extdata) { TreeSocket* s = (TreeSocket*)opaque; if (target) @@ -3711,6 +3856,13 @@ 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; + DoOneToMany(Srv->GetServerName(),"FMODE",*params); + } } virtual ~ModuleSpanningTree()