X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree.cpp;h=b5584b5321b2f20575fb28451d583646db48bb45;hb=8ab23609afd280d7a3bf20ca674cb4204afec149;hp=e91158666ba883f6a2cc40c189306a609fd12a98;hpb=55fdc886a1a7941ef1d0162ac73cbf368cd66151;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp index e91158666..b5584b532 100644 --- a/src/modules/m_spanningtree.cpp +++ b/src/modules/m_spanningtree.cpp @@ -74,7 +74,7 @@ class ModuleSpanningTree; static ModuleSpanningTree* TreeProtocolModule; extern ServerConfig* Config; - +extern InspIRCd* ServerInstance; extern std::vector modules; extern std::vector factory; extern int MODCOUNT; @@ -109,7 +109,7 @@ 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. @@ -121,7 +121,7 @@ server_hash serverlist; 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 */ @@ -802,7 +802,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, CullList* Goners) { /* recursively squit the servers attached to 'Current'. * We're going backwards so we don't remove users @@ -811,7 +811,7 @@ 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,Goners); } /* Now we've whacked the kids, whack self */ num_lost_servers++; @@ -819,8 +819,7 @@ class TreeSocket : public InspSocket { 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++; } } @@ -849,7 +848,8 @@ class TreeSocket : public InspSocket num_lost_servers = 0; num_lost_users = 0; CullList* Goners = new CullList(); - SquitServer(Current, Goners); + std::string from = Current->GetParent()->GetName()+" "+Current->GetName(); + SquitServer(from, Current, Goners); Goners->Apply(); Current->Tidy(); Current->GetParent()->DelChild(Current); @@ -864,13 +864,14 @@ 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; + char* modelist[64]; + memset(&modelist,0,sizeof(modelist)); for (unsigned int q = 0; q < params.size(); q++) { modelist[q] = (char*)params[q].c_str(); @@ -882,7 +883,7 @@ class TreeSocket : public InspSocket } /* FTOPIC command */ - bool ForceTopic(std::string source, std::deque params) + bool ForceTopic(std::string source, std::deque ¶ms) { if (params.size() != 4) return true; @@ -896,7 +897,7 @@ class TreeSocket : public InspSocket { std::string oldtopic = c->topic; strlcpy(c->topic,params[3].c_str(),MAXTOPIC); - strlcpy(c->setby,params[2].c_str(),NICKMAX); + strlcpy(c->setby,params[2].c_str(),NICKMAX-1); c->topicset = ts; /* if the topic text is the same as the current topic, * dont bother to send the TOPIC command out, just silently @@ -927,7 +928,7 @@ class TreeSocket : public InspSocket } /* 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,6 +936,7 @@ 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],"+"); @@ -1057,7 +1059,7 @@ class TreeSocket : public InspSocket } /* NICK command */ - bool IntroduceClient(std::string source, std::deque params) + bool IntroduceClient(std::string source, std::deque ¶ms) { if (params.size() < 8) return true; @@ -1091,9 +1093,9 @@ class TreeSocket : public InspSocket clientlist[tempnick] = new userrec(); clientlist[tempnick]->fd = FD_MAGIC_NUMBER; - strlcpy(clientlist[tempnick]->nick, tempnick,NICKMAX); - strlcpy(clientlist[tempnick]->host, params[2].c_str(),160); - strlcpy(clientlist[tempnick]->dhost, params[3].c_str(),160); + strlcpy(clientlist[tempnick]->nick, tempnick,NICKMAX-1); + strlcpy(clientlist[tempnick]->host, params[2].c_str(),63); + strlcpy(clientlist[tempnick]->dhost, params[3].c_str(),63); clientlist[tempnick]->server = (char*)FindServerNamePtr(source.c_str()); strlcpy(clientlist[tempnick]->ident, params[4].c_str(),IDENTMAX); strlcpy(clientlist[tempnick]->fullname, params[7].c_str(),MAXGECOS); @@ -1105,13 +1107,10 @@ class TreeSocket : public InspSocket ucrec a; a.channel = NULL; a.uc_modes = 0; - for (int i = 0; i < MAXCHANS; i++) - clientlist[tempnick]->chans.push_back(a); + clientlist[tempnick]->chans.resize(MAXCHANS); + + 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)); - 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); @@ -1134,15 +1133,19 @@ 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); + size_t counter = snprintf(list,MAXBUF,":%s FJOIN %s %lu",Srv->GetServerName().c_str(),c->name,(unsigned long)c->age); + size_t initial = counter; + std::map *ulist = c->GetUsers(); std::vector specific_halfop; std::vector specific_voice; + for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) { char* o = i->second; userrec* otheruser = (userrec*)o; - strlcat(list," ",MAXBUF); + charlcat(list,' ',MAXBUF); + counter++; int x = cflags(otheruser,c); if ((x & UCMODE_HOP) && (x & UCMODE_OP)) { @@ -1153,27 +1156,33 @@ class TreeSocket : public InspSocket specific_voice.push_back(otheruser); } - char* n = ""; + char n = 0; if (x & UCMODE_OP) { - n = "@"; + n = '@'; } else if (x & UCMODE_HOP) { - n = "%"; + n = '%'; } else if (x & UCMODE_VOICE) { - n = "+"; + n = '+'; + } + + if (n) + { + charlcat(list,n,MAXBUF); + counter++; } - strlcat(list,n,MAXBUF); - strlcat(list,otheruser->nick,MAXBUF); - if (strlen(list)>(480-NICKMAX)) + counter += strlcat(list,otheruser->nick,MAXBUF); + + if (counter > (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); + counter = snprintf(list,MAXBUF,":%s FJOIN %s %lu",Srv->GetServerName().c_str(),c->name,(unsigned long)c->age); for (unsigned int y = 0; y < specific_voice.size(); y++) { this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" +v "+specific_voice[y]->nick); @@ -1184,7 +1193,7 @@ class TreeSocket : public InspSocket } } } - if (list[strlen(list)-1] != ':') + if (counter != initial) { log(DEBUG,"Final FJOIN line"); this->WriteLine(list); @@ -1203,47 +1212,81 @@ class TreeSocket : public InspSocket 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); + if ((iterations % 10) == 0) + { + ServerInstance->DoOneIteration(false); + } } - 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); + if ((iterations % 10) == 0) + { + ServerInstance->DoOneIteration(false); + } } - 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); + if ((iterations % 10) == 0) + { + ServerInstance->DoOneIteration(false); + } } - 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); + if ((iterations % 10) == 0) + { + ServerInstance->DoOneIteration(false); + } } - 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); + if ((iterations % 10) == 0) + { + ServerInstance->DoOneIteration(false); + } } - 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); + if ((iterations % 10) == 0) + { + ServerInstance->DoOneIteration(false); + } } - 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); + if ((iterations % 10) == 0) + { + ServerInstance->DoOneIteration(false); + } } - 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); + if ((iterations % 10) == 0) + { + ServerInstance->DoOneIteration(false); + } } } @@ -1252,8 +1295,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,7 +1328,8 @@ 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) { @@ -1315,19 +1361,31 @@ class TreeSocket : public InspSocket */ void DoBurst(TreeServer* s) { + /* The calls here to ServerInstance->DoOneIteration(false); 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); + std::string endburst = "ENDBURST"; Srv->SendOpers("*** Bursting to \2"+s->GetName()+"\2."); - this->WriteLine("BURST"); + this->WriteLine(burst); + ServerInstance->DoOneIteration(false); /* send our version string */ this->WriteLine(":"+Srv->GetServerName()+" VERSION :"+Srv->GetVersion()); /* Send server tree */ this->SendServers(TreeRoot,s,1); + ServerInstance->DoOneIteration(false); /* Send users and their oper status */ this->SendUsers(s); + ServerInstance->DoOneIteration(false); /* Send everything else (channel modes, xlines etc) */ this->SendChannelModes(s); + ServerInstance->DoOneIteration(false); this->SendXLines(s); + ServerInstance->DoOneIteration(false); FOREACH_MOD(I_OnSyncOtherMetaData,OnSyncOtherMetaData((Module*)TreeProtocolModule,(void*)this)); - this->WriteLine("ENDBURST"); + ServerInstance->DoOneIteration(false); + this->WriteLine(endburst); Srv->SendOpers("*** Finished bursting to \2"+s->GetName()+"\2."); } @@ -1341,18 +1399,22 @@ class TreeSocket : public InspSocket */ virtual bool OnDataReady() { - log(DEBUG,"TreeSocket::OnDataReady"); + int iterations = 0; char* data = this->Read(); /* Check that the data read is a valid pointer and it has some content */ if (data && *data) { - 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. */ while (in_buffer.find("\n") != std::string::npos) { + iterations++; + if ((iterations % 10) == 0) + { + ServerInstance->DoOneIteration(false); + } std::string ret = in_buffer.substr(0,in_buffer.find("\n")-1); in_buffer = in_buffer.substr(in_buffer.find("\n")+1,in_buffer.length()-in_buffer.find("\n")); if (ret.find("\r") != std::string::npos) @@ -1374,7 +1436,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 +1449,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) @@ -1403,14 +1466,16 @@ class TreeSocket : public InspSocket char result64[10240]; if (this->keylength) { - while (line.length() % this->keylength != 0) + // pad it to the key length + int n = this->keylength - (line.length() % this->keylength); + if (n) { - // pad it to be a multiple of the key length - line = line + "\7"; + log(DEBUG,"Append %d chars to line to make it %d long from %d, key length %d",n,n+line.length(),line.length(),this->keylength); + line.append(n,'\7'); } } 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); @@ -1434,12 +1499,15 @@ class TreeSocket : public InspSocket bool OperType(std::string prefix, std::deque ¶ms) { if (params.size() != 1) + { + log(DEBUG,"Received invalid oper type from %s",prefix.c_str()); return true; + } std::string opertype = params[0]; userrec* u = Srv->FindNick(prefix); if (u) { - strlcpy(u->oper,opertype.c_str(),NICKMAX); + strlcpy(u->oper,opertype.c_str(),NICKMAX-1); if (!strchr(u->modes,'o')) { strcat(u->modes,"o"); @@ -1681,11 +1749,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; @@ -2011,73 +2088,94 @@ class TreeSocket : public InspSocket 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 == "") + for (char* x = l; *x; x++) + { + if ((*x == '\r') || (*x == '\n')) + *x = 0; + } + if (!*l) return true; - Srv->Log(DEBUG,"IN: "+line); - + + log(DEBUG,"IN: %s",l); + std::deque params; - this->Split(line,true,params); - std::string command = ""; + this->Split(l,true,params); + irc::string command = ""; std::string prefix = ""; if (((params[0].c_str())[0] == ':') && (params.size() > 1)) { prefix = params[0]; - command = params[1]; + command = params[1].c_str(); char* pref = (char*)prefix.c_str(); prefix = ++pref; params.pop_front(); @@ -2086,7 +2184,7 @@ class TreeSocket : public InspSocket else { prefix = ""; - command = params[0]; + command = params[0].c_str(); params.pop_front(); } @@ -2166,6 +2264,14 @@ class TreeSocket : public InspSocket } else if (command == "BURST") { + time_t THEM = atoi(params[0].c_str()); + long delta = THEM-TIME; + if ((delta < -600) || (delta > 600)) + { + WriteOpers("*** \2ERROR\2: Your clocks are out by "+ConvToStr(abs(delta))+" seconds (this is more than ten minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2"); + 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; + } this->LinkState = CONNECTED; Node = new TreeServer(InboundServerName,InboundDescription,TreeRoot,this); TreeRoot->AddChild(Node); @@ -2290,6 +2396,16 @@ class TreeSocket : public InspSocket } else if (command == "PING") { + /* + * We just got a ping from a server that's bursting. + * This can't be right, so set them to not bursting, and + * apply their lines. + */ + if (this->bursting) + { + this->bursting = false; + apply_lines(APPLY_ZLINES|APPLY_GLINES|APPLY_QLINES); + } if (prefix == "") { prefix = this->GetName(); @@ -2298,6 +2414,16 @@ class TreeSocket : public InspSocket } else if (command == "PONG") { + /* + * We just got a pong from a server that's bursting. + * This can't be right, so set them to not bursting, and + * apply their lines. + */ + if (this->bursting) + { + this->bursting = false; + apply_lines(APPLY_ZLINES|APPLY_GLINES|APPLY_QLINES); + } if (prefix == "") { prefix = this->GetName(); @@ -2340,6 +2466,24 @@ class TreeSocket : public InspSocket { return this->Time(prefix,params); } + else if ((command == "KICK") && (IsServer(prefix))) + { + std::string sourceserv = this->myhost; + if (params.size() == 3) + { + userrec* user = Srv->FindNick(params[1]); + chanrec* chan = Srv->FindChannel(params[0]); + if (user && chan) + { + server_kick_channel(user,chan,(char*)params[2].c_str(),false); + } + } + if (this->InboundServerName != "") + { + sourceserv = this->InboundServerName; + } + return DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params); + } else if (command == "SVSJOIN") { if (prefix == "") @@ -2360,6 +2504,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 @@ -2408,7 +2558,11 @@ class TreeSocket : public InspSocket { strparams[q] = (char*)params[q].c_str(); } - Srv->CallCommandHandler(command, strparams, params.size(), who); + 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; + } } else { @@ -2506,7 +2660,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")) @@ -2527,7 +2681,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; } } @@ -2678,7 +2832,11 @@ void ReadConfiguration(bool rebind) for (int j =0; j < Conf->Enumerate("link"); j++) { Link L; + char ServerN[MAXBUF]; L.Name = Conf->ReadValue("link","name",j); + strlcpy(ServerN,L.Name.c_str(),MAXBUF); + strlower(ServerN); + L.Name = ServerN; L.IPAddr = Conf->ReadValue("link","ipaddr",j); L.Port = Conf->ReadInteger("link","port",j,true); L.SendPass = Conf->ReadValue("link","sendpass",j); @@ -2752,7 +2910,7 @@ class ModuleSpanningTree : public Module } for (unsigned int q = 0; q < Current->ChildCount(); q++) { - if ((HideULines) && (Srv->IsUlined(Current->GetName()))) + if ((HideULines) && (Srv->IsUlined(Current->GetChild(q)->GetName()))) { if (*user->oper) { @@ -2764,6 +2922,9 @@ class ModuleSpanningTree : public Module ShowLinks(Current->GetChild(q),user,hops+1); } } + /* Don't display the line if its a uline, hide ulines is on, and the user isnt an oper */ + if ((HideULines) && (Srv->IsUlined(Current->GetName())) && (!*user->oper)) + return; WriteServ(user->fd,"364 %s %s %s :%d %s",user->nick,Current->GetName().c_str(),(FlatLinks && (!*user->oper)) ? Srv->GetServerName().c_str() : Parent.c_str(),(FlatLinks && (!*user->oper)) ? 0 : hops,Current->GetDesc().c_str()); } @@ -3458,6 +3619,14 @@ class ModuleSpanningTree : public Module params.push_back(":"+reason); DoOneToMany(source->nick,"KICK",params); } + else if (!source) + { + std::deque params; + params.push_back(chan->name); + params.push_back(user->nick); + params.push_back(":"+reason); + DoOneToMany(Srv->GetServerName(),"KICK",params); + } } virtual void OnRemoteKill(userrec* source, userrec* dest, std::string reason)