summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2008-05-09 17:24:50 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2008-05-09 17:24:50 +0000
commit03ef675c0dd4742464d8ad93888e98721a044108 (patch)
treeb3c65ebc4118b415a3f339f5ac852d5b58bc9f8b /include
parentfc349c873818311b6a45aeaace624a3cd3ec96f2 (diff)
Convert CIDR matching and wildcard matching to operate on std::strings
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9681 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'include')
-rw-r--r--include/socket.h6
-rw-r--r--include/testsuite.h1
-rw-r--r--include/wildcard.h8
3 files changed, 8 insertions, 7 deletions
diff --git a/include/socket.h b/include/socket.h
index 7ff40794c..e6ea1615d 100644
--- a/include/socket.h
+++ b/include/socket.h
@@ -81,7 +81,7 @@ namespace irc
* @returns True if the first mask_bits of address matches the first
* mask_bits of mask.
*/
- CoreExport bool MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mask_bits);
+ CoreExport bool MatchCIDRBits(const unsigned char* address, const unsigned char* mask, unsigned int mask_bits);
/** Match CIDR, without matching username/nickname parts.
*
@@ -92,7 +92,7 @@ namespace irc
* @param cidr_mask The human readable mask, e.g. 1.2.0.0/16
* @return True if the mask matches the address
*/
- CoreExport bool MatchCIDR(const char* address, const char* cidr_mask);
+ CoreExport bool MatchCIDR(const std::string &address, const std::string &cidr_mask);
/** Match CIDR, including an optional username/nickname part.
*
@@ -105,7 +105,7 @@ namespace irc
* @param cidr_mask The human readable mask, e.g. *\@1.2.0.0/16
* @return True if the mask matches the address
*/
- CoreExport bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_username);
+ CoreExport bool MatchCIDR(const std::string &address, const std::string &cidr_mask, bool match_with_username);
/** Convert an insp_inaddr into human readable form.
*
diff --git a/include/testsuite.h b/include/testsuite.h
index 27472faa9..45456aa47 100644
--- a/include/testsuite.h
+++ b/include/testsuite.h
@@ -25,6 +25,7 @@ class TestSuite : public Extensible
~TestSuite();
bool DoThreadTests();
+ bool DoWildTests();
};
#endif
diff --git a/include/wildcard.h b/include/wildcard.h
index 0d5e3e0aa..8c99b8dca 100644
--- a/include/wildcard.h
+++ b/include/wildcard.h
@@ -16,21 +16,21 @@
* @param mask the mask to check against
* @return true if the strings match
*/
-CoreExport bool match(const char *str, const char *mask);
+CoreExport bool match(const std::string &str, const std::string &mask);
/** Match a string against a mask, and define wether or not to use CIDR rules
* @param str The string to check
* @param mask the mask to check against
* @param use_cidr_match True if CIDR matching rules should be applied first
* @return true if the strings match
*/
-CoreExport bool match(const char *str, const char *mask, bool use_cidr_match);
+CoreExport bool match(const std::string &str, const std::string &mask, bool use_cidr_match);
/** Match a string against a mask, defining wether case sensitivity applies.
* @param str The string to check
* @param mask the mask to check against
* @param case_sensitive True if the match is case sensitive
* @return True if the strings match
*/
-CoreExport bool match(bool case_sensitive, const char *str, const char *mask);
+CoreExport bool match(bool case_sensitive, const std::string &str, const std::string &mask);
/** Match a string against a mask, defining wether case sensitivity applies,
* and defining wether or not to use CIDR rules first.
* @param case_sensitive True if the match is case sensitive
@@ -39,5 +39,5 @@ CoreExport bool match(bool case_sensitive, const char *str, const char *mask);
* @param use_cidr_match True if CIDR matching rules should be applied first
* @return true if the strings match
*/
-CoreExport bool match(bool case_sensitive, const char *str, const char *mask, bool use_cidr_match);
+CoreExport bool match(bool case_sensitive, const std::string &str, const std::string &mask, bool use_cidr_match);