ConfigReader *Conf;
std::vector<Link> LinkBlocks;
+template<typename T> 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
* 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
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++;
{
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++;
}
}
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);
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);
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<char*,char*> *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<userrec*> specific_halfop;
std::vector<userrec*> specific_voice;
- for (std::map<char*,char*>::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);
}
}
}
- if (list[strlen(list)-1] != ':')
+ if (counter != initial)
{
log(DEBUG,"Final FJOIN line");
this->WriteLine(list);
* back to the core so that a large burst is split into at least 6 sections
* (possibly more)
*/
- std::string burst = "BURST";
+ std::string burst = "BURST "+ConvToStr(time(NULL));
std::string endburst = "ENDBURST";
Srv->SendOpers("*** Bursting to \2"+s->GetName()+"\2.");
this->WriteLine(burst);
/* 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;
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<std::string> 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))
}
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);
}
if (!Srv->CallCommandHandler(command.c_str(), strparams, params.size(), who))
{
- this->WriteLine("ERROR :Unrecognised command -- possibly loaded mismatched modules");
+ this->WriteLine("ERROR :Unrecognised command '"+std::string(command.c_str())+"' -- possibly loaded mismatched modules");
return false;
}
}
// returns a list of DIRECT servernames for a specific channel
void GetListOfServersForChannel(chanrec* c, std::deque<TreeServer*> &list)
{
- std::map<char*,char*> *ulist = c->GetUsers();
- for (std::map<char*,char*>::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);
}
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;
}
projects / user / henk / code / inspircd.git / blobdiff