X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree.cpp;h=e99bd814d4efcb2c78e7c6a0adcdf105085db295;hb=c2a5839bcbd6bebf0dd102a8dfd283e92c8a0507;hp=20c86f705e5169a5487c55f420e8ce3252ca5f8a;hpb=f5c28c5e69f2d179eb54c5904d33d585b4e92a4e;p=user%2Fhenk%2Fcode%2Finspircd.git
diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index 20c86f705..e99bd814d 100644
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -468,6 +468,13 @@ class Link
ConfigReader *Conf;
std::vector LinkBlocks;
+template inline string ConvToStr(const T &in)
+{
+ stringstream tmp;
+ if (!(tmp << in)) return string();
+ return tmp.str();
+}
+
/* Yay for fast searches!
* This is hundreds of times faster than recursion
* or even scanning a linked list, especially when
@@ -802,7 +809,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 +818,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 +826,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 +855,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 +871,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 +890,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;
@@ -927,7 +935,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 +943,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 +1066,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;
@@ -1092,8 +1101,8 @@ 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);
+ 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);
@@ -1102,16 +1111,8 @@ class TreeSocket : public InspSocket
strlcpy(clientlist[tempnick]->modes, modes.c_str(),53);
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,(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,46 +1135,54 @@ 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 counter = snprintf(list,MAXBUF,":%s FJOIN %s %lu",Srv->GetServerName().c_str(),c->name,(unsigned long)c->age);
+ size_t initial = counter;
+
+ 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);
+ charlcat(list,' ',MAXBUF);
+ counter++;
+ 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 = "";
+ char n = 0;
if (x & UCMODE_OP)
{
- n = "@";
+ n = '@';
}
else if (x & UCMODE_HOP)
{
- n = "%";
+ n = '%';
}
else if (x & UCMODE_VOICE)
{
- n = "+";
+ n = '+';
}
- strlcat(list,n,MAXBUF);
- strlcat(list,otheruser->nick,MAXBUF);
- if (strlen(list)>(480-NICKMAX))
+ if (n)
+ {
+ charlcat(list,n,MAXBUF);
+ counter++;
+ }
+
+ counter += strlcat(list,i->second->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,76 +1212,78 @@ 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 ((i % 20) == 0)
+ 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 ((i % 20) == 0)
+ 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 ((i % 20) == 0)
+ 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 ((i % 20) == 0)
+ 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 ((i % 20) == 0)
+ 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 ((i % 20) == 0)
+ 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 ((i % 20) == 0)
+ 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 ((i % 20) == 0)
+ if ((iterations % 10) == 0)
{
ServerInstance->DoOneIteration(false);
}
@@ -1285,7 +1296,8 @@ class TreeSocket : public InspSocket
char data[MAXBUF];
std::deque list;
int iterations = 0;
- const char* sn = Srv->GetServerName().c_str();
+ 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);
@@ -1308,10 +1320,6 @@ class TreeSocket : public InspSocket
{
FOREACH_MOD(I_OnSyncChannelMetaData,OnSyncChannelMetaData(c->second,(Module*)TreeProtocolModule,(void*)this,list[j]));
}
- if ((iterations % 20) == 0)
- {
- ServerInstance->DoOneIteration(false);
- }
}
}
@@ -1320,7 +1328,7 @@ class TreeSocket : public InspSocket
{
char data[MAXBUF];
std::deque list;
- int interations = 0;
+ int iterations = 0;
for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++, iterations++)
{
if (u->second->registered == 7)
@@ -1342,10 +1350,6 @@ class TreeSocket : public InspSocket
{
FOREACH_MOD(I_OnSyncUserMetaData,OnSyncUserMetaData(u->second,(Module*)TreeProtocolModule,(void*)this,list[j]));
}
- if ((iterations % 20) == 0)
- {
- ServerInstance->DoOneIteration(false);
- }
}
}
}
@@ -1357,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(NULL));
+ 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.");
}
@@ -1383,13 +1399,11 @@ 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.
@@ -1397,7 +1411,7 @@ class TreeSocket : public InspSocket
while (in_buffer.find("\n") != std::string::npos)
{
iterations++;
- if ((iterations % 20) == 0)
+ if ((iterations % 10) == 0)
{
ServerInstance->DoOneIteration(false);
}
@@ -1422,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;
@@ -1435,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)
@@ -1460,7 +1475,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);
@@ -1734,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;
@@ -2064,67 +2088,88 @@ 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);
+ this->Split(l,true,params);
irc::string command = "";
std::string prefix = "";
if (((params[0].c_str())[0] == ':') && (params.size() > 1))
@@ -2219,6 +2264,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);
@@ -2451,6 +2512,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
@@ -2499,7 +2566,11 @@ class TreeSocket : public InspSocket
{
strparams[q] = (char*)params[q].c_str();
}
- Srv->CallCommandHandler(command.c_str(), 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
{
@@ -2582,14 +2653,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);
}
@@ -2884,19 +2953,21 @@ class ModuleSpanningTree : public Module
void HandleLusers(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;
}