Fix m_geoip warning about the use of C++11 features.

[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 cdd269003fffce75fbd9b5dfb8b5ecc17c19f93f..570901430be5dae46f5455df8ab8048623933e40 100644 (file)
--- a/src/modules/extra/m_geoip.cpp
+++ b/src/modules/extra/m_geoip.cpp
@@ -1,22 +1,39 @@
-/*       +------------------------------------+
- *       | 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"
 
+// Fix warnings about the use of commas at end of enumerator lists on C++03.
+#if defined __clang__
+# pragma clang diagnostic ignored "-Wc++11-extensions"
+#elif defined __GNUC__
+# pragma GCC diagnostic ignored "-pedantic"
+#endif
+
 #include <GeoIP.h>
 
-/* $ModDesc: Provides a way to restrict users by country using GeoIP lookup */
+#ifdef _WIN32
+# pragma comment(lib, "GeoIP.lib")
+#endif
+
 /* $LinkerFlags: -lGeoIP */
 
 class ModuleGeoIP : public Module
@@ -24,40 +41,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)
+       ModuleGeoIP()
+               : ext("geoip_cc", ExtensionItem::EXT_USER, this)
+               , gi(NULL)
        {
-               gi = GeoIP_new(GEOIP_STANDARD);
        }
 
-       void init()
+       void init() CXX11_OVERRIDE
        {
-               ServerInstance->Modules->AddService(ext);
-               Implementation eventlist[] = { I_OnSetConnectClass };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
+               gi = GeoIP_new(GEOIP_STANDARD);
+               if (gi == NULL)
+                               throw ModuleException("Unable to initialize geoip, are you missing GeoIP.dat?");
+
+               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;
@@ -68,7 +103,35 @@ class ModuleGeoIP : public Module
                                return MOD_RES_PASSTHRU;
                return MOD_RES_DENY;
        }
+
+       ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE
+       {
+               if (stats.GetSymbol() != '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++;
+               }
+
+               for (std::map<std::string, unsigned int>::const_iterator i = results.begin(); i != results.end(); ++i)
+               {
+                       stats.AddRow(801, "GeoIPSTATS " + i->first + " " + ConvToStr(i->second));
+               }
+
+               if (unknown)
+                       stats.AddRow(801, "GeoIPSTATS Unknown " + ConvToStr(unknown));
+
+               return MOD_RES_DENY;
+       }
 };
 
 MODULE_INIT(ModuleGeoIP)
-