nginx: src/http/modules/ngx_http_geo

annotate src/http/modules/ngx_http_geo_module.c @ 2447:3d868fc44879

fix range start for ranges those spread in two or more slots

author	Igor Sysoev <igor@sysoev.ru>
date	Fri, 16 Jan 2009 15:44:39 +0000
parents	6978f3827a5c
children	bbec98632208

rev	line source
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2 /*
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3 * Copyright (C) Igor Sysoev
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4 */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	5
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	6
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	7 #include <ngx_config.h>
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	8 #include <ngx_core.h>
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	9 #include <ngx_http.h>
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	10
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	11
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	12 typedef struct {
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	13 u_short start;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	14 u_short end;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	15 ngx_http_variable_value_t *value;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	16 } ngx_http_geo_range_t;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	17
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	18
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	19 typedef struct {
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	20 ngx_http_geo_range_t *ranges;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	21 ngx_uint_t n;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	22 } ngx_http_geo_low_ranges_t;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	23
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	24
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	25 typedef struct {
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	26 ngx_http_geo_low_ranges_t low[0x10000];
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	27 ngx_http_variable_value_t *default_value;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	28 } ngx_http_geo_high_ranges_t;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	29
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	30
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	31 typedef struct {
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	32 ngx_http_variable_value_t *value;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	33 ngx_str_t *net;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	34 ngx_http_geo_high_ranges_t *high;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	35 ngx_radix_tree_t *tree;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	36 ngx_rbtree_t rbtree;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	37 ngx_rbtree_node_t sentinel;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	38 ngx_pool_t *pool;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	39 ngx_pool_t *temp_pool;
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	40 } ngx_http_geo_conf_ctx_t;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	41
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	42
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	43 typedef struct {
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	44 union {
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	45 ngx_radix_tree_t *tree;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	46 ngx_http_geo_high_ranges_t *high;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	47 } u;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	48
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	49 ngx_int_t index;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	50 } ngx_http_geo_ctx_t;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	51
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	52
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	53 static in_addr_t ngx_http_geo_addr(ngx_http_request_t *r,
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	54 ngx_http_geo_ctx_t *ctx);
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	55 static char ngx_http_geo_block(ngx_conf_t cf, ngx_command_t cmd, void conf);
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	56 static char ngx_http_geo(ngx_conf_t cf, ngx_command_t dummy, void conf);
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	57 static char ngx_http_geo_range(ngx_conf_t cf, ngx_http_geo_conf_ctx_t *ctx,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	58 ngx_str_t *value);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	59 static char ngx_http_geo_add_range(ngx_conf_t cf,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	60 ngx_http_geo_conf_ctx_t *ctx, in_addr_t start, in_addr_t end);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	61 static ngx_uint_t ngx_http_geo_delete_range(ngx_conf_t *cf,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	62 ngx_http_geo_conf_ctx_t *ctx, in_addr_t start, in_addr_t end);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	63 static char ngx_http_geo_cidr(ngx_conf_t cf, ngx_http_geo_conf_ctx_t *ctx,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	64 ngx_str_t *value);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	65 static ngx_http_variable_value_t ngx_http_geo_value(ngx_conf_t cf,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	66 ngx_http_geo_conf_ctx_t ctx, ngx_str_t value);
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	67
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	68
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	69 static ngx_command_t ngx_http_geo_commands[] = {
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	70
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	71 { ngx_string("geo"),
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	72 NGX_HTTP_MAIN_CONF\|NGX_CONF_BLOCK\|NGX_CONF_TAKE12,
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	73 ngx_http_geo_block,
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	74 NGX_HTTP_MAIN_CONF_OFFSET,
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	75 0,
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	76 NULL },
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	77
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	78 ngx_null_command
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	79 };
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	80
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	81
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	82 static ngx_http_module_t ngx_http_geo_module_ctx = {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	83 NULL, /* preconfiguration */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	84 NULL, /* postconfiguration */
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	85
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	86 NULL, /* create main configuration */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	87 NULL, /* init main configuration */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	88
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	89 NULL, /* create server configuration */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	90 NULL, /* merge server configuration */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	91
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	92 NULL, /* create location configuration */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	93 NULL /* merge location configuration */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	94 };
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	95
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	96
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	97 ngx_module_t ngx_http_geo_module = {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	98 NGX_MODULE_V1,
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	99 &ngx_http_geo_module_ctx, /* module context */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	100 ngx_http_geo_commands, /* module directives */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	101 NGX_HTTP_MODULE, /* module type */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	102 NULL, /* init master */
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	103 NULL, /* init module */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	104 NULL, /* init process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	105 NULL, /* init thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	106 NULL, /* exit thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	107 NULL, /* exit process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	108 NULL, /* exit master */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	109 NGX_MODULE_V1_PADDING
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	110 };
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	111
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	112
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	113 /* AF_INET only */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	114
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	115 static ngx_int_t
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	116 ngx_http_geo_cidr_variable(ngx_http_request_t r, ngx_http_variable_value_t v,
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	117 uintptr_t data)
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	118 {
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	119 ngx_http_geo_ctx_t ctx = (ngx_http_geo_ctx_t ) data;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	120
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	121 ngx_http_variable_value_t *vv;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	122
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	123 vv = (ngx_http_variable_value_t *)
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	124 ngx_radix32tree_find(ctx->u.tree, ngx_http_geo_addr(r, ctx));
489 45a460f82aec nginx-0.1.19-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	125
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	126 v = vv;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	127
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	128 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	129 "http geo: %v", v);
489 45a460f82aec nginx-0.1.19-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	130
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	131 return NGX_OK;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	132 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	133
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	134
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	135 static ngx_int_t
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	136 ngx_http_geo_range_variable(ngx_http_request_t r, ngx_http_variable_value_t v,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	137 uintptr_t data)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	138 {
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	139 ngx_http_geo_ctx_t ctx = (ngx_http_geo_ctx_t ) data;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	140
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	141 in_addr_t addr;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	142 ngx_uint_t i, n;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	143 ngx_http_geo_range_t *range;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	144
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	145 v = ctx->u.high->default_value;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	146
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	147 addr = ngx_http_geo_addr(r, ctx);
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	148
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	149 range = ctx->u.high->low[addr >> 16].ranges;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	150
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	151 n = addr & 0xffff;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	152
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	153 for (i = 0; i < ctx->u.high->low[addr >> 16].n; i++) {
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	154 if (n >= (ngx_uint_t) range[i].start
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	155 && n <= (ngx_uint_t) range[i].end)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	156 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	157 v = range[i].value;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	158 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	159 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	160
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	161 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	162 "http geo: %v", v);
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	163
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	164 return NGX_OK;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	165 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	166
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	167
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	168 static in_addr_t
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	169 ngx_http_geo_addr(ngx_http_request_t r, ngx_http_geo_ctx_t ctx)
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	170 {
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	171 struct sockaddr_in *sin;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	172 ngx_http_variable_value_t *v;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	173
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	174 if (ctx->index == -1) {
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	175 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	176 "http geo started: %V", &r->connection->addr_text);
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	177
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	178 sin = (struct sockaddr_in *) r->connection->sockaddr;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	179 return ntohl(sin->sin_addr.s_addr);
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	180 }
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	181
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	182 v = ngx_http_get_flushed_variable(r, ctx->index);
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	183
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	184 if (v == NULL \|\| v->not_found) {
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	185 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	186 "http geo not found");
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	187
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	188 return 0;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	189 }
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	190
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	191 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	192 "http geo started: %v", v);
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	193
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	194 return ntohl(ngx_inet_addr(v->data, v->len));
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	195 }
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	196
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	197
489 45a460f82aec nginx-0.1.19-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	198 static char *
45a460f82aec nginx-0.1.19-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	199 ngx_http_geo_block(ngx_conf_t cf, ngx_command_t cmd, void *conf)
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	200 {
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	201 char *rv;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	202 size_t len;
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	203 ngx_str_t *value, name;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	204 ngx_uint_t i;
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	205 ngx_conf_t save;
d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	206 ngx_pool_t *pool;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	207 ngx_array_t *a;
1406 03341711f9a2 use %v for ngx_variable_value_t in ngx_sprintf(), Igor Sysoev <igor@sysoev.ru> parents: 1380 diff changeset	208 ngx_http_variable_t *var;
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	209 ngx_http_geo_ctx_t *geo;
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	210 ngx_http_geo_conf_ctx_t ctx;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	211
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	212 value = cf->args->elts;
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	213
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	214 geo = ngx_palloc(cf->pool, sizeof(ngx_http_geo_ctx_t));
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	215 if (geo == NULL) {
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	216 return NGX_CONF_ERROR;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	217 }
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	218
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	219 name = value[1];
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	220 name.len--;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	221 name.data++;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	222
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	223 if (cf->args->nelts == 3) {
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	224
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	225 geo->index = ngx_http_get_variable_index(cf, &name);
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	226 if (geo->index == NGX_ERROR) {
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	227 return NGX_CONF_ERROR;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	228 }
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	229
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	230 name = value[2];
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	231 name.len--;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	232 name.data++;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	233
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	234 } else {
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	235 geo->index = -1;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	236 }
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	237
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	238 var = ngx_http_add_variable(cf, &name, NGX_HTTP_VAR_CHANGEABLE);
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	239 if (var == NULL) {
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	240 return NGX_CONF_ERROR;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	241 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	242
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	243 pool = ngx_create_pool(16384, cf->log);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	244 if (pool == NULL) {
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	245 return NGX_CONF_ERROR;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	246 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	247
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	248 ctx.temp_pool = ngx_create_pool(16384, cf->log);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	249 if (ctx.temp_pool == NULL) {
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	250 return NGX_CONF_ERROR;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	251 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	252
2334 6e30d64f919b use value rbtree instead of array in geo configuration Igor Sysoev <igor@sysoev.ru> parents: 1565 diff changeset	253 ngx_rbtree_init(&ctx.rbtree, &ctx.sentinel,
6e30d64f919b use value rbtree instead of array in geo configuration Igor Sysoev <igor@sysoev.ru> parents: 1565 diff changeset	254 ngx_http_variable_value_rbtree_insert);
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	255
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	256 ctx.high = NULL;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	257 ctx.tree = NULL;
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	258 ctx.pool = cf->pool;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	259
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	260 save = *cf;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	261 cf->pool = pool;
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	262 cf->ctx = &ctx;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	263 cf->handler = ngx_http_geo;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	264 cf->handler_conf = conf;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	265
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	266 rv = ngx_conf_parse(cf, NULL);
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	267
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	268 *cf = save;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	269
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	270 if (ctx.high) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	271
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	272 for (i = 0; i < 0x10000; i++) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	273 a = (ngx_array_t *) ctx.high->low[i].ranges;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	274
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	275 if (a == NULL \|\| a->nelts == 0) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	276 continue;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	277 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	278
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	279 ctx.high->low[i].n = a->nelts;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	280
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	281 len = a->nelts * sizeof(ngx_http_geo_range_t);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	282
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	283 ctx.high->low[i].ranges = ngx_palloc(cf->pool, len);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	284 if (ctx.high->low[i].ranges == NULL ){
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	285 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	286 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	287
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	288 ngx_memcpy(ctx.high->low[i].ranges, a->elts, len);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	289 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	290
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	291 geo->u.high = ctx.high;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	292
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	293 var->get_handler = ngx_http_geo_range_variable;
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	294 var->data = (uintptr_t) geo;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	295
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	296 ngx_destroy_pool(ctx.temp_pool);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	297 ngx_destroy_pool(pool);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	298
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	299 if (ctx.high->default_value == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	300 ctx.high->default_value = &ngx_http_variable_null_value;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	301 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	302
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	303 } else {
2358 ac0cf19eb582 create empty radix tree for "geo $geo { }" case Igor Sysoev <igor@sysoev.ru> parents: 2340 diff changeset	304 if (ctx.tree == NULL) {
ac0cf19eb582 create empty radix tree for "geo $geo { }" case Igor Sysoev <igor@sysoev.ru> parents: 2340 diff changeset	305 ctx.tree = ngx_radix_tree_create(cf->pool, -1);
ac0cf19eb582 create empty radix tree for "geo $geo { }" case Igor Sysoev <igor@sysoev.ru> parents: 2340 diff changeset	306 if (ctx.tree == NULL) {
ac0cf19eb582 create empty radix tree for "geo $geo { }" case Igor Sysoev <igor@sysoev.ru> parents: 2340 diff changeset	307 return NGX_CONF_ERROR;
ac0cf19eb582 create empty radix tree for "geo $geo { }" case Igor Sysoev <igor@sysoev.ru> parents: 2340 diff changeset	308 }
ac0cf19eb582 create empty radix tree for "geo $geo { }" case Igor Sysoev <igor@sysoev.ru> parents: 2340 diff changeset	309 }
ac0cf19eb582 create empty radix tree for "geo $geo { }" case Igor Sysoev <igor@sysoev.ru> parents: 2340 diff changeset	310
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	311 geo->u.tree = ctx.tree;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	312
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	313 var->get_handler = ngx_http_geo_cidr_variable;
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	314 var->data = (uintptr_t) geo;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	315
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	316 ngx_destroy_pool(ctx.temp_pool);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	317 ngx_destroy_pool(pool);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	318
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	319 if (ngx_radix32tree_find(ctx.tree, 0) != NGX_RADIX_NO_VALUE) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	320 return rv;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	321 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	322
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	323 if (ngx_radix32tree_insert(ctx.tree, 0, 0,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	324 (uintptr_t) &ngx_http_variable_null_value)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	325 == NGX_ERROR)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	326 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	327 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	328 }
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	329 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	330
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	331 return rv;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	332 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	333
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	334
489 45a460f82aec nginx-0.1.19-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	335 static char *
45a460f82aec nginx-0.1.19-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	336 ngx_http_geo(ngx_conf_t cf, ngx_command_t dummy, void *conf)
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	337 {
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	338 char *rv;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	339 ngx_str_t *value, file;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	340 ngx_http_geo_conf_ctx_t *ctx;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	341
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	342 ctx = cf->ctx;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	343
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	344 value = cf->args->elts;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	345
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	346 if (cf->args->nelts == 1) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	347
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	348 if (ngx_strcmp(value[0].data, "ranges") == 0) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	349
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	350 if (ctx->tree) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	351 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	352 "the \"ranges\" directive must be "
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	353 "the first directive inside \"geo\" block");
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	354 goto failed;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	355 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	356
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	357 ctx->high = ngx_pcalloc(ctx->pool,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	358 sizeof(ngx_http_geo_high_ranges_t));
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	359 if (ctx->high == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	360 goto failed;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	361 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	362
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	363 rv = NGX_CONF_OK;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	364
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	365 goto done;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	366 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	367 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	368
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	369 if (cf->args->nelts != 2) {
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	370 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	371 "invalid number of the geo parameters");
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	372 goto failed;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	373 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	374
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	375 if (ngx_strcmp(value[0].data, "include") == 0) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	376
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	377 file.len = value[1].len++;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	378
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	379 file.data = ngx_pstrdup(ctx->temp_pool, &value[1]);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	380 if (file.data == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	381 goto failed;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	382 }
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	383
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	384 if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK){
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	385 goto failed;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	386 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	387
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	388 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data);
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	389
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	390 rv = ngx_conf_parse(cf, &file);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	391
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	392 goto done;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	393 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	394
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	395 if (ctx->high) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	396 rv = ngx_http_geo_range(cf, ctx, value);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	397
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	398 } else {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	399 rv = ngx_http_geo_cidr(cf, ctx, value);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	400 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	401
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	402 done:
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	403
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	404 ngx_reset_pool(cf->pool);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	405
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	406 return rv;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	407
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	408 failed:
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	409
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	410 ngx_reset_pool(cf->pool);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	411
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	412 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	413 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	414
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	415
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	416 static char *
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	417 ngx_http_geo_range(ngx_conf_t cf, ngx_http_geo_conf_ctx_t ctx,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	418 ngx_str_t *value)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	419 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	420 u_char p, last;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	421 in_addr_t start, end;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	422 ngx_str_t *net;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	423 ngx_uint_t del;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	424 ngx_http_variable_value_t *old;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	425
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	426 if (ngx_strcmp(value[0].data, "default") == 0) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	427
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	428 old = ctx->high->default_value;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	429
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	430 ctx->high->default_value = ngx_http_geo_value(cf, ctx, &value[1]);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	431 if (ctx->high->default_value == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	432 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	433 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	434
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	435 if (old) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	436 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	437 "duplicate range \"%V\", value: \"%v\", old value: \"%v\"",
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	438 &value[0], ctx->high->default_value, old);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	439 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	440
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	441 return NGX_CONF_OK;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	442 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	443
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	444 if (ngx_strcmp(value[0].data, "delete") == 0) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	445 net = &value[1];
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	446 del = 1;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	447
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	448 } else {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	449 net = &value[0];
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	450 del = 0;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	451 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	452
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	453 last = net->data + net->len;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	454
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	455 p = ngx_strlchr(net->data, last, '-');
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	456
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	457 if (p == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	458 goto invalid;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	459 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	460
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	461 start = ngx_inet_addr(net->data, p - net->data);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	462
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	463 if (start == INADDR_NONE) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	464 goto invalid;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	465 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	466
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	467 start = ntohl(start);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	468
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	469 p++;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	470
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	471 end = ngx_inet_addr(p, last - p);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	472
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	473 if (end == INADDR_NONE) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	474 goto invalid;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	475 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	476
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	477 end = ntohl(end);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	478
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	479 if (start > end) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	480 goto invalid;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	481 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	482
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	483 if (del) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	484 if (ngx_http_geo_delete_range(cf, ctx, start, end)) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	485 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	486 "no address range \"%V\" to delete", net);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	487 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	488
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	489 return NGX_CONF_OK;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	490 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	491
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	492 ctx->value = ngx_http_geo_value(cf, ctx, &value[1]);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	493
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	494 if (ctx->value == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	495 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	496 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	497
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	498 ctx->net = net;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	499
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	500 return ngx_http_geo_add_range(cf, ctx, start, end);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	501
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	502 invalid:
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	503
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	504 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid range \"%V\"", net);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	505
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	506 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	507 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	508
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	509
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	510 /* the add procedure is optimized to add a growing up sequence */
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	511
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	512 static char *
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	513 ngx_http_geo_add_range(ngx_conf_t cf, ngx_http_geo_conf_ctx_t ctx,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	514 in_addr_t start, in_addr_t end)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	515 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	516 in_addr_t n;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	517 ngx_uint_t h, i, s, e;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	518 ngx_array_t *a;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	519 ngx_http_geo_range_t *range;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	520
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	521 for (n = start; n < end; n += 0x10000) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	522
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	523 h = n >> 16;
2447 3d868fc44879 fix range start for ranges those spread in two or more slots Igor Sysoev <igor@sysoev.ru> parents: 2442 diff changeset	524
3d868fc44879 fix range start for ranges those spread in two or more slots Igor Sysoev <igor@sysoev.ru> parents: 2442 diff changeset	525 if (n == start) {
3d868fc44879 fix range start for ranges those spread in two or more slots Igor Sysoev <igor@sysoev.ru> parents: 2442 diff changeset	526 s = n & 0xffff;
3d868fc44879 fix range start for ranges those spread in two or more slots Igor Sysoev <igor@sysoev.ru> parents: 2442 diff changeset	527 } else {
3d868fc44879 fix range start for ranges those spread in two or more slots Igor Sysoev <igor@sysoev.ru> parents: 2442 diff changeset	528 s = 0;
3d868fc44879 fix range start for ranges those spread in two or more slots Igor Sysoev <igor@sysoev.ru> parents: 2442 diff changeset	529 }
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	530
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	531 if ((n \| 0xffff) > end) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	532 e = end & 0xffff;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	533
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	534 } else {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	535 e = 0xffff;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	536 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	537
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	538 a = (ngx_array_t *) ctx->high->low[h].ranges;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	539
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	540 if (a == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	541 a = ngx_array_create(ctx->temp_pool, 64,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	542 sizeof(ngx_http_geo_range_t));
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	543 if (a == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	544 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	545 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	546
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	547 ctx->high->low[h].ranges = (ngx_http_geo_range_t *) a;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	548 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	549
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	550 i = a->nelts;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	551 range = a->elts;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	552
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	553 while (i) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	554
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	555 i--;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	556
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	557 if (e < (ngx_uint_t) range[i].start) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	558 continue;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	559 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	560
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	561 if (s > (ngx_uint_t) range[i].end) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	562
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	563 /* add after the range */
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	564
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	565 range = ngx_array_push(a);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	566 if (range == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	567 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	568 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	569
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	570 range = a->elts;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	571
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	572 ngx_memcpy(&range[i + 2], &range[i + 1],
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	573 (a->nelts - 2 - i) * sizeof(ngx_http_geo_range_t));
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	574
2442 6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	575 range[i + 1].start = (u_short) s;
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	576 range[i + 1].end = (u_short) e;
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	577 range[i + 1].value = ctx->value;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	578
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	579 goto next;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	580 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	581
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	582 if (s == (ngx_uint_t) range[i].start
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	583 && e == (ngx_uint_t) range[i].end)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	584 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	585 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	586 "duplicate range \"%V\", value: \"%v\", old value: \"%v\"",
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	587 ctx->net, ctx->value, range[i].value);
2442 6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	588
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	589 range[i].value = ctx->value;
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	590
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	591 goto next;
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	592 }
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	593
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	594 if (s > (ngx_uint_t) range[i].start
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	595 && e < (ngx_uint_t) range[i].end)
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	596 {
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	597 /* split the range and insert the new one */
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	598
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	599 range = ngx_array_push(a);
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	600 if (range == NULL) {
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	601 return NGX_CONF_ERROR;
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	602 }
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	603
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	604 range = ngx_array_push(a);
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	605 if (range == NULL) {
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	606 return NGX_CONF_ERROR;
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	607 }
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	608
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	609 range = a->elts;
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	610
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	611 ngx_memcpy(&range[i + 3], &range[i + 1],
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	612 (a->nelts - 3 - i) * sizeof(ngx_http_geo_range_t));
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	613
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	614 range[i + 2].start = (u_short) (e + 1);
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	615 range[i + 2].end = range[i].end;
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	616 range[i + 2].value = range[i].value;
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	617
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	618 range[i].end = (u_short) (s - 1);
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	619
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	620 range[i + 1].start = (u_short) s;
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	621 range[i + 1].end = (u_short) e;
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	622 range[i + 1].value = ctx->value;
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	623
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	624 goto next;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	625 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	626
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	627 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	628 "overlapped range \"%V\"", ctx->net);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	629
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	630 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	631 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	632
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	633 /* add the first range */
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	634
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	635 range = ngx_array_push(a);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	636 if (range == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	637 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	638 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	639
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	640 range->start = (u_short) s;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	641 range->end = (u_short) e;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	642 range->value = ctx->value;
2442 6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	643
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	644 next:
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	645
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	646 continue;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	647 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	648
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	649 return NGX_CONF_OK;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	650 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	651
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	652
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	653 static ngx_uint_t
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	654 ngx_http_geo_delete_range(ngx_conf_t cf, ngx_http_geo_conf_ctx_t ctx,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	655 in_addr_t start, in_addr_t end)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	656 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	657 in_addr_t n;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	658 ngx_uint_t h, i, s, e, warn;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	659 ngx_array_t *a;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	660 ngx_http_geo_range_t *range;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	661
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	662 warn = 0;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	663
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	664 for (n = start; n < end; n += 0x10000) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	665
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	666 h = n >> 16;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	667 s = n & 0xffff;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	668
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	669 if ((n \| 0xffff) > end) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	670 e = end & 0xffff;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	671
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	672 } else {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	673 e = 0xffff;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	674 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	675
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	676 a = (ngx_array_t *) ctx->high->low[h].ranges;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	677
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	678 if (a == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	679 warn = 1;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	680 continue;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	681 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	682
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	683 range = a->elts;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	684 for (i = 0; i < a->nelts; i++) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	685
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	686 if (s == (ngx_uint_t) range[i].start
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	687 && e == (ngx_uint_t) range[i].end)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	688 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	689 ngx_memcpy(&range[i], &range[i + 1],
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	690 (a->nelts - 1 - i) * sizeof(ngx_http_geo_range_t));
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	691 break;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	692 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	693
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	694 if (s != (ngx_uint_t) range[i].start
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	695 && e != (ngx_uint_t) range[i].end)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	696 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	697 continue;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	698 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	699
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	700 warn = 1;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	701 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	702 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	703
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	704 return warn;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	705 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	706
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	707
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	708 static char *
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	709 ngx_http_geo_cidr(ngx_conf_t cf, ngx_http_geo_conf_ctx_t ctx,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	710 ngx_str_t *value)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	711 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	712 ngx_int_t rc, del;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	713 ngx_str_t *net;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	714 ngx_uint_t i;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	715 ngx_inet_cidr_t cidrin;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	716 ngx_http_variable_value_t val, old;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	717
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	718 if (ctx->tree == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	719 ctx->tree = ngx_radix_tree_create(ctx->pool, -1);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	720 if (ctx->tree == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	721 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	722 }
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	723 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	724
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	725 if (ngx_strcmp(value[0].data, "default") == 0) {
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	726 cidrin.addr = 0;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	727 cidrin.mask = 0;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	728 net = &value[0];
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	729
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	730 } else {
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	731 if (ngx_strcmp(value[0].data, "delete") == 0) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	732 net = &value[1];
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	733 del = 1;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	734
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	735 } else {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	736 net = &value[0];
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	737 del = 0;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	738 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	739
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	740 if (ngx_strcmp(net->data, "255.255.255.255") == 0) {
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	741 cidrin.addr = 0xffffffff;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	742 cidrin.mask = 0xffffffff;
1380 b590a528fd41 ignore meaningless bits in CIDR and warn about them Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	743
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	744 } else {
2401 39f3b4f9989e style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2399 diff changeset	745 rc = ngx_ptocidr(net, &cidrin);
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	746
2401 39f3b4f9989e style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2399 diff changeset	747 if (rc == NGX_ERROR) {
39f3b4f9989e style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2399 diff changeset	748 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
39f3b4f9989e style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2399 diff changeset	749 "invalid network \"%V\"", net);
39f3b4f9989e style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2399 diff changeset	750 return NGX_CONF_ERROR;
39f3b4f9989e style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2399 diff changeset	751 }
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	752
2401 39f3b4f9989e style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2399 diff changeset	753 if (rc == NGX_DONE) {
39f3b4f9989e style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2399 diff changeset	754 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
39f3b4f9989e style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2399 diff changeset	755 "low address bits of %V are meaningless",
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	756 net);
2401 39f3b4f9989e style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2399 diff changeset	757 }
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	758
2401 39f3b4f9989e style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2399 diff changeset	759 cidrin.addr = ntohl(cidrin.addr);
39f3b4f9989e style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2399 diff changeset	760 cidrin.mask = ntohl(cidrin.mask);
1380 b590a528fd41 ignore meaningless bits in CIDR and warn about them Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	761 }
b590a528fd41 ignore meaningless bits in CIDR and warn about them Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	762
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	763 if (del) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	764 if (ngx_radix32tree_delete(ctx->tree, cidrin.addr, cidrin.mask)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	765 != NGX_OK)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	766 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	767 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	768 "no network \"%V\" to delete", net);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	769 }
2365 8522a901df2f fix "delete CIDR" Igor Sysoev <igor@sysoev.ru> parents: 2358 diff changeset	770
8522a901df2f fix "delete CIDR" Igor Sysoev <igor@sysoev.ru> parents: 2358 diff changeset	771 return NGX_CONF_OK;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	772 }
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	773 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	774
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	775 val = ngx_http_geo_value(cf, ctx, &value[1]);
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	776
2334 6e30d64f919b use value rbtree instead of array in geo configuration Igor Sysoev <igor@sysoev.ru> parents: 1565 diff changeset	777 if (val == NULL) {
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	778 return NGX_CONF_ERROR;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	779 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	780
553 45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	781 for (i = 2; i; i--) {
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	782 rc = ngx_radix32tree_insert(ctx->tree, cidrin.addr, cidrin.mask,
2334 6e30d64f919b use value rbtree instead of array in geo configuration Igor Sysoev <igor@sysoev.ru> parents: 1565 diff changeset	783 (uintptr_t) val);
553 45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	784 if (rc == NGX_OK) {
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	785 return NGX_CONF_OK;
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	786 }
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	787
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	788 if (rc == NGX_ERROR) {
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	789 return NGX_CONF_ERROR;
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	790 }
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	791
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	792 /* rc == NGX_BUSY */
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	793
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	794 old = (ngx_http_variable_value_t *)
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	795 ngx_radix32tree_find(ctx->tree, cidrin.addr & cidrin.mask);
553 45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	796
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	797 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	798 "duplicate network \"%V\", value: \"%v\", old value: \"%v\"",
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	799 net, val, old);
553 45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	800
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	801 rc = ngx_radix32tree_delete(ctx->tree, cidrin.addr, cidrin.mask);
553 45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	802
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	803 if (rc == NGX_ERROR) {
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	804 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid radix tree");
553 45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	805 return NGX_CONF_ERROR;
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	806 }
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	807 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	808
553 45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	809 return NGX_CONF_ERROR;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	810 }
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	811
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	812
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	813 static ngx_http_variable_value_t *
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	814 ngx_http_geo_value(ngx_conf_t cf, ngx_http_geo_conf_ctx_t ctx,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	815 ngx_str_t *value)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	816 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	817 uint32_t hash;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	818 ngx_http_variable_value_t *val;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	819 ngx_http_variable_value_node_t *vvn;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	820
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	821 hash = ngx_crc32_long(value->data, value->len);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	822
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	823 val = ngx_http_variable_value_lookup(&ctx->rbtree, value, hash);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	824
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	825 if (val) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	826 return val;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	827 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	828
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	829 val = ngx_palloc(ctx->pool, sizeof(ngx_http_variable_value_t));
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	830 if (val == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	831 return NULL;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	832 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	833
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	834 val->len = value->len;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	835 val->data = ngx_pstrdup(ctx->pool, value);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	836 if (val->data == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	837 return NULL;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	838 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	839
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	840 val->valid = 1;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	841 val->no_cacheable = 0;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	842 val->not_found = 0;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	843
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	844 vvn = ngx_palloc(ctx->temp_pool, sizeof(ngx_http_variable_value_node_t));
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	845 if (vvn == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	846 return NULL;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	847 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	848
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	849 vvn->node.key = hash;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	850 vvn->len = val->len;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	851 vvn->value = val;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	852
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	853 ngx_rbtree_insert(&ctx->rbtree, &vvn->node);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	854
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	855 return val;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	856 }

Mercurial > hg > nginx

annotate src/http/modules/ngx_http_geo_module.c @ 2447:3d868fc44879