* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
*/
#include "inspircd.h"
-#include "wildcard.h"
/* $ModDesc: Provides /tline command used to test who a mask matches */
/** Handle /TLINE
- */
-class cmd_tline : public command_t
+ */
+class CommandTline : public Command
{
public:
- cmd_tline (InspIRCd* Instance) : command_t(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, userrec *user)
+ CmdResult Handle (const std::vector<std::string> ¶meters, User *user)
{
float n_counted = 0;
float n_matched = 0;
float n_match_host = 0;
float n_match_ip = 0;
- for (user_hash::const_iterator u = ServerInstance->clientlist->begin(); u != ServerInstance->clientlist->end(); u++)
+ 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++;
}
}
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;
}
};
class ModuleTLine : public Module
{
- cmd_tline* newcommand;
+ CommandTline* newcommand;
public:
ModuleTLine(InspIRCd* Me)
: Module(Me)
{
-
- newcommand = new cmd_tline(ServerInstance);
+
+ newcommand = new CommandTline(ServerInstance);
ServerInstance->AddCommand(newcommand);
- }
- void Implements(char* List)
- {
}
+
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);
}
};