nginx: src/http/modules/ngx_http_geo

annotate src/http/modules/ngx_http_geo_module.c @ 2340:22d2b6609853

*) descrease geo configuration memory usage *) geo delete *) geo ranges

author	Igor Sysoev <igor@sysoev.ru>
date	Tue, 25 Nov 2008 15:59:06 +0000
parents	6e30d64f919b
children	ac0cf19eb582

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 {
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	13 u_short start;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	14 u_short end;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	15 ngx_http_variable_value_t *value;
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 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	20 ngx_http_geo_range_t *ranges;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	21 ngx_uint_t n;
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 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	26 ngx_http_geo_low_ranges_t low[0x10000];
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	27 ngx_http_variable_value_t *default_value;
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 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	32 ngx_http_variable_value_t *value;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	33 ngx_str_t *net;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	34 ngx_http_geo_high_ranges_t *high;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	35 ngx_radix_tree_t *tree;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	36 ngx_rbtree_t rbtree;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	37 ngx_rbtree_node_t sentinel;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	38 ngx_pool_t *pool;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 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
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	43 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	44 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	45 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	46 ngx_str_t *value);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	47 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	48 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	49 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	50 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	51 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	52 ngx_str_t *value);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	53 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	54 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	55
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	56
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	57 static ngx_command_t ngx_http_geo_commands[] = {
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	58
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	59 { ngx_string("geo"),
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	60 NGX_HTTP_MAIN_CONF\|NGX_CONF_BLOCK\|NGX_CONF_TAKE1,
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	61 ngx_http_geo_block,
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	62 NGX_HTTP_MAIN_CONF_OFFSET,
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	63 0,
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	64 NULL },
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	65
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	66 ngx_null_command
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
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	70 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	71 NULL, /* preconfiguration */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	72 NULL, /* postconfiguration */
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	73
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	74 NULL, /* create main configuration */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	75 NULL, /* init main configuration */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	76
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	77 NULL, /* create server configuration */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	78 NULL, /* merge server configuration */
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 NULL, /* create location configuration */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	81 NULL /* merge location configuration */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	82 };
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	83
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	84
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	85 ngx_module_t ngx_http_geo_module = {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	86 NGX_MODULE_V1,
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	87 &ngx_http_geo_module_ctx, /* module context */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	88 ngx_http_geo_commands, /* module directives */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	89 NGX_HTTP_MODULE, /* module type */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	90 NULL, /* init master */
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	91 NULL, /* init module */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	92 NULL, /* init process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	93 NULL, /* init thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	94 NULL, /* exit thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	95 NULL, /* exit process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	96 NULL, /* exit master */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	97 NGX_MODULE_V1_PADDING
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	98 };
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	99
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	100
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	101 /* AF_INET only */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	102
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	103 static ngx_int_t
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	104 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	105 uintptr_t data)
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	106 {
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	107 ngx_radix_tree_t tree = (ngx_radix_tree_t ) data;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	108
489 45a460f82aec nginx-0.1.19-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	109 struct sockaddr_in *sin;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	110 ngx_http_variable_value_t *vv;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	111
489 45a460f82aec nginx-0.1.19-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	112 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
45a460f82aec nginx-0.1.19-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	113 "http geo started");
45a460f82aec nginx-0.1.19-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	114
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	115 sin = (struct sockaddr_in *) r->connection->sockaddr;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	116
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	117 vv = (ngx_http_variable_value_t *)
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	118 ngx_radix32tree_find(tree, ntohl(sin->sin_addr.s_addr));
489 45a460f82aec nginx-0.1.19-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	119
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	120 v = vv;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	121
489 45a460f82aec nginx-0.1.19-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	122 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
1406 03341711f9a2 use %v for ngx_variable_value_t in ngx_sprintf(), Igor Sysoev <igor@sysoev.ru> parents: 1380 diff changeset	123 "http geo: %V %v", &r->connection->addr_text, v);
489 45a460f82aec nginx-0.1.19-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	124
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	125 return NGX_OK;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	126 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	127
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	128
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	129 static ngx_int_t
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	130 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	131 uintptr_t data)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	132 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	133 ngx_http_geo_high_ranges_t high = (ngx_http_geo_high_ranges_t ) data;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	134
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	135 in_addr_t addr;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	136 ngx_uint_t i, n;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	137 struct sockaddr_in *sin;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	138 ngx_http_geo_range_t *range;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	139
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	140 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	141 "http geo started");
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	142
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	143 sin = (struct sockaddr_in *) r->connection->sockaddr;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	144
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	145 v = high->default_value;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	146
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	147 addr = ntohl(sin->sin_addr.s_addr);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	148
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	149 range = high->low[addr >> 16].ranges;
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
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	153 for (i = 0; i < high->low[addr >> 16].n; i++) {
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
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	161 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	162 "http geo: %V %v", &r->connection->addr_text, v);
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
489 45a460f82aec nginx-0.1.19-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	168 static char *
45a460f82aec nginx-0.1.19-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	169 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	170 {
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	171 char *rv;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	172 size_t len;
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	173 ngx_str_t *value, name;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	174 ngx_uint_t i;
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	175 ngx_conf_t save;
d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	176 ngx_pool_t *pool;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	177 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	178 ngx_http_variable_t *var;
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	179 ngx_http_geo_conf_ctx_t ctx;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	180
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	181 value = cf->args->elts;
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	182
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	183 name = value[1];
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	184
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	185 if (name.data[0] != '$') {
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	186 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	187 "\"%V\" variable name should start with '$'",
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	188 &value[1]);
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	189 } else {
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	190 name.len--;
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	191 name.data++;
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	192 }
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	193
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1406 diff changeset	194 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	195 if (var == NULL) {
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	196 return NGX_CONF_ERROR;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	197 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	198
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	199 pool = ngx_create_pool(16384, cf->log);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	200 if (pool == NULL) {
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	201 return NGX_CONF_ERROR;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	202 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	203
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	204 ctx.temp_pool = ngx_create_pool(16384, cf->log);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	205 if (ctx.temp_pool == NULL) {
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	206 return NGX_CONF_ERROR;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	207 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	208
2334 6e30d64f919b use value rbtree instead of array in geo configuration Igor Sysoev <igor@sysoev.ru> parents: 1565 diff changeset	209 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	210 ngx_http_variable_value_rbtree_insert);
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	211
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	212 ctx.high = NULL;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	213 ctx.tree = NULL;
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	214 ctx.pool = cf->pool;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	215
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	216 save = *cf;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	217 cf->pool = pool;
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	218 cf->ctx = &ctx;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	219 cf->handler = ngx_http_geo;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	220 cf->handler_conf = conf;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	221
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	222 rv = ngx_conf_parse(cf, NULL);
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	223
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	224 *cf = save;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	225
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	226 if (ctx.high) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	227
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	228 for (i = 0; i < 0x10000; i++) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	229 a = (ngx_array_t *) ctx.high->low[i].ranges;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	230
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	231 if (a == NULL \|\| a->nelts == 0) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	232 continue;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	233 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	234
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	235 ctx.high->low[i].n = a->nelts;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	236
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	237 len = a->nelts * sizeof(ngx_http_geo_range_t);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	238
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	239 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	240 if (ctx.high->low[i].ranges == NULL ){
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	241 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	242 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	243
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	244 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	245 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	246
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	247 var->get_handler = ngx_http_geo_range_variable;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	248 var->data = (uintptr_t) ctx.high;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	249
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	250 ngx_destroy_pool(ctx.temp_pool);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	251 ngx_destroy_pool(pool);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	252
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	253 if (ctx.high->default_value == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	254 ctx.high->default_value = &ngx_http_variable_null_value;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	255 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	256
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	257 } else {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	258 var->get_handler = ngx_http_geo_cidr_variable;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	259 var->data = (uintptr_t) ctx.tree;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	260
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	261 ngx_destroy_pool(ctx.temp_pool);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	262 ngx_destroy_pool(pool);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	263
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	264 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	265 return rv;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	266 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	267
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	268 if (ngx_radix32tree_insert(ctx.tree, 0, 0,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	269 (uintptr_t) &ngx_http_variable_null_value)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	270 == NGX_ERROR)
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 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	273 }
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	274 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	275
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	276 return rv;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	277 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	278
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	279
489 45a460f82aec nginx-0.1.19-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	280 static char *
45a460f82aec nginx-0.1.19-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	281 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	282 {
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	283 char *rv;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	284 ngx_str_t *value, file;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	285 ngx_http_geo_conf_ctx_t *ctx;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	286
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	287 ctx = cf->ctx;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	288
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	289 value = cf->args->elts;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	290
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	291 if (cf->args->nelts == 1) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	292
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	293 if (ngx_strcmp(value[0].data, "ranges") == 0) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	294
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	295 if (ctx->tree) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	296 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	297 "the \"ranges\" directive must be "
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	298 "the first directive inside \"geo\" block");
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	299 goto failed;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	300 }
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 ctx->high = ngx_pcalloc(ctx->pool,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	303 sizeof(ngx_http_geo_high_ranges_t));
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	304 if (ctx->high == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	305 goto failed;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	306 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	307
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	308 rv = NGX_CONF_OK;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	309
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	310 goto done;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	311 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	312 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	313
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	314 if (cf->args->nelts != 2) {
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	315 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	316 "invalid number of the geo parameters");
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	317 goto failed;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	318 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	319
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	320 if (ngx_strcmp(value[0].data, "include") == 0) {
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 file.len = value[1].len++;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	323
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	324 file.data = ngx_pstrdup(ctx->temp_pool, &value[1]);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	325 if (file.data == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	326 goto failed;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	327 }
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	328
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	329 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	330 goto failed;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	331 }
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 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	334
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	335 rv = ngx_conf_parse(cf, &file);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	336
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	337 goto done;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	338 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	339
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	340 if (ctx->high) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	341 rv = ngx_http_geo_range(cf, ctx, value);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	342
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	343 } else {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	344 rv = ngx_http_geo_cidr(cf, ctx, value);
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
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	347 done:
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	348
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	349 ngx_reset_pool(cf->pool);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	350
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	351 return rv;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	352
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	353 failed:
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	354
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	355 ngx_reset_pool(cf->pool);
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 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	358 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	359
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	360
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	361 static char *
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	362 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	363 ngx_str_t *value)
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 u_char p, last;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	366 in_addr_t start, end;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	367 ngx_str_t *net;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	368 ngx_uint_t del;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	369 ngx_http_variable_value_t *old;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	370
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	371 if (ngx_strcmp(value[0].data, "default") == 0) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	372
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	373 old = ctx->high->default_value;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	374
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	375 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	376 if (ctx->high->default_value == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	377 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	378 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	379
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	380 if (old) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	381 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	382 "duplicate range \"%V\", value: \"%v\", old value: \"%v\"",
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	383 &value[0], ctx->high->default_value, old);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	384 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	385
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	386 return NGX_CONF_OK;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	387 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	388
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	389 if (ngx_strcmp(value[0].data, "delete") == 0) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	390 net = &value[1];
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	391 del = 1;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	392
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	393 } else {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	394 net = &value[0];
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	395 del = 0;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	396 }
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 last = net->data + net->len;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	399
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	400 p = ngx_strlchr(net->data, last, '-');
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 if (p == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	403 goto invalid;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	404 }
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 start = ngx_inet_addr(net->data, p - net->data);
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 if (start == INADDR_NONE) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	409 goto invalid;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	410 }
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 start = ntohl(start);
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 p++;
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 end = ngx_inet_addr(p, last - p);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	417
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	418 if (end == INADDR_NONE) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	419 goto invalid;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	420 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	421
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	422 end = ntohl(end);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	423
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	424 if (start > end) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	425 goto invalid;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	426 }
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 if (del) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	429 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	430 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	431 "no address range \"%V\" to delete", net);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	432 }
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 return NGX_CONF_OK;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	435 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	436
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	437 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	438
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	439 if (ctx->value == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	440 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	441 }
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 ctx->net = net;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	444
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	445 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	446
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	447 invalid:
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	448
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	449 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	450
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	451 return NGX_CONF_ERROR;
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
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 /* 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	456
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	457 static char *
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	458 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	459 in_addr_t start, in_addr_t end)
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 in_addr_t n;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	462 ngx_uint_t h, i, s, e;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	463 ngx_array_t *a;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	464 ngx_http_geo_range_t *range;
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 for (n = start; n < end; n += 0x10000) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	467
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	468 h = n >> 16;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	469 s = n & 0xffff;
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 if ((n \| 0xffff) > end) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	472 e = end & 0xffff;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	473
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	474 } else {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	475 e = 0xffff;
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
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	478 a = (ngx_array_t *) ctx->high->low[h].ranges;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	479
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	480 if (a == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	481 a = ngx_array_create(ctx->temp_pool, 64,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	482 sizeof(ngx_http_geo_range_t));
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	483 if (a == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	484 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	485 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	486
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	487 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	488 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	489
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	490 i = a->nelts;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	491 range = a->elts;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	492
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	493 while (i) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	494
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	495 i--;
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 if (e < (ngx_uint_t) range[i].start) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	498 continue;
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
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	501 if (s > (ngx_uint_t) range[i].end) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	502
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	503 /* add after the range */
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	504
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	505 range = ngx_array_push(a);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	506 if (range == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	507 return NGX_CONF_ERROR;
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 range = a->elts;
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 ngx_memcpy(&range[i + 2], &range[i + 1],
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	513 (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	514
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	515 range = &range[i + 1];
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	516
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	517 goto next;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	518 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	519
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	520 if (s == (ngx_uint_t) range[i].start
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	521 && e == (ngx_uint_t) range[i].end)
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 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	524 "duplicate range \"%V\", value: \"%v\", old value: \"%v\"",
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	525 ctx->net, ctx->value, range[i].value);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	526 continue;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	527 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	528
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	529 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	530 "overlapped range \"%V\"", ctx->net);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	531
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	532 return NGX_CONF_ERROR;
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
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	535 /* add the first range */
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 range = ngx_array_push(a);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	538 if (range == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	539 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	540 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	541
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	542 next:
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	543
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	544 range->start = (u_short) s;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	545 range->end = (u_short) e;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	546 range->value = ctx->value;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	547 }
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 return NGX_CONF_OK;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	550 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	551
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 static ngx_uint_t
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	554 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	555 in_addr_t start, in_addr_t end)
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 in_addr_t n;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	558 ngx_uint_t h, i, s, e, warn;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	559 ngx_array_t *a;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	560 ngx_http_geo_range_t *range;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	561
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	562 warn = 0;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	563
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	564 for (n = start; n < end; n += 0x10000) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	565
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	566 h = n >> 16;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	567 s = n & 0xffff;
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 if ((n \| 0xffff) > end) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	570 e = end & 0xffff;
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 } else {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	573 e = 0xffff;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	574 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	575
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	576 a = (ngx_array_t *) ctx->high->low[h].ranges;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	577
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	578 if (a == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	579 warn = 1;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	580 continue;
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
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	583 range = a->elts;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	584 for (i = 0; i < a->nelts; i++) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	585
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	586 if (s == (ngx_uint_t) range[i].start
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	587 && e == (ngx_uint_t) range[i].end)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	588 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	589 ngx_memcpy(&range[i], &range[i + 1],
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	590 (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	591 break;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	592 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	593
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	594 if (s != (ngx_uint_t) range[i].start
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	595 && e != (ngx_uint_t) range[i].end)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	596 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	597 continue;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	598 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	599
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	600 warn = 1;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	601 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	602 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	603
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	604 return warn;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	605 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	606
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	607
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	608 static char *
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	609 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	610 ngx_str_t *value)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	611 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	612 ngx_int_t rc, del;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	613 ngx_str_t *net;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	614 ngx_uint_t i;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	615 ngx_inet_cidr_t cidrin;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	616 ngx_http_variable_value_t val, old;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	617
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	618 if (ctx->tree == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	619 ctx->tree = ngx_radix_tree_create(ctx->pool, -1);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	620 if (ctx->tree == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	621 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	622 }
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	623 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	624
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	625 if (ngx_strcmp(value[0].data, "default") == 0) {
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	626 cidrin.addr = 0;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	627 cidrin.mask = 0;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	628 net = &value[0];
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	629
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	630 } else {
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	631 if (ngx_strcmp(value[0].data, "delete") == 0) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	632 net = &value[1];
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	633 del = 1;
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 } else {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	636 net = &value[0];
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	637 del = 0;
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 rc = ngx_ptocidr(net, &cidrin);
1380 b590a528fd41 ignore meaningless bits in CIDR and warn about them Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	641
b590a528fd41 ignore meaningless bits in CIDR and warn about them Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	642 if (rc == NGX_ERROR) {
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	643 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	644 "invalid network \"%V\"", net);
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	645 return NGX_CONF_ERROR;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	646 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	647
1380 b590a528fd41 ignore meaningless bits in CIDR and warn about them Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	648 if (rc == NGX_DONE) {
b590a528fd41 ignore meaningless bits in CIDR and warn about them Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	649 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	650 "low address bits of %V are meaningless", net);
1380 b590a528fd41 ignore meaningless bits in CIDR and warn about them Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	651 }
b590a528fd41 ignore meaningless bits in CIDR and warn about them Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	652
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	653 cidrin.addr = ntohl(cidrin.addr);
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	654 cidrin.mask = ntohl(cidrin.mask);
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	655
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	656 if (del) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	657 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	658 != NGX_OK)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	659 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	660 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	661 "no network \"%V\" to delete", net);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	662 return NGX_CONF_OK;
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 }
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	665 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	666
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	667 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	668
2334 6e30d64f919b use value rbtree instead of array in geo configuration Igor Sysoev <igor@sysoev.ru> parents: 1565 diff changeset	669 if (val == NULL) {
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	670 return NGX_CONF_ERROR;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	671 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	672
553 45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	673 for (i = 2; i; i--) {
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	674 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	675 (uintptr_t) val);
553 45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	676 if (rc == NGX_OK) {
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	677 return NGX_CONF_OK;
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	678 }
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	679
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	680 if (rc == NGX_ERROR) {
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	681 return NGX_CONF_ERROR;
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	682 }
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	683
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	684 /* rc == NGX_BUSY */
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	685
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	686 old = (ngx_http_variable_value_t *)
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	687 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	688
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	689 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	690 "duplicate network \"%V\", value: \"%v\", old value: \"%v\"",
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	691 net, val, old);
553 45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	692
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	693 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	694
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	695 if (rc == NGX_ERROR) {
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	696 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	697 return NGX_CONF_ERROR;
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	698 }
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	699 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	700
553 45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	701 return NGX_CONF_ERROR;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	702 }
2340 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
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	705 static ngx_http_variable_value_t *
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	706 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	707 ngx_str_t *value)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	708 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	709 uint32_t hash;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	710 ngx_http_variable_value_t *val;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	711 ngx_http_variable_value_node_t *vvn;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	712
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	713 hash = ngx_crc32_long(value->data, value->len);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	714
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	715 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	716
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	717 if (val) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	718 return val;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	719 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	720
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	721 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	722 if (val == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	723 return NULL;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	724 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	725
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	726 val->len = value->len;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	727 val->data = ngx_pstrdup(ctx->pool, value);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	728 if (val->data == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	729 return NULL;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	730 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	731
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	732 val->valid = 1;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	733 val->no_cacheable = 0;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	734 val->not_found = 0;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	735
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	736 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	737 if (vvn == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	738 return NULL;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	739 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	740
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	741 vvn->node.key = hash;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	742 vvn->len = val->len;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	743 vvn->value = val;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	744
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	745 ngx_rbtree_insert(&ctx->rbtree, &vvn->node);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	746
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	747 return val;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	748 }

Mercurial > hg > nginx

annotate src/http/modules/ngx_http_geo_module.c @ 2340:22d2b6609853