diff options
Diffstat (limited to 'src/modules/m_spanningtree')
35 files changed, 40 insertions, 5 deletions
diff --git a/src/modules/m_spanningtree/cachetimer.cpp b/src/modules/m_spanningtree/cachetimer.cpp index 97b9b3b4f..71214dcfa 100644 --- a/src/modules/m_spanningtree/cachetimer.cpp +++ b/src/modules/m_spanningtree/cachetimer.cpp @@ -15,6 +15,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" diff --git a/src/modules/m_spanningtree/handshaketimer.cpp b/src/modules/m_spanningtree/handshaketimer.cpp index 44938bafa..c1e36df38 100644 --- a/src/modules/m_spanningtree/handshaketimer.cpp +++ b/src/modules/m_spanningtree/handshaketimer.cpp @@ -15,6 +15,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" diff --git a/src/modules/m_spanningtree/hmac.cpp b/src/modules/m_spanningtree/hmac.cpp index 418a64724..7744ab217 100644 --- a/src/modules/m_spanningtree/hmac.cpp +++ b/src/modules/m_spanningtree/hmac.cpp @@ -15,6 +15,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" #include "m_hash.h" diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index b0d40ddf9..7085d501d 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -17,6 +17,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" diff --git a/src/modules/m_spanningtree/override_admin.cpp b/src/modules/m_spanningtree/override_admin.cpp index 46d030c06..3a4aa2a1f 100644 --- a/src/modules/m_spanningtree/override_admin.cpp +++ b/src/modules/m_spanningtree/override_admin.cpp @@ -17,6 +17,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" @@ -31,7 +32,7 @@ int ModuleSpanningTree::HandleAdmin(const std::vector<std::string>& parameters, { if (parameters.size() > 0) { - if (InspIRCd::Match(ServerInstance->Config->ServerName, parameters[0])) + if (match(ServerInstance->Config->ServerName, parameters[0])) return 0; /* Remote ADMIN, the server is within the 1st parameter */ diff --git a/src/modules/m_spanningtree/override_map.cpp b/src/modules/m_spanningtree/override_map.cpp index cccfad4dc..48050b7af 100644 --- a/src/modules/m_spanningtree/override_map.cpp +++ b/src/modules/m_spanningtree/override_map.cpp @@ -14,6 +14,7 @@ /* $ModDesc: Provides a spanning tree server link protocol */ #include "inspircd.h" +#include "wildcard.h" #include "m_spanningtree/main.h" #include "m_spanningtree/utils.h" diff --git a/src/modules/m_spanningtree/override_modules.cpp b/src/modules/m_spanningtree/override_modules.cpp index b824612ff..1d33d104e 100644 --- a/src/modules/m_spanningtree/override_modules.cpp +++ b/src/modules/m_spanningtree/override_modules.cpp @@ -17,6 +17,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" @@ -31,7 +32,7 @@ int ModuleSpanningTree::HandleModules(const std::vector<std::string>& parameters { if (parameters.size() > 0) { - if (InspIRCd::Match(ServerInstance->Config->ServerName, parameters[0])) + if (match(ServerInstance->Config->ServerName, parameters[0])) return 0; std::deque<std::string> params; diff --git a/src/modules/m_spanningtree/override_motd.cpp b/src/modules/m_spanningtree/override_motd.cpp index 0ed8417fa..e689be1f7 100644 --- a/src/modules/m_spanningtree/override_motd.cpp +++ b/src/modules/m_spanningtree/override_motd.cpp @@ -17,6 +17,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" @@ -31,7 +32,7 @@ int ModuleSpanningTree::HandleMotd(const std::vector<std::string>& parameters, U { if (parameters.size() > 0) { - if (InspIRCd::Match(ServerInstance->Config->ServerName, parameters[0])) + if (match(ServerInstance->Config->ServerName, parameters[0])) return 0; /* Remote MOTD, the server is within the 1st parameter */ diff --git a/src/modules/m_spanningtree/override_squit.cpp b/src/modules/m_spanningtree/override_squit.cpp index d73408a45..812424c81 100644 --- a/src/modules/m_spanningtree/override_squit.cpp +++ b/src/modules/m_spanningtree/override_squit.cpp @@ -17,6 +17,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" diff --git a/src/modules/m_spanningtree/override_stats.cpp b/src/modules/m_spanningtree/override_stats.cpp index 2b1b5660c..d6ae89e4d 100644 --- a/src/modules/m_spanningtree/override_stats.cpp +++ b/src/modules/m_spanningtree/override_stats.cpp @@ -17,6 +17,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" @@ -32,7 +33,7 @@ int ModuleSpanningTree::HandleStats(const std::vector<std::string>& parameters, { if (parameters.size() > 1) { - if (InspIRCd::Match(ServerInstance->Config->ServerName, parameters[1])) + if (match(ServerInstance->Config->ServerName, parameters[1])) return 0; /* Remote STATS, the server is within the 2nd parameter */ diff --git a/src/modules/m_spanningtree/override_time.cpp b/src/modules/m_spanningtree/override_time.cpp index cb7850047..882607161 100644 --- a/src/modules/m_spanningtree/override_time.cpp +++ b/src/modules/m_spanningtree/override_time.cpp @@ -17,6 +17,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" diff --git a/src/modules/m_spanningtree/override_whois.cpp b/src/modules/m_spanningtree/override_whois.cpp index 25af17620..d10298348 100644 --- a/src/modules/m_spanningtree/override_whois.cpp +++ b/src/modules/m_spanningtree/override_whois.cpp @@ -17,6 +17,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" diff --git a/src/modules/m_spanningtree/ping.cpp b/src/modules/m_spanningtree/ping.cpp index b884305b2..a4a188665 100644 --- a/src/modules/m_spanningtree/ping.cpp +++ b/src/modules/m_spanningtree/ping.cpp @@ -15,6 +15,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" #include "socketengine.h" diff --git a/src/modules/m_spanningtree/pong.cpp b/src/modules/m_spanningtree/pong.cpp index 8e21f5a3e..e9bed25b8 100644 --- a/src/modules/m_spanningtree/pong.cpp +++ b/src/modules/m_spanningtree/pong.cpp @@ -15,6 +15,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" #include "socketengine.h" diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp index fa65e742e..37109a79d 100644 --- a/src/modules/m_spanningtree/postcommand.cpp +++ b/src/modules/m_spanningtree/postcommand.cpp @@ -17,6 +17,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" diff --git a/src/modules/m_spanningtree/precommand.cpp b/src/modules/m_spanningtree/precommand.cpp index 6a78e6c88..beffba6e9 100644 --- a/src/modules/m_spanningtree/precommand.cpp +++ b/src/modules/m_spanningtree/precommand.cpp @@ -17,6 +17,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" diff --git a/src/modules/m_spanningtree/push.cpp b/src/modules/m_spanningtree/push.cpp index b2fc045f0..460cb71db 100644 --- a/src/modules/m_spanningtree/push.cpp +++ b/src/modules/m_spanningtree/push.cpp @@ -15,6 +15,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" #include "socketengine.h" diff --git a/src/modules/m_spanningtree/rconnect.cpp b/src/modules/m_spanningtree/rconnect.cpp index 19738ace0..3e514563d 100644 --- a/src/modules/m_spanningtree/rconnect.cpp +++ b/src/modules/m_spanningtree/rconnect.cpp @@ -15,6 +15,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" diff --git a/src/modules/m_spanningtree/resolvers.cpp b/src/modules/m_spanningtree/resolvers.cpp index 3ea6e2bdf..1673a02de 100644 --- a/src/modules/m_spanningtree/resolvers.cpp +++ b/src/modules/m_spanningtree/resolvers.cpp @@ -15,6 +15,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" diff --git a/src/modules/m_spanningtree/resolvers.h b/src/modules/m_spanningtree/resolvers.h index 552815ac0..54fd9c481 100644 --- a/src/modules/m_spanningtree/resolvers.h +++ b/src/modules/m_spanningtree/resolvers.h @@ -18,6 +18,7 @@ #include "commands/cmd_stats.h" #include "socket.h" #include "inspircd.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" diff --git a/src/modules/m_spanningtree/rsquit.cpp b/src/modules/m_spanningtree/rsquit.cpp index 5407189b3..1b798deb7 100644 --- a/src/modules/m_spanningtree/rsquit.cpp +++ b/src/modules/m_spanningtree/rsquit.cpp @@ -15,6 +15,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp index 0ff0e30f6..40e12b03a 100644 --- a/src/modules/m_spanningtree/server.cpp +++ b/src/modules/m_spanningtree/server.cpp @@ -15,6 +15,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" #include "socketengine.h" diff --git a/src/modules/m_spanningtree/stats.cpp b/src/modules/m_spanningtree/stats.cpp index 5c529ab92..9ac255c37 100644 --- a/src/modules/m_spanningtree/stats.cpp +++ b/src/modules/m_spanningtree/stats.cpp @@ -15,6 +15,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" #include "socketengine.h" diff --git a/src/modules/m_spanningtree/svsjoin.cpp b/src/modules/m_spanningtree/svsjoin.cpp index d3c47f47b..276138200 100644 --- a/src/modules/m_spanningtree/svsjoin.cpp +++ b/src/modules/m_spanningtree/svsjoin.cpp @@ -15,6 +15,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" #include "socketengine.h" diff --git a/src/modules/m_spanningtree/svsnick.cpp b/src/modules/m_spanningtree/svsnick.cpp index ef57f6dbb..b2cd67128 100644 --- a/src/modules/m_spanningtree/svsnick.cpp +++ b/src/modules/m_spanningtree/svsnick.cpp @@ -15,6 +15,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" #include "socketengine.h" diff --git a/src/modules/m_spanningtree/svspart.cpp b/src/modules/m_spanningtree/svspart.cpp index 95d1a1c23..c3bc1b081 100644 --- a/src/modules/m_spanningtree/svspart.cpp +++ b/src/modules/m_spanningtree/svspart.cpp @@ -15,6 +15,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" #include "socketengine.h" diff --git a/src/modules/m_spanningtree/time.cpp b/src/modules/m_spanningtree/time.cpp index eb90eab8d..85377a478 100644 --- a/src/modules/m_spanningtree/time.cpp +++ b/src/modules/m_spanningtree/time.cpp @@ -15,6 +15,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" #include "socketengine.h" diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp index c3167b9b3..0b21a462d 100644 --- a/src/modules/m_spanningtree/treeserver.cpp +++ b/src/modules/m_spanningtree/treeserver.cpp @@ -15,6 +15,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h index fb0fe1c31..fef7b107b 100644 --- a/src/modules/m_spanningtree/treesocket.h +++ b/src/modules/m_spanningtree/treesocket.h @@ -18,6 +18,7 @@ #include "commands/cmd_stats.h" #include "socket.h" #include "inspircd.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp index 1f0288a66..3e9558e83 100644 --- a/src/modules/m_spanningtree/treesocket1.cpp +++ b/src/modules/m_spanningtree/treesocket1.cpp @@ -15,6 +15,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" #include "m_hash.h" diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp index 5b3ace4d4..6f66598d9 100644 --- a/src/modules/m_spanningtree/treesocket2.cpp +++ b/src/modules/m_spanningtree/treesocket2.cpp @@ -15,6 +15,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" #include "socketengine.h" diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp index 2ebceb3cf..ce7718324 100644 --- a/src/modules/m_spanningtree/uid.cpp +++ b/src/modules/m_spanningtree/uid.cpp @@ -15,6 +15,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" #include "m_hash.h" diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp index acf822bf7..5e1d226ab 100644 --- a/src/modules/m_spanningtree/utils.cpp +++ b/src/modules/m_spanningtree/utils.cpp @@ -15,6 +15,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" #include "socketengine.h" @@ -90,7 +91,7 @@ TreeServer* SpanningTreeUtilities::FindServerMask(const std::string &ServerName) { for (server_hash::iterator i = serverlist.begin(); i != serverlist.end(); i++) { - if (InspIRCd::Match(i->first,ServerName)) + if (match(i->first,ServerName)) return i->second; } return NULL; diff --git a/src/modules/m_spanningtree/version.cpp b/src/modules/m_spanningtree/version.cpp index e2129d884..5271be1d3 100644 --- a/src/modules/m_spanningtree/version.cpp +++ b/src/modules/m_spanningtree/version.cpp @@ -15,6 +15,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" #include "socketengine.h" diff --git a/src/modules/m_spanningtree/whois.cpp b/src/modules/m_spanningtree/whois.cpp index b38f25a38..1763f427a 100644 --- a/src/modules/m_spanningtree/whois.cpp +++ b/src/modules/m_spanningtree/whois.cpp @@ -15,6 +15,7 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" +#include "wildcard.h" #include "xline.h" #include "transport.h" #include "socketengine.h" |