X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fwildcard.cpp;h=4a313af760b34e2d7d4443005f4978be990c0ac7;hb=20fa9e1038ee3d5c2d0c89bf7e8e6dcda0644aa6;hp=b62fd8a613d1b82802390a1d3178abae290daab9;hpb=f71e6bf9cb41811f18864f5d4eecb26e29d03f25;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/wildcard.cpp b/src/wildcard.cpp index b62fd8a61..4a313af76 100644 --- a/src/wildcard.cpp +++ b/src/wildcard.cpp @@ -20,8 +20,6 @@ #include "inspircd.h" -#include "hashcomp.h" -#include "inspstring.h" static bool MatchInternal(const unsigned char* str, const unsigned char* mask, unsigned const char* map) { @@ -111,9 +109,9 @@ bool InspIRCd::MatchCIDR(const char* str, const char* mask, unsigned const char* bool InspIRCd::MatchMask(const std::string& masks, const std::string& hostname, const std::string& ipaddr) { - std::stringstream masklist(masks); + irc::spacesepstream masklist(masks); std::string mask; - while (masklist >> mask) + while (masklist.GetToken(mask)) { if (InspIRCd::Match(hostname, mask, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(ipaddr, mask, ascii_case_insensitive_map))