#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
* are created and destroyed.
*/
-class TreeServer
+class TreeServer : public classbase
{
TreeServer* Parent; /* Parent entry */
TreeServer* Route; /* Route entry */
TreeSocket* Socket; /* For directly connected servers this points at the socket object */
time_t NextPing; /* After this time, the server should be PINGed*/
bool LastPingWasGood; /* True if the server responded to the last PING with a PONG */
- std::map<userrec*,userrec*> Users; /* Users on this server */
- bool DontModifyHash; /* When the server is splitting, this is set to true so we dont bash our own iterator to death */
public:
VersionString = "";
UserCount = OperCount = 0;
VersionString = Srv->GetVersion();
- DontModifyHash = false;
}
/* We use this constructor only to create the 'root' item, TreeRoot, which
VersionString = Srv->GetVersion();
Route = NULL;
Socket = NULL; /* Fix by brain */
- DontModifyHash = false;
AddHashEntry();
}
{
VersionString = "";
UserCount = OperCount = 0;
- DontModifyHash = false;
this->SetNextPingTime(time(NULL) + 120);
this->SetPingFlag();
this->AddHashEntry();
}
- void AddUser(userrec* user)
- {
- if (this->DontModifyHash)
- {
- log(DEBUG,"Not modifying hash");
- return;
- }
-
- log(DEBUG,"Add user %s to server %s",user->nick,this->ServerName.c_str());
- std::map<userrec*,userrec*>::iterator iter;
- iter = Users.find(user);
- if (iter == Users.end())
- Users[user] = user;
- }
-
- void DelUser(userrec* user)
- {
- /* FIX BY BRAIN:
- * Quitting the user in QuitUsers changes the hash by removing the user here,
- * corrupting the iterator!
- * When netsplitting, this->DontModifyHash is set to prevent it now!
- */
- if (this->DontModifyHash)
- {
- log(DEBUG,"Not modifying hash");
- return;
- }
-
- log(DEBUG,"Remove user %s from server %s",user->nick,this->ServerName.c_str());
- std::map<userrec*,userrec*>::iterator iter;
- iter = Users.find(user);
- if (iter != Users.end())
- Users.erase(iter);
- }
-
int QuitUsers(const std::string &reason)
{
- int x = Users.size();
- log(DEBUG,"Removing %d users from server %s",x,this->ServerName.c_str());
+ log(DEBUG,"Removing all users from server %s",this->ServerName.c_str());
const char* reason_s = reason.c_str();
- this->DontModifyHash = true;
- for (std::map<userrec*,userrec*>::iterator n = Users.begin(); n != Users.end(); n++)
+ std::vector<userrec*> time_to_die;
+ for (user_hash::iterator n = clientlist.begin(); n != clientlist.end(); n++)
{
- log(DEBUG,"Kill %s fd=%d",n->second->nick,n->second->fd);
- if (!IS_LOCAL(n->second))
- kill_link(n->second,reason_s);
+ if (!strcmp(n->second->server, this->ServerName.c_str()))
+ {
+ time_to_die.push_back(n->second);
+ }
}
- Users.clear();
- this->DontModifyHash = false;
- return x;
+ for (std::vector<userrec*>::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
* of them, and populate the list on rehash/load.
*/
-class Link
+class Link : public classbase
{
public:
irc::string Name;
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? */
{
/* 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);
}
return true;
userrec* who = new userrec();
who->fd = FD_MAGIC_NUMBER;
- char* modelist[64];
+ const char* modelist[64];
memset(&modelist,0,sizeof(modelist));
for (unsigned int q = 0; q < params.size(); q++)
{
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;
for (unsigned int usernum = 2; usernum < params.size(); usernum++)
{
/* process one channel at a time, applying modes. */
- char* usr = const_cast<char*>(params[usernum].c_str());
+ char* usr = (char*)params[usernum].c_str();
/* Safety check just to make sure someones not sent us an FJOIN full of spaces
* (is this even possible?) */
if (usr && *usr)
{
/* 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
{
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
{
strlcpy(clientlist[tempnick]->fullname, params[7].c_str(),MAXGECOS);
clientlist[tempnick]->registered = 7;
clientlist[tempnick]->signon = age;
- strlcpy(clientlist[tempnick]->modes, params[5].c_str(),53);
- for (char *v = clientlist[tempnick]->modes; *v; v++)
+ for (std::string::iterator v = params[5].begin(); v != params[5].end(); v++)
{
- switch (*v)
- {
- case 'i':
- clientlist[tempnick]->modebits |= UM_INVISIBLE;
- break;
- case 'w':
- clientlist[tempnick]->modebits |= UM_WALLOPS;
- break;
- case 's':
- clientlist[tempnick]->modebits |= UM_SERVERNOTICE;
- break;
- default:
- break;
- }
+ clientlist[tempnick]->modes[(*v)-65] = 1;
}
inet_aton(params[6].c_str(),&clientlist[tempnick]->ip4);
if (SourceServer)
{
log(DEBUG,"Found source server of %s",clientlist[tempnick]->nick);
- SourceServer->AddUser(clientlist[tempnick]);
SourceServer->AddUserCount();
}
{
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,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)
{
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;
}
if (who)
{
- if (command == "QUIT")
- {
- TreeServer* s = FindServer(who->server);
- if (s)
- {
- s->DelUser(who);
- }
- }
- else if ((command == "NICK") && (params.size() > 0))
+ if ((command == "NICK") && (params.size() > 0))
{
/* On nick messages, check that the nick doesnt
* already exist here. If it does, kill their copy,
userrec* y = Srv->FindNick(prefix);
if (y)
{
- TreeServer* n = FindServer(y->server);
- if (n)
- {
- n->DelUser(y);
- }
Srv->QuitUser(y,"Nickname collision");
}
return DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params);
}
// 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))
{
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();
// (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
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)
return 1;
}
- int HandleTime(char** parameters, int pcnt, userrec* user)
+ int HandleTime(const char** parameters, int pcnt, userrec* user)
{
if ((user->fd > -1) && (pcnt))
{
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))
{
}
}
- 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]);
return 1;
}
- int HandleConnect(char** parameters, int pcnt, userrec* user)
+ int HandleConnect(const char** parameters, int pcnt, userrec* user)
{
for (std::vector<Link>::iterator x = LinkBlocks.begin(); x < LinkBlocks.end(); x++)
{
return 0;
}
- virtual int OnPreCommand(const 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)
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);
if (SourceServer)
{
SourceServer->DelUserCount();
- SourceServer->DelUser(user);
}
}
params.push_back(dest->nick);
params.push_back(":"+reason);
DoOneToMany(source->nick,"KILL",params);
- /* NOTE: We must remove the user from the servers list here.
- * If we do not, there is a chance the user could hang around
- * in the list if there is a desync for example (this would
- * not be good).
- * Part of the 'random crash on netsplit' tidying up. -Brain
- */
- TreeServer* n = FindServer(dest->server);
- if (n)
- {
- n->DelUser(dest);
- }
}
virtual void OnRehash(const std::string ¶meter)
(*params)[2] = ":" + (*params)[2];
DoOneToMany(Srv->GetServerName(),"METADATA",*params);
}
+ else if (event->GetEventID() == "send_mode")
+ {
+ std::deque<std::string>* params = (std::deque<std::string>*)event->GetData();
+ if (params->size() < 2)
+ return;
+ DoOneToMany(Srv->GetServerName(),"FMODE",*params);
+ }
}
virtual ~ModuleSpanningTree()
projects / user / henk / code / inspircd.git / blobdiff