X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_tline.cpp;h=c249f3b3ba7f5ba8ad05bf8beac92b904822ab07;hb=a1a7b96a8c994eb09a3d071f3daf28252b8c188b;hp=28a3d2f69945929ed2bb980acf1ece2de11d7621;hpb=dd98d56cabcd08a3d5207454e002b187af98d28a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp
index 28a3d2f69..c249f3b3b 100644
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -12,22 +12,21 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /* $ModDesc: Provides /tline command used to test who a mask matches */
 
 /** Handle /TLINE
- */ 
+ */
 class CommandTline : public Command
 {
  public:
-	CommandTline (InspIRCd* Instance) : Command(Instance,"TLINE", 'o', 1)
+	CommandTline (InspIRCd* Instance) : Command(Instance,"TLINE", "o", 1)
 	{
 		this->source = "m_tline.so";
 		this->syntax = "<mask>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, User *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
 		float n_counted = 0;
 		float n_matched = 0;
@@ -37,16 +36,15 @@ class CommandTline : public Command
 		for (user_hash::const_iterator u = ServerInstance->Users->clientlist->begin(); u != ServerInstance->Users->clientlist->end(); u++)
 		{
 			n_counted++;
-			if (match(u->second->GetFullRealHost(),parameters[0]))
+			if (InspIRCd::Match(u->second->GetFullRealHost(),parameters[0]))
 			{
 				n_matched++;
 				n_match_host++;
 			}
 			else
 			{
-				char host[MAXBUF];
-				snprintf(host, MAXBUF, "%s@%s", u->second->ident, u->second->GetIPString());
-				if (match(host, parameters[0], true))
+				std::string host = std::string(u->second->ident) + "@" + u->second->GetIPString();
+				if (InspIRCd::MatchCIDR(host, parameters[0]))
 				{
 					n_matched++;
 					n_match_ip++;
@@ -54,11 +52,11 @@ class CommandTline : public Command
 			}
 		}
 		if (n_matched)
-			user->WriteServ( "NOTICE %s :*** TLINE: Counted %0.0f user(s). Matched '%s' against %0.0f user(s) (%0.2f%% of the userbase). %0.0f by hostname and %0.0f by IP address.",user->nick, n_counted, parameters[0], n_matched, (n_matched/n_counted)*100, n_match_host, n_match_ip);
+			user->WriteServ( "NOTICE %s :*** TLINE: Counted %0.0f user(s). Matched '%s' against %0.0f user(s) (%0.2f%% of the userbase). %0.0f by hostname and %0.0f by IP address.",user->nick.c_str(), n_counted, parameters[0].c_str(), n_matched, (n_matched/n_counted)*100, n_match_host, n_match_ip);
 		else
-			user->WriteServ( "NOTICE %s :*** TLINE: Counted %0.0f user(s). Matched '%s' against no user(s).", user->nick, n_counted, parameters[0]);
+			user->WriteServ( "NOTICE %s :*** TLINE: Counted %0.0f user(s). Matched '%s' against no user(s).", user->nick.c_str(), n_counted, parameters[0].c_str());
 
-		return CMD_LOCALONLY;			
+		return CMD_LOCALONLY;
 	}
 };
 
@@ -69,7 +67,7 @@ class ModuleTLine : public Module
 	ModuleTLine(InspIRCd* Me)
 		: Module(Me)
 	{
-		
+
 		newcommand = new CommandTline(ServerInstance);
 		ServerInstance->AddCommand(newcommand);
 
@@ -79,10 +77,10 @@ class ModuleTLine : public Module
 	virtual ~ModuleTLine()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_VENDOR,API_VERSION);
+		return Version(1, 2, 0, 0, VF_VENDOR,API_VERSION);
 	}
 };