Support for geoipasnum and geoiporg

AUTHORS

@@ -11,3 +11,4 @@ Lorenzo Pistone <[email protected]>
 Mike Trinkala <[email protected]>
 Vadim A. Misbakh-Soloviov <[email protected]>
 Marcin Deranek <[email protected]>
+Jimmy Carter <[email protected]>

rockspec/lua-geoip-scm-1.rockspec

@@ -50,6 +50,16 @@ build = {
             "src/"
          },
          libraries = { "GeoIP" }
-      }
+      },                         
+      ["geoip.asnum"] = {
+         sources = {
+            "src/database.c",
+            "src/asnum.c"
+         },
+         incdirs = {
+            "src/"
+         },
+         libraries = { "GeoIP" }
+      } 
    }
 }

src/asnum.c

@@ -0,0 +1,196 @@
+/*
+* asnum.c: Bindings for MaxMind's GeoIP library
+*              See copyright information in file COPYRIGHT.
+*/
+
+#include "lua-geoip.h"
+#include "database.h"
+
+#define LUAGEOIP_ASNUM_VERSION     "lua-geoip.asnum 0.1.1"
+#define LUAGEOIP_ASNUM_COPYRIGHT   "Copyright (C) 2011, lua-geoip authors"
+#define LUAGEOIP_ASNUM_DESCRIPTION \
+        "Bindings for MaxMind's GeoIP library (asnum database)"
+
+static GeoIP * check_asnum_db(lua_State * L, int idx)
+{
+  int type = 0;
+  luageoip_DB * pDB = (luageoip_DB *)luaL_checkudata(
+      L,
+      idx,
+      LUAGEOIP_ASNUM_MT
+    );
+  if (pDB == NULL)
+  {
+    lua_pushstring(L, "lua-geoip error: asnum db is null");
+    return NULL;
+  }
+
+  if (pDB->pGeoIP == NULL)
+  {
+    lua_pushstring(L, "lua-geoip error: attempted to use closed asnum db");
+    return NULL;
+  }
+
+  type = GeoIP_database_edition(pDB->pGeoIP);
+  if (
+      type != GEOIP_ASNUM_EDITION &&
+      type != GEOIP_ASNUM_EDITION_V6
+    )
+  {
+    lua_pushstring(L, "lua-geoip error: object is not a asnum db");
+    return NULL;
+  }
+
+  return pDB->pGeoIP;
+}
+
+
+
+static int lasnum_query_by_name(lua_State * L)
+{
+  GeoIP * pGeoIP = check_asnum_db(L, 1);
+  const char * name = luaL_checkstring(L, 2);
+
+  if (pGeoIP == NULL)
+  {
+    return lua_error(L); /* Error message already on stack */
+  }
+
+   lua_pushstring(
+      L, GeoIP_org_by_name(pGeoIP, name)
+    );
+   return 1;
+}
+
+
+
+static int lasnum_charset(lua_State * L)
+{
+  GeoIP * pGeoIP = check_asnum_db(L, 1);
+  if (pGeoIP == NULL)
+  {
+    return lua_error(L); /* Error message already on stack */
+  }
+
+  lua_pushinteger(L, GeoIP_charset(pGeoIP));
+
+  return 1;
+}
+
+static int lasnum_set_charset(lua_State * L)
+{
+  GeoIP * pGeoIP = check_asnum_db(L, 1);
+  int charset = luaL_checkint(L, 2);
+
+  if (pGeoIP == NULL)
+  {
+    return lua_error(L); /* Error message already on stack */
+  }
+
+  GeoIP_set_charset(pGeoIP, charset);
+
+  return 0;
+}
+
+static int lasnum_close(lua_State * L)
+{
+  luageoip_DB * pDB = (luageoip_DB *)luaL_checkudata(L, 1, LUAGEOIP_ASNUM_MT);
+
+  if (pDB && pDB->pGeoIP != NULL)
+  {
+  	GeoIP_delete(pDB->pGeoIP);
+  	pDB->pGeoIP = NULL;
+  }
+
+  return 0;
+}
+
+#define lasnum_gc lasnum_close
+
+static int lasnum_tostring(lua_State * L)
+{
+  GeoIP * pGeoIP = check_asnum_db(L, 1);
+  if (pGeoIP == NULL)
+  {
+    return lua_error(L); /* Error message already on stack */
+  }
+
+  lua_pushstring(L, GeoIP_database_info(pGeoIP));
+
+  return 1;
+}
+
+static const luaL_reg M[] =
+{
+  { "query_by_name", lasnum_query_by_name },
+  /*
+  { "query_by_addr", lasnum_query_by_addr },
+  { "query_by_ipnum", lasnum_query_by_ipnum },
+*/
+  { "charset", lasnum_charset },
+  { "set_charset", lasnum_set_charset },
+  { "close", lasnum_close },
+  { "__gc", lasnum_gc },
+  { "__tostring", lasnum_tostring },
+
+  { NULL, NULL }
+};
+
+/* Error message capture code inspired by code by Wolfgang Oertl. */
+static int lasnum_open(lua_State * L)
+{
+  static const int allowed_types[] =
+  {
+    GEOIP_ASNUM_EDITION,
+    GEOIP_ASNUM_EDITION_V6
+  };
+
+  return luageoip_common_open_db(
+      L,
+      M,
+      GEOIP_ASNUM_EDITION,
+      GEOIP_MEMORY_CACHE,
+      LUAGEOIP_ASNUM_MT,
+      GEOIP_INDEX_CACHE, /* not allowed */
+      2,
+      allowed_types
+    );
+}
+
+/* Lua module API */
+static const struct luaL_reg R[] =
+{
+  { "open", lasnum_open },
+
+  { NULL, NULL }
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+LUALIB_API int luaopen_geoip_asnum(lua_State * L)
+{
+  /*
+  * Register module
+  */
+  luaL_register(L, "geoip.asnum", R);
+
+  /*
+  * Register module information
+  */
+  lua_pushliteral(L, LUAGEOIP_ASNUM_VERSION);
+  lua_setfield(L, -2, "_VERSION");
+
+  lua_pushliteral(L, LUAGEOIP_ASNUM_COPYRIGHT);
+  lua_setfield(L, -2, "_COPYRIGHT");
+
+  lua_pushliteral(L, LUAGEOIP_ASNUM_DESCRIPTION);
+  lua_setfield(L, -2, "_DESCRIPTION");
+
+  return 1;
+}
+
+#ifdef __cplusplus
+}
+#endif

src/database.h

@@ -7,11 +7,12 @@
 #define LUAGEOIP_DATABASE_H_
 
 #define LUAGEOIP_COUNTRY_MT "lua-geoip.db.country"
+#define LUAGEOIP_ASNUM_MT "lua-geoip.db.asnum"
 #define LUAGEOIP_CITY_MT "lua-geoip.db.city"
 
 int luageoip_common_open_db(
     lua_State * L,
-    const luaL_Reg * M,
+    const luaL_reg * M,
     int default_type,
     int default_flags,
     const char * mt_name,