X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhashcomp.cpp;h=ae9cf6e7646f3d1ebb0996691a080f3a53824006;hb=b64177d3fb4f113c4db3325575970964867f01cc;hp=a51430a4b9efc20f34c6a4f836823b9c21aacfb5;hpb=cbef0241a04eafe5250b75ebb3f7ef8c32ecb260;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index a51430a4b..ae9cf6e76 100644
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -287,6 +287,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 +340,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 +350,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 +361,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);
 	}
 }