X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree.cpp;h=7e7e91382e44cad7cc3e2c6d0e31bf60e65cbf8c;hb=8144a16f89b75f527e4d860e7176c9c1a8b14eca;hp=caa5c335300617ac303d7a280896c9948a096461;hpb=844abcbc569f68e3aa9adc04bad599117ed55327;p=user%2Fhenk%2Fcode%2Finspircd.git
diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index caa5c3353..7e7e91382 100644
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -37,7 +37,7 @@ using namespace std;
/** If you make a change which breaks the protocol, increment this.
* If you completely change the protocol, completely change the number.
*/
-const long ProtocolVersion = 1100;
+const long ProtocolVersion = 1101;
/*
* The server list in InspIRCd is maintained as two structures
@@ -66,7 +66,7 @@ class ModuleSpanningTree;
static ModuleSpanningTree* TreeProtocolModule;
static InspIRCd* ServerInstance;
-/* Any socket can have one of five states at any one time.
+/** Any socket can have one of five states at any one time.
* The LISTENER state indicates a socket which is listening
* for connections. It cannot receive data itself, only incoming
* sockets.
@@ -165,7 +165,7 @@ class UserManager : public classbase
};
-/* Each server in the tree is represented by one class of
+/** 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
* remote servers, the TreeSocket entry will be NULL.
@@ -179,7 +179,6 @@ class UserManager : public classbase
* TreeServer items, deleting and inserting them as they
* are created and destroyed.
*/
-
class TreeServer : public classbase
{
InspIRCd* ServerInstance; /* Creator */
@@ -197,7 +196,7 @@ class TreeServer : public classbase
public:
- /* We don't use this constructor. Its a dummy, and won't cause any insertion
+ /** We don't use this constructor. Its a dummy, and won't cause any insertion
* of the TreeServer into the hash_map. See below for the two we DO use.
*/
TreeServer(InspIRCd* Instance) : ServerInstance(Instance)
@@ -210,7 +209,7 @@ class TreeServer : public classbase
VersionString = ServerInstance->GetVersionString();
}
- /* We use this constructor only to create the 'root' item, TreeRoot, which
+ /** We use this constructor only to create the 'root' item, TreeRoot, which
* represents our own server. Therefore, it has no route, no parent, and
* no socket associated with it. Its version string is our own local version.
*/
@@ -225,7 +224,7 @@ class TreeServer : public classbase
AddHashEntry();
}
- /* When we create a new server, we call this constructor to initialize it.
+ /** When we create a new server, we call this constructor to initialize it.
* This constructor initializes the server's Route and Parent, and sets up
* its ping counters so that it will be pinged one minute from now.
*/
@@ -313,7 +312,7 @@ class TreeServer : public classbase
return time_to_die.size();
}
- /* This method is used to add the structure to the
+ /** This method is used to add the structure to the
* hash_map for linear searches. It is only called
* by the constructors.
*/
@@ -325,7 +324,7 @@ class TreeServer : public classbase
serverlist[this->ServerName.c_str()] = this;
}
- /* This method removes the reference to this object
+ /** This method removes the reference to this object
* from the hash_map which is used for linear searches.
* It is only called by the default destructor.
*/
@@ -337,10 +336,9 @@ class TreeServer : public classbase
serverlist.erase(iter);
}
- /* These accessors etc should be pretty self-
+ /** These accessors etc should be pretty self-
* explanitory.
*/
-
TreeServer* GetRoute()
{
return Route;
@@ -457,7 +455,7 @@ class TreeServer : public classbase
return false;
}
- /* Removes child nodes of this node, and of that node, etc etc.
+ /** Removes child nodes of this node, and of that node, etc etc.
* This is used during netsplits to automatically tidy up the
* server tree. It is slow, we don't use it for much else.
*/
@@ -487,13 +485,12 @@ class TreeServer : public classbase
}
};
-/* The Link class might as well be a struct,
+/** The Link class might as well be a struct,
* but this is C++ and we don't believe in structs (!).
* It holds the entire information of one
* tag from the main config file. We maintain a list
* of them, and populate the list on rehash/load.
*/
-
class Link : public classbase
{
public:
@@ -520,7 +517,7 @@ Link* FindLink(const std::string& name);
ConfigReader *Conf;
std::vector LinkBlocks;
-/* Yay for fast searches!
+/** Yay for fast searches!
* This is hundreds of times faster than recursion
* or even scanning a linked list, especially when
* there are more than a few servers to deal with.
@@ -540,7 +537,7 @@ TreeServer* FindServer(std::string ServerName)
}
}
-/* Returns the locally connected server we must route a
+/** Returns the locally connected server we must route a
* message through to reach server 'ServerName'. This
* only applies to one-to-one and not one-to-many routing.
* See the comments for the constructor of TreeServer
@@ -561,7 +558,7 @@ TreeServer* BestRouteTo(std::string ServerName)
}
}
-/* Find the first server matching a given glob mask.
+/** Find the first server matching a given glob mask.
* Theres no find-using-glob method of hash_map [awwww :-(]
* so instead, we iterate over the list using an iterator
* and match each one until we get a hit. Yes its slow,
@@ -604,7 +601,8 @@ class cmd_rconnect : public command_t
ServerInstance->SNO->WriteToSnoMask('l',"Remote CONNECT from %s matching \002%s\002, connecting server \002%s\002",user->nick,parameters[0],parameters[1]);
const char* para[1];
para[0] = parameters[1];
- Creator->OnPreCommand("CONNECT", para, 1, user, true);
+ std::string original_command = std::string("CONNECT ") + parameters[1];
+ Creator->OnPreCommand("CONNECT", para, 1, user, true, original_command);
return CMD_SUCCESS;
}
@@ -615,7 +613,7 @@ class cmd_rconnect : public command_t
-/* Every SERVER connection inbound or outbound is represented by
+/** Every SERVER connection inbound or outbound is represented by
* an object of type TreeSocket.
* TreeSockets, being inherited from InspSocket, can be tied into
* the core socket engine, and we cn therefore receive activity events
@@ -626,7 +624,6 @@ class cmd_rconnect : public command_t
* maintain a list of servers, some of which are directly connected,
* some of which are not.
*/
-
class TreeSocket : public InspSocket
{
std::string myhost;
@@ -647,7 +644,7 @@ class TreeSocket : public InspSocket
public:
- /* Because most of the I/O gubbins are encapsulated within
+ /** Because most of the I/O gubbins are encapsulated within
* InspSocket, we just call the superclass constructor for
* most of the action, and append a few of our own values
* to it.
@@ -670,7 +667,7 @@ class TreeSocket : public InspSocket
this->ctx_out = NULL;
}
- /* When a listening socket gives us a new file descriptor,
+ /** When a listening socket gives us a new file descriptor,
* we must associate it with a socket without creating a new
* connection. This constructor is used for this purpose.
*/
@@ -698,13 +695,13 @@ class TreeSocket : public InspSocket
ctx_in = new AES();
ctx_out = new AES();
- ServerInstance->Log(DEBUG,"Initialized AES key %s",key.c_str());
+ Instance->Log(DEBUG,"Initialized AES key %s",key.c_str());
// key must be 16, 24, 32 etc bytes (multiple of 8)
keylength = key.length();
if (!(keylength == 16 || keylength == 24 || keylength == 32))
{
this->Instance->SNO->WriteToSnoMask('l',"\2ERROR\2: Key length for encryptionkey is not 16, 24 or 32 bytes in length!");
- ServerInstance->Log(DEBUG,"Key length not 16, 24 or 32 characters!");
+ Instance->Log(DEBUG,"Key length not 16, 24 or 32 characters!");
}
else
{
@@ -716,7 +713,7 @@ class TreeSocket : public InspSocket
}
}
- /* When an outbound connection finishes connecting, we receive
+ /** When an outbound connection finishes connecting, we receive
* this event, and must send our SERVER string to the other
* side. If the other side is happy, as outlined in the server
* to server docs on the inspircd.org site, the other side
@@ -731,7 +728,7 @@ class TreeSocket : public InspSocket
{
if (x->Name == this->myhost)
{
- this->Instance->SNO->WriteToSnoMask('l',"Connection to \2"+myhost+"\2["+(x->HiddenFromStats ? "" : this->GetIP())+"] established.");
+ this->Instance->SNO->WriteToSnoMask('l',"Connection to \2"+myhost+"\2["+(x->HiddenFromStats ? "" : this->GetIP())+"] started.");
this->SendCapabilities();
if (x->EncryptionKey != "")
{
@@ -783,7 +780,7 @@ class TreeSocket : public InspSocket
return true;
}
- /* Recursively send the server tree with distances as hops.
+ /** Recursively send the server tree with distances as hops.
* This is used during network burst to inform the other server
* (and any of ITS servers too) of what servers we know about.
* If at any point any of these servers already exist on the other
@@ -1026,7 +1023,7 @@ class TreeSocket : public InspSocket
return true;
}
- /* This function forces this server to quit, removing this server
+ /** This function forces this server to quit, removing this server
* and any users on it (and servers and users below that, etc etc).
* It's very slow and pretty clunky, but luckily unless your network
* is having a REAL bad hair day, this function shouldnt be called
@@ -1048,7 +1045,7 @@ class TreeSocket : public InspSocket
num_lost_users += Current->QuitUsers(from);
}
- /* This is a wrapper function for SquitServer above, which
+ /** This is a wrapper function for SquitServer above, which
* does some validation first and passes on the SQUIT to all
* other remaining servers.
*/
@@ -1079,11 +1076,11 @@ class TreeSocket : public InspSocket
}
else
{
- ServerInstance->Log(DEFAULT,"Squit from unknown server");
+ Instance->Log(DEFAULT,"Squit from unknown server");
}
}
- /* FMODE command - server mode with timestamp checks */
+ /** FMODE command - server mode with timestamp checks */
bool ForceMode(std::string source, std::deque ¶ms)
{
/* Chances are this is a 1.0 FMODE without TS */
@@ -1154,7 +1151,7 @@ class TreeSocket : public InspSocket
*/
if (TS == ourTS)
{
- ServerInstance->Log(DEBUG,"Entering TS equality check");
+ Instance->Log(DEBUG,"Entering TS equality check");
ModeHandler* mh = NULL;
unsigned long paramptr = 3;
std::string to_bounce = "";
@@ -1264,7 +1261,7 @@ class TreeSocket : public InspSocket
if ((mh->GetNumParams(adding) > 0) && (paramptr < params.size()))
{
- ServerInstance->Log(DEBUG,"Mode removal %d %d",adding, mh->GetNumParams(adding));
+ Instance->Log(DEBUG,"Mode removal %d %d",adding, mh->GetNumParams(adding));
params_to_keep.push_back(params[paramptr++]);
}
}
@@ -1298,7 +1295,7 @@ class TreeSocket : public InspSocket
newparams.push_back(params[0]);
newparams.push_back(ConvToStr(ourTS));
newparams.push_back(to_bounce+params_to_bounce);
- ServerInstance->Log(DEBUG,"BOUNCE BACK: %s",(to_bounce+params_to_bounce).c_str());
+ Instance->Log(DEBUG,"BOUNCE BACK: %s",(to_bounce+params_to_bounce).c_str());
DoOneToOne(this->Instance->Config->ServerName,"FMODE",newparams,sourceserv);
}
@@ -1309,23 +1306,23 @@ class TreeSocket : public InspSocket
modelist[0] = params[0].c_str();
modelist[1] = to_keep.c_str();
- if (params_to_keep.size() > 2)
+ if (params_to_keep.size() > 1)
{
- for (q = 2; (q < params_to_keep.size()) && (q < 64); q++)
+ for (q = 0; (q < params_to_keep.size()) && (q < 64); q++)
{
- ServerInstance->Log(DEBUG,"KEEP Item %d of %d: %s", q, params_to_keep.size(), params_to_keep[q].c_str());
+ Instance->Log(DEBUG,"KEEP Item %d of %d: %s", q, params_to_keep.size(), params_to_keep[q].c_str());
modelist[n++] = params_to_keep[q].c_str();
}
}
if (smode)
{
- ServerInstance->Log(DEBUG,"Send mode");
+ Instance->Log(DEBUG,"Send mode");
this->Instance->SendMode(modelist, n+2, who);
}
else
{
- ServerInstance->Log(DEBUG,"Send mode client");
+ Instance->Log(DEBUG,"Send mode client");
this->Instance->CallCommandHandler("MODE", modelist, n+2, who);
}
@@ -1440,11 +1437,11 @@ class TreeSocket : public InspSocket
newparams[2] = modebounce;
/* Only send it back the way it came, no need to send it anywhere else */
DoOneToOne(this->Instance->Config->ServerName,"FMODE",newparams,sourceserv);
- ServerInstance->Log(DEBUG,"FMODE bounced intelligently, our TS less than theirs and the other server is NOT a uline.");
+ Instance->Log(DEBUG,"FMODE bounced intelligently, our TS less than theirs and the other server is NOT a uline.");
}
else
{
- ServerInstance->Log(DEBUG,"Allow modes, TS lower for sender");
+ Instance->Log(DEBUG,"Allow modes, TS lower for sender");
/* The server was ulined, but something iffy is up with the TS.
* Sound the alarm bells!
*/
@@ -1468,7 +1465,7 @@ class TreeSocket : public InspSocket
return true;
}
- /* FTOPIC command */
+ /** FTOPIC command */
bool ForceTopic(std::string source, std::deque ¶ms)
{
if (params.size() != 4)
@@ -1512,7 +1509,7 @@ class TreeSocket : public InspSocket
return true;
}
- /* FJOIN, similar to unreal SJOIN */
+ /** FJOIN, similar to unreal SJOIN */
bool ForceJoin(std::string source, std::deque ¶ms)
{
if (params.size() < 3)
@@ -1549,7 +1546,23 @@ class TreeSocket : public InspSocket
ourTS = us->age;
}
- ServerInstance->Log(DEBUG,"FJOIN detected, our TS=%lu, their TS=%lu",ourTS,TS);
+ /* XXX: PAY ATTENTION:
+ * In 1.1, if they have the newer channel, we immediately clear
+ * all status modes from our users. We then accept their modes.
+ * If WE have the newer channel its the other side's job to do this.
+ * Note that this causes the losing server to send out confirming
+ * FMODE lines.
+ */
+ if ((ourTS > TS) || (this->Instance->ULine(source.c_str())))
+ {
+ Instance->Log(DEBUG,"FJOIN detected, our TS=%lu, their TS=%lu",ourTS,TS);
+ std::deque param_list;
+ us->age = TS;
+ ourTS = TS;
+ param_list.push_back(chan->name);
+ Instance->Log(DEBUG,"REMOVE ALL STATUS MODES FROM OUR USERS *NOW*");
+ this->RemoveStatus(Instance->Config->ServerName, param_list);
+ }
irc::tokenstream users(params[2]);
std::string item = "*";
@@ -1572,7 +1585,7 @@ class TreeSocket : public InspSocket
int ntimes = 0;
while ((*permissions) && (*permissions != ','))
{
- ModeHandler* mh = ServerInstance->Modes->FindPrefix(*permissions);
+ ModeHandler* mh = Instance->Modes->FindPrefix(*permissions);
if (mh)
{
ntimes++;
@@ -1591,7 +1604,7 @@ class TreeSocket : public InspSocket
/* Did they get any modes? How many times? */
for (int k = 0; k < ntimes; k++)
- mode_users[modectr++] = strdup(usr); // XXX
+ mode_users[modectr++] = strdup(usr);
who = this->Instance->FindNick(usr);
if (who)
@@ -1605,34 +1618,15 @@ class TreeSocket : public InspSocket
if ((ourTS >= TS) || (this->Instance->ULine(who->server)))
{
/* We also always let u-lined clients win, no matter what the TS value */
- ServerInstance->Log(DEBUG,"Our our channel newer than theirs, accepting their modes");
+ Instance->Log(DEBUG,"Our our channel newer than theirs, accepting their modes");
this->Instance->SendMode((const char**)mode_users,modectr,who);
if (ourTS != TS)
{
- ServerInstance->Log(DEFAULT,"Channel TS for %s changed from %lu to %lu",us->name,ourTS,TS);
+ Instance->Log(DEFAULT,"Channel TS for %s changed from %lu to %lu",us->name,ourTS,TS);
us->age = TS;
ourTS = TS;
}
}
- else
- {
- ServerInstance->Log(DEBUG,"Their channel newer than ours, bouncing their modes");
- /* bouncy bouncy! */
- std::deque params;
- /* modes are now being UNSET... */
- *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(this->Instance->Config->ServerName,"FMODE",params);
- }
strcpy(mode_users[1],"+");
for (unsigned int f = 2; f < modectr; f++)
free(mode_users[f]);
@@ -1641,7 +1635,7 @@ class TreeSocket : public InspSocket
}
else
{
- ServerInstance->Log(SPARSE,"Warning! Invalid user %s in FJOIN to channel %s IGNORED", who->nick, channel.c_str());
+ Instance->Log(SPARSE,"Warning! Invalid user in FJOIN to channel %s IGNORED", channel.c_str());
continue;
}
}
@@ -1653,30 +1647,15 @@ class TreeSocket : public InspSocket
{
if (ourTS >= TS)
{
- ServerInstance->Log(DEBUG,"Our our channel newer than theirs, accepting their modes");
+ Instance->Log(DEBUG,"Our our channel newer than theirs, accepting their modes");
this->Instance->SendMode((const char**)mode_users,modectr,who);
if (ourTS != TS)
{
- ServerInstance->Log(DEFAULT,"Channel TS for %s changed from %lu to %lu",us->name,ourTS,TS);
+ Instance->Log(DEFAULT,"Channel TS for %s changed from %lu to %lu",us->name,ourTS,TS);
us->age = TS;
ourTS = TS;
}
}
- else
- {
- ServerInstance->Log(DEBUG,"Their channel newer than ours, bouncing their modes");
- std::deque params;
- *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(this->Instance->Config->ServerName,"FMODE",params);
- }
for (unsigned int f = 2; f < modectr; f++)
free(mode_users[f]);
@@ -1684,7 +1663,7 @@ class TreeSocket : public InspSocket
return true;
}
- /* NICK command */
+ /** NICK command */
bool IntroduceClient(std::string source, std::deque ¶ms)
{
if (params.size() < 8)
@@ -1706,14 +1685,14 @@ class TreeSocket : public InspSocket
params[5] = params[5].substr(pos_after_plus);
const char* tempnick = params[1].c_str();
- ServerInstance->Log(DEBUG,"Introduce client %s!%s@%s",tempnick,params[4].c_str(),params[2].c_str());
+ Instance->Log(DEBUG,"Introduce client %s!%s@%s",tempnick,params[4].c_str(),params[2].c_str());
user_hash::iterator iter = this->Instance->clientlist.find(tempnick);
if (iter != this->Instance->clientlist.end())
{
// nick collision
- ServerInstance->Log(DEBUG,"Nick collision on %s!%s@%s: %lu %lu",tempnick,params[4].c_str(),params[2].c_str(),(unsigned long)age,(unsigned long)iter->second->age);
+ Instance->Log(DEBUG,"Nick collision on %s!%s@%s: %lu %lu",tempnick,params[4].c_str(),params[2].c_str(),(unsigned long)age,(unsigned long)iter->second->age);
this->WriteLine(std::string(":")+this->Instance->Config->ServerName+" KILL "+tempnick+" :Nickname collision");
return true;
}
@@ -1749,20 +1728,20 @@ class TreeSocket : public InspSocket
TreeServer* SourceServer = FindServer(source);
if (SourceServer)
{
- ServerInstance->Log(DEBUG,"Found source server of %s",_new->nick);
+ Instance->Log(DEBUG,"Found source server of %s",_new->nick);
SourceServer->AddUserCount();
}
return true;
}
- /* Send one or more FJOINs for a channel of users.
+ /** Send one or more FJOINs for a channel of users.
* If the length of a single line is more than 480-NICKMAX
* in length, it is split over multiple lines.
*/
void SendFJoins(TreeServer* Current, chanrec* c)
{
- ServerInstance->Log(DEBUG,"Sending FJOINs to other server for %s",c->name);
+ Instance->Log(DEBUG,"Sending FJOINs to other server for %s",c->name);
char list[MAXBUF];
std::string individual_halfops = std::string(":")+this->Instance->Config->ServerName+" FMODE "+c->name+" "+ConvToStr(c->age);
@@ -1808,7 +1787,7 @@ class TreeSocket : public InspSocket
this->WriteLine(std::string(":")+this->Instance->Config->ServerName+" FMODE "+c->name+" "+ConvToStr(c->age)+" +"+c->ChanModes(true)+modes+" "+params);
}
- /* Send G, Q, Z and E lines */
+ /** Send G, Q, Z and E lines */
void SendXLines(TreeServer* Current)
{
char data[MAXBUF];
@@ -1816,49 +1795,49 @@ class TreeSocket : public InspSocket
const char* sn = n.c_str();
int iterations = 0;
/* Yes, these arent too nice looking, but they get the job done */
- for (std::vector::iterator i = Instance->XLines->zlines.begin(); i != Instance->XLines->zlines.end(); i++, iterations++)
+ for (std::vector::iterator i = Instance->XLines->zlines.begin(); i != Instance->XLines->zlines.end(); i++, iterations++)
{
- snprintf(data,MAXBUF,":%s ADDLINE Z %s %s %lu %lu :%s",sn,i->ipaddr,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason);
+ 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);
}
- for (std::vector::iterator i = Instance->XLines->qlines.begin(); i != Instance->XLines->qlines.end(); i++, iterations++)
+ for (std::vector::iterator i = Instance->XLines->qlines.begin(); i != Instance->XLines->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);
+ 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);
}
- for (std::vector::iterator i = Instance->XLines->glines.begin(); i != Instance->XLines->glines.end(); i++, iterations++)
+ for (std::vector::iterator i = Instance->XLines->glines.begin(); i != Instance->XLines->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);
+ 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);
}
- for (std::vector::iterator i = Instance->XLines->elines.begin(); i != Instance->XLines->elines.end(); i++, iterations++)
+ for (std::vector::iterator i = Instance->XLines->elines.begin(); i != Instance->XLines->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);
+ 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);
}
- for (std::vector::iterator i = Instance->XLines->pzlines.begin(); i != Instance->XLines->pzlines.end(); i++, iterations++)
+ for (std::vector::iterator i = Instance->XLines->pzlines.begin(); i != Instance->XLines->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);
+ 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);
}
- for (std::vector::iterator i = Instance->XLines->pqlines.begin(); i != Instance->XLines->pqlines.end(); i++, iterations++)
+ for (std::vector::iterator i = Instance->XLines->pqlines.begin(); i != Instance->XLines->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);
+ 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);
}
- for (std::vector::iterator i = Instance->XLines->pglines.begin(); i != Instance->XLines->pglines.end(); i++, iterations++)
+ for (std::vector::iterator i = Instance->XLines->pglines.begin(); i != Instance->XLines->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);
+ 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);
}
- for (std::vector::iterator i = Instance->XLines->pelines.begin(); i != Instance->XLines->pelines.end(); i++, iterations++)
+ for (std::vector::iterator i = Instance->XLines->pelines.begin(); i != Instance->XLines->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);
+ 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);
}
}
- /* Send channel modes and topics */
+ /** Send channel modes and topics */
void SendChannelModes(TreeServer* Current)
{
char data[MAXBUF];
@@ -1884,7 +1863,7 @@ class TreeSocket : public InspSocket
}
}
- /* send all users and their oper state/modes */
+ /** send all users and their oper state/modes */
void SendUsers(TreeServer* Current)
{
char data[MAXBUF];
@@ -1915,7 +1894,7 @@ class TreeSocket : public InspSocket
}
}
- /* This function is called when we want to send a netburst to a local
+ /** This function is called when we want to send a netburst to a local
* server. There is a set order we must do this, because for example
* users require their servers to exist, and channels require their
* users to exist. You get the idea.
@@ -1942,7 +1921,7 @@ class TreeSocket : public InspSocket
this->Instance->SNO->WriteToSnoMask('l',"Finished bursting to \2"+name+"\2.");
}
- /* This function is called when we receive data from a remote
+ /** This function is called when we receive data from a remote
* server. We buffer the data in a std::string (it doesnt stay
* there for long), reading using InspSocket::Read() which can
* read up to 16 kilobytes in one operation.
@@ -1975,14 +1954,14 @@ class TreeSocket : public InspSocket
char result[1024];
memset(result,0,1024);
memset(out,0,1024);
- ServerInstance->Log(DEBUG,"Original string '%s'",ret.c_str());
+ Instance->Log(DEBUG,"Original string '%s'",ret.c_str());
/* ERROR + CAPAB is still allowed unencryped */
if ((ret.substr(0,7) != "ERROR :") && (ret.substr(0,6) != "CAPAB "))
{
int nbytes = from64tobits(out, ret.c_str(), 1024);
if ((nbytes > 0) && (nbytes < 1024))
{
- ServerInstance->Log(DEBUG,"m_spanningtree: decrypt %d bytes",nbytes);
+ Instance->Log(DEBUG,"m_spanningtree: decrypt %d bytes",nbytes);
ctx_in->Decrypt(out, result, nbytes, 0);
for (int t = 0; t < nbytes; t++)
if (result[t] == '\7') result[t] = 0;
@@ -1992,7 +1971,7 @@ class TreeSocket : public InspSocket
}
if (!this->ProcessLine(ret))
{
- ServerInstance->Log(DEBUG,"ProcessLine says no!");
+ Instance->Log(DEBUG,"ProcessLine says no!");
return false;
}
}
@@ -2006,7 +1985,7 @@ class TreeSocket : public InspSocket
int WriteLine(std::string line)
{
- ServerInstance->Log(DEBUG,"OUT: %s",line.c_str());
+ Instance->Log(DEBUG,"OUT: %s",line.c_str());
if (this->ctx_out)
{
char result[10240];
@@ -2017,7 +1996,7 @@ class TreeSocket : public InspSocket
int n = this->keylength - (line.length() % this->keylength);
if (n)
{
- ServerInstance->Log(DEBUG,"Append %d chars to line to make it %d long from %d, key length %d",n,n+line.length(),line.length(),this->keylength);
+ Instance->Log(DEBUG,"Append %d chars to line to make it %d long from %d, key length %d",n,n+line.length(),line.length(),this->keylength);
line.append(n,'\7');
}
}
@@ -2040,7 +2019,7 @@ class TreeSocket : public InspSocket
return false;
}
- /* remote MOTD. leet, huh? */
+ /** remote MOTD. leet, huh? */
bool Motd(std::string prefix, std::deque ¶ms)
{
if (params.size() > 0)
@@ -2057,23 +2036,23 @@ class TreeSocket : public InspSocket
par.push_back(prefix);
par.push_back("");
- if (!ServerInstance->Config->MOTD.size())
+ if (!Instance->Config->MOTD.size())
{
- par[1] = std::string("::")+ServerInstance->Config->ServerName+" 422 "+source->nick+" :Message of the day file is missing.";
+ par[1] = std::string("::")+Instance->Config->ServerName+" 422 "+source->nick+" :Message of the day file is missing.";
DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
return true;
}
- par[1] = std::string("::")+ServerInstance->Config->ServerName+" 375 "+source->nick+" :"+ServerInstance->Config->ServerName+" message of the day";
+ par[1] = std::string("::")+Instance->Config->ServerName+" 375 "+source->nick+" :"+Instance->Config->ServerName+" message of the day";
DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
- for (unsigned int i = 0; i < ServerInstance->Config->MOTD.size(); i++)
+ for (unsigned int i = 0; i < Instance->Config->MOTD.size(); i++)
{
- par[1] = std::string("::")+ServerInstance->Config->ServerName+" 372 "+source->nick+" :- "+ServerInstance->Config->MOTD[i];
+ par[1] = std::string("::")+Instance->Config->ServerName+" 372 "+source->nick+" :- "+Instance->Config->MOTD[i];
DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
}
- par[1] = std::string("::")+ServerInstance->Config->ServerName+" 376 "+source->nick+" End of message of the day.";
+ par[1] = std::string("::")+Instance->Config->ServerName+" 376 "+source->nick+" End of message of the day.";
DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
}
}
@@ -2088,7 +2067,7 @@ class TreeSocket : public InspSocket
return true;
}
- /* remote ADMIN. leet, huh? */
+ /** remote ADMIN. leet, huh? */
bool Admin(std::string prefix, std::deque ¶ms)
{
if (params.size() > 0)
@@ -2105,16 +2084,16 @@ class TreeSocket : public InspSocket
par.push_back(prefix);
par.push_back("");
- par[1] = std::string("::")+ServerInstance->Config->ServerName+" 256 "+source->nick+" :Administrative info for "+ServerInstance->Config->ServerName;
+ par[1] = std::string("::")+Instance->Config->ServerName+" 256 "+source->nick+" :Administrative info for "+Instance->Config->ServerName;
DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
- par[1] = std::string("::")+ServerInstance->Config->ServerName+" 257 "+source->nick+" :Name - "+ServerInstance->Config->AdminName;
+ par[1] = std::string("::")+Instance->Config->ServerName+" 257 "+source->nick+" :Name - "+Instance->Config->AdminName;
DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
- par[1] = std::string("::")+ServerInstance->Config->ServerName+" 258 "+source->nick+" :Nickname - "+ServerInstance->Config->AdminNick;
+ par[1] = std::string("::")+Instance->Config->ServerName+" 258 "+source->nick+" :Nickname - "+Instance->Config->AdminNick;
DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
- par[1] = std::string("::")+ServerInstance->Config->ServerName+" 258 "+source->nick+" :E-Mail - "+ServerInstance->Config->AdminEmail;
+ par[1] = std::string("::")+Instance->Config->ServerName+" 258 "+source->nick+" :E-Mail - "+Instance->Config->AdminEmail;
DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
}
}
@@ -2166,14 +2145,14 @@ class TreeSocket : public InspSocket
}
- /* Because the core won't let users or even SERVERS set +o,
+ /** Because the core won't let users or even SERVERS set +o,
* we use the OPERTYPE command to do this.
*/
bool OperType(std::string prefix, std::deque ¶ms)
{
if (params.size() != 1)
{
- ServerInstance->Log(DEBUG,"Received invalid oper type from %s",prefix.c_str());
+ Instance->Log(DEBUG,"Received invalid oper type from %s",prefix.c_str());
return true;
}
std::string opertype = params[0];
@@ -2187,7 +2166,7 @@ class TreeSocket : public InspSocket
return true;
}
- /* Because Andy insists that services-compatible servers must
+ /** Because Andy insists that services-compatible servers must
* implement SVSNICK and SVSJOIN, that's exactly what we do :p
*/
bool ForceNick(std::string prefix, std::deque ¶ms)
@@ -2398,23 +2377,23 @@ class TreeSocket : public InspSocket
switch (*(params[0].c_str()))
{
case 'Z':
- propogate = ServerInstance->XLines->add_zline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str());
- ServerInstance->XLines->zline_set_creation_time(params[1].c_str(), atoi(params[3].c_str()));
+ propogate = Instance->XLines->add_zline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str());
+ Instance->XLines->zline_set_creation_time(params[1].c_str(), atoi(params[3].c_str()));
break;
case 'Q':
- propogate = ServerInstance->XLines->add_qline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str());
- ServerInstance->XLines->qline_set_creation_time(params[1].c_str(), atoi(params[3].c_str()));
+ propogate = Instance->XLines->add_qline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str());
+ Instance->XLines->qline_set_creation_time(params[1].c_str(), atoi(params[3].c_str()));
break;
case 'E':
- propogate = ServerInstance->XLines->add_eline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str());
- ServerInstance->XLines->eline_set_creation_time(params[1].c_str(), atoi(params[3].c_str()));
+ propogate = Instance->XLines->add_eline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str());
+ Instance->XLines->eline_set_creation_time(params[1].c_str(), atoi(params[3].c_str()));
break;
case 'G':
- propogate = ServerInstance->XLines->add_gline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str());
- ServerInstance->XLines->gline_set_creation_time(params[1].c_str(), atoi(params[3].c_str()));
+ propogate = Instance->XLines->add_gline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str());
+ Instance->XLines->gline_set_creation_time(params[1].c_str(), atoi(params[3].c_str()));
break;
case 'K':
- propogate = ServerInstance->XLines->add_kline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str());
+ propogate = Instance->XLines->add_kline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str());
break;
default:
/* Just in case... */
@@ -2439,8 +2418,8 @@ class TreeSocket : public InspSocket
}
if (!this->bursting)
{
- ServerInstance->Log(DEBUG,"Applying lines...");
- ServerInstance->XLines->apply_lines(APPLY_ZLINES|APPLY_GLINES|APPLY_QLINES);
+ Instance->Log(DEBUG,"Applying lines...");
+ Instance->XLines->apply_lines(APPLY_ZLINES|APPLY_GLINES|APPLY_QLINES);
}
return true;
}
@@ -2466,12 +2445,12 @@ class TreeSocket : public InspSocket
if (params.size() < 1)
return true;
- ServerInstance->Log(DEBUG,"In IDLE command");
+ Instance->Log(DEBUG,"In IDLE command");
userrec* u = this->Instance->FindNick(prefix);
if (u)
{
- ServerInstance->Log(DEBUG,"USER EXISTS: %s",u->nick);
+ Instance->Log(DEBUG,"USER EXISTS: %s",u->nick);
// an incoming request
if (params.size() == 1)
{
@@ -2479,10 +2458,9 @@ class TreeSocket : public InspSocket
if ((x) && (IS_LOCAL(x)))
{
userrec* x = this->Instance->FindNick(params[0]);
- ServerInstance->Log(DEBUG,"Got IDLE");
char signon[MAXBUF];
char idle[MAXBUF];
- ServerInstance->Log(DEBUG,"Sending back IDLE 3");
+
snprintf(signon,MAXBUF,"%lu",(unsigned long)x->signon);
snprintf(idle,MAXBUF,"%lu",(unsigned long)abs((x->idle_lastmsg)-time(NULL)));
std::deque par;
@@ -2504,7 +2482,6 @@ class TreeSocket : public InspSocket
userrec* who_to_send_to = this->Instance->FindNick(who_did_the_whois);
if ((who_to_send_to) && (IS_LOCAL(who_to_send_to)))
{
- ServerInstance->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());
@@ -2625,6 +2602,52 @@ class TreeSocket : public InspSocket
}
}
+ bool RemoveStatus(std::string prefix, std::deque ¶ms)
+ {
+ if (params.size() < 1)
+ return true;
+
+ chanrec* c = Instance->FindChan(params[0]);
+
+ if (c)
+ {
+ CUList *ulist = c->GetUsers();
+ for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+ {
+ std::string modesequence = Instance->Modes->ModeString(i->second, c);
+ if (modesequence.length())
+ {
+ modesequence = "-" + modesequence;
+
+ std::deque items;
+ const char* y[127];
+ unsigned int z = 0;
+ std::string x = "*";
+ irc::spacesepstream sep(modesequence);
+
+ while ((x = sep.GetToken()) != "")
+ {
+ if (!z)
+ {
+ y[z++] = c->name;
+ items.push_back(c->name);
+ items.push_back(ConvToStr(c->age));
+ }
+ items.push_back(x);
+ y[z++] = (items.end() - 1)->c_str();
+ }
+
+ DoOneToMany(Instance->Config->ServerName, "FMODE", items);
+ userrec* n = new userrec(Instance);
+ n->SetFd(FD_MAGIC_NUMBER);
+ Instance->SendMode(y,z,n);
+ delete n;
+ }
+ }
+ }
+ return true;
+ }
+
bool RemoteServer(std::string prefix, std::deque ¶ms)
{
if (params.size() < 4)
@@ -2781,7 +2804,7 @@ class TreeSocket : public InspSocket
line = line.substr(0, line.find_first_of("\r\n"));
- ServerInstance->Log(DEBUG,"IN: %s", line.c_str());
+ Instance->Log(DEBUG,"IN: %s", line.c_str());
this->Split(line.c_str(),params);
@@ -2944,7 +2967,7 @@ class TreeSocket : public InspSocket
if ((!route_back_again) || (route_back_again->GetSocket() != this))
{
if (route_back_again)
- ServerInstance->Log(DEBUG,"Protocol violation: Fake direction in command '%s' from connection '%s'",line.c_str(),this->GetName().c_str());
+ Instance->Log(DEBUG,"Protocol violation: Fake direction in command '%s' from connection '%s'",line.c_str(),this->GetName().c_str());
return true;
}
@@ -3020,6 +3043,10 @@ class TreeSocket : public InspSocket
{
return this->MetaData(prefix,params);
}
+ else if (command == "REMSTATUS")
+ {
+ return this->RemoveStatus(prefix,params);
+ }
else if (command == "PING")
{
/*
@@ -3030,7 +3057,7 @@ class TreeSocket : public InspSocket
if (this->bursting)
{
this->bursting = false;
- ServerInstance->XLines->apply_lines(APPLY_ZLINES|APPLY_GLINES|APPLY_QLINES);
+ Instance->XLines->apply_lines(APPLY_ZLINES|APPLY_GLINES|APPLY_QLINES);
}
if (prefix == "")
{
@@ -3048,7 +3075,7 @@ class TreeSocket : public InspSocket
if (this->bursting)
{
this->bursting = false;
- ServerInstance->XLines->apply_lines(APPLY_ZLINES|APPLY_GLINES|APPLY_QLINES);
+ Instance->XLines->apply_lines(APPLY_ZLINES|APPLY_GLINES|APPLY_QLINES);
}
if (prefix == "")
{
@@ -3131,7 +3158,7 @@ class TreeSocket : public InspSocket
else if (command == "ENDBURST")
{
this->bursting = false;
- ServerInstance->XLines->apply_lines(APPLY_ZLINES|APPLY_GLINES|APPLY_QLINES);
+ Instance->XLines->apply_lines(APPLY_ZLINES|APPLY_GLINES|APPLY_QLINES);
std::string sourceserv = this->myhost;
if (this->InboundServerName != "")
{
@@ -3196,6 +3223,7 @@ class TreeSocket : public InspSocket
return true;
break;
default:
+ /* CMD_SUCCESS and CMD_USER_DELETED fall through here */
break;
}
}
@@ -3208,7 +3236,7 @@ class TreeSocket : public InspSocket
}
else
{
- ServerInstance->Log(DEBUG,"Command with unknown origin '%s'",prefix.c_str());
+ Instance->Log(DEBUG,"Command with unknown origin '%s'",prefix.c_str());
return true;
}
}
@@ -3373,7 +3401,7 @@ void AddThisServer(TreeServer* server, std::deque &list)
list.push_back(server);
}
-// returns a list of DIRECT servernames for a specific channel
+/** returns a list of DIRECT servernames for a specific channel */
void GetListOfServersForChannel(chanrec* c, std::deque &list)
{
CUList *ulist = c->GetUsers();
@@ -4229,7 +4257,7 @@ class ModuleSpanningTree : public Module
return 0;
}
- virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated)
+ virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
{
/* If the command doesnt appear to be valid, we dont want to mess with it. */
if (!validated)
@@ -4291,7 +4319,7 @@ class ModuleSpanningTree : public Module
return 0;
}
- virtual void OnPostCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, CmdResult result)
+ virtual void OnPostCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, CmdResult result, const std::string &original_line)
{
if ((result == CMD_SUCCESS) && (ServerInstance->IsValidModuleCommand(command, pcnt, user)))
{
@@ -4467,34 +4495,17 @@ class ModuleSpanningTree : public Module
// Only do this for local users
if (IS_LOCAL(user))
{
- char ts[24];
- snprintf(ts,24,"%lu",(unsigned long)channel->age);
-
std::deque params;
params.clear();
params.push_back(channel->name);
-
- /** XXX: The client protocol will IGNORE this parameter.
- * We could make use of it if we wanted to keep the TS
- * in step if somehow we lose it.
- */
- params.push_back(ts);
-
- if (channel->GetUserCounter() > 1)
- {
- // not the first in the channel
- DoOneToMany(user->nick,"JOIN",params);
- }
- else
- {
- // first in the channel, set up their permissions
- // and the channel TS with FJOIN.
- params.clear();
- params.push_back(channel->name);
- params.push_back(ts);
- params.push_back("@,"+std::string(user->nick));
- DoOneToMany(ServerInstance->Config->ServerName,"FJOIN",params);
- }
+ // set up their permissions and the channel TS with FJOIN.
+ // All users are FJOINed now, because a module may specify
+ // new joining permissions for the user.
+ params.clear();
+ params.push_back(channel->name);
+ params.push_back(ConvToStr(channel->age));
+ params.push_back(std::string(channel->GetAllPrefixChars(user))+","+std::string(user->nick));
+ DoOneToMany(ServerInstance->Config->ServerName,"FJOIN",params);
}
}
@@ -4793,17 +4804,26 @@ class ModuleSpanningTree : public Module
virtual void OnEvent(Event* event)
{
+ std::deque* params = (std::deque*)event->GetData();
+
if (event->GetEventID() == "send_metadata")
{
- std::deque* params = (std::deque*)event->GetData();
if (params->size() < 3)
return;
(*params)[2] = ":" + (*params)[2];
DoOneToMany(ServerInstance->Config->ServerName,"METADATA",*params);
}
+ else if (event->GetEventID() == "send_topic")
+ {
+ if (params->size() < 2)
+ return;
+ (*params)[1] = ":" + (*params)[1];
+ params->insert(params->begin() + 1,ServerInstance->Config->ServerName);
+ params->insert(params->begin() + 1,ConvToStr(ServerInstance->Time()));
+ DoOneToMany(ServerInstance->Config->ServerName,"FTOPIC",*params);
+ }
else if (event->GetEventID() == "send_mode")
{
- std::deque* params = (std::deque*)event->GetData();
if (params->size() < 2)
return;
// Insert the TS value of the object, either userrec or chanrec