X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree.cpp;h=1dbf54b59e2eeaebec146e8b67b0419f805b206f;hb=2ea814385ef00a34f150e08c3dae14ef90978458;hp=9e9efddc48d61596232211c5bccfb25b7e902b12;hpb=cb7982a32ed1d8c8fa42beb3056c35f44ad6eb21;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp index 9e9efddc4..1dbf54b59 100644 --- a/src/modules/m_spanningtree.cpp +++ b/src/modules/m_spanningtree.cpp @@ -883,26 +883,23 @@ class TreeSocket : public InspSocket { if (params.size() != 4) return true; - std::string channel = params[0]; time_t ts = atoi(params[1].c_str()); - std::string setby = params[2]; - std::string topic = params[3]; std::string nsource = source; - chanrec* c = Srv->FindChannel(channel); + chanrec* c = Srv->FindChannel(params[0]); if (c) { if ((ts >= c->topicset) || (!*c->topic)) { std::string oldtopic = c->topic; - strlcpy(c->topic,topic.c_str(),MAXTOPIC); - strlcpy(c->setby,setby.c_str(),NICKMAX); + strlcpy(c->topic,params[3].c_str(),MAXTOPIC); + strlcpy(c->setby,params[2].c_str(),NICKMAX); c->topicset = ts; /* if the topic text is the same as the current topic, * dont bother to send the TOPIC command out, just silently * update the set time and set nick. */ - if (oldtopic != topic) + if (oldtopic != params[3]) { userrec* user = Srv->FindNick(source); if (!user) @@ -1061,12 +1058,13 @@ class TreeSocket : public InspSocket { if (params.size() < 8) return true; + if (params.size() > 8) + { + this->WriteLine(":"+Srv->GetServerName()+" KILL "+params[1]+" :Invalid client introduction ("+params[1]+"?)"); + return true; + } // NICK age nick host dhost ident +modes ip :gecos // 0 1 2 3 4 5 6 7 - std::string nick = params[1]; - std::string host = params[2]; - std::string dhost = params[3]; - std::string ident = params[4]; time_t age = atoi(params[0].c_str()); std::string modes = params[5]; while (*(modes.c_str()) == '+') @@ -1075,17 +1073,15 @@ class TreeSocket : public InspSocket m++; modes = m; } - std::string ip = params[6]; - std::string gecos = params[7]; - char* tempnick = (char*)nick.c_str(); - log(DEBUG,"Introduce client %s!%s@%s",tempnick,ident.c_str(),host.c_str()); + char* tempnick = (char*)params[1].c_str(); + log(DEBUG,"Introduce client %s!%s@%s",tempnick,params[4].c_str(),params[2].c_str()); user_hash::iterator iter; iter = clientlist.find(tempnick); if (iter != clientlist.end()) { // nick collision - log(DEBUG,"Nick collision on %s!%s@%s: %lu %lu",tempnick,ident.c_str(),host.c_str(),(unsigned long)age,(unsigned long)iter->second->age); + log(DEBUG,"Nick collision on %s!%s@%s: %lu %lu",tempnick,params[4].c_str(),params[2].c_str(),(unsigned long)age,(unsigned long)iter->second->age); this->WriteLine(":"+Srv->GetServerName()+" KILL "+tempnick+" :Nickname collision"); return true; } @@ -1093,15 +1089,15 @@ class TreeSocket : public InspSocket clientlist[tempnick] = new userrec(); clientlist[tempnick]->fd = FD_MAGIC_NUMBER; strlcpy(clientlist[tempnick]->nick, tempnick,NICKMAX); - strlcpy(clientlist[tempnick]->host, host.c_str(),160); - strlcpy(clientlist[tempnick]->dhost, dhost.c_str(),160); + 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]->ident, ident.c_str(),IDENTMAX); - strlcpy(clientlist[tempnick]->fullname, gecos.c_str(),MAXGECOS); + 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); - inet_aton(ip.c_str(),&clientlist[tempnick]->ip4); + inet_aton(params[6].c_str(),&clientlist[tempnick]->ip4); ucrec a; a.channel = NULL; @@ -1133,26 +1129,67 @@ 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(); + 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); - strlcat(list,cmode(otheruser,c),MAXBUF); + int x = cflags(otheruser,c); + if ((x & UCMODE_HOP) && (x & UCMODE_OP)) + { + specific_halfop.push_back(otheruser); + } + if (((x & UCMODE_HOP) || (x & UCMODE_OP)) && (x & UCMODE_VOICE)) + { + specific_voice.push_back(otheruser); + } + char* n = ""; + if (x & UCMODE_OP) + { + n = "@"; + } + else if (x & UCMODE_HOP) + { + n = "%"; + } + else if (x & UCMODE_VOICE) + { + n = "+"; + } + strlcat(list,n,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); + for (unsigned int y = 0; y < specific_voice.size(); y++) + { + this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" +v "+specific_voice[y]->nick); + } + for (unsigned int y = 0; y < specific_halfop.size(); y++) + { + this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" +h "+specific_halfop[y]->nick); + } } } if (list[strlen(list)-1] != ':') { log(DEBUG,"Final FJOIN line"); this->WriteLine(list); + for (unsigned int y = 0; y < specific_voice.size(); y++) + { + this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" +v "+specific_voice[y]->nick); + } + for (unsigned int y = 0; y < specific_halfop.size(); y++) + { + this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" +h "+specific_halfop[y]->nick); + } } } @@ -1160,45 +1197,46 @@ class TreeSocket : public InspSocket void SendXLines(TreeServer* Current) { char data[MAXBUF]; + const char* sn = Srv->GetServerName().c_str(); /* Yes, these arent too nice looking, but they get the job done */ for (std::vector::iterator i = zlines.begin(); i != zlines.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); + 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++) { - 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); + 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++) { - 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); + 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++) { - 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); + 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++) { - 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); + 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++) { - 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); + 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++) { - 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); + 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++) { - 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); + 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); } } @@ -1208,19 +1246,20 @@ 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++) { SendFJoins(Current, c->second); - snprintf(data,MAXBUF,":%s FMODE %s +%s",Srv->GetServerName().c_str(),c->second->name,chanmodes(c->second,true)); + snprintf(data,MAXBUF,":%s FMODE %s +%s",sn,c->second->name,chanmodes(c->second,true)); this->WriteLine(data); if (*c->second->topic) { - snprintf(data,MAXBUF,":%s FTOPIC %s %lu %s :%s",Srv->GetServerName().c_str(),c->second->name,(unsigned long)c->second->topicset,c->second->setby,c->second->topic); + snprintf(data,MAXBUF,":%s FTOPIC %s %lu %s :%s",sn,c->second->name,(unsigned long)c->second->topicset,c->second->setby,c->second->topic); this->WriteLine(data); } for (BanList::iterator b = c->second->bans.begin(); b != c->second->bans.end(); b++) { - snprintf(data,MAXBUF,":%s FMODE %s +b %s",Srv->GetServerName().c_str(),c->second->name,b->data); + snprintf(data,MAXBUF,":%s FMODE %s +b %s",sn,c->second->name,b->data); this->WriteLine(data); } FOREACH_MOD(I_OnSyncChannel,OnSyncChannel(c->second,(Module*)TreeProtocolModule,(void*)this)); @@ -1244,7 +1283,7 @@ class TreeSocket : public InspSocket { 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); this->WriteLine(data); - if (strchr(u->second->modes,'o')) + if (*u->second->oper) { this->WriteLine(":"+std::string(u->second->nick)+" OPERTYPE "+std::string(u->second->oper)); } @@ -1300,23 +1339,16 @@ class TreeSocket : public InspSocket /* Check that the data read is a valid pointer and it has some content */ if (data && *data) { - this->in_buffer += 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) { - char* line = (char*)in_buffer.c_str(); - std::string ret = ""; - while ((*line != '\n') && (strlen(line))) - { - if ((*line != '\r') && (*line != '\n')) - ret = ret + *line; - line++; - } - if ((*line == '\n') || (*line == '\r')) - line++; - in_buffer = line; + 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) + ret = in_buffer.substr(0,in_buffer.find("\r")-1); /* Process this one, abort if it * didnt return true. */ @@ -1429,9 +1461,15 @@ class TreeSocket : public InspSocket userrec* u = Srv->FindNick(params[0]); if (u) { - Srv->ChangeUserNick(u,params[1]); - u->age = atoi(params[2].c_str()); DoOneToAllButSender(prefix,"SVSNICK",params,prefix); + if (IS_LOCAL(u)) + { + std::deque par; + par.push_back(params[1]); + DoOneToMany(u->nick,"NICK",par); + Srv->ChangeUserNick(u,params[1]); + u->age = atoi(params[2].c_str()); + } } return true; } @@ -1495,11 +1533,35 @@ class TreeSocket : public InspSocket { if (params.size() < 1) return true; - TreeServer* ServerSource = FindServer(prefix); - if (ServerSource) + if (params.size() == 1) { - ServerSource->SetPingFlag(); + TreeServer* ServerSource = FindServer(prefix); + if (ServerSource) + { + ServerSource->SetPingFlag(); + } } + else + { + std::string forwardto = params[1]; + if (forwardto == Srv->GetServerName()) + { + // this is a PONG for us + // if the prefix is a user, check theyre local, and if they are, + // dump the PONG reply back to their fd. If its a server, do nowt. + // Services might want to send these s->s, but we dont need to yet. + userrec* u = Srv->FindNick(prefix); + if (u) + { + WriteServ(u->fd,"PONG %s %s",params[0].c_str(),params[1].c_str()); + } + } + else + { + // not for us, pass it on :) + DoOneToOne(prefix,"PONG",params,forwardto); + } + } return true; } @@ -1567,42 +1629,46 @@ class TreeSocket : public InspSocket { if (params.size() < 6) return true; - std::string linetype = params[0]; /* Z, Q, E, G, K */ - std::string mask = params[1]; /* Line type dependent */ - std::string source = params[2]; /* may not be online or may be a server */ - std::string settime = params[3]; /* EPOCH time set */ - std::string duration = params[4]; /* Duration secs */ - std::string reason = params[5]; - switch (*(linetype.c_str())) + bool propogate = false; + + switch (*(params[0].c_str())) { 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())); + 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())); 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())); + 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())); 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())); + 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())); 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())); + 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())); break; case 'K': - add_kline(atoi(duration.c_str()), source.c_str(), reason.c_str(), mask.c_str()); + propogate = add_kline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str()); break; default: /* Just in case... */ - Srv->SendOpers("*** \2WARNING\2: Invalid xline type '"+linetype+"' sent by server "+prefix+", ignored!"); + Srv->SendOpers("*** \2WARNING\2: Invalid xline type '"+params[0]+"' sent by server "+prefix+", ignored!"); + propogate = false; break; } /* Send it on its way */ - params[5] = ":" + params[5]; - DoOneToAllButSender(prefix,"ADDLINE",params,prefix); + if (propogate) + { + params[5] = ":" + params[5]; + DoOneToAllButSender(prefix,"ADDLINE",params,prefix); + } + if (!this->bursting) + { + apply_lines(APPLY_ZLINES|APPLY_GLINES|APPLY_QLINES); + } return true; } @@ -1678,14 +1744,110 @@ class TreeSocket : public InspSocket } return true; } + + bool Push(std::string prefix, std::deque ¶ms) + { + if (params.size() < 2) + return true; + userrec* u = Srv->FindNick(params[0]); + if (IS_LOCAL(u)) + { + // push the raw to the user + if (Srv->IsUlined(prefix)) + { + ::Write(u->fd,"%s",params[1].c_str()); + } + else + { + log(DEBUG,"PUSH from non-ulined server dropped into the bit-bucket: :%s PUSH %s :%s",prefix.c_str(),params[0].c_str(),params[1].c_str()); + } + } + else + { + // continue the raw onwards + params[1] = ":" + params[1]; + DoOneToOne(prefix,"PUSH",params,u->server); + } + return true; + } + + bool Time(std::string prefix, std::deque ¶ms) + { + // :source.server TIME remote.server sendernick + // :remote.server TIME source.server sendernick TS + if (params.size() == 2) + { + // someone querying our time? + if (Srv->GetServerName() == params[0]) + { + userrec* u = Srv->FindNick(params[1]); + if (u) + { + char curtime[256]; + snprintf(curtime,256,"%lu",(unsigned long)time(NULL)); + params.push_back(curtime); + params[0] = prefix; + DoOneToOne(Srv->GetServerName(),"TIME",params,params[0]); + } + } + else + { + // not us, pass it on + userrec* u = Srv->FindNick(params[1]); + if (u) + DoOneToOne(prefix,"TIME",params,params[0]); + } + } + else if (params.size() == 3) + { + // a response to a previous TIME + userrec* u = Srv->FindNick(params[1]); + if ((u) && (IS_LOCAL(u))) + { + time_t rawtime = atol(params[2].c_str()); + struct tm * timeinfo; + timeinfo = localtime(&rawtime); + char tms[26]; + snprintf(tms,26,"%s",asctime(timeinfo)); + tms[24] = 0; + WriteServ(u->fd,"391 %s %s :%s",u->nick,prefix.c_str(),tms); + } + else + { + if (u) + DoOneToOne(prefix,"TIME",params,u->server); + } + } + return true; + } bool LocalPing(std::string prefix, std::deque ¶ms) { if (params.size() < 1) return true; - std::string stufftobounce = params[0]; - this->WriteLine(":"+Srv->GetServerName()+" PONG "+stufftobounce); - return true; + if (params.size() == 1) + { + std::string stufftobounce = params[0]; + this->WriteLine(":"+Srv->GetServerName()+" PONG "+stufftobounce); + return true; + } + else + { + std::string forwardto = params[1]; + if (forwardto == Srv->GetServerName()) + { + // this is a ping for us, send back PONG to the requesting server + params[1] = params[0]; + params[0] = forwardto; + DoOneToOne(forwardto,"PONG",params,params[1]); + } + else + { + // not for us, pass it on :) + DoOneToOne(prefix,"PING",params,forwardto); + } + return true; + } } bool RemoteServer(std::string prefix, std::deque ¶ms) @@ -2128,6 +2290,14 @@ class TreeSocket : public InspSocket { return this->Whois(prefix,params); } + else if (command == "PUSH") + { + return this->Push(prefix,params); + } + else if (command == "TIME") + { + return this->Time(prefix,params); + } else if (command == "SVSJOIN") { if (prefix == "") @@ -2147,6 +2317,7 @@ class TreeSocket : public InspSocket else if (command == "ENDBURST") { this->bursting = false; + apply_lines(APPLY_ZLINES|APPLY_GLINES|APPLY_QLINES); return true; } else @@ -2509,12 +2680,14 @@ class ModuleSpanningTree : public Module std::vector Bindings; int line; int NumServers; + unsigned int max_local; + unsigned int max_global; cmd_rconnect* command_rconnect; public: ModuleSpanningTree(Server* Me) - : Module::Module(Me) + : Module::Module(Me), max_local(0), max_global(0) { Srv = Me; Bindings.clear(); @@ -2549,7 +2722,7 @@ class ModuleSpanningTree : public Module ShowLinks(Current->GetChild(q),user,hops+1); } } - WriteServ(user->fd,"364 %s %s %s :%d %s",user->nick,Current->GetName().c_str(),Parent.c_str(),(FlatLinks && (!*user->oper)) ? 0 : hops,Current->GetDesc().c_str()); + 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()); } int CountLocalServs() @@ -2571,11 +2744,19 @@ class ModuleSpanningTree : public Module void HandleLusers(char** parameters, int pcnt, userrec* user) { + /* 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(); + 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,"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); return; } @@ -2724,6 +2905,30 @@ class ModuleSpanningTree : public Module return 1; } + int HandleTime(char** parameters, int pcnt, userrec* user) + { + if ((user->fd > -1) && (pcnt)) + { + TreeServer* found = FindServerMask(parameters[0]); + if (found) + { + // we dont' override for local server + if (found == TreeRoot) + return 0; + + std::deque params; + params.push_back(found->GetName()); + params.push_back(user->nick); + DoOneToOne(Srv->GetServerName(),"TIME",params,found->GetName()); + } + else + { + WriteServ(user->fd,"402 %s %s :No such server",user->nick,parameters[0]); + } + } + return 1; + } + int HandleRemoteWhois(char** parameters, int pcnt, userrec* user) { if ((user->fd > -1) && (pcnt > 1)) @@ -2906,6 +3111,10 @@ class ModuleSpanningTree : public Module this->HandleMap(parameters,pcnt,user); return 1; } + else if ((command == "TIME") && (pcnt > 0)) + { + return this->HandleTime(parameters,pcnt,user); + } else if (command == "LUSERS") { this->HandleLusers(parameters,pcnt,user);