X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_geoip.cpp;h=3561d1a5da2f21d18bbb61c4acf072b88f4145dc;hb=3ccf0065d43db80f31c6404aeac4d65551481508;hp=5b78be88b765697d3db494b7906700fa26f2f1fa;hpb=699a8b2fc82949bfd5a39acc5b00670a5c350b4d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_geoip.cpp b/src/modules/extra/m_geoip.cpp
index 5b78be88b..3561d1a5d 100644
--- a/src/modules/extra/m_geoip.cpp
+++ b/src/modules/extra/m_geoip.cpp
@@ -1,26 +1,32 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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/>.
  */
 
+
 #include "inspircd.h"
 #include "xline.h"
 
 #include <GeoIP.h>
 
-#ifdef WINDOWS
+#ifdef _WIN32
 # pragma comment(lib, "GeoIP.lib")
 #endif
 
-/* $ModDesc: Provides a way to restrict users by country using GeoIP lookup */
 /* $LinkerFlags: -lGeoIP */
 
 class ModuleGeoIP : public Module
@@ -28,43 +34,56 @@ class ModuleGeoIP : public Module
 	LocalStringExt ext;
 	GeoIP* gi;
 
+	std::string* SetExt(LocalUser* user)
+	{
+		const char* c = GeoIP_country_code_by_addr(gi, user->GetIPString().c_str());
+		if (!c)
+			c = "UNK";
+
+		std::string* cc = new std::string(c);
+		ext.set(user, cc);
+		return cc;
+	}
+
  public:
 	ModuleGeoIP() : ext("geoip_cc", this), gi(NULL)
 	{
 	}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
 		gi = GeoIP_new(GEOIP_STANDARD);
 		if (gi == NULL)
 				throw ModuleException("Unable to initialize geoip, are you missing GeoIP.dat?");
 
-		ServerInstance->Modules->AddService(ext);
-		Implementation eventlist[] = { I_OnSetConnectClass };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+		const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
+		for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); ++i)
+		{
+			LocalUser* user = *i;
+			if ((user->registered == REG_ALL) && (!ext.get(user)))
+			{
+				SetExt(user);
+			}
+		}
 	}
 
 	~ModuleGeoIP()
 	{
-		GeoIP_delete(gi);
+		if (gi)
+			GeoIP_delete(gi);
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides a way to assign users to connect classes by country using GeoIP lookup", VF_VENDOR);
 	}
 
-	ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass)
+	ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE
 	{
 		std::string* cc = ext.get(user);
 		if (!cc)
-		{
-			const char* c = GeoIP_country_code_by_addr(gi, user->GetIPString());
-			if (!c)
-				c = "UNK";
-			cc = new std::string(c);
-			ext.set(user, cc);
-		}
+			cc = SetExt(user);
+
 		std::string geoip = myclass->config->getString("geoip");
 		if (geoip.empty())
 			return MOD_RES_PASSTHRU;
@@ -75,7 +94,36 @@ class ModuleGeoIP : public Module
 				return MOD_RES_PASSTHRU;
 		return MOD_RES_DENY;
 	}
+
+	ModResult OnStats(char symbol, User* user, string_list &out) CXX11_OVERRIDE
+	{
+		if (symbol != 'G')
+			return MOD_RES_PASSTHRU;
+
+		unsigned int unknown = 0;
+		std::map<std::string, unsigned int> results;
+
+		const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
+		for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); ++i)
+		{
+			std::string* cc = ext.get(*i);
+			if (cc)
+				results[*cc]++;
+			else
+				unknown++;
+		}
+
+		std::string p = "801 " + user->nick + " :GeoIPSTATS ";
+		for (std::map<std::string, unsigned int>::const_iterator i = results.begin(); i != results.end(); ++i)
+		{
+			out.push_back(p + i->first + " " + ConvToStr(i->second));
+		}
+
+		if (unknown)
+			out.push_back(p + "Unknown " + ConvToStr(unknown));
+
+		return MOD_RES_DENY;
+	}
 };
 
 MODULE_INIT(ModuleGeoIP)
-