diff options
Diffstat (limited to 'src/modules')
53 files changed, 82 insertions, 30 deletions
diff --git a/src/modules/extra/m_ssl_oper_cert.cpp b/src/modules/extra/m_ssl_oper_cert.cpp index e3cfa191a..817854fa8 100644 --- a/src/modules/extra/m_ssl_oper_cert.cpp +++ b/src/modules/extra/m_ssl_oper_cert.cpp @@ -20,6 +20,7 @@ #include "channels.h" #include "modules.h" #include "transport.h" +#include "wildcard.h" /** Handle /FINGERPRINT */ @@ -103,7 +104,7 @@ class ModuleOperSSLCert : public Module std::string xhost; while (hl >> xhost) { - if (InspIRCd::Match(host, xhost) || match(ip, xhost, true)) + if (match(host, xhost) || match(ip, xhost, true)) { return true; } diff --git a/src/modules/extra/m_sslinfo.cpp b/src/modules/extra/m_sslinfo.cpp index 5c4e50721..82ac7c18e 100644 --- a/src/modules/extra/m_sslinfo.cpp +++ b/src/modules/extra/m_sslinfo.cpp @@ -16,6 +16,7 @@ #include "channels.h" #include "modules.h" #include "transport.h" +#include "wildcard.h" #include "dns.h" /* $ModDesc: Provides /sslinfo command used to test who a mask matches */ diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index 9ddd3a3cc..28190cec9 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -12,6 +12,7 @@ */ #include "inspircd.h" +#include "wildcard.h" /* $ModDesc: Provides aliases of commands. */ @@ -156,7 +157,7 @@ class ModuleAlias : public Module /* Does it match the pattern? */ if (!Aliases[i].format.empty()) { - if (InspIRCd::Match(Aliases[i].case_sensitive, compare, Aliases[i].format)) + if (!match(Aliases[i].case_sensitive, compare, Aliases[i].format)) continue; } diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp index fc7e3db50..6cd99c73e 100644 --- a/src/modules/m_banexception.cpp +++ b/src/modules/m_banexception.cpp @@ -13,6 +13,7 @@ #include "inspircd.h" #include "u_listmode.h" +#include "wildcard.h" /* $ModDesc: Provides support for the +e channel mode */ /* $ModDep: ../../include/u_listmode.h */ @@ -77,7 +78,7 @@ public: std::string maskptr = it->mask.substr(2); - if (InspIRCd::Match(user->GetFullRealHost(), maskptr) || match(user->GetFullHost(), maskptr) || (InspIRCd::Match(mask, maskptr, true))) + if (match(user->GetFullRealHost(), maskptr) || match(user->GetFullHost(), maskptr) || (match(mask, maskptr, true))) { // They match an entry on the list, so let them pass this. return 1; @@ -103,7 +104,7 @@ public: continue; std::string maskptr = it->mask.substr(2); - if (InspIRCd::Match(str, maskptr)) + if (match(str, maskptr)) return 1; // matches } } @@ -127,7 +128,7 @@ public: std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString(); for (modelist::iterator it = list->begin(); it != list->end(); it++) { - if (InspIRCd::Match(user->GetFullRealHost(), it->mask) || match(user->GetFullHost(), it->mask) || (InspIRCd::Match(mask, it->mask, true))) + if (match(user->GetFullRealHost(), it->mask) || match(user->GetFullHost(), it->mask) || (match(mask, it->mask, true))) { // They match an entry on the list, so let them in. return 1; @@ -169,7 +170,7 @@ public: std::string mask = std::string(LM->user->nick) + "!" + LM->user->ident + "@" + LM->user->GetIPString(); for (modelist::iterator it = list->begin(); it != list->end(); it++) { - if (InspIRCd::Match(LM->user->GetFullRealHost(), it->mask) || match(LM->user->GetFullHost(), it->mask) || (InspIRCd::Match(mask, it->mask, true))) + if (match(LM->user->GetFullRealHost(), it->mask) || match(LM->user->GetFullHost(), it->mask) || (match(mask, it->mask, true))) { // They match an entry return (char*)it->mask.c_str(); diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index a03e2d6d3..ac9e8f2ac 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -12,6 +12,7 @@ */ #include "inspircd.h" +#include "wildcard.h" /* $ModDesc: Provides the /check command to retrieve information on a user, channel, or IP address */ @@ -130,13 +131,13 @@ class CommandCheck : public Command /* hostname or other */ for (user_hash::const_iterator a = ServerInstance->Users->clientlist->begin(); a != ServerInstance->Users->clientlist->end(); a++) { - if (InspIRCd::Match(a->second->host, parameters[0]) || match(a->second->dhost, parameters[0])) + if (match(a->second->host, parameters[0]) || match(a->second->dhost, parameters[0])) { /* host or vhost matches mask */ user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost()); } /* IP address */ - else if (InspIRCd::Match(a->second->GetIPString(), parameters[0], true)) + else if (match(a->second->GetIPString(), parameters[0], true)) { /* same IP. */ user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost()); diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp index f5b3d08da..64ba71d95 100644 --- a/src/modules/m_cloaking.cpp +++ b/src/modules/m_cloaking.cpp @@ -12,6 +12,7 @@ */ #include "inspircd.h" +#include "wildcard.h" #include "m_hash.h" /* $ModDesc: Provides masking of user hostnames */ @@ -313,7 +314,7 @@ class ModuleCloaking : public Module snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), tofree->c_str()); for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++) { - if (InspIRCd::Match(mask,i->data)) + if (match(mask,i->data)) return -1; } } diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp index 097227d39..82bdf5550 100644 --- a/src/modules/m_clones.cpp +++ b/src/modules/m_clones.cpp @@ -12,6 +12,7 @@ */ #include "inspircd.h" +#include "wildcard.h" /* $ModDesc: Provides the /clones command to retrieve information on clones. */ diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp index 76487122f..2489f2a1f 100644 --- a/src/modules/m_conn_umodes.cpp +++ b/src/modules/m_conn_umodes.cpp @@ -12,6 +12,7 @@ */ #include "inspircd.h" +#include "wildcard.h" /* $ModDesc: Sets (and unsets) modes on users when they connect */ @@ -63,7 +64,7 @@ class ModuleModesOnConnect : public Module { std::string hostn = Conf->ReadValue("connect","allow",j); /* XXX: Fixme: does not respect port, limit, etc */ - if ((InspIRCd::Match(user->GetIPString(),hostn,true)) || (InspIRCd::Match(user->host,hostn))) + if ((match(user->GetIPString(),hostn,true)) || (match(user->host,hostn))) { std::string ThisModes = Conf->ReadValue("connect","modes",j); if (!ThisModes.empty()) diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp index 75d086f52..0023ab6dc 100644 --- a/src/modules/m_customtitle.cpp +++ b/src/modules/m_customtitle.cpp @@ -12,6 +12,7 @@ */ #include "inspircd.h" +#include "wildcard.h" /* $ModDesc: Provides the TITLE command which allows setting of CUSTOM WHOIS TITLE line */ @@ -33,7 +34,7 @@ class CommandTitle : public Command std::string xhost; while (hl >> xhost) { - if (InspIRCd::Match(host, xhost) || match(ip,xhost, true)) + if (match(host, xhost) || match(ip,xhost, true)) { return true; } diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp index 45c9cbcd6..2717d873a 100644 --- a/src/modules/m_denychans.cpp +++ b/src/modules/m_denychans.cpp @@ -12,6 +12,7 @@ */ #include "inspircd.h" +#include "wildcard.h" /* $ModDesc: Implements config tags which allow blocking of joins to channels */ @@ -53,12 +54,12 @@ class ModuleDenyChannels : public Module for (int j =0; j < Conf->Enumerate("badchan"); j++) { - if (InspIRCd::Match(redirect, Conf->ReadValue("badchan","name",j))) + if (match(redirect, Conf->ReadValue("badchan","name",j))) { bool goodchan = false; for (int k =0; k < Conf->Enumerate("goodchan"); k++) { - if (InspIRCd::Match(redirect, Conf->ReadValue("goodchan","name",k))) + if (match(redirect, Conf->ReadValue("goodchan","name",k))) goodchan = true; } @@ -90,7 +91,7 @@ class ModuleDenyChannels : public Module { for (int j =0; j < Conf->Enumerate("badchan"); j++) { - if (InspIRCd::Match(cname, Conf->ReadValue("badchan","name",j))) + if (match(cname, Conf->ReadValue("badchan","name",j))) { if (IS_OPER(user) && Conf->ReadFlag("badchan","allowopers",j)) { @@ -103,7 +104,7 @@ class ModuleDenyChannels : public Module for (int i = 0; i < Conf->Enumerate("goodchan"); i++) { - if (InspIRCd::Match(cname, Conf->ReadValue("goodchan", "name", i))) + if (match(cname, Conf->ReadValue("goodchan", "name", i))) { return 0; } diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp index 3dcae8293..95c40d65e 100644 --- a/src/modules/m_hostchange.cpp +++ b/src/modules/m_hostchange.cpp @@ -12,6 +12,7 @@ */ #include "inspircd.h" +#include "wildcard.h" /* $ModDesc: Provides masking of user hostnames in a different way to m_cloaking */ @@ -96,7 +97,7 @@ class ModuleHostChange : public Module { for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++) { - if (((InspIRCd::Match(user->MakeHost(), i->first, true)) || (InspIRCd::Match(user->MakeHostIP(), i->first)))) + if (((match(user->MakeHost(), i->first, true)) || (match(user->MakeHostIP(), i->first)))) { Host* h = i->second; diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp index 0258deba9..0aa462818 100644 --- a/src/modules/m_httpd_acl.cpp +++ b/src/modules/m_httpd_acl.cpp @@ -14,6 +14,7 @@ #include "inspircd.h" #include "httpd.h" #include "protocol.h" +#include "wildcard.h" /* $ModDesc: Provides access control lists (passwording of resources, ip restrictions etc) to m_httpd.so dependent modules */ /* $ModDep: httpd.h */ @@ -172,7 +173,7 @@ class ModuleHTTPAccessList : public Module for (std::vector<HTTPACL>::const_iterator this_acl = acl_list.begin(); this_acl != acl_list.end(); ++this_acl) { - if (InspIRCd::Match(http->GetURI(), this_acl->path)) + if (match(http->GetURI(), this_acl->path)) { if (!this_acl->blacklist.empty()) { @@ -182,7 +183,7 @@ class ModuleHTTPAccessList : public Module while (sep.GetToken(entry)) { - if (InspIRCd::Match(http->GetIP(), entry)) + if (match(http->GetIP(), entry)) { ServerInstance->Logs->Log("m_httpd_acl", DEBUG, "Denying access to blacklisted resource %s (matched by pattern %s) from ip %s (matched by entry %s)", http->GetURI().c_str(), this_acl->path.c_str(), http->GetIP().c_str(), entry.c_str()); @@ -200,7 +201,7 @@ class ModuleHTTPAccessList : public Module while (sep.GetToken(entry)) { - if (InspIRCd::Match(http->GetIP(), entry)) + if (match(http->GetIP(), entry)) allow_access = true; } diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp index dccba06b3..98b1ab55e 100644 --- a/src/modules/m_inviteexception.cpp +++ b/src/modules/m_inviteexception.cpp @@ -69,7 +69,7 @@ public: std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString(); for (modelist::iterator it = list->begin(); it != list->end(); it++) { - if(InspIRCd::Match(user->GetFullRealHost(), it->mask) || match(user->GetFullHost(), it->mask) || (InspIRCd::Match(mask, it->mask, true))) + if(match(user->GetFullRealHost(), it->mask) || match(user->GetFullHost(), it->mask) || (match(mask, it->mask, true))) { // They match an entry on the list, so let them in. return 1; @@ -94,7 +94,7 @@ public: std::string mask = std::string(LM->user->nick) + "!" + LM->user->ident + "@" + LM->user->GetIPString(); for (modelist::iterator it = list->begin(); it != list->end(); it++) { - if (InspIRCd::Match(LM->user->GetFullRealHost(), it->mask) || match(LM->user->GetFullHost(), it->mask.c_str()) || (InspIRCd::Match(mask, it->mask, true))) + if (match(LM->user->GetFullRealHost(), it->mask) || match(LM->user->GetFullHost(), it->mask.c_str()) || (match(mask, it->mask, true))) { // They match an entry return (char*)it->mask.c_str(); diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index 9e2cbd719..8d01833d6 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -12,6 +12,7 @@ */ #include "inspircd.h" +#include "wildcard.h" /* $ModDesc: Provides support for unreal-style oper-override */ diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp index 9638a7a5e..f719b9e87 100644 --- a/src/modules/m_safelist.cpp +++ b/src/modules/m_safelist.cpp @@ -12,6 +12,7 @@ */ #include "inspircd.h" +#include "wildcard.h" /** Holds a users m_safelist state */ @@ -184,7 +185,7 @@ class ModuleSafeList : public Module if ((chan) && (chan->modes[CM_PRIVATE]) && (!IS_OPER(user))) { - bool display = (InspIRCd::Match(chan->name, ld->glob) || (!chan->topic.empty() && match(chan->topic, ld->glob))); + bool display = (match(chan->name, ld->glob) || (!chan->topic.empty() && match(chan->topic, ld->glob))); if ((users) && (display)) { int counter = snprintf(buffer, MAXBUF, "322 %s * %ld :", user->nick.c_str(), users); @@ -194,7 +195,7 @@ class ModuleSafeList : public Module } else if ((chan) && ((((!(chan->IsModeSet('p'))) && (!(chan->IsModeSet('s'))))) || (has_user) || IS_OPER(user))) { - bool display = (InspIRCd::Match(chan->name, ld->glob) || (!chan->topic.empty() && match(chan->topic, ld->glob))); + bool display = (match(chan->name, ld->glob) || (!chan->topic.empty() && match(chan->topic, ld->glob))); if ((users) && (display)) { int counter = snprintf(buffer, MAXBUF, "322 %s %s %ld :[+%s] %s", user->nick.c_str(), chan->name.c_str(), users, chan->ChanModes(has_user || IS_OPER(user)), chan->topic.c_str()); diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp index 6ffee68c0..cdd968212 100644 --- a/src/modules/m_silence.cpp +++ b/src/modules/m_silence.cpp @@ -12,6 +12,7 @@ */ #include "inspircd.h" +#include "wildcard.h" /* $ModDesc: Provides support for the /SILENCE command */ 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" diff --git a/src/modules/m_spy.cpp b/src/modules/m_spy.cpp index 193d22234..c43cee956 100644 --- a/src/modules/m_spy.cpp +++ b/src/modules/m_spy.cpp @@ -14,6 +14,7 @@ /* $ModDesc: Provides the ability to see the complete names list of channels an oper is not a member of */ #include "inspircd.h" +#include "wildcard.h" class ModuleSpy : public Module { diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp index 843b68fca..31bd67e17 100644 --- a/src/modules/m_tline.cpp +++ b/src/modules/m_tline.cpp @@ -12,6 +12,7 @@ */ #include "inspircd.h" +#include "wildcard.h" /* $ModDesc: Provides /tline command used to test who a mask matches */ @@ -36,7 +37,7 @@ class CommandTline : public Command for (user_hash::const_iterator u = ServerInstance->Users->clientlist->begin(); u != ServerInstance->Users->clientlist->end(); u++) { n_counted++; - if (InspIRCd::Match(u->second->GetFullRealHost(),parameters[0])) + if (match(u->second->GetFullRealHost(),parameters[0])) { n_matched++; n_match_host++; @@ -44,7 +45,7 @@ class CommandTline : public Command else { std::string host = std::string(u->second->ident) + "@" + u->second->GetIPString(); - if (InspIRCd::Match(host, parameters[0], true)) + if (match(host, parameters[0], true)) { n_matched++; n_match_ip++; |