nginx: src/http/modules/ngx_http_geo

annotate src/http/modules/ngx_http_geo_module.c @ 3650:c12b0dd5bd1c

change duplicate default geo range processing

author	Igor Sysoev <igor@sysoev.ru>
date	Tue, 29 Jun 2010 13:36:16 +0000
parents	9f22c780d574
children	1eea82e36053

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 {
3645 9f22c780d574 eliminate a number of ranges: about 18,000 /16 networks are empty, Igor Sysoev <igor@sysoev.ru> parents: 3643 diff changeset	13 ngx_http_variable_value_t *value;
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	14 u_short start;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	15 u_short end;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	16 } ngx_http_geo_range_t;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	17
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	18
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	19 typedef struct {
3645 9f22c780d574 eliminate a number of ranges: about 18,000 /16 networks are empty, Igor Sysoev <igor@sysoev.ru> parents: 3643 diff changeset	20 ngx_http_geo_range_t *low[0x10000];
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	21 ngx_http_variable_value_t *default_value;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	22 } ngx_http_geo_high_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 {
3641 6802ba529ec4 change ngx_http_variable_value_node_t to more generic ngx_str_node_t Igor Sysoev <igor@sysoev.ru> parents: 3456 diff changeset	26 ngx_str_node_t sn;
6802ba529ec4 change ngx_http_variable_value_node_t to more generic ngx_str_node_t Igor Sysoev <igor@sysoev.ru> parents: 3456 diff changeset	27 ngx_http_variable_value_t *value;
6802ba529ec4 change ngx_http_variable_value_node_t to more generic ngx_str_node_t Igor Sysoev <igor@sysoev.ru> parents: 3456 diff changeset	28 } ngx_http_geo_variable_value_node_t;
6802ba529ec4 change ngx_http_variable_value_node_t to more generic ngx_str_node_t Igor Sysoev <igor@sysoev.ru> parents: 3456 diff changeset	29
6802ba529ec4 change ngx_http_variable_value_node_t to more generic ngx_str_node_t Igor Sysoev <igor@sysoev.ru> parents: 3456 diff changeset	30
6802ba529ec4 change ngx_http_variable_value_node_t to more generic ngx_str_node_t Igor Sysoev <igor@sysoev.ru> parents: 3456 diff changeset	31 typedef struct {
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	32 ngx_http_variable_value_t *value;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	33 ngx_str_t *net;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	34 ngx_http_geo_high_ranges_t *high;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	35 ngx_radix_tree_t *tree;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	36 ngx_rbtree_t rbtree;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	37 ngx_rbtree_node_t sentinel;
2992 2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	38 ngx_array_t *proxies;
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	39 ngx_pool_t *pool;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	40 ngx_pool_t *temp_pool;
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	41 } ngx_http_geo_conf_ctx_t;
485 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
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	44 typedef struct {
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	45 union {
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	46 ngx_radix_tree_t *tree;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	47 ngx_http_geo_high_ranges_t *high;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	48 } u;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	49
2992 2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	50 ngx_array_t *proxies;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	51
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	52 ngx_int_t index;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	53 } ngx_http_geo_ctx_t;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	54
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	55
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	56 static in_addr_t ngx_http_geo_addr(ngx_http_request_t *r,
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	57 ngx_http_geo_ctx_t *ctx);
2992 2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	58 static in_addr_t ngx_http_geo_real_addr(ngx_http_request_t *r,
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	59 ngx_http_geo_ctx_t *ctx);
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	60 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	61 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	62 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	63 ngx_str_t *value);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	64 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	65 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	66 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	67 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	68 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	69 ngx_str_t *value);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	70 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	71 ngx_http_geo_conf_ctx_t ctx, ngx_str_t value);
2992 2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	72 static char ngx_http_geo_add_proxy(ngx_conf_t cf,
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	73 ngx_http_geo_conf_ctx_t ctx, ngx_cidr_t cidr);
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	74 static ngx_int_t ngx_http_geo_cidr_value(ngx_conf_t cf, ngx_str_t net,
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	75 ngx_cidr_t *cidr);
485 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
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	78 static ngx_command_t ngx_http_geo_commands[] = {
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 { ngx_string("geo"),
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	81 NGX_HTTP_MAIN_CONF\|NGX_CONF_BLOCK\|NGX_CONF_TAKE12,
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	82 ngx_http_geo_block,
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	83 NGX_HTTP_MAIN_CONF_OFFSET,
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	84 0,
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	85 NULL },
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	86
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	87 ngx_null_command
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	88 };
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	89
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	90
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	91 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	92 NULL, /* preconfiguration */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	93 NULL, /* postconfiguration */
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	94
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	95 NULL, /* create main configuration */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	96 NULL, /* init main configuration */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	97
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	98 NULL, /* create server configuration */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	99 NULL, /* merge server configuration */
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 NULL, /* create location configuration */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	102 NULL /* merge location configuration */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	103 };
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	104
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	105
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	106 ngx_module_t ngx_http_geo_module = {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	107 NGX_MODULE_V1,
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	108 &ngx_http_geo_module_ctx, /* module context */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	109 ngx_http_geo_commands, /* module directives */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	110 NGX_HTTP_MODULE, /* module type */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	111 NULL, /* init master */
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	112 NULL, /* init module */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	113 NULL, /* init process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	114 NULL, /* init thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	115 NULL, /* exit thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	116 NULL, /* exit process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	117 NULL, /* exit master */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	118 NGX_MODULE_V1_PADDING
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	119 };
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	120
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	121
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	122 /* AF_INET only */
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	123
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	124 static ngx_int_t
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	125 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	126 uintptr_t data)
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	127 {
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	128 ngx_http_geo_ctx_t ctx = (ngx_http_geo_ctx_t ) data;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	129
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	130 ngx_http_variable_value_t *vv;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	131
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	132 vv = (ngx_http_variable_value_t *)
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	133 ngx_radix32tree_find(ctx->u.tree, ngx_http_geo_addr(r, ctx));
489 45a460f82aec nginx-0.1.19-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	134
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	135 v = vv;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	136
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	137 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	138 "http geo: %v", v);
489 45a460f82aec nginx-0.1.19-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	139
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 563 diff changeset	140 return NGX_OK;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	141 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	142
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	143
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	144 static ngx_int_t
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	145 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	146 uintptr_t data)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	147 {
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	148 ngx_http_geo_ctx_t ctx = (ngx_http_geo_ctx_t ) data;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	149
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	150 in_addr_t addr;
3645 9f22c780d574 eliminate a number of ranges: about 18,000 /16 networks are empty, Igor Sysoev <igor@sysoev.ru> parents: 3643 diff changeset	151 ngx_uint_t n;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	152 ngx_http_geo_range_t *range;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	153
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	154 v = ctx->u.high->default_value;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	155
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	156 addr = ngx_http_geo_addr(r, ctx);
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	157
3645 9f22c780d574 eliminate a number of ranges: about 18,000 /16 networks are empty, Igor Sysoev <igor@sysoev.ru> parents: 3643 diff changeset	158 range = ctx->u.high->low[addr >> 16];
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	159
3645 9f22c780d574 eliminate a number of ranges: about 18,000 /16 networks are empty, Igor Sysoev <igor@sysoev.ru> parents: 3643 diff changeset	160 if (range) {
9f22c780d574 eliminate a number of ranges: about 18,000 /16 networks are empty, Igor Sysoev <igor@sysoev.ru> parents: 3643 diff changeset	161 n = addr & 0xffff;
9f22c780d574 eliminate a number of ranges: about 18,000 /16 networks are empty, Igor Sysoev <igor@sysoev.ru> parents: 3643 diff changeset	162 do {
9f22c780d574 eliminate a number of ranges: about 18,000 /16 networks are empty, Igor Sysoev <igor@sysoev.ru> parents: 3643 diff changeset	163 if (n >= (ngx_uint_t) range->start && n <= (ngx_uint_t) range->end)
9f22c780d574 eliminate a number of ranges: about 18,000 /16 networks are empty, Igor Sysoev <igor@sysoev.ru> parents: 3643 diff changeset	164 {
9f22c780d574 eliminate a number of ranges: about 18,000 /16 networks are empty, Igor Sysoev <igor@sysoev.ru> parents: 3643 diff changeset	165 v = range->value;
9f22c780d574 eliminate a number of ranges: about 18,000 /16 networks are empty, Igor Sysoev <igor@sysoev.ru> parents: 3643 diff changeset	166 break;
9f22c780d574 eliminate a number of ranges: about 18,000 /16 networks are empty, Igor Sysoev <igor@sysoev.ru> parents: 3643 diff changeset	167 }
9f22c780d574 eliminate a number of ranges: about 18,000 /16 networks are empty, Igor Sysoev <igor@sysoev.ru> parents: 3643 diff changeset	168 } while ((++range)->value);
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	169 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	170
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	171 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	172 "http geo: %v", v);
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	173
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	174 return NGX_OK;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	175 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	176
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	177
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	178 static in_addr_t
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	179 ngx_http_geo_addr(ngx_http_request_t r, ngx_http_geo_ctx_t ctx)
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	180 {
2992 2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	181 u_char p, ip;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	182 size_t len;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	183 in_addr_t addr;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	184 ngx_uint_t i, n;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	185 ngx_in_cidr_t *proxies;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	186 ngx_table_elt_t *xfwd;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	187
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	188 addr = ngx_http_geo_real_addr(r, ctx);
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	189
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	190 xfwd = r->headers_in.x_forwarded_for;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	191
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	192 if (xfwd == NULL \|\| ctx->proxies == NULL) {
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	193 return addr;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	194 }
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	195
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	196 proxies = ctx->proxies->elts;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	197 n = ctx->proxies->nelts;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	198
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	199 for (i = 0; i < n; i++) {
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	200 if ((addr & proxies[i].mask) == proxies[i].addr) {
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	201
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	202 len = xfwd->value.len;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	203 ip = xfwd->value.data;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	204
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	205 for (p = ip + len - 1; p > ip; p--) {
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	206 if (p == ' ' \|\| p == ',') {
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	207 p++;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	208 len -= p - ip;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	209 ip = p;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	210 break;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	211 }
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	212 }
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	213
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	214 return ntohl(ngx_inet_addr(ip, len));
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	215 }
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	216 }
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	217
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	218 return addr;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	219 }
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	220
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	221
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	222 static in_addr_t
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	223 ngx_http_geo_real_addr(ngx_http_request_t r, ngx_http_geo_ctx_t ctx)
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	224 {
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	225 struct sockaddr_in *sin;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	226 ngx_http_variable_value_t *v;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	227
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	228 if (ctx->index == -1) {
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	229 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	230 "http geo started: %V", &r->connection->addr_text);
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	231
2512 2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2457 diff changeset	232 if (r->connection->sockaddr->sa_family != AF_INET) {
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2457 diff changeset	233 return 0;
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2457 diff changeset	234 }
2e91aecb9e57 a prelimiary IPv6 support, HTTP listen Igor Sysoev <igor@sysoev.ru> parents: 2457 diff changeset	235
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	236 sin = (struct sockaddr_in *) r->connection->sockaddr;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	237 return ntohl(sin->sin_addr.s_addr);
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	238 }
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	239
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	240 v = ngx_http_get_flushed_variable(r, ctx->index);
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	241
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	242 if (v == NULL \|\| v->not_found) {
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	243 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	244 "http geo not found");
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	245
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	246 return 0;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	247 }
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	248
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	249 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	250 "http geo started: %v", v);
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	251
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	252 return ntohl(ngx_inet_addr(v->data, v->len));
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	253 }
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	254
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	255
489 45a460f82aec nginx-0.1.19-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	256 static char *
45a460f82aec nginx-0.1.19-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	257 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	258 {
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	259 char *rv;
3645 9f22c780d574 eliminate a number of ranges: about 18,000 /16 networks are empty, Igor Sysoev <igor@sysoev.ru> parents: 3643 diff changeset	260 void **p;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	261 size_t len;
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	262 ngx_str_t *value, name;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	263 ngx_uint_t i;
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	264 ngx_conf_t save;
d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	265 ngx_pool_t *pool;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	266 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	267 ngx_http_variable_t *var;
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	268 ngx_http_geo_ctx_t *geo;
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	269 ngx_http_geo_conf_ctx_t ctx;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	270
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	271 value = cf->args->elts;
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	272
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	273 geo = ngx_palloc(cf->pool, sizeof(ngx_http_geo_ctx_t));
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	274 if (geo == NULL) {
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	275 return NGX_CONF_ERROR;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	276 }
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	277
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	278 name = value[1];
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	279 name.len--;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	280 name.data++;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	281
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	282 if (cf->args->nelts == 3) {
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	283
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	284 geo->index = ngx_http_get_variable_index(cf, &name);
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	285 if (geo->index == NGX_ERROR) {
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	286 return NGX_CONF_ERROR;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	287 }
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	288
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	289 name = value[2];
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	290 name.len--;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	291 name.data++;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	292
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	293 } else {
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	294 geo->index = -1;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	295 }
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	296
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	297 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	298 if (var == NULL) {
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	299 return NGX_CONF_ERROR;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	300 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	301
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	302 pool = ngx_create_pool(16384, cf->log);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	303 if (pool == NULL) {
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	304 return NGX_CONF_ERROR;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	305 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	306
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	307 ctx.temp_pool = ngx_create_pool(16384, cf->log);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	308 if (ctx.temp_pool == NULL) {
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	309 return NGX_CONF_ERROR;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	310 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	311
3641 6802ba529ec4 change ngx_http_variable_value_node_t to more generic ngx_str_node_t Igor Sysoev <igor@sysoev.ru> parents: 3456 diff changeset	312 ngx_rbtree_init(&ctx.rbtree, &ctx.sentinel, ngx_str_rbtree_insert_value);
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	313
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	314 ctx.high = NULL;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	315 ctx.tree = NULL;
2992 2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	316 ctx.proxies = NULL;
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	317 ctx.pool = cf->pool;
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 save = *cf;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	320 cf->pool = pool;
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	321 cf->ctx = &ctx;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	322 cf->handler = ngx_http_geo;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	323 cf->handler_conf = conf;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	324
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	325 rv = ngx_conf_parse(cf, NULL);
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	326
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	327 *cf = save;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	328
2992 2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	329 geo->proxies = ctx.proxies;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	330
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	331 if (ctx.high) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	332
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	333 for (i = 0; i < 0x10000; i++) {
3645 9f22c780d574 eliminate a number of ranges: about 18,000 /16 networks are empty, Igor Sysoev <igor@sysoev.ru> parents: 3643 diff changeset	334 a = (ngx_array_t *) ctx.high->low[i];
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	335
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	336 if (a == NULL \|\| a->nelts == 0) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	337 continue;
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 len = a->nelts * sizeof(ngx_http_geo_range_t);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	341
3645 9f22c780d574 eliminate a number of ranges: about 18,000 /16 networks are empty, Igor Sysoev <igor@sysoev.ru> parents: 3643 diff changeset	342 ctx.high->low[i] = ngx_palloc(cf->pool, len + sizeof(void *));
9f22c780d574 eliminate a number of ranges: about 18,000 /16 networks are empty, Igor Sysoev <igor@sysoev.ru> parents: 3643 diff changeset	343 if (ctx.high->low[i] == NULL) {
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	344 return NGX_CONF_ERROR;
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
3645 9f22c780d574 eliminate a number of ranges: about 18,000 /16 networks are empty, Igor Sysoev <igor@sysoev.ru> parents: 3643 diff changeset	347 p = (void **) ngx_cpymem(ctx.high->low[i], a->elts, len);
9f22c780d574 eliminate a number of ranges: about 18,000 /16 networks are empty, Igor Sysoev <igor@sysoev.ru> parents: 3643 diff changeset	348 *p = NULL;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	349 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	350
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	351 geo->u.high = ctx.high;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	352
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	353 var->get_handler = ngx_http_geo_range_variable;
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	354 var->data = (uintptr_t) geo;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	355
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	356 ngx_destroy_pool(ctx.temp_pool);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	357 ngx_destroy_pool(pool);
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 if (ctx.high->default_value == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	360 ctx.high->default_value = &ngx_http_variable_null_value;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	361 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	362
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	363 } else {
2358 ac0cf19eb582 create empty radix tree for "geo $geo { }" case Igor Sysoev <igor@sysoev.ru> parents: 2340 diff changeset	364 if (ctx.tree == NULL) {
ac0cf19eb582 create empty radix tree for "geo $geo { }" case Igor Sysoev <igor@sysoev.ru> parents: 2340 diff changeset	365 ctx.tree = ngx_radix_tree_create(cf->pool, -1);
ac0cf19eb582 create empty radix tree for "geo $geo { }" case Igor Sysoev <igor@sysoev.ru> parents: 2340 diff changeset	366 if (ctx.tree == NULL) {
ac0cf19eb582 create empty radix tree for "geo $geo { }" case Igor Sysoev <igor@sysoev.ru> parents: 2340 diff changeset	367 return NGX_CONF_ERROR;
ac0cf19eb582 create empty radix tree for "geo $geo { }" case Igor Sysoev <igor@sysoev.ru> parents: 2340 diff changeset	368 }
ac0cf19eb582 create empty radix tree for "geo $geo { }" case Igor Sysoev <igor@sysoev.ru> parents: 2340 diff changeset	369 }
ac0cf19eb582 create empty radix tree for "geo $geo { }" case Igor Sysoev <igor@sysoev.ru> parents: 2340 diff changeset	370
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	371 geo->u.tree = ctx.tree;
aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	372
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	373 var->get_handler = ngx_http_geo_cidr_variable;
2399 aecf0755cee3 $geo variable support Igor Sysoev <igor@sysoev.ru> parents: 2398 diff changeset	374 var->data = (uintptr_t) geo;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	375
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	376 ngx_destroy_pool(ctx.temp_pool);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	377 ngx_destroy_pool(pool);
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 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	380 return rv;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	381 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	382
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	383 if (ngx_radix32tree_insert(ctx.tree, 0, 0,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	384 (uintptr_t) &ngx_http_variable_null_value)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	385 == NGX_ERROR)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	386 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	387 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	388 }
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	389 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	390
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	391 return rv;
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	392 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	393
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	394
489 45a460f82aec nginx-0.1.19-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	395 static char *
45a460f82aec nginx-0.1.19-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 487 diff changeset	396 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	397 {
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	398 char *rv;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	399 ngx_str_t *value, file;
2992 2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	400 ngx_cidr_t cidr;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	401 ngx_http_geo_conf_ctx_t *ctx;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	402
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	403 ctx = cf->ctx;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	404
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	405 value = cf->args->elts;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	406
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	407 if (cf->args->nelts == 1) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	408
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	409 if (ngx_strcmp(value[0].data, "ranges") == 0) {
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 if (ctx->tree) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	412 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	413 "the \"ranges\" directive must be "
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	414 "the first directive inside \"geo\" block");
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	415 goto failed;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	416 }
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 ctx->high = ngx_pcalloc(ctx->pool,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	419 sizeof(ngx_http_geo_high_ranges_t));
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	420 if (ctx->high == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	421 goto failed;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	422 }
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 rv = NGX_CONF_OK;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	425
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	426 goto done;
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 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	429
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	430 if (cf->args->nelts != 2) {
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	431 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	432 "invalid number of the geo parameters");
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	433 goto failed;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	434 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	435
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	436 if (ngx_strcmp(value[0].data, "include") == 0) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	437
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	438 file.len = value[1].len++;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	439
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	440 file.data = ngx_pstrdup(ctx->temp_pool, &value[1]);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	441 if (file.data == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	442 goto failed;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	443 }
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	444
3642 ac33852faaac style fix Igor Sysoev <igor@sysoev.ru> parents: 3641 diff changeset	445 if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK) {
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	446 goto failed;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	447 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	448
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	449 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	450
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	451 rv = ngx_conf_parse(cf, &file);
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 goto done;
2992 2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	454
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	455 } else if (ngx_strcmp(value[0].data, "proxy") == 0) {
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	456
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	457 if (ngx_http_geo_cidr_value(cf, &value[1], &cidr) != NGX_OK) {
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	458 goto failed;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	459 }
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	460
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	461 rv = ngx_http_geo_add_proxy(cf, ctx, &cidr);
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	462
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	463 goto done;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	464 }
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 if (ctx->high) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	467 rv = ngx_http_geo_range(cf, ctx, value);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	468
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	469 } else {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	470 rv = ngx_http_geo_cidr(cf, ctx, value);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	471 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	472
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	473 done:
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	474
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	475 ngx_reset_pool(cf->pool);
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 return rv;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	478
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	479 failed:
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	480
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	481 ngx_reset_pool(cf->pool);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	482
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	483 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	484 }
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 static char *
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	488 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	489 ngx_str_t *value)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	490 {
3650 c12b0dd5bd1c change duplicate default geo range processing Igor Sysoev <igor@sysoev.ru> parents: 3645 diff changeset	491 u_char p, last;
c12b0dd5bd1c change duplicate default geo range processing Igor Sysoev <igor@sysoev.ru> parents: 3645 diff changeset	492 in_addr_t start, end;
c12b0dd5bd1c change duplicate default geo range processing Igor Sysoev <igor@sysoev.ru> parents: 3645 diff changeset	493 ngx_str_t *net;
c12b0dd5bd1c change duplicate default geo range processing Igor Sysoev <igor@sysoev.ru> parents: 3645 diff changeset	494 ngx_uint_t del;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	495
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	496 if (ngx_strcmp(value[0].data, "default") == 0) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	497
3650 c12b0dd5bd1c change duplicate default geo range processing Igor Sysoev <igor@sysoev.ru> parents: 3645 diff changeset	498 if (ctx->high->default_value) {
c12b0dd5bd1c change duplicate default geo range processing Igor Sysoev <igor@sysoev.ru> parents: 3645 diff changeset	499 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
c12b0dd5bd1c change duplicate default geo range processing Igor Sysoev <igor@sysoev.ru> parents: 3645 diff changeset	500 "duplicate default geo range value: \"%V\", old value: \"%v\"",
c12b0dd5bd1c change duplicate default geo range processing Igor Sysoev <igor@sysoev.ru> parents: 3645 diff changeset	501 &value[1], ctx->high->default_value);
c12b0dd5bd1c change duplicate default geo range processing Igor Sysoev <igor@sysoev.ru> parents: 3645 diff changeset	502 }
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	503
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	504 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	505 if (ctx->high->default_value == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	506 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	507 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	508
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	509 return NGX_CONF_OK;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	510 }
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 if (ngx_strcmp(value[0].data, "delete") == 0) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	513 net = &value[1];
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	514 del = 1;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	515
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	516 } else {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	517 net = &value[0];
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	518 del = 0;
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
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	521 last = net->data + net->len;
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 p = ngx_strlchr(net->data, last, '-');
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	524
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	525 if (p == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	526 goto invalid;
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 start = ngx_inet_addr(net->data, p - net->data);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	530
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	531 if (start == INADDR_NONE) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	532 goto invalid;
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 start = ntohl(start);
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 p++;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	538
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	539 end = ngx_inet_addr(p, last - p);
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 if (end == INADDR_NONE) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	542 goto invalid;
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
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	545 end = ntohl(end);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	546
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	547 if (start > end) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	548 goto invalid;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	549 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	550
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	551 if (del) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	552 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	553 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	554 "no address range \"%V\" to delete", net);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	555 }
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 return NGX_CONF_OK;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	558 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	559
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	560 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	561
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	562 if (ctx->value == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	563 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	564 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	565
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	566 ctx->net = net;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	567
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	568 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	569
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	570 invalid:
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	571
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	572 ngx_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	573
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	574 return NGX_CONF_ERROR;
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
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 /* 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	579
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	580 static char *
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	581 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	582 in_addr_t start, in_addr_t end)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	583 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	584 in_addr_t n;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	585 ngx_uint_t h, i, s, e;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	586 ngx_array_t *a;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	587 ngx_http_geo_range_t *range;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	588
3456 91cff7f97a50 fix a geo range if the range includes two or more /16 networks Igor Sysoev <igor@sysoev.ru> parents: 3115 diff changeset	589 for (n = start; n <= end; n = (n + 0x10000) & 0xffff0000) {
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	590
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	591 h = n >> 16;
2447 3d868fc44879 fix range start for ranges those spread in two or more slots Igor Sysoev <igor@sysoev.ru> parents: 2442 diff changeset	592
3d868fc44879 fix range start for ranges those spread in two or more slots Igor Sysoev <igor@sysoev.ru> parents: 2442 diff changeset	593 if (n == start) {
3d868fc44879 fix range start for ranges those spread in two or more slots Igor Sysoev <igor@sysoev.ru> parents: 2442 diff changeset	594 s = n & 0xffff;
3d868fc44879 fix range start for ranges those spread in two or more slots Igor Sysoev <igor@sysoev.ru> parents: 2442 diff changeset	595 } else {
3d868fc44879 fix range start for ranges those spread in two or more slots Igor Sysoev <igor@sysoev.ru> parents: 2442 diff changeset	596 s = 0;
3d868fc44879 fix range start for ranges those spread in two or more slots Igor Sysoev <igor@sysoev.ru> parents: 2442 diff changeset	597 }
2340 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 if ((n \| 0xffff) > end) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	600 e = end & 0xffff;
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 } else {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	603 e = 0xffff;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	604 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	605
3645 9f22c780d574 eliminate a number of ranges: about 18,000 /16 networks are empty, Igor Sysoev <igor@sysoev.ru> parents: 3643 diff changeset	606 a = (ngx_array_t *) ctx->high->low[h];
2340 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 if (a == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	609 a = ngx_array_create(ctx->temp_pool, 64,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	610 sizeof(ngx_http_geo_range_t));
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	611 if (a == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	612 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	613 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	614
3645 9f22c780d574 eliminate a number of ranges: about 18,000 /16 networks are empty, Igor Sysoev <igor@sysoev.ru> parents: 3643 diff changeset	615 ctx->high->low[h] = (ngx_http_geo_range_t *) a;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	616 }
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 i = a->nelts;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	619 range = a->elts;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	620
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	621 while (i) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	622
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	623 i--;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	624
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	625 if (e < (ngx_uint_t) range[i].start) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	626 continue;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	627 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	628
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	629 if (s > (ngx_uint_t) range[i].end) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	630
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	631 /* add after the range */
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	632
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	633 range = ngx_array_push(a);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	634 if (range == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	635 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	636 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	637
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	638 range = a->elts;
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 ngx_memcpy(&range[i + 2], &range[i + 1],
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	641 (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	642
2442 6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	643 range[i + 1].start = (u_short) s;
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	644 range[i + 1].end = (u_short) e;
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	645 range[i + 1].value = ctx->value;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	646
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	647 goto next;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	648 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	649
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	650 if (s == (ngx_uint_t) range[i].start
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	651 && e == (ngx_uint_t) range[i].end)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	652 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	653 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	654 "duplicate range \"%V\", value: \"%v\", old value: \"%v\"",
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	655 ctx->net, ctx->value, range[i].value);
2442 6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	656
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	657 range[i].value = ctx->value;
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	658
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	659 goto next;
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	660 }
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	661
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	662 if (s > (ngx_uint_t) range[i].start
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	663 && e < (ngx_uint_t) range[i].end)
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	664 {
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	665 /* split the range and insert the new one */
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	666
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	667 range = ngx_array_push(a);
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	668 if (range == NULL) {
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	669 return NGX_CONF_ERROR;
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	670 }
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	671
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	672 range = ngx_array_push(a);
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	673 if (range == NULL) {
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	674 return NGX_CONF_ERROR;
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	675 }
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	676
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	677 range = a->elts;
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	678
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	679 ngx_memcpy(&range[i + 3], &range[i + 1],
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	680 (a->nelts - 3 - i) * sizeof(ngx_http_geo_range_t));
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	681
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	682 range[i + 2].start = (u_short) (e + 1);
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	683 range[i + 2].end = range[i].end;
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	684 range[i + 2].value = range[i].value;
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	685
2452 95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	686 range[i + 1].start = (u_short) s;
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	687 range[i + 1].end = (u_short) e;
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	688 range[i + 1].value = ctx->value;
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	689
2442 6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	690 range[i].end = (u_short) (s - 1);
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	691
2452 95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	692 goto next;
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	693 }
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	694
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	695 if (s == (ngx_uint_t) range[i].start
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	696 && e < (ngx_uint_t) range[i].end)
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	697 {
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	698 /* shift the range start and insert the new range */
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	699
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	700 range = ngx_array_push(a);
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	701 if (range == NULL) {
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	702 return NGX_CONF_ERROR;
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	703 }
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	704
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	705 range = a->elts;
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	706
2457 1aff348d9aa8 fix segfault when geo range replaces starting part of another range Igor Sysoev <igor@sysoev.ru> parents: 2452 diff changeset	707 ngx_memcpy(&range[i + 1], &range[i],
1aff348d9aa8 fix segfault when geo range replaces starting part of another range Igor Sysoev <igor@sysoev.ru> parents: 2452 diff changeset	708 (a->nelts - 1 - i) * sizeof(ngx_http_geo_range_t));
2452 95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	709
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	710 range[i + 1].start = (u_short) (e + 1);
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	711
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	712 range[i].start = (u_short) s;
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	713 range[i].end = (u_short) e;
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	714 range[i].value = ctx->value;
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	715
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	716 goto next;
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	717 }
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	718
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	719 if (s > (ngx_uint_t) range[i].start
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	720 && e == (ngx_uint_t) range[i].end)
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	721 {
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	722 /* shift the range end and insert the new range */
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	723
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	724 range = ngx_array_push(a);
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	725 if (range == NULL) {
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	726 return NGX_CONF_ERROR;
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	727 }
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	728
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	729 range = a->elts;
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	730
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	731 ngx_memcpy(&range[i + 2], &range[i + 1],
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	732 (a->nelts - 2 - i) * sizeof(ngx_http_geo_range_t));
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	733
2442 6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	734 range[i + 1].start = (u_short) s;
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	735 range[i + 1].end = (u_short) e;
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	736 range[i + 1].value = ctx->value;
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	737
2452 95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	738 range[i].end = (u_short) (s - 1);
95f078e7d743 allow insertion range if its start or end is the same as existent one Igor Sysoev <igor@sysoev.ru> parents: 2451 diff changeset	739
2442 6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	740 goto next;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	741 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	742
2448 bbec98632208 log both overrlaped ranges Igor Sysoev <igor@sysoev.ru> parents: 2447 diff changeset	743 s = (ngx_uint_t) range[i].start;
bbec98632208 log both overrlaped ranges Igor Sysoev <igor@sysoev.ru> parents: 2447 diff changeset	744 e = (ngx_uint_t) range[i].end;
bbec98632208 log both overrlaped ranges Igor Sysoev <igor@sysoev.ru> parents: 2447 diff changeset	745
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	746 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
2448 bbec98632208 log both overrlaped ranges Igor Sysoev <igor@sysoev.ru> parents: 2447 diff changeset	747 "range \"%V\" overlaps \"%d.%d.%d.%d-%d.%d.%d.%d\"",
bbec98632208 log both overrlaped ranges Igor Sysoev <igor@sysoev.ru> parents: 2447 diff changeset	748 ctx->net,
bbec98632208 log both overrlaped ranges Igor Sysoev <igor@sysoev.ru> parents: 2447 diff changeset	749 h >> 8, h & 0xff, s >> 8, s & 0xff,
bbec98632208 log both overrlaped ranges Igor Sysoev <igor@sysoev.ru> parents: 2447 diff changeset	750 h >> 8, h & 0xff, e >> 8, e & 0xff);
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	751
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	752 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	753 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	754
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	755 /* add the first range */
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	756
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	757 range = ngx_array_push(a);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	758 if (range == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	759 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	760 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	761
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	762 range->start = (u_short) s;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	763 range->end = (u_short) e;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	764 range->value = ctx->value;
2442 6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	765
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	766 next:
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	767
6978f3827a5c ) fix duplicate geo ranges Igor Sysoev <igor@sysoev.ru>* parents: 2401 diff changeset	768 continue;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	769 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	770
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	771 return NGX_CONF_OK;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	772 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	773
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	774
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	775 static ngx_uint_t
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	776 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	777 in_addr_t start, in_addr_t end)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	778 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	779 in_addr_t n;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	780 ngx_uint_t h, i, s, e, warn;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	781 ngx_array_t *a;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	782 ngx_http_geo_range_t *range;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	783
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	784 warn = 0;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	785
2451 b70e7f34d92b fix single address range Igor Sysoev <igor@sysoev.ru> parents: 2450 diff changeset	786 for (n = start; n <= end; n += 0x10000) {
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	787
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	788 h = n >> 16;
2449 450a277dad48 repeat r2448 for range deletion Igor Sysoev <igor@sysoev.ru> parents: 2448 diff changeset	789
450a277dad48 repeat r2448 for range deletion Igor Sysoev <igor@sysoev.ru> parents: 2448 diff changeset	790 if (n == start) {
450a277dad48 repeat r2448 for range deletion Igor Sysoev <igor@sysoev.ru> parents: 2448 diff changeset	791 s = n & 0xffff;
450a277dad48 repeat r2448 for range deletion Igor Sysoev <igor@sysoev.ru> parents: 2448 diff changeset	792 } else {
450a277dad48 repeat r2448 for range deletion Igor Sysoev <igor@sysoev.ru> parents: 2448 diff changeset	793 s = 0;
450a277dad48 repeat r2448 for range deletion Igor Sysoev <igor@sysoev.ru> parents: 2448 diff changeset	794 }
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	795
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	796 if ((n \| 0xffff) > end) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	797 e = end & 0xffff;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	798
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	799 } else {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	800 e = 0xffff;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	801 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	802
3645 9f22c780d574 eliminate a number of ranges: about 18,000 /16 networks are empty, Igor Sysoev <igor@sysoev.ru> parents: 3643 diff changeset	803 a = (ngx_array_t *) ctx->high->low[h];
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	804
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	805 if (a == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	806 warn = 1;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	807 continue;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	808 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	809
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	810 range = a->elts;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	811 for (i = 0; i < a->nelts; i++) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	812
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	813 if (s == (ngx_uint_t) range[i].start
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	814 && e == (ngx_uint_t) range[i].end)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	815 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	816 ngx_memcpy(&range[i], &range[i + 1],
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	817 (a->nelts - 1 - i) * sizeof(ngx_http_geo_range_t));
2450 19b28be544fe fix range deletion Igor Sysoev <igor@sysoev.ru> parents: 2449 diff changeset	818
19b28be544fe fix range deletion Igor Sysoev <igor@sysoev.ru> parents: 2449 diff changeset	819 a->nelts--;
19b28be544fe fix range deletion Igor Sysoev <igor@sysoev.ru> parents: 2449 diff changeset	820
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	821 break;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	822 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	823
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	824 if (s != (ngx_uint_t) range[i].start
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	825 && e != (ngx_uint_t) range[i].end)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	826 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	827 continue;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	828 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	829
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	830 warn = 1;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	831 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	832 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	833
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	834 return warn;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	835 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	836
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	837
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	838 static char *
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	839 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	840 ngx_str_t *value)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	841 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	842 ngx_int_t rc, del;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	843 ngx_str_t *net;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	844 ngx_uint_t i;
2537 a472d954c534 prepare ngx_ptocidr() for IPv6 Igor Sysoev <igor@sysoev.ru> parents: 2512 diff changeset	845 ngx_cidr_t cidr;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	846 ngx_http_variable_value_t val, old;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	847
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	848 if (ctx->tree == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	849 ctx->tree = ngx_radix_tree_create(ctx->pool, -1);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	850 if (ctx->tree == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	851 return NGX_CONF_ERROR;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	852 }
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	853 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	854
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	855 if (ngx_strcmp(value[0].data, "default") == 0) {
2537 a472d954c534 prepare ngx_ptocidr() for IPv6 Igor Sysoev <igor@sysoev.ru> parents: 2512 diff changeset	856 cidr.u.in.addr = 0;
a472d954c534 prepare ngx_ptocidr() for IPv6 Igor Sysoev <igor@sysoev.ru> parents: 2512 diff changeset	857 cidr.u.in.mask = 0;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	858 net = &value[0];
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	859
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	860 } else {
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	861 if (ngx_strcmp(value[0].data, "delete") == 0) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	862 net = &value[1];
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	863 del = 1;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	864
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	865 } else {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	866 net = &value[0];
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	867 del = 0;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	868 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	869
2992 2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	870 if (ngx_http_geo_cidr_value(cf, net, &cidr) != NGX_OK) {
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	871 return NGX_CONF_ERROR;
1380 b590a528fd41 ignore meaningless bits in CIDR and warn about them Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	872 }
b590a528fd41 ignore meaningless bits in CIDR and warn about them Igor Sysoev <igor@sysoev.ru> parents: 1352 diff changeset	873
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	874 if (del) {
2537 a472d954c534 prepare ngx_ptocidr() for IPv6 Igor Sysoev <igor@sysoev.ru> parents: 2512 diff changeset	875 if (ngx_radix32tree_delete(ctx->tree, cidr.u.in.addr,
a472d954c534 prepare ngx_ptocidr() for IPv6 Igor Sysoev <igor@sysoev.ru> parents: 2512 diff changeset	876 cidr.u.in.mask)
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	877 != NGX_OK)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	878 {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	879 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	880 "no network \"%V\" to delete", net);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	881 }
2365 8522a901df2f fix "delete CIDR" Igor Sysoev <igor@sysoev.ru> parents: 2358 diff changeset	882
8522a901df2f fix "delete CIDR" Igor Sysoev <igor@sysoev.ru> parents: 2358 diff changeset	883 return NGX_CONF_OK;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	884 }
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	885 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	886
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	887 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	888
2334 6e30d64f919b use value rbtree instead of array in geo configuration Igor Sysoev <igor@sysoev.ru> parents: 1565 diff changeset	889 if (val == NULL) {
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	890 return NGX_CONF_ERROR;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	891 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	892
553 45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	893 for (i = 2; i; i--) {
2537 a472d954c534 prepare ngx_ptocidr() for IPv6 Igor Sysoev <igor@sysoev.ru> parents: 2512 diff changeset	894 rc = ngx_radix32tree_insert(ctx->tree, cidr.u.in.addr, cidr.u.in.mask,
2334 6e30d64f919b use value rbtree instead of array in geo configuration Igor Sysoev <igor@sysoev.ru> parents: 1565 diff changeset	895 (uintptr_t) val);
553 45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	896 if (rc == NGX_OK) {
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	897 return NGX_CONF_OK;
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	898 }
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	899
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	900 if (rc == NGX_ERROR) {
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	901 return NGX_CONF_ERROR;
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	902 }
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	903
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	904 /* rc == NGX_BUSY */
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	905
3115 204ea173234f style fix Igor Sysoev <igor@sysoev.ru> parents: 2992 diff changeset	906 old = (ngx_http_variable_value_t *)
2537 a472d954c534 prepare ngx_ptocidr() for IPv6 Igor Sysoev <igor@sysoev.ru> parents: 2512 diff changeset	907 ngx_radix32tree_find(ctx->tree, cidr.u.in.addr & cidr.u.in.mask);
553 45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	908
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	909 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	910 "duplicate network \"%V\", value: \"%v\", old value: \"%v\"",
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	911 net, val, old);
553 45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	912
2537 a472d954c534 prepare ngx_ptocidr() for IPv6 Igor Sysoev <igor@sysoev.ru> parents: 2512 diff changeset	913 rc = ngx_radix32tree_delete(ctx->tree, cidr.u.in.addr, cidr.u.in.mask);
553 45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	914
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	915 if (rc == NGX_ERROR) {
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	916 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	917 return NGX_CONF_ERROR;
45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	918 }
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	919 }
4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	920
553 45033d85b30e nginx-0.2.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 547 diff changeset	921 return NGX_CONF_ERROR;
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	922 }
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	923
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	924
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	925 static ngx_http_variable_value_t *
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	926 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	927 ngx_str_t *value)
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	928 {
3641 6802ba529ec4 change ngx_http_variable_value_node_t to more generic ngx_str_node_t Igor Sysoev <igor@sysoev.ru> parents: 3456 diff changeset	929 uint32_t hash;
6802ba529ec4 change ngx_http_variable_value_node_t to more generic ngx_str_node_t Igor Sysoev <igor@sysoev.ru> parents: 3456 diff changeset	930 ngx_http_variable_value_t *val;
6802ba529ec4 change ngx_http_variable_value_node_t to more generic ngx_str_node_t Igor Sysoev <igor@sysoev.ru> parents: 3456 diff changeset	931 ngx_http_geo_variable_value_node_t *gvvn;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	932
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	933 hash = ngx_crc32_long(value->data, value->len);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	934
3641 6802ba529ec4 change ngx_http_variable_value_node_t to more generic ngx_str_node_t Igor Sysoev <igor@sysoev.ru> parents: 3456 diff changeset	935 gvvn = (ngx_http_geo_variable_value_node_t *)
6802ba529ec4 change ngx_http_variable_value_node_t to more generic ngx_str_node_t Igor Sysoev <igor@sysoev.ru> parents: 3456 diff changeset	936 ngx_str_rbtree_lookup(&ctx->rbtree, value, hash);
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	937
3641 6802ba529ec4 change ngx_http_variable_value_node_t to more generic ngx_str_node_t Igor Sysoev <igor@sysoev.ru> parents: 3456 diff changeset	938 if (gvvn) {
6802ba529ec4 change ngx_http_variable_value_node_t to more generic ngx_str_node_t Igor Sysoev <igor@sysoev.ru> parents: 3456 diff changeset	939 return gvvn->value;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	940 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	941
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	942 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	943 if (val == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	944 return NULL;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	945 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	946
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	947 val->len = value->len;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	948 val->data = ngx_pstrdup(ctx->pool, value);
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	949 if (val->data == NULL) {
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	950 return NULL;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	951 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	952
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	953 val->valid = 1;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	954 val->no_cacheable = 0;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	955 val->not_found = 0;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	956
3641 6802ba529ec4 change ngx_http_variable_value_node_t to more generic ngx_str_node_t Igor Sysoev <igor@sysoev.ru> parents: 3456 diff changeset	957 gvvn = ngx_palloc(ctx->temp_pool,
6802ba529ec4 change ngx_http_variable_value_node_t to more generic ngx_str_node_t Igor Sysoev <igor@sysoev.ru> parents: 3456 diff changeset	958 sizeof(ngx_http_geo_variable_value_node_t));
6802ba529ec4 change ngx_http_variable_value_node_t to more generic ngx_str_node_t Igor Sysoev <igor@sysoev.ru> parents: 3456 diff changeset	959 if (gvvn == NULL) {
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	960 return NULL;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	961 }
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	962
3641 6802ba529ec4 change ngx_http_variable_value_node_t to more generic ngx_str_node_t Igor Sysoev <igor@sysoev.ru> parents: 3456 diff changeset	963 gvvn->sn.node.key = hash;
6802ba529ec4 change ngx_http_variable_value_node_t to more generic ngx_str_node_t Igor Sysoev <igor@sysoev.ru> parents: 3456 diff changeset	964 gvvn->sn.str.len = val->len;
6802ba529ec4 change ngx_http_variable_value_node_t to more generic ngx_str_node_t Igor Sysoev <igor@sysoev.ru> parents: 3456 diff changeset	965 gvvn->sn.str.data = val->data;
6802ba529ec4 change ngx_http_variable_value_node_t to more generic ngx_str_node_t Igor Sysoev <igor@sysoev.ru> parents: 3456 diff changeset	966 gvvn->value = val;
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	967
3641 6802ba529ec4 change ngx_http_variable_value_node_t to more generic ngx_str_node_t Igor Sysoev <igor@sysoev.ru> parents: 3456 diff changeset	968 ngx_rbtree_insert(&ctx->rbtree, &gvvn->sn.node);
2340 22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	969
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	970 return val;
22d2b6609853 ) descrease geo configuration memory usage Igor Sysoev <igor@sysoev.ru>* parents: 2334 diff changeset	971 }
2992 2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	972
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	973
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	974 static char *
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	975 ngx_http_geo_add_proxy(ngx_conf_t cf, ngx_http_geo_conf_ctx_t ctx,
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	976 ngx_cidr_t *cidr)
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	977 {
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	978 ngx_in_cidr_t *c;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	979
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	980 if (ctx->proxies == NULL) {
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	981 ctx->proxies = ngx_array_create(ctx->pool, 4, sizeof(ngx_in_cidr_t));
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	982 if (ctx->proxies == NULL) {
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	983 return NGX_CONF_ERROR;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	984 }
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	985 }
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	986
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	987 c = ngx_array_push(ctx->proxies);
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	988 if (c == NULL) {
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	989 return NGX_CONF_ERROR;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	990 }
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	991
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	992 c->addr = cidr->u.in.addr;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	993 c->mask = cidr->u.in.mask;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	994
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	995 return NGX_CONF_OK;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	996 }
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	997
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	998
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	999 static ngx_int_t
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1000 ngx_http_geo_cidr_value(ngx_conf_t cf, ngx_str_t net, ngx_cidr_t *cidr)
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1001 {
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1002 ngx_int_t rc;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1003
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1004 if (ngx_strcmp(net->data, "255.255.255.255") == 0) {
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1005 cidr->u.in.addr = 0xffffffff;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1006 cidr->u.in.mask = 0xffffffff;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1007
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1008 return NGX_OK;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1009 }
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1010
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1011 rc = ngx_ptocidr(net, cidr);
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1012
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1013 if (rc == NGX_ERROR) {
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1014 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid network \"%V\"", net);
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1015 return NGX_ERROR;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1016 }
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1017
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1018 if (cidr->family != AF_INET) {
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1019 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "\"geo\" supports IPv4 only");
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1020 return NGX_ERROR;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1021 }
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1022
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1023 if (rc == NGX_DONE) {
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1024 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1025 "low address bits of %V are meaningless", net);
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1026 }
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1027
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1028 cidr->u.in.addr = ntohl(cidr->u.in.addr);
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1029 cidr->u.in.mask = ntohl(cidr->u.in.mask);
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1030
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1031 return NGX_OK;
2465ff3da161 geo module supports trusted proxies Igor Sysoev <igor@sysoev.ru> parents: 2537 diff changeset	1032 }

Mercurial > hg > nginx

annotate src/http/modules/ngx_http_geo_module.c @ 3650:c12b0dd5bd1c