nginx: src/http/modules/ngx_http_geo

annotate src/http/modules/ngx_http_geo_module.c @ 3642:ac33852faaac

style fix

author	Igor Sysoev <igor@sysoev.ru>
date	Wed, 23 Jun 2010 16:34:54 +0000
parents	6802ba529ec4
children	762712d69672

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

Mercurial > hg > nginx

annotate src/http/modules/ngx_http_geo_module.c @ 3642:ac33852faaac