Merge insp20

[user/henk/code/inspircd.git] / src / modules / extra / m_geoip.cpp

diff --git a/src/modules/extra/m_geoip.cpp b/src/modules/extra/m_geoip.cpp
index 939752875e886ffa78ecdf7af1be71edf30163e7..d21a82149b423cbbe84fca796fff24f5dbddff5f 100644 (file)
--- a/src/modules/extra/m_geoip.cpp
+++ b/src/modules/extra/m_geoip.cpp
@@ -23,11 +23,10 @@
 
 #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
@@ -35,43 +34,58 @@ 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)
+       ModuleGeoIP()
+               : ext("geoip_cc", ExtensionItem::EXT_USER, 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;
@@ -82,7 +96,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)
-