Add support for blocking tag messages with the deaf mode.

[user/henk/code/inspircd.git] / src / wildcard.cpp

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index b62fd8a613d1b82802390a1d3178abae290daab9..f9e706906b3f4bbe3339b22b36088680a035bf6d 100644 (file)
--- 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,8 +23,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 +112,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))