#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 "commands/cmd_stats.h"
#include "socket.h"
#include "helperfuncs.h"
#include "inspircd.h"
#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
typedef nspace::hash_map<std::string, TreeServer*, nspace::hash<string>, irc::StrHashComp> server_hash;
server_hash serverlist;
+typedef nspace::hash_map<std::string, userrec*> uid_hash;
+typedef nspace::hash_map<std::string, char*> sid_hash;
+
/* More forward declarations */
bool DoOneToOne(std::string prefix, std::string command, std::deque<std::string> ¶ms, std::string target);
bool DoOneToAllButSender(std::string prefix, std::string command, std::deque<std::string> ¶ms, std::string omit);
extern std::vector<QLine> pqlines;
extern std::vector<ELine> pelines;
+std::vector<std::string> ValidIPs;
+
+class UserManager : public classbase
+{
+ uid_hash uids;
+ sid_hash sids;
+ public:
+ UserManager()
+ {
+ uids.clear();
+ sids.clear();
+ }
+
+ std::string UserToUID(userrec* user)
+ {
+ return "";
+ }
+
+ std::string UIDToUser(const std::string &UID)
+ {
+ return "";
+ }
+
+ std::string CreateAndAdd(userrec* user)
+ {
+ return "";
+ }
+
+ std::string CreateAndAdd(const std::string &servername)
+ {
+ return "";
+ }
+
+ std::string ServerToSID(const std::string &servername)
+ {
+ return "";
+ }
+
+ std::string SIDToServer(const std::string &SID)
+ {
+ return "";
+ }
+
+ userrec* FindByID(const std::string &UID)
+ {
+ return NULL;
+ }
+};
+
+
/* Each server in the tree is represented by one class of
* type TreeServer. A locally connected TreeServer can
* have a class of type TreeSocket associated with it, for
* 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 */
public:
this->AddHashEntry();
}
- void AddUser(userrec* user)
- {
- 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)
- {
- 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 all users from server %s",this->ServerName.c_str());
const char* reason_s = reason.c_str();
- 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++)
+ {
+ if (!strcmp(n->second->server, this->ServerName.c_str()))
+ {
+ time_to_die.push_back(n->second);
+ }
+ }
+ for (std::vector<userrec*>::iterator n = time_to_die.begin(); n != time_to_die.end(); n++)
{
- log(DEBUG,"Kill %s",n->second->nick);
- kill_link(n->second,reason_s);
+ userrec* a = (userrec*)*n;
+ log(DEBUG,"Kill %s fd=%d",a->nick,a->fd);
+ if (!IS_LOCAL(a))
+ userrec::QuitUser(a,reason_s);
}
- Users.clear();
- return x;
+ return time_to_die.size();
}
/* This method is used to add the structure to the
TreeServer* s = (TreeServer*)*a;
s->Tidy();
Children.erase(a);
- delete s;
+ DELETE(s);
stillchildren = true;
break;
}
* 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";
- }
+ syntax = "<remote-server-mask> <servermask>";
+ }
- 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);
}
~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()
/* Now we've whacked the kids, whack self */
num_lost_servers++;
num_lost_users += Current->QuitUsers(from);
- /*for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
- {
- if (!strcasecmp(u->second->server,Current->GetName().c_str()))
- {
- Goners->AddItem(u->second,from);
- num_lost_users++;
- }
- }*/
}
/* This is a wrapper function for SquitServer above, which
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
}
}
- /* FMODE command */
+ /* FMODE command - server mode with timestamp checks */
bool ForceMode(std::string source, std::deque<std::string> ¶ms)
{
- if (params.size() < 2)
- return true;
- userrec* who = new userrec();
- who->fd = FD_MAGIC_NUMBER;
- char* modelist[64];
+ /* Chances are this is a 1.0 FMODE without TS */
+ if (params.size() < 3)
+ {
+ this->WriteLine("ERROR :Version 1.0 FMODE sent to version 1.1 server");
+ return false;
+ }
+
+ bool smode = false;
+ std::string sourceserv;
+
+ /* Are we dealing with an FMODE from a user, or from a server? */
+ userrec* who = Srv->FindNick(source);
+ if (who)
+ {
+ /* FMODE from a user, set sourceserv to the users server name */
+ sourceserv = who->server;
+ }
+ else
+ {
+ /* FMODE from a server, create a fake user to receive mode feedback */
+ who = new userrec();
+ who->fd = FD_MAGIC_NUMBER;
+ smode = true; /* Setting this flag tells us we should free the userrec later */
+ sourceserv = source; /* Set sourceserv to the actual source string */
+ }
+ const char* modelist[64];
+ time_t TS = 0;
+ int n = 0;
memset(&modelist,0,sizeof(modelist));
- for (unsigned int q = 0; q < params.size(); q++)
+ for (unsigned int q = 0; (q < params.size()) && (q < 64); q++)
+ {
+ if (q == 1)
+ {
+ /* The timestamp is in this position.
+ * We don't want to pass that up to the
+ * server->client protocol!
+ */
+ TS = atoi(params[q].c_str());
+ }
+ else
+ {
+ /* Everything else is fine to append to the modelist */
+ modelist[n++] = params[q].c_str();
+ }
+
+ }
+ /* Extract the TS value of the object, either userrec or chanrec */
+ userrec* dst = Srv->FindNick(params[0]);
+ chanrec* chan = NULL;
+ time_t ourTS = 0;
+ if (dst)
{
- modelist[q] = (char*)params[q].c_str();
+ ourTS = dst->age;
}
- Srv->SendMode(modelist,params.size(),who);
- DoOneToAllButSender(source,"FMODE",params,source);
- delete who;
+ else
+ {
+ chan = Srv->FindChannel(params[0]);
+ if (chan)
+ {
+ ourTS = chan->age;
+ }
+ }
+
+ /* TS is equal: Merge the mode changes, use voooodoooooo on modes
+ * with parameters.
+ */
+ if (TS == ourTS)
+ {
+ log(DEBUG,"Entering TS equality check");
+ ModeHandler* mh = NULL;
+ unsigned long paramptr = 3;
+ std::string to_bounce = "";
+ std::string to_keep = "";
+ std::vector<std::string> params_to_keep;
+ std::string params_to_bounce = "";
+ bool adding = true;
+ char cur_change = 1;
+ char old_change = 0;
+ char old_bounce_change = 0;
+ /* Merge modes, basically do special stuff to mode with params */
+ for (std::string::iterator x = params[2].begin(); x != params[2].end(); x++)
+ {
+ switch (*x)
+ {
+ case '-':
+ adding = false;
+ break;
+ case '+':
+ adding = true;
+ break;
+ default:
+ if (adding)
+ {
+ /* We only care about whats being set,
+ * not whats being unset
+ */
+ mh = ServerInstance->ModeGrok->FindMode(*x, chan ? MODETYPE_CHANNEL : MODETYPE_USER);
+
+ if ((mh) && (mh->GetNumParams(adding) > 0) && (!mh->IsListMode()))
+ {
+ /* We only want to do special things to
+ * modes with parameters, we are going to rewrite
+ * those parameters
+ */
+ ModePair ret;
+ adding ? cur_change = '+' : cur_change = '-';
+
+ ret = mh->ModeSet(smode ? NULL : who, dst, chan, params[paramptr]);
+
+ /* The mode is set here, check which we should keep */
+ if (ret.first)
+ {
+ bool which_to_keep = mh->CheckTimeStamp(TS, ourTS, params[paramptr], ret.second, chan);
+
+ if (which_to_keep == true)
+ {
+ /* Keep ours, bounce theirs:
+ * Send back ours to them and
+ * drop their mode changs
+ */
+ adding ? cur_change = '+' : cur_change = '-';
+ if (cur_change != old_bounce_change)
+ to_bounce += cur_change;
+ to_bounce += *x;
+ old_bounce_change = cur_change;
+
+ if ((mh->GetNumParams(adding) > 0) && (paramptr < params.size()))
+ params_to_bounce.append(" ").append(ret.second);
+ }
+ else
+ {
+ /* Keep theirs: Accept their mode change,
+ * do nothing else
+ */
+ adding ? cur_change = '+' : cur_change = '-';
+ if (cur_change != old_change)
+ to_keep += cur_change;
+ to_keep += *x;
+ old_change = cur_change;
+
+ if ((mh->GetNumParams(adding) > 0) && (paramptr < params.size()))
+ params_to_keep.push_back(params[paramptr]);
+ }
+ }
+ else
+ {
+ /* Mode isnt set here, we want it */
+ adding ? cur_change = '+' : cur_change = '-';
+ if (cur_change != old_change)
+ to_keep += cur_change;
+ to_keep += *x;
+ old_change = cur_change;
+
+ if ((mh->GetNumParams(adding) > 0) && (paramptr < params.size()))
+ params_to_keep.push_back(params[paramptr]);
+ }
+
+ paramptr++;
+ }
+ else
+ {
+ mh = ServerInstance->ModeGrok->FindMode(*x, chan ? MODETYPE_CHANNEL : MODETYPE_USER);
+
+ if (mh)
+ {
+ adding ? cur_change = '+' : cur_change = '-';
+
+ /* Just keep this, safe to merge with no checks
+ * it has no parameters
+ */
+
+ if (cur_change != old_change)
+ to_keep += cur_change;
+ to_keep += *x;
+ old_change = cur_change;
+
+ if ((mh->GetNumParams(adding) > 0) && (paramptr < params.size()))
+ {
+ log(DEBUG,"Mode removal %d %d",adding, mh->GetNumParams(adding));
+ params_to_keep.push_back(params[paramptr++]);
+ }
+ }
+ }
+ }
+ else
+ {
+ mh = ServerInstance->ModeGrok->FindMode(*x, chan ? MODETYPE_CHANNEL : MODETYPE_USER);
+
+ if (mh)
+ {
+ /* Taking a mode away */
+ adding ? cur_change = '+' : cur_change = '-';
+
+ if (cur_change != old_change)
+ to_keep += cur_change;
+ to_keep += *x;
+ old_change = cur_change;
+
+ if ((mh->GetNumParams(adding) > 0) && (paramptr < params.size()))
+ params_to_keep.push_back(params[paramptr++]);
+ }
+ }
+ break;
+ }
+ }
+
+ if (to_bounce.length())
+ {
+ std::deque<std::string> newparams;
+ newparams.push_back(params[0]);
+ newparams.push_back(ConvToStr(ourTS));
+ newparams.push_back(to_bounce+params_to_bounce);
+ DoOneToOne(Srv->GetServerName(),"FMODE",newparams,sourceserv);
+ }
+
+ if (to_keep.length())
+ {
+ unsigned int n = 2;
+ unsigned int q = 0;
+ modelist[0] = params[0].c_str();
+ modelist[1] = to_keep.c_str();
+
+ if (params_to_keep.size() > 2)
+ {
+ for (q = 2; (q < params_to_keep.size()) && (q < 64); q++)
+ {
+ log(DEBUG,"Item %d of %d", q, params_to_keep.size());
+ modelist[n++] = params_to_keep[q].c_str();
+ }
+ }
+
+ if (smode)
+ {
+ log(DEBUG,"Send mode");
+ Srv->SendMode(modelist, n+2, who);
+ }
+ else
+ {
+ log(DEBUG,"Send mode client");
+ Srv->CallCommandHandler("MODE", modelist, n+2, who);
+ }
+
+ /* HOT POTATO! PASS IT ON! */
+ DoOneToAllButSender(source,"FMODE",params,sourceserv);
+ }
+ }
+ else
+ /* U-lined servers always win regardless of their TS */
+ if ((TS > ourTS) && (!Srv->IsUlined(source)))
+ {
+ /* Bounce the mode back to its sender.* We use our lower TS, so the other end
+ * SHOULD accept it, if its clock is right.
+ *
+ * NOTE: We should check that we arent bouncing anything thats already set at this end.
+ * If we are, bounce +ourmode to 'reinforce' it. This prevents desyncs.
+ * e.g. They send +l 50, we have +l 10 set. rather than bounce -l 50, we bounce +l 10.
+ *
+ * Thanks to jilles for pointing out this one-hell-of-an-issue before i even finished
+ * writing the code. It took me a while to come up with this solution.
+ *
+ * XXX: BE SURE YOU UNDERSTAND THIS CODE FULLY BEFORE YOU MESS WITH IT.
+ */
+
+ std::deque<std::string> newparams; /* New parameter list we send back */
+ newparams.push_back(params[0]); /* Target, user or channel */
+ newparams.push_back(ConvToStr(ourTS)); /* Timestamp value of the target */
+ newparams.push_back(""); /* This contains the mode string. For now
+ * it's empty, we fill it below.
+ */
+
+ /* Intelligent mode bouncing. Don't just invert, reinforce any modes which are already
+ * set to avoid a desync here.
+ */
+ std::string modebounce = "";
+ bool adding = true;
+ unsigned int t = 3;
+ ModeHandler* mh = NULL;
+ char cur_change = 1;
+ char old_change = 0;
+ for (std::string::iterator x = params[2].begin(); x != params[2].end(); x++)
+ {
+ /* Iterate over all mode chars in the sent set */
+ switch (*x)
+ {
+ /* Adding or subtracting modes? */
+ case '-':
+ adding = false;
+ break;
+ case '+':
+ adding = true;
+ break;
+ default:
+ /* Find the mode handler for this mode */
+ mh = ServerInstance->ModeGrok->FindMode(*x, chan ? MODETYPE_CHANNEL : MODETYPE_USER);
+
+ /* Got a mode handler?
+ * This also prevents us bouncing modes we have no handler for.
+ */
+ if (mh)
+ {
+ ModePair ret;
+ std::string p = "";
+
+ /* Does the mode require a parameter right now?
+ * If it does, fetch it if we can
+ */
+ if ((mh->GetNumParams(adding) > 0) && (t < params.size()))
+ p = params[t++];
+
+ /* Call the ModeSet method to determine if its set with the
+ * given parameter here or not.
+ */
+ ret = mh->ModeSet(smode ? NULL : who, dst, chan, p);
+
+ /* XXX: Really. Dont ask.
+ * Determine from if its set combined with what the current
+ * 'state' is (adding or not) as to wether we should 'invert'
+ * or 'reinforce' the mode change
+ */
+ (!ret.first ? (adding ? cur_change = '-' : cur_change = '+') : (!adding ? cur_change = '-' : cur_change = '+'));
+
+ /* Quickly determine if we have 'flipped' from + to -,
+ * or - to +, to prevent unneccessary +/- chars in the
+ * output string that waste bandwidth
+ */
+ if (cur_change != old_change)
+ modebounce += cur_change;
+ old_change = cur_change;
+
+ /* Add the mode character to the output string */
+ modebounce += mh->GetModeChar();
+
+ /* We got a parameter back from ModeHandler::ModeSet,
+ * are we supposed to be sending one out right now?
+ */
+ if (ret.second.length())
+ {
+ if (mh->GetNumParams(cur_change == '+') > 0)
+ /* Yes we're supposed to be sending out
+ * the parameter. Make sure it goes
+ */
+ newparams.push_back(ret.second);
+ }
+
+ }
+ break;
+ }
+ }
+
+ /* Update the parameters for FMODE with the new 'bounced' string */
+ newparams[2] = modebounce;
+ /* Only send it back the way it came, no need to send it anywhere else */
+ DoOneToOne(Srv->GetServerName(),"FMODE",newparams,sourceserv);
+ log(DEBUG,"FMODE bounced intelligently, our TS less than theirs and the other server is NOT a uline.");
+ }
+ else
+ {
+ log(DEBUG,"Allow modes, TS lower for sender");
+ /* The server was ulined, but something iffy is up with the TS.
+ * Sound the alarm bells!
+ */
+ if ((Srv->IsUlined(sourceserv)) && (TS > ourTS))
+ {
+ WriteOpers("\2WARNING!\2 U-Lined server '%s' has bad TS for '%s' (accepted change): \2SYNC YOUR CLOCKS\2 to avoid this notice",sourceserv.c_str(),params[0].c_str());
+ }
+ /* Allow the mode, route it to either server or user command handling */
+ if (smode)
+ Srv->SendMode(modelist,n,who);
+ else
+ Srv->CallCommandHandler("MODE", modelist, n, who);
+
+ /* HOT POTATO! PASS IT ON! */
+ DoOneToAllButSender(source,"FMODE",params,sourceserv);
+ }
+ /* Are we supposed to free the userrec? */
+ if (smode)
+ DELETE(who);
+
return true;
}
userrec* user = Srv->FindNick(source);
if (!user)
{
- WriteChannelWithServ((char*)source.c_str(), c, "TOPIC %s :%s", c->name, c->topic);
+ c->WriteChannelWithServ(source.c_str(), "TOPIC %s :%s", c->name, c->topic);
}
else
{
- WriteChannel(c, user, "TOPIC %s :%s", c->name, c->topic);
+ c->WriteChannel(user, "TOPIC %s :%s", c->name, c->topic);
nsource = user->server;
}
/* all done, send it on its way */
memset(&mode_users,0,sizeof(mode_users));
mode_users[0] = first;
mode_users[1] = modestring;
- strcpy(mode_users[1],"+");
+ strcpy(modestring,"+");
unsigned int modectr = 2;
userrec* who = NULL;
who = Srv->FindNick(usr);
if (who)
{
- Srv->JoinUserToChannel(who,channel,key);
+ chanrec::JoinUser(who, channel.c_str(), true, key);
if (modectr >= (MAXMODES-1))
{
/* theres a mode for this user. push them onto the mode queue, and flush it
{
/* 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);
+ if (ourTS != TS)
+ {
+ log(DEFAULT,"Channel TS for %s changed from %lu to %lu",us->name,ourTS,TS);
+ us->age = TS;
+ ourTS = TS;
+ }
}
else
{
*mode_users[1] = '-';
for (unsigned int x = 0; x < modectr; x++)
{
+ if (x == 1)
+ {
+ params.push_back(ConvToStr(us->age));
+ }
params.push_back(mode_users[x]);
+
}
// tell everyone to bounce the modes. bad modes, bad!
DoOneToMany(Srv->GetServerName(),"FMODE",params);
/* there werent enough modes built up to flush it during FJOIN,
* or, there are a number left over. flush them out.
*/
- if ((modectr > 2) && (who))
+ if ((modectr > 2) && (who) && (us))
{
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);
+ if (ourTS != TS)
+ {
+ log(DEFAULT,"Channel TS for %s changed from %lu to %lu",us->name,ourTS,TS);
+ us->age = TS;
+ ourTS = TS;
+ }
}
else
{
*mode_users[1] = '-';
for (unsigned int x = 0; x < modectr; x++)
{
+ if (x == 1)
+ {
+ params.push_back(ConvToStr(us->age));
+ }
params.push_back(mode_users[x]);
}
DoOneToMany(Srv->GetServerName(),"FMODE",params);
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)
{
return true;
}
// NICK age nick host dhost ident +modes ip :gecos
- // 0 123 4 56 7
+ // 0 1 2 3 4 5 6 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]->registered = REG_ALL;
clientlist[tempnick]->signon = age;
- strlcpy(clientlist[tempnick]->modes, modes.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);
- 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 (params[6].find_first_of(":") != std::string::npos)
+ clientlist[tempnick]->SetSockAddr(AF_INET6, params[6].c_str(), 0);
+ else
+ clientlist[tempnick]->SetSockAddr(AF_INET, params[6].c_str(), 0);
+
+ WriteOpers("*** Client connecting at %s: %s!%s@%s [%s]",clientlist[tempnick]->server,clientlist[tempnick]->nick,clientlist[tempnick]->ident,clientlist[tempnick]->host, clientlist[tempnick]->GetIPString());
params[7] = ":" + params[7];
DoOneToAllButSender(source,"NICK",params,source);
TreeServer* SourceServer = FindServer(source);
if (SourceServer)
{
- SourceServer->AddUser(clientlist[tempnick]);
+ log(DEBUG,"Found source server of %s",clientlist[tempnick]->nick);
SourceServer->AddUserCount();
}
{
log(DEBUG,"Sending FJOINs to other server for %s",c->name);
char list[MAXBUF];
- std::string individual_halfops = ":"+Srv->GetServerName()+" FMODE "+c->name;
+ std::string individual_halfops = ":"+Srv->GetServerName()+" FMODE "+c->name+" "+ConvToStr(c->age);
size_t dlen, curlen;
dlen = curlen = snprintf(list,MAXBUF,":%s FJOIN %s %lu",Srv->GetServerName().c_str(),c->name,(unsigned long)c->age);
CUList *ulist = c->GetUsers();
std::vector<userrec*> specific_halfop;
std::vector<userrec*> specific_voice;
+ std::string modes = "";
+ std::string params = "";
for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
const char* n = "";
if (x & UCMODE_OP)
- ; {
+ {
n = "@";
}
else if (x & UCMODE_HOP)
numusers = 0;
for (unsigned int y = 0; y < specific_voice.size(); y++)
{
- this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" +v "+specific_voice[y]->nick);
+ modes.append("v");
+ params.append(specific_voice[y]->nick).append(" ");
+ //this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" "+ConvToStr(c->age)+" +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);
+ modes.append("h");
+ params.append(specific_halfop[y]->nick).append(" ");
+ //this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" "+ConvToStr(c->age)+" +h "+specific_halfop[y]->nick);
}
}
}
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);
+ modes.append("v");
+ params.append(specific_voice[y]->nick).append(" ");
+ //this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" "+ConvToStr(c->age)+" +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);
+ modes.append("h");
+ params.append(specific_halfop[y]->nick).append(" ");
+ //this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" "+ConvToStr(c->age)+" +h "+specific_halfop[y]->nick);
}
}
+ //std::string modes = "";
+ //std::string params = "";
+ for (BanList::iterator b = c->bans.begin(); b != c->bans.end(); b++)
+ {
+ modes.append("b");
+ params.append(b->data).append(" ");
+ }
+ /* XXX: Send each channel mode and its params -- we'll need a method for this in ModeHandler? */
+ //FOREACH_MOD(I_OnSyncChannel,OnSyncChannel(c->second,(Module*)TreeProtocolModule,(void*)this));
+ this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" "+ConvToStr(c->age)+" +"+chanmodes(c,true)+modes+" "+params);
}
/* Send G, Q, Z and E lines */
for (chan_hash::iterator c = chanlist.begin(); c != chanlist.end(); c++, iterations++)
{
SendFJoins(Current, c->second);
- 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",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",sn,c->second->name,b->data);
- this->WriteLine(data);
- }
FOREACH_MOD(I_OnSyncChannel,OnSyncChannel(c->second,(Module*)TreeProtocolModule,(void*)this));
list.clear();
c->second->GetExtList(list);
int iterations = 0;
for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++, iterations++)
{
- if (u->second->registered == 7)
+ if (u->second->registered == REG_ALL)
{
- 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->FormatModes(),u->second->GetIPString(),u->second->fullname);
this->WriteLine(data);
if (*u->second->oper)
{
return false;
}
+ bool Stats(std::string prefix, std::deque<std::string> ¶ms)
+ {
+ /* Get the reply to a STATS query if it matches this servername,
+ * and send it back as a load of PUSH queries
+ */
+ if (params.size() > 1)
+ {
+ if (Srv->MatchText(Srv->GetServerName(), params[1]))
+ {
+ /* It's for our server */
+ string_list results;
+ userrec* source = Srv->FindNick(prefix);
+ if (source)
+ {
+ std::deque<std::string> par;
+ par.push_back(prefix);
+ par.push_back("");
+ DoStats(*(params[0].c_str()), source, results);
+ for (size_t i = 0; i < results.size(); i++)
+ {
+ par[1] = "::" + results[i];
+ DoOneToOne(Srv->GetServerName(), "PUSH",par, source->server);
+ }
+ }
+ }
+ else
+ {
+ /* Pass it on */
+ userrec* source = Srv->FindNick(prefix);
+ if (source)
+ DoOneToOne(prefix, "STATS", params, params[1]);
+ }
+ }
+ return true;
+ }
+
+
/* Because the core won't let users or even SERVERS set +o,
* we use the OPERTYPE command to do this.
*/
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;
{
std::deque<std::string> par;
par.push_back(params[1]);
- DoOneToMany(u->nick,"NICK",par);
- Srv->ChangeUserNick(u,params[1]);
+ /* This is not required as one is sent in OnUserPostNick below
+ */
+ //DoOneToMany(u->nick,"NICK",par);
+ if (!u->ForceNickChange(params[1].c_str()))
+ {
+ userrec::QuitUser(u, "Nickname collision");
+ return true;
+ }
u->age = atoi(params[2].c_str());
}
}
if (u)
{
- Srv->JoinUserToChannel(u,params[1],"");
+ chanrec::JoinUser(u, params[1].c_str(), false);
DoOneToAllButSender(prefix,"SVSJOIN",params,prefix);
}
return true;
std::string reason = params[1];
params[1] = ":" + params[1];
DoOneToAllButSender(prefix,"KILL",params,sourceserv);
- Srv->QuitUser(who,reason);
+ ::Write(who->fd, ":%s KILL %s :%s (%s)", sourceserv.c_str(), who->nick, sourceserv.c_str(), reason.c_str());
+ userrec::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());
if (params.size() == 1)
{
userrec* x = Srv->FindNick(params[0]);
- if ((x) && (x->fd > -1))
+ if ((x) && (IS_LOCAL(x)))
{
userrec* x = Srv->FindNick(params[0]);
log(DEBUG,"Got IDLE");
{
std::string who_did_the_whois = params[0];
userrec* who_to_send_to = Srv->FindNick(who_did_the_whois);
- if ((who_to_send_to) && (who_to_send_to->fd > -1))
+ if ((who_to_send_to) && (IS_LOCAL(who_to_send_to)))
{
log(DEBUG,"Got final IDLE");
// an incoming reply to a whois we sent out
std::string nick_whoised = prefix;
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());
+ if ((who_to_send_to) && (IS_LOCAL(who_to_send_to)))
+ 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
- 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());
- }
+ ::Write(u->fd,"%s",params[1].c_str());
}
else
{
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);
return false;
}
- void Split(std::string line, bool stripcolon, std::deque<std::string> &n)
+ void Split(std::string line, std::deque<std::string> &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);
- int count = 0;
- char param[1024];
- char* pptr = param;
-
n.clear();
- int item = 0;
- while (!s.eof())
- {
- char c = 0;
- s.get(c);
- if (c == ' ')
- {
- *pptr = 0;
- if (*param)
- n.push_back(param);
- *param = count = 0;
- pptr = param;
- item++;
- }
- else
- {
- if (!s.eof())
- {
- *pptr++ = c;
- count++;
- }
- if ((*param == ':') && (count == 1) && (item > 0))
- {
- *param = count = 0;
- pptr = param;
- while (!s.eof())
- {
- s.get(c);
- if (!s.eof())
- {
- *pptr++ = c;
- count++;
- }
- }
- *pptr = 0;
- n.push_back(param);
- *param = count = 0;
- pptr = param;
- }
- }
- }
- *pptr = 0;
- if (*param)
- {
+ irc::tokenstream tokens(line);
+ std::string param;
+ while ((param = tokens.GetToken()) != "")
n.push_back(param);
- }
-
return;
}
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(),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 == "STATS")
+ {
+ return this->Stats(prefix, params);
+ }
else if (command == "SERVER")
{
return this->RemoteServer(prefix,params);
chanrec* chan = Srv->FindChannel(params[0]);
if (user && chan)
{
- server_kick_channel(user,chan,(char*)params[2].c_str(),false);
+ if (!chan->ServerKickUser(user, params[2].c_str(), false))
+ /* Yikes, the channels gone! */
+ delete chan;
}
}
if (this->InboundServerName != "")
}
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,
* 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]);
p.push_back(prefix);
p.push_back("Nickname collision");
DoOneToMany(Srv->GetServerName(),"KILL",p);
- Srv->QuitUser(x,"Nickname collision ("+prefix+" -> "+params[0]+")");
+ userrec::QuitUser(x,"Nickname collision ("+prefix+" -> "+params[0]+")");
userrec* y = Srv->FindNick(prefix);
if (y)
{
- Srv->QuitUser(y,"Nickname collision");
+ userrec::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))
{
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;
+
+ found = (std::find(ValidIPs.begin(), ValidIPs.end(), ip) != ValidIPs.end());
+ if (!found)
+ {
+ for (vector<std::string>::iterator i = ValidIPs.begin(); i != ValidIPs.end(); i++)
+ if (MatchCIDR(ip, (*i).c_str()))
+ found = true;
+
+ 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;
}
};
+/** This class is used to resolve server hostnames during /connect and autoconnect.
+ * As of 1.1, the resolver system is seperated out from InspSocket, so we must do this
+ * resolver step first ourselves if we need it. This is totally nonblocking, and will
+ * callback to OnLookupComplete or OnError when completed. Once it has completed we
+ * will have an IP address which we can then use to continue our connection.
+ */
+class ServernameResolver : public Resolver
+{
+ private:
+ /** A copy of the Link tag info for what we're connecting to.
+ * We take a copy, rather than using a pointer, just in case the
+ * admin takes the tag away and rehashes while the domain is resolving.
+ */
+ Link MyLink;
+ public:
+ ServernameResolver(const std::string &hostname, Link x) : Resolver(hostname, DNS_QUERY_FORWARD), MyLink(x)
+ {
+ /* Nothing in here, folks */
+ }
+
+ void OnLookupComplete(const std::string &result)
+ {
+ /* Initiate the connection, now that we have an IP to use.
+ * Passing a hostname directly to InspSocket causes it to
+ * just bail and set its FD to -1.
+ */
+ TreeServer* CheckDupe = FindServer(MyLink.Name.c_str());
+ if (!CheckDupe) /* Check that nobody tried to connect it successfully while we were resolving */
+ {
+ TreeSocket* newsocket = new TreeSocket(result,MyLink.Port,false,10,MyLink.Name.c_str());
+ if (newsocket->GetFd() > -1)
+ {
+ /* We're all OK */
+ Srv->AddSocket(newsocket);
+ }
+ else
+ {
+ /* Something barfed, show the opers */
+ WriteOpers("*** CONNECT: Error connecting \002%s\002: %s.",MyLink.Name.c_str(),strerror(errno));
+ delete newsocket;
+ }
+ }
+ }
+
+ void OnError(ResolverError e, const std::string &errormessage)
+ {
+ /* Ooops! */
+ WriteOpers("*** CONNECT: Error connecting \002%s\002: Unable to resolve hostname - %s",MyLink.Name.c_str(),errormessage.c_str());
+ }
+};
+
+class SecurityIPResolver : public Resolver
+{
+ private:
+ Link MyLink;
+ public:
+ SecurityIPResolver(const std::string &hostname, Link x) : Resolver(hostname, DNS_QUERY_FORWARD), MyLink(x)
+ {
+ }
+
+ void OnLookupComplete(const std::string &result)
+ {
+ log(DEBUG,"Security IP cache: Adding IP address '%s' for Link '%s'",result.c_str(),MyLink.Name.c_str());
+ ValidIPs.push_back(result);
+ }
+
+ void OnError(ResolverError e, const std::string &errormessage)
+ {
+ log(DEBUG,"Could not resolve IP associated with Link '%s': %s",MyLink.Name.c_str(),errormessage.c_str());
+ }
+};
+
void AddThisServer(TreeServer* server, std::deque<TreeServer*> &list)
{
for (unsigned int c = 0; c < list.size(); c++)
TreeServer* omitroute = BestRouteTo(omit);
if ((command == "NOTICE") || (command == "PRIVMSG"))
{
- if ((params.size() >= 2) && (*(params[0].c_str()) != '$'))
+ if (params.size() >= 2)
{
/* Prefixes */
if ((*(params[0].c_str()) == '@') || (*(params[0].c_str()) == '%') || (*(params[0].c_str()) == '+'))
{
params[0] = params[0].substr(1, params[0].length()-1);
}
- if (*(params[0].c_str()) != '#')
+ if ((*(params[0].c_str()) != '#') && (*(params[0].c_str()) != '$'))
{
// special routing for private messages/notices
userrec* d = Srv->FindNick(params[0]);
return true;
}
}
+ else if (*(params[0].c_str()) == '$')
+ {
+ std::deque<std::string> par;
+ par.push_back(params[0]);
+ par.push_back(":"+params[1]);
+ DoOneToAllButSender(prefix,command.c_str(),par,omitroute->GetName());
+ return true;
+ }
else
{
log(DEBUG,"Channel privmsg going to chan %s",params[0].c_str());
{
log(DEFAULT,"m_spanningtree: Warning: Failed to bind server port %d",Port);
listener->Close();
- delete listener;
+ DELETE(listener);
}
}
}
FlatLinks = Conf->ReadFlag("options","flatlinks",0);
HideULines = Conf->ReadFlag("options","hideulines",0);
LinkBlocks.clear();
+ ValidIPs.clear();
for (int j =0; j < Conf->Enumerate("link"); j++)
{
Link L;
+ std::string Allow = Conf->ReadValue("link","allowmask",j);
L.Name = (Conf->ReadValue("link","name",j)).c_str();
L.IPAddr = Conf->ReadValue("link","ipaddr",j);
L.Port = Conf->ReadInteger("link","port",j,true);
/* Bugfix by brain, do not allow people to enter bad configurations */
if ((L.IPAddr != "") && (L.RecvPass != "") && (L.SendPass != "") && (L.Name != "") && (L.Port))
{
+ ValidIPs.push_back(L.IPAddr);
+
+ if (Allow.length())
+ ValidIPs.push_back(Allow);
+
+ /* Needs resolving */
+ insp_inaddr binip;
+ if (insp_aton(L.IPAddr.c_str(), &binip) < 1)
+ {
+ try
+ {
+ SecurityIPResolver* sr = new SecurityIPResolver(L.IPAddr, L);
+ Srv->AddResolver(sr);
+ }
+ catch (ModuleException& e)
+ {
+ log(DEBUG,"Error in resolver: %s",e.GetReason());
+ }
+ }
+
LinkBlocks.push_back(L);
log(DEBUG,"m_spanningtree: Read server %s with host %s:%d",L.Name.c_str(),L.IPAddr.c_str(),L.Port);
}
}
}
}
- delete Conf;
+ DELETE(Conf);
}
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();
max_global = n_users;
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());
+ if (usercount_opers())
+ WriteServ(user->fd,"252 %s %d :operator(s) online",user->nick,usercount_opers());
+ if (usercount_unknown())
+ WriteServ(user->fd,"253 %s %d :unknown connections",user->nick,usercount_unknown());
+ if (chancount())
+ 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,n_users,max_global);
}
}
+ int HandleStats(const char** parameters, int pcnt, userrec* user)
+ {
+ if (pcnt > 1)
+ {
+ /* Remote STATS, the server is within the 2nd parameter */
+ std::deque<std::string> params;
+ params.push_back(parameters[0]);
+ params.push_back(parameters[1]);
+ /* Send it out remotely, generate no reply yet */
+ TreeServer* s = FindServerMask(parameters[1]);
+ if (s)
+ {
+ params[1] = s->GetName();
+ DoOneToOne(user->nick, "STATS", params, s->GetName());
+ }
+ else
+ {
+ WriteServ(user->fd, "402 %s %s :No such server", user->nick, parameters[0]);
+ }
+ return 1;
+ }
+ return 0;
+ }
+
// Ok, prepare to be confused.
// After much mulling over how to approach this, it struck me that
// the 'usual' way of doing a /MAP isnt the best way. Instead of
// (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))
+ if ((IS_LOCAL(user)) && (pcnt))
{
TreeServer* found = FindServerMask(parameters[0]);
if (found)
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))
+ if ((IS_LOCAL(user)) && (pcnt > 1))
{
userrec* remote = Srv->FindNick(parameters[1]);
if ((remote) && (remote->fd < 0))
{
// 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)
+
+ insp_inaddr binip;
+
+ /* Do we already have an IP? If so, no need to resolve it. */
+ if (insp_aton(x->IPAddr.c_str(), &binip) > 0)
{
- Srv->AddSocket(newsocket);
+ TreeSocket* newsocket = new TreeSocket(x->IPAddr,x->Port,false,10,x->Name.c_str());
+ if (newsocket->GetFd() > -1)
+ {
+ Srv->AddSocket(newsocket);
+ }
+ else
+ {
+ WriteOpers("*** AUTOCONNECT: Error autoconnecting \002%s\002: %s.",x->Name.c_str(),strerror(errno));
+ delete newsocket;
+ }
}
else
{
- WriteOpers("*** AUTOCONNECT: Error autoconnecting \002%s\002.",x->Name.c_str());
- delete newsocket;
+ try
+ {
+ ServernameResolver* snr = new ServernameResolver(x->IPAddr, *x);
+ Srv->AddResolver(snr);
+ }
+ catch (ModuleException& e)
+ {
+ log(DEBUG,"Error in resolver: %s",e.GetReason());
+ }
}
+
}
}
}
}
- 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++)
{
if (!CheckDupe)
{
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)
+ insp_inaddr binip;
+
+ /* Do we already have an IP? If so, no need to resolve it. */
+ if (insp_aton(x->IPAddr.c_str(), &binip) > 0)
{
- Srv->AddSocket(newsocket);
+ TreeSocket* newsocket = new TreeSocket(x->IPAddr,x->Port,false,10,x->Name.c_str());
+ if (newsocket->GetFd() > -1)
+ {
+ Srv->AddSocket(newsocket);
+ }
+ else
+ {
+ WriteOpers("*** CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno));
+ delete newsocket;
+ }
}
else
{
- WriteServ(user->fd,"NOTICE %s :*** CONNECT: Error connecting \002%s\002.",user->nick,x->Name.c_str());
- delete newsocket;
+ try
+ {
+ ServernameResolver* snr = new ServernameResolver(x->IPAddr, *x);
+ Srv->AddResolver(snr);
+ }
+ catch (ModuleException& e)
+ {
+ log(DEBUG,"Error in resolver: %s",e.GetReason());
+ }
}
return 1;
}
return 1;
}
- virtual int OnStats(char statschar, userrec* user)
+ virtual int OnStats(char statschar, userrec* user, string_list &results)
{
if (statschar == 'c')
{
for (unsigned int i = 0; i < LinkBlocks.size(); i++)
{
- WriteServ(user->fd,"213 %s C *@%s * %s %d 0 %c%c%c",user->nick,(LinkBlocks[i].HiddenFromStats ? "<hidden>" : LinkBlocks[i].IPAddr).c_str(),LinkBlocks[i].Name.c_str(),LinkBlocks[i].Port,(LinkBlocks[i].EncryptionKey != "" ? 'e' : '-'),(LinkBlocks[i].AutoConnect ? 'a' : '-'),'s');
- WriteServ(user->fd,"244 %s H * * %s",user->nick,LinkBlocks[i].Name.c_str());
+ results.push_back(Srv->GetServerName()+" 213 "+user->nick+" C *@"+(LinkBlocks[i].HiddenFromStats ? "<hidden>" : LinkBlocks[i].IPAddr)+" * "+LinkBlocks[i].Name.c_str()+" "+ConvToStr(LinkBlocks[i].Port)+" "+(LinkBlocks[i].EncryptionKey != "" ? 'e' : '-')+(LinkBlocks[i].AutoConnect ? 'a' : '-')+'s');
+ results.push_back(Srv->GetServerName()+" 244 "+user->nick+" H * * "+LinkBlocks[i].Name.c_str());
}
- WriteServ(user->fd,"219 %s %c :End of /STATS report",user->nick,statschar);
- WriteOpers("*** Notice: Stats '%c' requested by %s (%s@%s)",statschar,user->nick,user->ident,user->host);
+ results.push_back(Srv->GetServerName()+" 219 "+user->nick+" "+statschar+" :End of /STATS report");
+ WriteOpers("*** Notice: %s '%c' requested by %s (%s@%s)",(!strcmp(user->server,Config->ServerName) ? "Stats" : "Remote stats"),statschar,user->nick,user->ident,user->host);
return 1;
}
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)
{
return this->HandleConnect(parameters,pcnt,user);
}
+ else if (command == "STATS")
+ {
+ return this->HandleStats(parameters,pcnt,user);
+ }
else if (command == "SQUIT")
{
return this->HandleSquit(parameters,pcnt,user);
virtual void OnUserInvite(userrec* source,userrec* dest,chanrec* channel)
{
- if (source->fd > -1)
+ if (IS_LOCAL(source))
{
std::deque<std::string> params;
params.push_back(dest->nick);
virtual void OnWallops(userrec* user, const std::string &text)
{
- if (user->fd > -1)
+ if (IS_LOCAL(user))
{
std::deque<std::string> params;
params.push_back(":"+text);
if (target_type == TYPE_USER)
{
userrec* d = (userrec*)dest;
- if ((d->fd < 0) && (user->fd > -1))
+ if ((d->fd < 0) && (IS_LOCAL(user)))
{
std::deque<std::string> params;
params.clear();
DoOneToOne(user->nick,"NOTICE",params,d->server);
}
}
- else
+ else if (target_type == TYPE_CHANNEL)
{
- if (user->fd > -1)
+ if (IS_LOCAL(user))
{
chanrec *c = (chanrec*)dest;
std::string cname = c->name;
}
}
}
+ else if (target_type == TYPE_SERVER)
+ {
+ if (IS_LOCAL(user))
+ {
+ char* target = (char*)dest;
+ std::deque<std::string> par;
+ par.push_back(target);
+ par.push_back(":"+text);
+ DoOneToMany(user->nick,"NOTICE",par);
+ }
+ }
}
virtual void OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status)
// route private messages which are targetted at clients only to the server
// which needs to receive them
userrec* d = (userrec*)dest;
- if ((d->fd < 0) && (user->fd > -1))
+ if ((d->fd < 0) && (IS_LOCAL(user)))
{
std::deque<std::string> params;
params.clear();
DoOneToOne(user->nick,"PRIVMSG",params,d->server);
}
}
- else
+ else if (target_type == TYPE_CHANNEL)
{
- if (user->fd > -1)
+ if (IS_LOCAL(user))
{
chanrec *c = (chanrec*)dest;
std::string cname = c->name;
}
}
}
+ else if (target_type == TYPE_SERVER)
+ {
+ if (IS_LOCAL(user))
+ {
+ char* target = (char*)dest;
+ std::deque<std::string> par;
+ par.push_back(target);
+ par.push_back(":"+text);
+ DoOneToMany(user->nick,"PRIVMSG",par);
+ }
+ }
}
virtual void OnBackgroundTimer(time_t curtime)
virtual void OnUserJoin(userrec* user, chanrec* channel)
{
// Only do this for local users
- if (user->fd > -1)
+ if (IS_LOCAL(user))
{
std::deque<std::string> params;
params.clear();
virtual void OnChangeHost(userrec* user, const std::string &newhost)
{
// only occurs for local clients
- if (user->registered != 7)
+ if (user->registered != REG_ALL)
return;
std::deque<std::string> params;
params.push_back(newhost);
virtual void OnChangeName(userrec* user, const std::string &gecos)
{
// only occurs for local clients
- if (user->registered != 7)
+ if (user->registered != REG_ALL)
return;
std::deque<std::string> params;
params.push_back(gecos);
virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage)
{
- if (user->fd > -1)
+ if (IS_LOCAL(user))
{
std::deque<std::string> params;
params.push_back(channel->name);
virtual void OnUserConnect(userrec* user)
{
char agestr[MAXBUF];
- if (user->fd > -1)
+ if (IS_LOCAL(user))
{
std::deque<std::string> params;
snprintf(agestr,MAXBUF,"%lu",(unsigned long)user->age);
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((char*)inet_ntoa(user->ip4));
+ params.push_back("+"+std::string(user->FormatModes()));
+ params.push_back(user->GetIPString());
params.push_back(":"+std::string(user->fullname));
DoOneToMany(Srv->GetServerName(),"NICK",params);
virtual void OnUserQuit(userrec* user, const std::string &reason)
{
- if ((user->fd > -1) && (user->registered == 7))
+ if ((IS_LOCAL(user)) && (user->registered == REG_ALL))
{
std::deque<std::string> params;
params.push_back(":"+reason);
virtual void OnUserPostNick(userrec* user, const std::string &oldnick)
{
- if (user->fd > -1)
+ if (IS_LOCAL(user))
{
std::deque<std::string> params;
params.push_back(user->nick);
virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason)
{
- if ((source) && (source->fd > -1))
+ if ((source) && (IS_LOCAL(source)))
{
std::deque<std::string> params;
params.push_back(chan->name);
// locally.
virtual void OnOper(userrec* user, const std::string &opertype)
{
- if (user->fd > -1)
+ if (IS_LOCAL(user))
{
std::deque<std::string> params;
params.push_back(opertype);
void OnLine(userrec* source, const std::string &host, bool adding, char linetype, long duration, const std::string &reason)
{
- if (source->fd > -1)
+ if (IS_LOCAL(source))
{
char type[8];
snprintf(type,8,"%cLINE",linetype);
virtual void OnMode(userrec* user, void* dest, int target_type, const std::string &text)
{
- if ((user->fd > -1) && (user->registered == 7))
+ if ((IS_LOCAL(user)) && (user->registered == REG_ALL))
{
if (target_type == TYPE_USER)
{
if (target_type == TYPE_USER)
{
userrec* u = (userrec*)target;
- s->WriteLine(":"+Srv->GetServerName()+" FMODE "+u->nick+" "+modeline);
+ s->WriteLine(":"+Srv->GetServerName()+" FMODE "+u->nick+" "+ConvToStr(u->age)+" "+modeline);
}
else
{
chanrec* c = (chanrec*)target;
- s->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" "+modeline);
+ s->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" "+ConvToStr(c->age)+" "+modeline);
}
}
}
(*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;
+ // Insert the TS value of the object, either userrec or chanrec
+ time_t ourTS = 0;
+ userrec* a = Srv->FindNick((*params)[0]);
+ if (a)
+ {
+ ourTS = a->age;
+ }
+ else
+ {
+ chanrec* a = Srv->FindChannel((*params)[0]);
+ if (a)
+ {
+ ourTS = a->age;
+ }
+ }
+ params->insert(params->begin() + 1,ConvToStr(ourTS));
+ DoOneToMany(Srv->GetServerName(),"FMODE",*params);
+ }
}
virtual ~ModuleSpanningTree()
projects / user / henk / code / inspircd.git / blobdiff