summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-12-01 19:24:53 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-12-01 19:24:53 +0000
commit9941be7564b61343923129a2021309cfe04225e0 (patch)
tree5b0d6f250b274278410d5cb2fc6af7f8e2a2d915
parente0c54b23f69bed4df36348a2f88edaea6e1f96d4 (diff)
Added clever code to propogate module's special commands (SAJOIN, KNOCK etc) transparently!
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2084 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--include/inspircd.h1
-rw-r--r--include/modules.h2
-rw-r--r--src/inspircd.cpp21
-rw-r--r--src/modules.cpp5
-rw-r--r--src/modules/m_spanningtree.cpp22
5 files changed, 51 insertions, 0 deletions
diff --git a/include/inspircd.h b/include/inspircd.h
index 9bf0b8878..05a76f48e 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -95,6 +95,7 @@ void force_nickchange(userrec* user,const char* newnick);
void kill_link(userrec *user,const char* r);
void kill_link_silent(userrec *user,const char* r);
void call_handler(const char* commandname,char **parameters, int pcnt, userrec *user);
+bool is_valid_cmd(const char* commandname, int pcnt, userrec * user);
std::string GetRevision();
int loop_call(handlerfunc fn, char **parameters, int pcnt, userrec *u, int start, int end, int joins);
void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason);
diff --git a/include/modules.h b/include/modules.h
index ec49c90dc..9e3206736 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -978,6 +978,8 @@ class Server : public classbase
* used for privilage checks, etc.
*/
virtual void CallCommandHandler(std::string commandname, char** parameters, int pcnt, userrec* user);
+
+ virtual bool IsValidModuleCommand(std::string commandname, int pcnt, userrec* user);
/** Change displayed hostname of a user.
* You should always call this method to change a user's host rather than writing directly to the
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index a946abbbb..2e300df95 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -1560,6 +1560,27 @@ void handle_version(char **parameters, int pcnt, userrec *user)
}
+bool is_valid_cmd(const char* commandname, int pcnt, userrec * user)
+{
+ for (unsigned int i = 0; i < cmdlist.size(); i++)
+ {
+ if (!strcasecmp(cmdlist[i].command,commandname))
+ {
+ if (cmdlist[i].handler_function)
+ {
+ if (pcnt>=cmdlist[i].min_params)
+ {
+ if (strchr(user->modes,cmdlist[i].flags_needed))
+ {
+ return true;
+ }
+ }
+ }
+ }
+ }
+ return false;
+}
+
// calls a handler function for a command
void call_handler(const char* commandname,char **parameters, int pcnt, userrec *user)
diff --git a/src/modules.cpp b/src/modules.cpp
index 2dda2daf5..e199bcbcc 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -464,6 +464,11 @@ void Server::CallCommandHandler(std::string commandname, char** parameters, int
call_handler(commandname.c_str(),parameters,pcnt,user);
}
+bool Server::IsValidModuleCommand(std::string commandname, int pcnt, userrec* user)
+{
+ return is_valid_cmd(commandname, pcnt, user)
+}
+
void Server::Log(int level, std::string s)
{
log(level,"%s",s.c_str());
diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index bb2231306..fbdc6f1f5 100644
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -1418,6 +1418,28 @@ class ModuleSpanningTree : public Module
this->HandleLinks(parameters,pcnt,user);
return 1;
}
+ else if (Srv->IsValidModuleCommand(command, pcnt, user))
+ {
+ // this bit of code cleverly routes all module commands
+ // to all remote severs *automatically* so that modules
+ // can just handle commands locally, without having
+ // to have any special provision in place for remote
+ // commands and linking protocols.
+ std::deque<std::string> params;
+ params.clear();
+ for (int j = 0; j < pcnt; j++)
+ {
+ if (strchr(parameters[j],' '))
+ {
+ params.push_back(":" + std::string(parameters[j]));
+ }
+ else
+ {
+ params.push_back(std::string(parameters[j]));
+ }
+ }
+ DoOneToMany(user->nick,command,params);
+ }
return 0;
}