Move some of the modules in extras/ that arent really extra out of extras. Mark our modules as VENDOR and allow modules to have multple types.

1 files changed, 0 insertions, 176 deletions

diff --git a/modules/extra/m_dnsbl.cpp b/modules/extra/m_dnsbl.cpp
deleted file mode 100644
index 49d39d980..000000000
--- a/modules/extra/m_dnsbl.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * (C) 2003-2013 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- */
-
-#include "module.h"
-#include "dns.h"
-
-using namespace DNS;
-
-static ServiceReference<XLineManager> akills("XLineManager", "xlinemanager/sgline");
-static ServiceReference<Manager> dnsmanager("DNS::Manager", "dns/manager");
-
-struct Blacklist
-{
-	Anope::string name;
-	time_t bantime;
-	Anope::string reason;
-	std::map<int, Anope::string> replies;
-
-	Blacklist(const Anope::string &n, time_t b, const Anope::string &r, const std::map<int, Anope::string> &re) : name(n), bantime(b), reason(r), replies(re) { }
-};
-
-class DNSBLResolver : public Request
-{
-	Reference<User> user;
-	Blacklist blacklist;
-	bool add_to_akill;
-
- public:
-	DNSBLResolver(Module *c, User *u, const Blacklist &b, const Anope::string &host, bool add_akill) : Request(dnsmanager, c, host, QUERY_A, true), user(u), blacklist(b), add_to_akill(add_akill) { }
-
-	void OnLookupComplete(const Query *record) anope_override
-	{
-		if (!user || user->HasExt("m_dnsbl_akilled"))
-			return;
-
-		const ResourceRecord &ans_record = record->answers[0];
-		// Replies should be in 127.0.0.0/24
-		if (ans_record.rdata.find("127.0.0.") != 0)
-			return;
-
-		Anope::string record_reason;
-		if (!this->blacklist.replies.empty())
-		{
-			sockaddrs sresult;
-			sresult.pton(AF_INET, ans_record.rdata);
-			int result = sresult.sa4.sin_addr.s_addr >> 24;
-
-			if (!this->blacklist.replies.count(result))
-				return;
-			record_reason = this->blacklist.replies[result];
-		}
-
-		user->Extend("m_dnsbl_akilled");
-
-		Anope::string reason = this->blacklist.reason;
-		reason = reason.replace_all_cs("%n", user->nick);
-		reason = reason.replace_all_cs("%u", user->GetIdent());
-		reason = reason.replace_all_cs("%g", user->realname);
-		reason = reason.replace_all_cs("%h", user->host);
-		reason = reason.replace_all_cs("%i", user->ip);
-		reason = reason.replace_all_cs("%r", record_reason);
-		reason = reason.replace_all_cs("%N", Config->NetworkName);
-
-		Log(OperServ) << "DNSBL: " << user->GetMask() << " (" << user->ip << ") appears in " << this->blacklist.name;
-		XLine *x = new XLine("*@" + user->ip, Config->OperServ, Anope::CurTime + this->blacklist.bantime, reason, XLineManager::GenerateUID());
-		if (this->add_to_akill && akills)
-		{
-			akills->AddXLine(x);
-			akills->Send(NULL, x);
-		}
-		else
-		{
-			IRCD->SendAkill(NULL, x);
-			delete x;
-		}
-	}
-};
-
-class ModuleDNSBL : public Module
-{
-	std::vector<Blacklist> blacklists;
-	bool check_on_connect;
-	bool check_on_netburst;
-	bool add_to_akill;
-
- public:
-	ModuleDNSBL(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, SUPPORTED)
-	{
-		this->SetAuthor("Anope");
-
-		Implementation i[] = { I_OnReload, I_OnUserConnect };
-		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
-
-		OnReload();
-	}
-
-	void OnReload() anope_override
-	{
-		ConfigReader config;
-
-		this->check_on_connect = config.ReadFlag("m_dnsbl", "check_on_connect", "no", 0);
-		this->check_on_netburst = config.ReadFlag("m_dnsbl", "check_on_netburst", "no", 0);
-		this->add_to_akill = config.ReadFlag("m_dnsbl", "add_to_akill", "yes", 0);
-
-		this->blacklists.clear();
-		for (int i = 0, num = config.Enumerate("blacklist"); i < num; ++i)
-		{
-			Anope::string bname = config.ReadValue("blacklist", "name", "", i);
-			if (bname.empty())
-				continue;
-			Anope::string sbantime = config.ReadValue("blacklist", "time", "4h", i);
-			time_t bantime = Anope::DoTime(sbantime);
-			if (bantime < 0)
-				bantime = 9000;
-			Anope::string reason = config.ReadValue("blacklist", "reason", "", i);
-			std::map<int, Anope::string> replies;
-			for (int j = 0; j < 256; ++j)
-			{
-				Anope::string k = config.ReadValue("blacklist", stringify(j), "", i);
-				if (!k.empty())
-					replies[j] = k;
-			}
-
-			this->blacklists.push_back(Blacklist(bname, bantime, reason, replies));
-		}
-	}
-
-	void OnUserConnect(User *user, bool &exempt) anope_override
-	{
-		if (exempt || user->Quitting() || (!this->check_on_connect && !Me->IsSynced()) || !dnsmanager)
-			return;
-
-		if (!this->check_on_netburst && !user->server->IsSynced())
-			return;
-
-		/* At this time we only support IPv4 */
-		sockaddrs user_ip;
-		try
-		{
-			user_ip.pton(AF_INET, user->ip);
-		}
-		catch (const SocketException &)
-		{
-			/* User doesn't have a valid IPv4 IP (ipv6/spoof/etc) */
-			return;
-		}
-
-		const unsigned long &ip = user_ip.sa4.sin_addr.s_addr;
-		unsigned long reverse_ip = (ip << 24) | ((ip & 0xFF00) << 8) | ((ip & 0xFF0000) >> 8) | (ip >> 24);
-
-		user_ip.sa4.sin_addr.s_addr = reverse_ip;
-
-		for (unsigned i = 0; i < this->blacklists.size(); ++i)
-		{
-			const Blacklist &b = this->blacklists[i];
-
-			try
-			{
-				Anope::string dnsbl_host = user_ip.addr() + "." + b.name;
-				DNSBLResolver *res = new DNSBLResolver(this, user, b, dnsbl_host, this->add_to_akill);
-				dnsmanager->Process(res);
-			}
-			catch (const SocketException &ex)
-			{
-				Log(this) << ex.GetReason();
-			}
-		}
-	}
-};
-
-MODULE_INIT(ModuleDNSBL)
-