#include <deque>
#include "globals.h"
#include "inspircd_config.h"
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
+#include "hash_map.h"
+#include "configreader.h"
#include "users.h"
#include "channels.h"
#include "modules.h"
#include "commands.h"
+#include "commands/cmd_whois.h"
#include "socket.h"
#include "helperfuncs.h"
#include "inspircd.h"
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();
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);
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);
int QuitUsers(const std::string &reason)
{
int x = Users.size();
- log(DEBUG,"Removing all users from server %s",this->ServerName.c_str());
+ log(DEBUG,"Removing %d users from server %s",x,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++)
{
- log(DEBUG,"Kill %s",n->second->nick);
- kill_link(n->second,reason_s);
+ log(DEBUG,"Kill %s fd=%d",n->second->nick,n->second->fd);
+ if (!IS_LOCAL(n->second))
+ kill_link(n->second,reason_s);
}
Users.clear();
+ this->DontModifyHash = false;
return x;
}
TreeServer* s = (TreeServer*)*a;
s->Tidy();
Children.erase(a);
- delete s;
+ DELETE(s);
stillchildren = true;
break;
}
~TreeSocket()
{
if (ctx_in)
- delete ctx_in;
+ DELETE(ctx_in);
if (ctx_out)
- delete ctx_out;
+ DELETE(ctx_out);
}
void InitAES(std::string key,std::string SName)
* dirty work is done in OnClose() (see below)
* which is still called on error conditions too.
*/
+ if (e == I_ERR_CONNECT)
+ {
+ Srv->SendOpers("*** Connection failed: Connection refused");
+ }
}
virtual int OnDisconnect()
SquitServer(from, Current);
Current->Tidy();
Current->GetParent()->DelChild(Current);
- delete Current;
+ DELETE(Current);
WriteOpers("Netsplit complete, lost \002%d\002 users on \002%d\002 servers.", num_lost_users, num_lost_servers);
}
else
}
Srv->SendMode(modelist,params.size(),who);
DoOneToAllButSender(source,"FMODE",params,source);
- delete who;
+ DELETE(who);
return true;
}
userrec* user = Srv->FindNick(source);
if (!user)
{
- WriteChannelWithServ((char*)source.c_str(), c, "TOPIC %s :%s", c->name, c->topic);
+ WriteChannelWithServ(source.c_str(), c, "TOPIC %s :%s", c->name, c->topic);
}
else
{
for (unsigned int usernum = 2; usernum < params.size(); usernum++)
{
/* process one channel at a time, applying modes. */
- char* usr = (char*)params[usernum].c_str();
+ char* usr = const_cast<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)
return true;
}
+ bool SyncChannelTS(std::string source, std::deque<std::string> ¶ms)
+ {
+ if (params.size() == 2)
+ {
+ chanrec* c = Srv->FindChannel(params[0]);
+ if (c)
+ {
+ time_t theirTS = atoi(params[1].c_str());
+ time_t ourTS = c->age;
+ if (ourTS >= theirTS)
+ {
+ log(DEBUG,"Updating timestamp for %s, our timestamp was %lu and theirs is %lu",c->name,ourTS,theirTS);
+ c->age = theirTS;
+ }
+ }
+ }
+ DoOneToAllButSender(Srv->GetServerName(),"SYNCTS",params,source);
+ return true;
+ }
+
/* NICK command */
bool IntroduceClient(std::string source, std::deque<std::string> ¶ms)
{
// NICK age nick host dhost ident +modes ip :gecos
// 0 123 4 56 7
time_t age = atoi(params[0].c_str());
- std::string modes = params[5];
- while (*(modes.c_str()) == '+')
- {
- char* m = (char*)modes.c_str();
- m++;
- modes = m;
- }
- char* tempnick = (char*)params[1].c_str();
+
+ /* This used to have a pretty craq'y loop doing the same thing,
+ * now we just let the STL do the hard work (more efficiently)
+ */
+ params[5] = params[5].substr(params[5].find_first_not_of('+'));
+
+ const char* tempnick = 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);
+ user_hash::iterator iter = clientlist.find(tempnick);
+
if (iter != clientlist.end())
{
// nick collision
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());
+ clientlist[tempnick]->server = FindServerNamePtr(source.c_str());
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);
+ strlcpy(clientlist[tempnick]->modes, params[5].c_str(),53);
+
for (char *v = clientlist[tempnick]->modes; *v; v++)
{
switch (*v)
}
inet_aton(params[6].c_str(),&clientlist[tempnick]->ip4);
- 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));
+ WriteOpers("*** Client connecting at %s: %s!%s@%s [%s]",clientlist[tempnick]->server,clientlist[tempnick]->nick,clientlist[tempnick]->ident,clientlist[tempnick]->host, inet_ntoa(clientlist[tempnick]->ip4));
params[7] = ":" + params[7];
DoOneToAllButSender(source,"NICK",params,source);
TreeServer* SourceServer = FindServer(source);
if (SourceServer)
{
+ log(DEBUG,"Found source server of %s",clientlist[tempnick]->nick);
SourceServer->AddUser(clientlist[tempnick]);
SourceServer->AddUserCount();
}
this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" +h "+specific_halfop[y]->nick);
}
}
+ this->WriteLine(":"+Srv->GetServerName()+" SYNCTS "+c->name+" "+ConvToStr(c->age));
}
/* Send G, Q, Z and E lines */
{
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<QLine>::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<GLine>::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<ELine>::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<ZLine>::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<QLine>::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<GLine>::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<ELine>::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);
- }
}
}
{
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,(char*)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->modes,inet_ntoa(u->second->ip4),u->second->fullname);
this->WriteLine(data);
if (*u->second->oper)
{
*/
void DoBurst(TreeServer* s)
{
- /* The calls here to ServerInstance->DoOneIteration(false); yield the processing
+ /* The calls here to ServerInstance-> yield the processing
* back to the core so that a large burst is split into at least 6 sections
* (possibly more)
*/
/* send our version string */
this->WriteLine(":"+Srv->GetServerName()+" VERSION :"+Srv->GetVersion());
/* Send server tree */
- if (FindServer(name))
- this->SendServers(TreeRoot,s,1);
- //ServerInstance->DoOneIteration(false);
+ this->SendServers(TreeRoot,s,1);
/* Send users and their oper status */
- if (FindServer(name))
- this->SendUsers(s);
- //ServerInstance->DoOneIteration(false);
+ this->SendUsers(s);
/* Send everything else (channel modes, xlines etc) */
- if (FindServer(name))
- this->SendChannelModes(s);
- //ServerInstance->DoOneIteration(false);
- if (FindServer(name))
- this->SendXLines(s);
- //ServerInstance->DoOneIteration(false);
+ this->SendChannelModes(s);
+ this->SendXLines(s);
FOREACH_MOD(I_OnSyncOtherMetaData,OnSyncOtherMetaData((Module*)TreeProtocolModule,(void*)this));
- //ServerInstance->DoOneIteration(false);
this->WriteLine(endburst);
Srv->SendOpers("*** Finished bursting to \2"+name+"\2.");
}
*/
virtual bool 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)
*/
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)
{
std::deque<std::string> par;
par.push_back(params[1]);
- DoOneToMany(u->nick,"NICK",par);
+ /* This is not required as one is sent in OnUserPostNick below
+ */
+ //DoOneToMany(u->nick,"NICK",par);
Srv->ChangeUserNick(u,params[1]);
u->age = atoi(params[2].c_str());
}
std::string reason = params[1];
params[1] = ":" + params[1];
DoOneToAllButSender(prefix,"KILL",params,sourceserv);
+ ::Write(who->fd, ":%s KILL %s :%s (%s)", sourceserv.c_str(), who->nick, sourceserv.c_str(), reason.c_str());
Srv->QuitUser(who,reason);
}
return true;
{
case 'Z':
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()));
+ zline_set_creation_time(params[1].c_str(), atoi(params[3].c_str()));
break;
case 'Q':
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()));
+ qline_set_creation_time(params[1].c_str(), atoi(params[3].c_str()));
break;
case 'E':
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()));
+ eline_set_creation_time(params[1].c_str(), atoi(params[3].c_str()));
break;
case 'G':
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()));
+ gline_set_creation_time(params[1].c_str(), atoi(params[3].c_str()));
break;
case 'K':
propogate = add_kline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str());
unsigned long signon = atoi(params[1].c_str());
unsigned long idle = atoi(params[2].c_str());
if ((who_to_send_to) && (who_to_send_to->fd > -1))
- do_whois(who_to_send_to,u,signon,idle,(char*)nick_whoised.c_str());
+ do_whois(who_to_send_to,u,signon,idle,nick_whoised.c_str());
}
else
{
userrec* u = Srv->FindNick(params[0]);
+ if (!u)
+ return true;
+
if (IS_LOCAL(u))
{
// push the raw to the user
TreeServer* CheckDupe = FindServer(servername);
if (CheckDupe)
{
- this->WriteLine("ERROR :Server "+servername+" already exists on server "+CheckDupe->GetParent()->GetName()+"!");
- Srv->SendOpers("*** Server connection from \2"+servername+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName());
+ this->WriteLine("ERROR :Server "+servername+" already exists!");
+ Srv->SendOpers("*** Server connection from \2"+servername+"\2 denied, already exists");
return false;
}
TreeServer* Node = new TreeServer(servername,description,ParentOfThis,NULL);
bool ProcessLine(std::string line)
{
- char* l = (char*)line.c_str();
- for (char* x = l; *x; x++)
- {
- if ((*x == '\r') || (*x == '\n'))
- *x = 0;
- }
- if (!*l)
- return true;
-
- log(DEBUG,"IN: %s",l);
-
std::deque<std::string> params;
- 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].c_str();
- char* pref = (char*)prefix.c_str();
- prefix = ++pref;
- params.pop_front();
- params.pop_front();
- }
- else
+ irc::string command;
+ std::string prefix;
+
+ if (line.empty())
+ return true;
+
+ line = line.substr(0, line.find_first_of("\r\n"));
+
+ log(DEBUG,"IN: %s", line.c_str());
+
+ this->Split(line.c_str(),true,params);
+
+ if ((params[0][0] == ':') && (params.size() > 1))
{
- prefix = "";
- command = params[0].c_str();
+ prefix = params[0].substr(1);
params.pop_front();
}
+ command = params[0].c_str();
+ params.pop_front();
+
if ((!this->ctx_in) && (command == "AES"))
{
std::string sserv = params[0];
{
return this->ForceJoin(prefix,params);
}
+ else if (command == "SYNCTS")
+ {
+ return this->SyncChannelTS(prefix,params);
+ }
else if (command == "SERVER")
{
return this->RemoteServer(prefix,params);
* and our copy.
*/
userrec* x = Srv->FindNick(params[0]);
- if (x)
+ if ((x) && (x != who))
{
std::deque<std::string> p;
p.push_back(params[0]);
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);
virtual int OnIncomingConnection(int newsock, char* ip)
{
+ /* To prevent anyone from attempting to flood opers/DDoS by connecting to the server port,
+ * or discovering if this port is the server port, we don't allow connections from any
+ * IPs for which we don't have a link block.
+ */
+ bool found = false;
+ char resolved_host[MAXBUF];
+ vector<Link>::iterator i;
+ for (i = LinkBlocks.begin(); i != LinkBlocks.end(); i++)
+ {
+ if (i->IPAddr == ip)
+ {
+ found = true;
+ break;
+ }
+ /* XXX: Fixme: blocks for a very short amount of time,
+ * we should cache these on rehash/startup
+ */
+ if (CleanAndResolve(resolved_host,i->IPAddr.c_str(),true))
+ {
+ if (std::string(resolved_host) == ip)
+ {
+ found = true;
+ break;
+ }
+ }
+ }
+ if (!found)
+ {
+ WriteOpers("Server connection from %s denied (no link blocks with that IP address)", ip);
+ close(newsock);
+ return false;
+ }
TreeSocket* s = new TreeSocket(newsock, ip);
Srv->AddSocket(s);
return true;
{
log(DEFAULT,"m_spanningtree: Warning: Failed to bind server port %d",Port);
listener->Close();
- delete listener;
+ DELETE(listener);
}
}
}
}
}
}
- delete Conf;
+ DELETE(Conf);
}
// an autoconnected server is not connected. Check if its time to connect it
WriteOpers("*** AUTOCONNECT: Auto-connecting server \002%s\002 (%lu seconds until next attempt)",x->Name.c_str(),x->AutoConnect);
TreeSocket* newsocket = new TreeSocket(x->IPAddr,x->Port,false,10,x->Name.c_str());
- if (newsocket->GetState() != I_ERROR)
+ if (newsocket->GetFd() > -1)
{
Srv->AddSocket(newsocket);
}
else
{
- WriteOpers("*** AUTOCONNECT: Error autoconnecting \002%s\002.",x->Name.c_str());
- delete newsocket;
+ WriteOpers("*** AUTOCONNECT: Error autoconnecting \002%s\002: %s.",x->Name.c_str(),strerror(errno));
+ DELETE(newsocket);
}
}
}
{
WriteServ(user->fd,"NOTICE %s :*** CONNECT: Connecting to server: \002%s\002 (%s:%d)",user->nick,x->Name.c_str(),(x->HiddenFromStats ? "<hidden>" : x->IPAddr.c_str()),x->Port);
TreeSocket* newsocket = new TreeSocket(x->IPAddr,x->Port,false,10,x->Name.c_str());
- if (newsocket->GetState() != I_ERROR)
+ if (newsocket->GetFd() > -1)
{
Srv->AddSocket(newsocket);
}
else
{
- WriteServ(user->fd,"NOTICE %s :*** CONNECT: Error connecting \002%s\002.",user->nick,x->Name.c_str());
- delete newsocket;
+ WriteServ(user->fd,"NOTICE %s :*** CONNECT: Error connecting \002%s\002: %s.",user->nick,x->Name.c_str(),strerror(errno));
+ DELETE(newsocket);
}
return 1;
}
std::deque<std::string> params;
params.clear();
params.push_back(channel->name);
- if (*channel->key)
- {
- // if the channel has a key, force the join by emulating the key.
- params.push_back(channel->key);
- }
+
if (channel->GetUserCounter() > 1)
{
// not the first in the channel
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)
projects / user / henk / code / inspircd.git / blobdiff