From 2c3745edb3013d4ffce393337566a8a58924740b Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Sun, 1 Jul 2012 21:11:59 +0200 Subject: Revert "users: introduce OnSetClientIP hook." This reverts commit 5fd31ec5a6ba6021763b36d8d17d4665900623ab. --- include/modules.h | 8 +------- src/modules.cpp | 1 - src/users.cpp | 2 -- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/include/modules.h b/include/modules.h index 7cd6bbeab..b428a5f8d 100644 --- a/include/modules.h +++ b/include/modules.h @@ -116,7 +116,7 @@ struct ModResult { * and numerical comparisons in preprocessor macros if they wish to support * multiple versions of InspIRCd in one file. */ -#define INSPIRCD_VERSION_API 2 +#define INSPIRCD_VERSION_API 1 /** * This #define allows us to call a method in all @@ -339,7 +339,6 @@ enum Implementation I_OnWhoisLine, I_OnBuildNeighborList, I_OnGarbageCollect, I_OnSetConnectClass, I_OnText, I_OnPassCompare, I_OnRunTestSuite, I_OnNamesListItem, I_OnNumeric, I_OnHookIO, I_OnPreRehash, I_OnModuleRehash, I_OnSendWhoLine, I_OnChangeIdent, - I_OnSetClientIP, I_END }; @@ -1289,11 +1288,6 @@ class CoreExport Module : public classbase, public usecountbase * @param line The raw line to send; modifiable, if empty no line will be returned. */ virtual void OnSendWhoLine(User* source, const std::vector& params, User* user, std::string& line); - - /** Called whenever a User's ip changes. - * @param user The user whose ip changed. - */ - virtual void OnSetClientIP(User *user); }; diff --git a/src/modules.cpp b/src/modules.cpp index 8306ff6af..ccd78a8f0 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -176,7 +176,6 @@ ModResult Module::OnNumeric(User*, unsigned int, const std::string&) { return MO void Module::OnHookIO(StreamSocket*, ListenSocket*) { } ModResult Module::OnAcceptConnection(int, ListenSocket*, irc::sockets::sockaddrs*, irc::sockets::sockaddrs*) { return MOD_RES_PASSTHRU; } void Module::OnSendWhoLine(User*, const std::vector&, User*, std::string&) { } -void Module::OnSetClientIP(User *) { } ModuleManager::ModuleManager() : ModCount(0) { diff --git a/src/users.cpp b/src/users.cpp index 020c1a9bf..0580bf54f 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -982,8 +982,6 @@ bool User::SetClientIP(irc::sockets::sockaddrs *sa) { memcpy(&client_sa, sa, sizeof(irc::sockets::sockaddrs)); - FOREACH_MOD(I_OnSetClientIP, OnSetClientIP(this)); - return true; } -- cgit v1.2.3