-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2006-2007 Craig Edwards <craigedwards@brainbox.cc>
*
- * ---------------------------------------------------
+ * 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
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-using namespace std;
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "wildcard.h"
#include "inspircd.h"
-#include "dns.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(Module* Creator) : Command(Creator,"TLINE", 1)
{
- this->source = "m_tline.so";
- this->syntax = "<mask>";
+ flags_needed = 'o'; this->syntax = "<mask>";
}
- CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+ CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
{
- float n_counted = 0;
- float n_matched = 0;
- float n_match_host = 0;
- float n_match_ip = 0;
+ unsigned int n_matched = 0;
+ unsigned int n_match_host = 0;
+ unsigned int n_match_ip = 0;
- for (user_hash::const_iterator u = ServerInstance->clientlist.begin(); u != ServerInstance->clientlist.end(); u++)
+ const user_hash& users = ServerInstance->Users->GetUsers();
+ for (user_hash::const_iterator u = users.begin(); u != users.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 = u->second->ident + "@" + u->second->GetIPString();
+ if (InspIRCd::MatchCIDR(host, parameters[0]))
{
n_matched++;
n_match_ip++;
}
}
}
+
+ unsigned long n_counted = users.size();
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);
+ {
+ float p = (n_matched / (float)n_counted) * 100;
+ user->WriteNotice(InspIRCd::Format("*** TLINE: Counted %lu user(s). Matched '%s' against %u user(s) (%0.2f%% of the userbase). %u by hostname and %u by IP address.", n_counted, parameters[0].c_str(), n_matched, p, 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->WriteNotice(InspIRCd::Format("*** TLINE: Counted %lu user(s). Matched '%s' against no user(s).", n_counted, parameters[0].c_str()));
- return CMD_FAILURE;
-
+ return CMD_SUCCESS;
}
};
class ModuleTLine : public Module
{
- cmd_tline* newcommand;
+ CommandTline cmd;
public:
- ModuleTLine(InspIRCd* Me)
- : Module::Module(Me)
- {
-
- newcommand = new cmd_tline(ServerInstance);
- ServerInstance->AddCommand(newcommand);
- }
-
- void Implements(char* List)
- {
- }
-
- virtual ~ModuleTLine()
+ ModuleTLine()
+ : cmd(this)
{
}
-
- virtual Version GetVersion()
- {
- return Version(1, 0, 0, 0, VF_VENDOR,API_VERSION);
- }
-};
-
-class ModuleTLineFactory : public ModuleFactory
-{
- public:
- ModuleTLineFactory()
+ Version GetVersion() CXX11_OVERRIDE
{
+ return Version("Provides /tline command used to test who a mask matches", VF_VENDOR);
}
-
- ~ModuleTLineFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleTLine(Me);
- }
-
};
-
-extern "C" void * init_module( void )
-{
- return new ModuleTLineFactory;
-}
-
+MODULE_INIT(ModuleTLine)