mirror of
https://github.com/nginx/nginx.git
synced 2025-01-19 01:42:58 +08:00
$geoip_dma_code and $geoip_area_code
This commit is contained in:
parent
41212d27fa
commit
dc87ab5a69
@ -32,6 +32,8 @@ 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_city_float_variable(ngx_http_request_t *r,
|
||||
ngx_http_variable_value_t *v, uintptr_t data);
|
||||
static ngx_int_t ngx_http_geoip_city_int_variable(ngx_http_request_t *r,
|
||||
ngx_http_variable_value_t *v, uintptr_t data);
|
||||
static GeoIPRecord *ngx_http_geoip_get_city_record(ngx_http_request_t *r);
|
||||
|
||||
static ngx_int_t ngx_http_geoip_add_variables(ngx_conf_t *cf);
|
||||
@ -144,6 +146,14 @@ static ngx_http_variable_t ngx_http_geoip_vars[] = {
|
||||
ngx_http_geoip_city_float_variable,
|
||||
offsetof(GeoIPRecord, longitude), 0, 0 },
|
||||
|
||||
{ ngx_string("geoip_dma_code"), NULL,
|
||||
ngx_http_geoip_city_int_variable,
|
||||
offsetof(GeoIPRecord, dma_code), 0, 0 },
|
||||
|
||||
{ ngx_string("geoip_area_code"), NULL,
|
||||
ngx_http_geoip_city_int_variable,
|
||||
offsetof(GeoIPRecord, area_code), 0, 0 },
|
||||
|
||||
{ ngx_null_string, NULL, NULL, 0, 0, 0 }
|
||||
};
|
||||
|
||||
@ -273,6 +283,35 @@ ngx_http_geoip_city_float_variable(ngx_http_request_t *r,
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_http_geoip_city_int_variable(ngx_http_request_t *r,
|
||||
ngx_http_variable_value_t *v, uintptr_t data)
|
||||
{
|
||||
int val;
|
||||
GeoIPRecord *gr;
|
||||
|
||||
gr = ngx_http_geoip_get_city_record(r);
|
||||
if (gr == NULL) {
|
||||
v->not_found = 1;
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
v->data = ngx_pnalloc(r->pool, NGX_INT64_LEN);
|
||||
if (v->data == NULL) {
|
||||
GeoIPRecord_delete(gr);
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
val = *(int *) ((char *) gr + data);
|
||||
|
||||
v->len = ngx_sprintf(v->data, "%d", val) - v->data;
|
||||
|
||||
GeoIPRecord_delete(gr);
|
||||
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
|
||||
static GeoIPRecord *
|
||||
ngx_http_geoip_get_city_record(ngx_http_request_t *r)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user