-/* Overloaded function that has the option of using cidr */
-bool match(const char *str, const char *mask, bool use_cidr_match)
+/********************************************************************
+ * Below here is all wrappers around match_internal
+ ********************************************************************/
+
+CoreExport bool InspIRCd::Match(const std::string &str, const std::string &mask, unsigned const char *map)
+{
+ if (!map)
+ map = national_case_insensitive_map;
+
+ return match_internal((const unsigned char *)str.c_str(), (const unsigned char *)mask.c_str(), map);
+}
+
+CoreExport bool InspIRCd::Match(const char *str, const char *mask, unsigned const char *map)
+{
+ if (!map)
+ map = national_case_insensitive_map;
+ return match_internal((const unsigned char *)str, (const unsigned char *)mask, map);
+}
+
+CoreExport bool InspIRCd::MatchCIDR(const std::string &str, const std::string &mask, unsigned const char *map)
+{
+ if (irc::sockets::MatchCIDR(str, mask, true))
+ return true;
+
+ if (!map)
+ map = national_case_insensitive_map;
+
+ // Fall back to regular match
+ return InspIRCd::Match(str, mask, map);
+}
+
+CoreExport bool InspIRCd::MatchCIDR(const char *str, const char *mask, unsigned const char *map)