X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fwildcard.cpp;h=f9e706906b3f4bbe3339b22b36088680a035bf6d;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=345c822d2d3bb58f4823d5623def24be6b670d45;hpb=fd0fa86da89ab4cefa778307088ef2552a05a170;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 345c822d2..f9e706906 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -1,8 +1,11 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2003, 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2013, 2017 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2008, 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -20,12 +23,11 @@
 
 
 #include "inspircd.h"
-#include "hashcomp.h"
-#include "inspstring.h"
 
-static bool match_internal(const unsigned char *str, const unsigned char *mask, unsigned const char *map)
+static bool MatchInternal(const unsigned char* str, const unsigned char* mask, unsigned const char* map)
 {
-	unsigned char *cp = NULL, *mp = NULL;
+	unsigned char* cp = NULL;
+	unsigned char* mp = NULL;
 	unsigned char* string = (unsigned char*)str;
 	unsigned char* wild = (unsigned char*)mask;
 
@@ -72,56 +74,49 @@ static bool match_internal(const unsigned char *str, const unsigned char *mask,
 	return !*wild;
 }
 
-/********************************************************************
- * Below here is all wrappers around match_internal
- ********************************************************************/
+// Below here is all wrappers around MatchInternal
 
-bool InspIRCd::Match(const std::string &str, const std::string &mask, unsigned const char *map)
+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);
+	return MatchInternal((const unsigned char*)str.c_str(), (const unsigned char*)mask.c_str(), map);
 }
 
-bool InspIRCd::Match(const char *str, const char *mask, unsigned const char *map)
+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);
+
+	return MatchInternal((const unsigned char*)str, (const unsigned char*)mask, map);
 }
 
-bool InspIRCd::MatchCIDR(const std::string &str, const std::string &mask, unsigned const char *map)
+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);
 }
 
-bool InspIRCd::MatchCIDR(const char *str, const char *mask, unsigned const char *map)
+bool InspIRCd::MatchCIDR(const char* str, const char* 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);
 }
 
 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) || 
+		if (InspIRCd::Match(hostname, mask, ascii_case_insensitive_map) ||
 			InspIRCd::MatchCIDR(ipaddr, mask, ascii_case_insensitive_map))
 		{
 			return true;