[Patch][GeoIP][1.0.0] GeoIP Organization / ISP support

[Arnaud GRANAL]

On Mon, Apr 18, 2011 at 4:46 PM, Arnaud GRANAL <serphen at gmail.com> wrote:
> Hi,
>
> I added support for MaxMind GeoIP Organization / MaxMind GeoIP ISP.
> Valgrind leak check OK. Tested stable with 1M queries.
>

Oops, there was a typo in error message, here is the fixed patch:


--- nginx-1.0.0-org/src/http/modules/ngx_http_geoip_module.c
2011-01-27 13:51:59.000000000 +0100
+++ nginx-1.0.0/src/http/modules/ngx_http_geoip_module.c
2011-04-18 15:01:12.139868822 +0200
@@ -1,6 +1,7 @@

 /*
 * Copyright (C) Igor Sysoev
+ * Copyright (C) Arnaud Granal
 */


@@ -15,6 +16,7 @@
 typedef struct {
    GeoIP      *country;
    GeoIP      *city;
+    GeoIP      *organization;
 } ngx_http_geoip_conf_t;


@@ -30,6 +32,8 @@
    ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_geoip_city_variable(ngx_http_request_t *r,
    ngx_http_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_http_geoip_organization_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_geoip_region_name_variable(ngx_http_request_t *r,
    ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_geoip_city_float_variable(ngx_http_request_t *r,
@@ -44,6 +48,8 @@
    void *conf);
 static char *ngx_http_geoip_city(ngx_conf_t *cf, ngx_command_t *cmd,
    void *conf);
+static char *ngx_http_geoip_organization(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
 static void ngx_http_geoip_cleanup(void *data);


@@ -63,6 +69,13 @@
      0,
      NULL },

+    { ngx_string("geoip_organization"),
+      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE12,
+      ngx_http_geoip_organization,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      0,
+      NULL },
+
      ngx_null_command
 };

@@ -112,6 +125,10 @@
      ngx_http_geoip_country_variable,
      (uintptr_t) GeoIP_country_name_by_ipnum, 0, 0 },

+    { ngx_string("geoip_organization_name"), NULL,
+      ngx_http_geoip_organization_variable,
+      (uintptr_t) GeoIP_org_by_ipnum, 0, 0 },
+
    { ngx_string("geoip_city_continent_code"), NULL,
      ngx_http_geoip_city_variable,
      offsetof(GeoIPRecord, continent_code), 0, 0 },
@@ -210,6 +227,52 @@
    return NGX_OK;
 }

+static ngx_int_t
+ngx_http_geoip_organization_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    ngx_http_geoip_variable_handler_pt  handler =
+        (ngx_http_geoip_variable_handler_pt) data;
+
+    u_long                  addr;
+    const char             *val;
+    struct sockaddr_in     *sin;
+    ngx_http_geoip_conf_t  *gcf;
+
+    gcf = ngx_http_get_module_main_conf(r, ngx_http_geoip_module);
+
+    if (gcf->organization == NULL) {
+        goto not_found;
+    }
+
+    if (r->connection->sockaddr->sa_family != AF_INET) {
+        goto not_found;
+    }
+
+    sin = (struct sockaddr_in *) r->connection->sockaddr;
+    addr = ntohl(sin->sin_addr.s_addr);
+
+    val = handler(gcf->organization, addr);
+
+    if (val == NULL) {
+        goto not_found;
+    }
+
+    v->len = ngx_strlen(val);
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->data = (u_char *) val;
+
+    return NGX_OK;
+
+not_found:
+
+    v->not_found = 1;
+
+    return NGX_OK;
+}
+

 static ngx_int_t
 ngx_http_geoip_city_variable(ngx_http_request_t *r,
@@ -423,7 +486,6 @@
    return conf;
 }

-
 static char *
 ngx_http_geoip_country(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
@@ -522,6 +584,53 @@
    }
 }

+static char *
+ngx_http_geoip_organization(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_geoip_conf_t  *gcf = conf;
+
+    ngx_str_t  *value;
+
+    if (gcf->organization) {
+        return "is duplicate";
+    }
+
+    value = cf->args->elts;
+
+    gcf->organization = GeoIP_open((char *) value[1].data, GEOIP_MEMORY_CACHE);
+
+    if (gcf->organization == NULL) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "GeoIO_open(\"%V\") failed", &value[1]);
+
+        return NGX_CONF_ERROR;
+    }
+
+    if (cf->args->nelts == 3) {
+        if (ngx_strcmp(value[2].data, "utf8") == 0) {
+            GeoIP_set_charset (gcf->organization, GEOIP_CHARSET_UTF8);
+
+        } else {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "invalid parameter \"%V\"", &value[2]);
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    switch (gcf->organization->databaseType) {
+
+    case GEOIP_ORG_EDITION:
+    case GEOIP_ISP_EDITION:
+
+        return NGX_CONF_OK;
+
+    default:
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid GeoIP organization database
\"%V\" type:%d",
+                           &value[1], gcf->organization->databaseType);
+        return NGX_CONF_ERROR;
+    }
+}

 static void
 ngx_http_geoip_cleanup(void *data)