X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree.cpp;h=e94209885b51581dcfd247d38fdb6f9b2f9252b0;hb=d4fe0b555c2a04968b50896cd094e65fe559dfd3;hp=7a409f759f6c074d12c467df012bad594fb4e64e;hpb=33887e4a65f3e5564204f052c0c145a6a9a8749b;p=user%2Fhenk%2Fcode%2Finspircd.git
diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index 7a409f759..e94209885 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.
*/
@@ -708,15 +705,18 @@ class TreeSocket : public InspSocket
}
else
{
- this->Instance->SNO->WriteToSnoMask('l',"\2AES\2: Initialized %d bit encryption to server %s",keylength*8,SName.c_str());
- ctx_in->MakeKey(key.c_str(), "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
- \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", keylength, keylength);
- ctx_out->MakeKey(key.c_str(), "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
- \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", keylength, keylength);
+ if (this->GetState() != I_ERROR)
+ {
+ this->Instance->SNO->WriteToSnoMask('l',"\2AES\2: Initialized %d bit encryption to server %s",keylength*8,SName.c_str());
+ ctx_in->MakeKey(key.c_str(), "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
+ \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", keylength, keylength);
+ ctx_out->MakeKey(key.c_str(), "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
+ \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", keylength, keylength);
+ }
}
}
- /* 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 +731,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 +783,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 +1026,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 +1048,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.
*/
@@ -1083,7 +1083,7 @@ class TreeSocket : public InspSocket
}
}
- /* 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 */
@@ -1309,7 +1309,7 @@ class TreeSocket : public InspSocket
modelist[0] = params[0].c_str();
modelist[1] = to_keep.c_str();
- if (params_to_keep.size() > 1)
+ if (params_to_keep.size() > 0)
{
for (q = 0; (q < params_to_keep.size()) && (q < 64); q++)
{
@@ -1321,12 +1321,12 @@ class TreeSocket : public InspSocket
if (smode)
{
Instance->Log(DEBUG,"Send mode");
- this->Instance->SendMode(modelist, n+2, who);
+ this->Instance->SendMode(modelist, n, who);
}
else
{
Instance->Log(DEBUG,"Send mode client");
- this->Instance->CallCommandHandler("MODE", modelist, n+2, who);
+ this->Instance->CallCommandHandler("MODE", modelist, n, who);
}
/* HOT POTATO! PASS IT ON! */
@@ -1468,7 +1468,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 +1512,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)
@@ -1534,23 +1534,38 @@ class TreeSocket : public InspSocket
chanrec* chan = this->Instance->FindChan(channel);
if (chan)
- {
key = chan->key;
- }
+
strlcpy(mode_users[0],channel.c_str(),MAXBUF);
/* default is a high value, which if we dont have this
* channel will let the other side apply their modes.
*/
time_t ourTS = time(NULL)+600;
- chanrec* us = this->Instance->FindChan(channel);
- if (us)
+
+ if (chan)
+ ourTS = chan->age;
+
+ /* 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())))
{
- ourTS = us->age;
+ Instance->Log(DEBUG,"FJOIN detected, our TS=%lu, their TS=%lu",ourTS,TS);
+ std::deque param_list;
+ if (chan)
+ chan->age = TS;
+ ourTS = TS;
+ param_list.push_back(channel);
+ Instance->Log(DEBUG,"REMOVE ALL STATUS MODES FROM OUR USERS *NOW*");
+ this->RemoveStatus(Instance->Config->ServerName, param_list);
}
- Instance->Log(DEBUG,"FJOIN detected, our TS=%lu, their TS=%lu",ourTS,TS);
-
irc::tokenstream users(params[2]);
std::string item = "*";
@@ -1570,69 +1585,64 @@ class TreeSocket : public InspSocket
{
char* permissions = usr;
int ntimes = 0;
- while ((*permissions) && (*permissions != ','))
+ char* nm = new char[MAXBUF];
+ char* tnm = nm;
+
+ while ((*permissions) && (*permissions != ',') && (ntimes < MAXBUF))
{
ModeHandler* mh = Instance->Modes->FindPrefix(*permissions);
if (mh)
{
ntimes++;
- charlcat(modestring,mh->GetModeChar(),MAXBUF);
+ *tnm++ = mh->GetModeChar();
}
else
{
- this->Instance->WriteOpers("ERROR: We received a user with an unknown prefix '%c'. Closed connection to avoid a desync.",mh->GetPrefix());
- this->WriteLine(std::string("ERROR :Invalid prefix '")+mh->GetModeChar()+"' in FJOIN");
+ this->Instance->WriteOpers("ERROR: We received a user with an unknown prefix '%c'. Closed connection to avoid a desync.",*permissions);
+ this->WriteLine(std::string("ERROR :Invalid prefix '")+(*permissions)+"' in FJOIN");
return false;
}
usr++;
permissions++;
}
- usr++;
- /* Did they get any modes? How many times? */
- for (int k = 0; k < ntimes; k++)
- mode_users[modectr++] = strdup(usr);
+ *tnm = 0;
+ usr++;
who = this->Instance->FindNick(usr);
if (who)
{
+ /* Did they get any modes? How many times? */
+ strlcat(modestring, nm, MAXBUF);
+ for (int k = 0; k < ntimes; k++)
+ mode_users[modectr++] = strdup(usr);
+
+ delete[] nm;
+
+ TreeServer* route_back_again = BestRouteTo(who->server);
+ if ((!route_back_again) || (route_back_again->GetSocket() != this))
+ {
+ Instance->Log(DEBUG,"Fake direction in FJOIN, user '%s'",who->nick);
+ continue;
+ }
chanrec::JoinUser(this->Instance, 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
* if there are more than MAXMODES to go.
*/
- if ((ourTS >= TS) || (this->Instance->ULine(who->server)))
+ if (ourTS >= TS)
{
/* We also always let u-lined clients win, no matter what the TS value */
Instance->Log(DEBUG,"Our our channel newer than theirs, accepting their modes");
this->Instance->SendMode((const char**)mode_users,modectr,who);
if (ourTS != TS)
{
- Instance->Log(DEFAULT,"Channel TS for %s changed from %lu to %lu",us->name,ourTS,TS);
- us->age = TS;
+ Instance->Log(DEFAULT,"Channel TS for %s changed from %lu to %lu",chan->name,ourTS,TS);
+ chan->age = TS;
ourTS = TS;
}
}
- else
- {
- Instance->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 +1651,8 @@ class TreeSocket : public InspSocket
}
else
{
- Instance->Log(SPARSE,"Warning! Invalid user %s in FJOIN to channel %s IGNORED", who->nick, channel.c_str());
+ delete[] nm;
+ Instance->Log(SPARSE,"Warning! Invalid user in FJOIN to channel %s IGNORED", channel.c_str());
continue;
}
}
@@ -1649,7 +1660,7 @@ class TreeSocket : public InspSocket
/* 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) && (us))
+ if ((modectr > 2) && (who) && (chan))
{
if (ourTS >= TS)
{
@@ -1657,26 +1668,11 @@ class TreeSocket : public InspSocket
this->Instance->SendMode((const char**)mode_users,modectr,who);
if (ourTS != TS)
{
- Instance->Log(DEFAULT,"Channel TS for %s changed from %lu to %lu",us->name,ourTS,TS);
- us->age = TS;
+ Instance->Log(DEFAULT,"Channel TS for %s changed from %lu to %lu",chan->name,ourTS,TS);
+ chan->age = TS;
ourTS = TS;
}
}
- else
- {
- Instance->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 +1680,7 @@ class TreeSocket : public InspSocket
return true;
}
- /* NICK command */
+ /** NICK command */
bool IntroduceClient(std::string source, std::deque ¶ms)
{
if (params.size() < 8)
@@ -1753,10 +1749,12 @@ class TreeSocket : public InspSocket
SourceServer->AddUserCount();
}
+ FOREACH_MOD(I_OnPostConnect,OnPostConnect(_new));
+
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.
*/
@@ -1808,7 +1806,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 +1814,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 +1882,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 +1913,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 +1940,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.
@@ -2040,7 +2038,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)
@@ -2088,7 +2086,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)
@@ -2166,7 +2164,7 @@ 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)
@@ -2187,7 +2185,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)
@@ -2245,6 +2243,7 @@ class TreeSocket : public InspSocket
this->Instance->SNO->WriteToSnoMask('l',"Remote rehash initiated from server \002"+prefix+"\002.");
this->Instance->RehashServer();
ReadConfiguration(false);
+ InitializeDisabledCommands(ServerInstance->Config->DisabledCommands, ServerInstance);
}
DoOneToAllButSender(prefix,"REHASH",params,prefix);
return true;
@@ -2623,6 +2622,64 @@ 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)
+ {
+ irc::modestacker modestack(false);
+ CUList *ulist = c->GetUsers();
+ const char* y[127];
+ std::deque stackresult;
+ std::string x;
+
+ for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+ {
+ std::string modesequence = Instance->Modes->ModeString(i->second, c);
+ if (modesequence.length())
+ {
+ ServerInstance->Log(DEBUG,"Mode sequence = '%s'",modesequence.c_str());
+ irc::spacesepstream sep(modesequence);
+ std::string modeletters = sep.GetToken();
+ ServerInstance->Log(DEBUG,"Mode letters = '%s'",modeletters.c_str());
+
+ while (!modeletters.empty())
+ {
+ char mletter = *(modeletters.begin());
+ modestack.Push(mletter,sep.GetToken());
+ ServerInstance->Log(DEBUG,"Push letter = '%c'",mletter);
+ modeletters.erase(modeletters.begin());
+ ServerInstance->Log(DEBUG,"Mode letters = '%s'",modeletters.c_str());
+ }
+ }
+ }
+
+ while (modestack.GetStackedLine(stackresult))
+ {
+ ServerInstance->Log(DEBUG,"Stacked line size %d",stackresult.size());
+ stackresult.push_front(ConvToStr(c->age));
+ stackresult.push_front(c->name);
+ DoOneToMany(Instance->Config->ServerName, "FMODE", stackresult);
+ stackresult.erase(stackresult.begin() + 1);
+ ServerInstance->Log(DEBUG,"Stacked items:");
+ for (size_t z = 0; z < stackresult.size(); z++)
+ {
+ y[z] = stackresult[z].c_str();
+ ServerInstance->Log(DEBUG,"\tstackresult[%d]='%s'",z,stackresult[z].c_str());
+ }
+ userrec* n = new userrec(Instance);
+ n->SetFd(FD_MAGIC_NUMBER);
+ Instance->SendMode(y, stackresult.size(), n);
+ delete n;
+ }
+ }
+ return true;
+ }
+
bool RemoteServer(std::string prefix, std::deque ¶ms)
{
if (params.size() < 4)
@@ -3018,6 +3075,10 @@ class TreeSocket : public InspSocket
{
return this->MetaData(prefix,params);
}
+ else if (command == "REMSTATUS")
+ {
+ return this->RemoveStatus(prefix,params);
+ }
else if (command == "PING")
{
/*
@@ -3372,7 +3433,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();
@@ -4228,7 +4289,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)
@@ -4290,7 +4351,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)))
{
@@ -4466,34 +4527,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);
}
}
@@ -4792,17 +4836,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
@@ -4831,7 +4884,7 @@ class ModuleSpanningTree : public Module
virtual Version GetVersion()
{
- return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+ return Version(1,1,0,2,VF_STATIC|VF_VENDOR,API_VERSION);
}
void Implements(char* List)