X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhashcomp.cpp;h=4ed98712a809e1d74e632e104ad35fef2996605f;hb=6214094a84f33ea80af4dac88dd1b82bd59a0b5c;hp=8febcbb5f6b08784a3d5d92a0595cec4e80a340c;hpb=b2ac8cc0a6405946a388b80df3be21bc276a61f3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 8febcbb5f..4ed98712a 100644
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -1,10 +1,16 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2013, 2018-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Adam <Adam@anope.org>
+ *   Copyright (C) 2012-2013, 2015-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2005-2009 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2007, 2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -193,8 +199,8 @@ size_t irc::insensitive::operator()(const std::string &s) const
 	return t;
 }
 
-irc::tokenstream::tokenstream(const std::string& msg, size_t start)
-	: message(msg, start)
+irc::tokenstream::tokenstream(const std::string& msg, size_t start, size_t end)
+	: message(msg, start, end)
 	, position(0)
 {
 }
@@ -287,6 +293,16 @@ bool irc::sepstream::StreamEnd()
 	return this->pos > this->tokens.length();
 }
 
+bool irc::sepstream::Contains(const std::string& value)
+{
+	std::string token;
+	while (GetToken(token))
+		if (value == token)
+			return true;
+
+	return false;
+}
+
 irc::portparser::portparser(const std::string &source, bool allow_overlapped)
 	: sep(source), in_range(0), range_begin(0), range_end(0), overlapped(allow_overlapped)
 {
@@ -330,7 +346,7 @@ long irc::portparser::GetToken()
 	if (x.empty())
 		return 0;
 
-	while (Overlaps(atoi(x.c_str())))
+	while (Overlaps(ConvToNum<long>(x)))
 	{
 		if (!sep.GetToken(x))
 			return 0;
@@ -340,8 +356,8 @@ long irc::portparser::GetToken()
 	if (dash != std::string::npos)
 	{
 		std::string sbegin(x, 0, dash);
-		range_begin = atoi(sbegin.c_str());
-		range_end = atoi(x.c_str()+dash+1);
+		range_begin =  ConvToNum<long>(sbegin);
+		range_end =  ConvToNum<long>(x.c_str() + dash + 1);
 
 		if ((range_begin > 0) && (range_end > 0) && (range_begin < 65536) && (range_end < 65536) && (range_begin < range_end))
 		{
@@ -351,11 +367,11 @@ long irc::portparser::GetToken()
 		else
 		{
 			/* Assume its just the one port */
-			return atoi(sbegin.c_str());
+			return ConvToNum<long>(sbegin);
 		}
 	}
 	else
 	{
-		return atoi(x.c_str());
+		return ConvToNum<long>(x);
 	}
 }