Mercurial > hg > nginx
annotate src/http/modules/ngx_http_geo_module.c @ 3654:b56935e34273
test binary geo ranges base only for ranges
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Wed, 30 Jun 2010 10:05:56 +0000 |
| parents | be3f716ba546 |
| children | ec20f1f93aea |
| rev | line source |
|---|---|
| 485 | 1 |
| 2 /* | |
| 3 * Copyright (C) Igor Sysoev | |
| 4 */ | |
| 5 | |
| 6 | |
| 7 #include <ngx_config.h> | |
| 8 #include <ngx_core.h> | |
| 9 #include <ngx_http.h> | |
| 10 | |
| 11 | |
| 12 typedef struct { | |
|
3645
9f22c780d574
eliminate a number of ranges: about 18,000 /16 networks are empty,
Igor Sysoev <igor@sysoev.ru>
parents:
3643
diff
changeset
|
13 ngx_http_variable_value_t *value; |
| 2399 | 14 u_short start; |
| 15 u_short end; | |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
16 } ngx_http_geo_range_t; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
17 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
18 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
19 typedef struct { |
| 3652 | 20 ngx_http_geo_range_t **low; |
| 2399 | 21 ngx_http_variable_value_t *default_value; |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
22 } ngx_http_geo_high_ranges_t; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
23 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
24 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
25 typedef struct { |
|
3641
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3456
diff
changeset
|
26 ngx_str_node_t sn; |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3456
diff
changeset
|
27 ngx_http_variable_value_t *value; |
| 3652 | 28 size_t offset; |
|
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
|
29 } 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
|
30 |
|
6802ba529ec4
change ngx_http_variable_value_node_t to more generic ngx_str_node_t
Igor Sysoev <igor@sysoev.ru>
parents:
3456
diff
changeset
|
31 |
|
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 typedef struct { |
| 2399 | 33 ngx_http_variable_value_t *value; |
| 34 ngx_str_t *net; | |
| 3652 | 35 ngx_http_geo_high_ranges_t high; |
| 2399 | 36 ngx_radix_tree_t *tree; |
| 37 ngx_rbtree_t rbtree; | |
| 38 ngx_rbtree_node_t sentinel; | |
|
2992
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
39 ngx_array_t *proxies; |
| 2399 | 40 ngx_pool_t *pool; |
| 41 ngx_pool_t *temp_pool; | |
| 3652 | 42 |
| 43 size_t data_size; | |
| 44 | |
| 45 ngx_str_t include_name; | |
| 46 ngx_uint_t includes; | |
| 47 ngx_uint_t entries; | |
| 48 | |
| 49 unsigned ranges:1; | |
| 50 unsigned outside_entries:1; | |
| 51 unsigned allow_binary_include:1; | |
| 52 unsigned binary_include:1; | |
| 589 | 53 } ngx_http_geo_conf_ctx_t; |
| 485 | 54 |
| 55 | |
| 2399 | 56 typedef struct { |
| 57 union { | |
| 58 ngx_radix_tree_t *tree; | |
| 3652 | 59 ngx_http_geo_high_ranges_t high; |
| 2399 | 60 } u; |
| 61 | |
|
2992
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
62 ngx_array_t *proxies; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
63 |
| 2399 | 64 ngx_int_t index; |
| 65 } ngx_http_geo_ctx_t; | |
| 66 | |
| 67 | |
| 68 static in_addr_t ngx_http_geo_addr(ngx_http_request_t *r, | |
| 69 ngx_http_geo_ctx_t *ctx); | |
|
2992
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
70 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
|
71 ngx_http_geo_ctx_t *ctx); |
| 485 | 72 static char *ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); |
| 73 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
|
74 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
|
75 ngx_str_t *value); |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
76 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
|
77 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
|
78 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
|
79 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
|
80 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
|
81 ngx_str_t *value); |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
82 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
|
83 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
|
84 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
|
85 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
|
86 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
|
87 ngx_cidr_t *cidr); |
| 3652 | 88 static char *ngx_http_geo_include(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx, |
| 89 ngx_str_t *name); | |
| 90 static ngx_int_t ngx_http_geo_include_binary_base(ngx_conf_t *cf, | |
| 91 ngx_http_geo_conf_ctx_t *ctx, ngx_str_t *name); | |
| 92 static void ngx_http_geo_create_binary_base(ngx_http_geo_conf_ctx_t *ctx); | |
| 93 static u_char *ngx_http_geo_copy_values(u_char *base, u_char *p, | |
| 94 ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel); | |
| 485 | 95 |
| 96 | |
| 97 static ngx_command_t ngx_http_geo_commands[] = { | |
| 98 | |
| 99 { ngx_string("geo"), | |
| 2399 | 100 NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE12, |
| 485 | 101 ngx_http_geo_block, |
| 102 NGX_HTTP_MAIN_CONF_OFFSET, | |
| 103 0, | |
| 104 NULL }, | |
| 105 | |
| 106 ngx_null_command | |
| 107 }; | |
| 108 | |
| 109 | |
| 110 static ngx_http_module_t ngx_http_geo_module_ctx = { | |
| 509 | 111 NULL, /* preconfiguration */ |
| 112 NULL, /* postconfiguration */ | |
| 485 | 113 |
| 114 NULL, /* create main configuration */ | |
| 115 NULL, /* init main configuration */ | |
| 116 | |
| 117 NULL, /* create server configuration */ | |
| 118 NULL, /* merge server configuration */ | |
| 119 | |
| 120 NULL, /* create location configuration */ | |
| 121 NULL /* merge location configuration */ | |
| 122 }; | |
| 123 | |
| 124 | |
| 125 ngx_module_t ngx_http_geo_module = { | |
| 509 | 126 NGX_MODULE_V1, |
| 485 | 127 &ngx_http_geo_module_ctx, /* module context */ |
| 128 ngx_http_geo_commands, /* module directives */ | |
| 129 NGX_HTTP_MODULE, /* module type */ | |
| 541 | 130 NULL, /* init master */ |
| 485 | 131 NULL, /* init module */ |
| 541 | 132 NULL, /* init process */ |
| 133 NULL, /* init thread */ | |
| 134 NULL, /* exit thread */ | |
| 135 NULL, /* exit process */ | |
| 136 NULL, /* exit master */ | |
| 137 NGX_MODULE_V1_PADDING | |
| 485 | 138 }; |
| 139 | |
| 140 | |
| 3652 | 141 typedef struct { |
| 142 u_char GEORNG[6]; | |
| 143 u_char version; | |
| 144 u_char ptr_size; | |
| 145 uint32_t endianess; | |
| 146 uint32_t crc32; | |
| 147 } ngx_http_geo_header_t; | |
| 148 | |
| 149 | |
| 150 static ngx_http_geo_header_t ngx_http_geo_header = { | |
| 151 { 'G', 'E', 'O', 'R', 'N', 'G' }, 0, sizeof(void *), 0x12345678, 0 | |
| 152 }; | |
| 153 | |
| 154 | |
| 485 | 155 /* AF_INET only */ |
| 156 | |
| 573 | 157 static ngx_int_t |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
158 ngx_http_geo_cidr_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, |
| 573 | 159 uintptr_t data) |
| 485 | 160 { |
| 2399 | 161 ngx_http_geo_ctx_t *ctx = (ngx_http_geo_ctx_t *) data; |
| 485 | 162 |
| 573 | 163 ngx_http_variable_value_t *vv; |
| 485 | 164 |
| 573 | 165 vv = (ngx_http_variable_value_t *) |
| 2399 | 166 ngx_radix32tree_find(ctx->u.tree, ngx_http_geo_addr(r, ctx)); |
| 489 | 167 |
| 573 | 168 *v = *vv; |
| 169 | |
| 2399 | 170 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 171 "http geo: %v", v); | |
| 489 | 172 |
| 573 | 173 return NGX_OK; |
| 485 | 174 } |
| 175 | |
| 176 | |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
177 static ngx_int_t |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
178 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
|
179 uintptr_t data) |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
180 { |
| 2399 | 181 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
|
182 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
183 in_addr_t addr; |
|
3645
9f22c780d574
eliminate a number of ranges: about 18,000 /16 networks are empty,
Igor Sysoev <igor@sysoev.ru>
parents:
3643
diff
changeset
|
184 ngx_uint_t n; |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
185 ngx_http_geo_range_t *range; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
186 |
| 3652 | 187 *v = *ctx->u.high.default_value; |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
188 |
| 2399 | 189 addr = ngx_http_geo_addr(r, ctx); |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
190 |
| 3652 | 191 range = ctx->u.high.low[addr >> 16]; |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
192 |
|
3645
9f22c780d574
eliminate a number of ranges: about 18,000 /16 networks are empty,
Igor Sysoev <igor@sysoev.ru>
parents:
3643
diff
changeset
|
193 if (range) { |
|
9f22c780d574
eliminate a number of ranges: about 18,000 /16 networks are empty,
Igor Sysoev <igor@sysoev.ru>
parents:
3643
diff
changeset
|
194 n = addr & 0xffff; |
|
9f22c780d574
eliminate a number of ranges: about 18,000 /16 networks are empty,
Igor Sysoev <igor@sysoev.ru>
parents:
3643
diff
changeset
|
195 do { |
|
9f22c780d574
eliminate a number of ranges: about 18,000 /16 networks are empty,
Igor Sysoev <igor@sysoev.ru>
parents:
3643
diff
changeset
|
196 if (n >= (ngx_uint_t) range->start && n <= (ngx_uint_t) range->end) |
|
9f22c780d574
eliminate a number of ranges: about 18,000 /16 networks are empty,
Igor Sysoev <igor@sysoev.ru>
parents:
3643
diff
changeset
|
197 { |
|
9f22c780d574
eliminate a number of ranges: about 18,000 /16 networks are empty,
Igor Sysoev <igor@sysoev.ru>
parents:
3643
diff
changeset
|
198 *v = *range->value; |
|
9f22c780d574
eliminate a number of ranges: about 18,000 /16 networks are empty,
Igor Sysoev <igor@sysoev.ru>
parents:
3643
diff
changeset
|
199 break; |
|
9f22c780d574
eliminate a number of ranges: about 18,000 /16 networks are empty,
Igor Sysoev <igor@sysoev.ru>
parents:
3643
diff
changeset
|
200 } |
|
9f22c780d574
eliminate a number of ranges: about 18,000 /16 networks are empty,
Igor Sysoev <igor@sysoev.ru>
parents:
3643
diff
changeset
|
201 } while ((++range)->value); |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
202 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
203 |
| 2399 | 204 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 205 "http geo: %v", v); | |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
206 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
207 return NGX_OK; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
208 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
209 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
210 |
| 2399 | 211 static in_addr_t |
| 212 ngx_http_geo_addr(ngx_http_request_t *r, ngx_http_geo_ctx_t *ctx) | |
| 213 { | |
|
2992
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
214 u_char *p, *ip; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
215 size_t len; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
216 in_addr_t addr; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
217 ngx_uint_t i, n; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
218 ngx_in_cidr_t *proxies; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
219 ngx_table_elt_t *xfwd; |
|
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 addr = ngx_http_geo_real_addr(r, ctx); |
|
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 xfwd = r->headers_in.x_forwarded_for; |
|
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 if (xfwd == NULL || ctx->proxies == NULL) { |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
226 return addr; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
227 } |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
228 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
229 proxies = ctx->proxies->elts; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
230 n = ctx->proxies->nelts; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
231 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
232 for (i = 0; i < n; i++) { |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
233 if ((addr & proxies[i].mask) == proxies[i].addr) { |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
234 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
235 len = xfwd->value.len; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
236 ip = xfwd->value.data; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
237 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
238 for (p = ip + len - 1; p > ip; p--) { |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
239 if (*p == ' ' || *p == ',') { |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
240 p++; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
241 len -= p - ip; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
242 ip = p; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
243 break; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
244 } |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
245 } |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
246 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
247 return ntohl(ngx_inet_addr(ip, len)); |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
248 } |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
249 } |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
250 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
251 return addr; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
252 } |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
253 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
254 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
255 static in_addr_t |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
256 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
|
257 { |
| 2399 | 258 struct sockaddr_in *sin; |
| 259 ngx_http_variable_value_t *v; | |
| 260 | |
| 261 if (ctx->index == -1) { | |
| 262 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 263 "http geo started: %V", &r->connection->addr_text); | |
| 264 | |
|
2512
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2457
diff
changeset
|
265 if (r->connection->sockaddr->sa_family != AF_INET) { |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2457
diff
changeset
|
266 return 0; |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2457
diff
changeset
|
267 } |
|
2e91aecb9e57
a prelimiary IPv6 support, HTTP listen
Igor Sysoev <igor@sysoev.ru>
parents:
2457
diff
changeset
|
268 |
| 2399 | 269 sin = (struct sockaddr_in *) r->connection->sockaddr; |
| 270 return ntohl(sin->sin_addr.s_addr); | |
| 271 } | |
| 272 | |
| 273 v = ngx_http_get_flushed_variable(r, ctx->index); | |
| 274 | |
| 275 if (v == NULL || v->not_found) { | |
| 276 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 277 "http geo not found"); | |
| 278 | |
| 279 return 0; | |
| 280 } | |
| 281 | |
| 282 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 283 "http geo started: %v", v); | |
| 284 | |
| 285 return ntohl(ngx_inet_addr(v->data, v->len)); | |
| 286 } | |
| 287 | |
| 288 | |
| 489 | 289 static char * |
| 290 ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 485 | 291 { |
| 589 | 292 char *rv; |
|
3645
9f22c780d574
eliminate a number of ranges: about 18,000 /16 networks are empty,
Igor Sysoev <igor@sysoev.ru>
parents:
3643
diff
changeset
|
293 void **p; |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
294 size_t len; |
| 2399 | 295 ngx_str_t *value, name; |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
296 ngx_uint_t i; |
| 589 | 297 ngx_conf_t save; |
| 298 ngx_pool_t *pool; | |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
299 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
|
300 ngx_http_variable_t *var; |
| 2399 | 301 ngx_http_geo_ctx_t *geo; |
| 589 | 302 ngx_http_geo_conf_ctx_t ctx; |
| 485 | 303 |
| 501 | 304 value = cf->args->elts; |
| 305 | |
| 2399 | 306 geo = ngx_palloc(cf->pool, sizeof(ngx_http_geo_ctx_t)); |
| 307 if (geo == NULL) { | |
| 308 return NGX_CONF_ERROR; | |
| 309 } | |
| 310 | |
| 311 name = value[1]; | |
| 312 name.len--; | |
| 313 name.data++; | |
| 314 | |
| 315 if (cf->args->nelts == 3) { | |
| 316 | |
| 317 geo->index = ngx_http_get_variable_index(cf, &name); | |
| 318 if (geo->index == NGX_ERROR) { | |
| 319 return NGX_CONF_ERROR; | |
| 320 } | |
| 321 | |
| 322 name = value[2]; | |
| 323 name.len--; | |
| 324 name.data++; | |
| 325 | |
| 326 } else { | |
| 327 geo->index = -1; | |
| 328 } | |
| 329 | |
| 330 var = ngx_http_add_variable(cf, &name, NGX_HTTP_VAR_CHANGEABLE); | |
| 501 | 331 if (var == NULL) { |
| 485 | 332 return NGX_CONF_ERROR; |
| 333 } | |
| 334 | |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
335 pool = ngx_create_pool(16384, cf->log); |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
336 if (pool == NULL) { |
| 485 | 337 return NGX_CONF_ERROR; |
| 338 } | |
| 339 | |
| 3652 | 340 ngx_memzero(&ctx, sizeof(ngx_http_geo_conf_ctx_t)); |
| 341 | |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
342 ctx.temp_pool = ngx_create_pool(16384, cf->log); |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
343 if (ctx.temp_pool == NULL) { |
| 485 | 344 return NGX_CONF_ERROR; |
| 345 } | |
| 346 | |
|
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
|
347 ngx_rbtree_init(&ctx.rbtree, &ctx.sentinel, ngx_str_rbtree_insert_value); |
| 485 | 348 |
| 589 | 349 ctx.pool = cf->pool; |
| 3652 | 350 ctx.data_size = sizeof(ngx_http_geo_header_t) |
| 351 + sizeof(ngx_http_variable_value_t) | |
| 352 + 0x10000 * sizeof(ngx_http_geo_range_t *); | |
| 353 ctx.allow_binary_include = 1; | |
| 485 | 354 |
| 355 save = *cf; | |
| 356 cf->pool = pool; | |
| 589 | 357 cf->ctx = &ctx; |
| 485 | 358 cf->handler = ngx_http_geo; |
| 359 cf->handler_conf = conf; | |
| 360 | |
| 361 rv = ngx_conf_parse(cf, NULL); | |
| 362 | |
| 363 *cf = save; | |
| 364 | |
|
2992
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
365 geo->proxies = ctx.proxies; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
366 |
| 3652 | 367 if (ctx.high.low) { |
| 368 | |
| 369 if (!ctx.binary_include) { | |
| 370 for (i = 0; i < 0x10000; i++) { | |
| 371 a = (ngx_array_t *) ctx.high.low[i]; | |
| 372 | |
| 373 if (a == NULL || a->nelts == 0) { | |
| 374 continue; | |
| 375 } | |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
376 |
| 3652 | 377 len = a->nelts * sizeof(ngx_http_geo_range_t); |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
378 |
| 3652 | 379 ctx.high.low[i] = ngx_palloc(cf->pool, len + sizeof(void *)); |
| 380 if (ctx.high.low[i] == NULL) { | |
| 381 return NGX_CONF_ERROR; | |
| 382 } | |
| 383 | |
| 384 p = (void **) ngx_cpymem(ctx.high.low[i], a->elts, len); | |
| 385 *p = NULL; | |
| 386 ctx.data_size += len + sizeof(void *); | |
|
2340
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 |
| 3652 | 389 if (ctx.allow_binary_include |
| 390 && !ctx.outside_entries | |
| 391 && ctx.entries > 100000 | |
| 392 && ctx.includes == 1) | |
| 393 { | |
| 394 ngx_http_geo_create_binary_base(&ctx); | |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
395 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
396 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
397 |
| 2399 | 398 geo->u.high = ctx.high; |
| 399 | |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
400 var->get_handler = ngx_http_geo_range_variable; |
| 2399 | 401 var->data = (uintptr_t) geo; |
| 485 | 402 |
| 3652 | 403 if (ctx.high.default_value == NULL) { |
| 404 ctx.high.default_value = &ngx_http_variable_null_value; | |
| 405 } | |
| 406 | |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
407 ngx_destroy_pool(ctx.temp_pool); |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
408 ngx_destroy_pool(pool); |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
409 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
410 } else { |
|
2358
ac0cf19eb582
create empty radix tree for "geo $geo { }" case
Igor Sysoev <igor@sysoev.ru>
parents:
2340
diff
changeset
|
411 if (ctx.tree == NULL) { |
|
ac0cf19eb582
create empty radix tree for "geo $geo { }" case
Igor Sysoev <igor@sysoev.ru>
parents:
2340
diff
changeset
|
412 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
|
413 if (ctx.tree == NULL) { |
|
ac0cf19eb582
create empty radix tree for "geo $geo { }" case
Igor Sysoev <igor@sysoev.ru>
parents:
2340
diff
changeset
|
414 return NGX_CONF_ERROR; |
|
ac0cf19eb582
create empty radix tree for "geo $geo { }" case
Igor Sysoev <igor@sysoev.ru>
parents:
2340
diff
changeset
|
415 } |
|
ac0cf19eb582
create empty radix tree for "geo $geo { }" case
Igor Sysoev <igor@sysoev.ru>
parents:
2340
diff
changeset
|
416 } |
|
ac0cf19eb582
create empty radix tree for "geo $geo { }" case
Igor Sysoev <igor@sysoev.ru>
parents:
2340
diff
changeset
|
417 |
| 2399 | 418 geo->u.tree = ctx.tree; |
| 419 | |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
420 var->get_handler = ngx_http_geo_cidr_variable; |
| 2399 | 421 var->data = (uintptr_t) geo; |
|
2340
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 ngx_destroy_pool(ctx.temp_pool); |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
424 ngx_destroy_pool(pool); |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
425 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
426 if (ngx_radix32tree_find(ctx.tree, 0) != NGX_RADIX_NO_VALUE) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
427 return rv; |
|
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 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
430 if (ngx_radix32tree_insert(ctx.tree, 0, 0, |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
431 (uintptr_t) &ngx_http_variable_null_value) |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
432 == NGX_ERROR) |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
433 { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
434 return NGX_CONF_ERROR; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
435 } |
| 485 | 436 } |
| 437 | |
| 438 return rv; | |
| 439 } | |
| 440 | |
| 441 | |
| 489 | 442 static char * |
| 443 ngx_http_geo(ngx_conf_t *cf, ngx_command_t *dummy, void *conf) | |
| 485 | 444 { |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
445 char *rv; |
| 3652 | 446 ngx_str_t *value; |
|
2992
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
447 ngx_cidr_t cidr; |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
448 ngx_http_geo_conf_ctx_t *ctx; |
| 485 | 449 |
| 589 | 450 ctx = cf->ctx; |
| 485 | 451 |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
452 value = cf->args->elts; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
453 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
454 if (cf->args->nelts == 1) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
455 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
456 if (ngx_strcmp(value[0].data, "ranges") == 0) { |
|
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 if (ctx->tree) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
459 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
460 "the \"ranges\" directive must be " |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
461 "the first directive inside \"geo\" block"); |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
462 goto failed; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
463 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
464 |
| 3652 | 465 ctx->ranges = 1; |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
466 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
467 rv = NGX_CONF_OK; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
468 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
469 goto done; |
|
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 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
472 |
| 485 | 473 if (cf->args->nelts != 2) { |
| 474 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 475 "invalid number of the geo parameters"); | |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
476 goto failed; |
| 485 | 477 } |
| 478 | |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
479 if (ngx_strcmp(value[0].data, "include") == 0) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
480 |
| 3652 | 481 rv = ngx_http_geo_include(cf, ctx, &value[1]); |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
482 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
483 goto done; |
|
2992
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
484 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
485 } else if (ngx_strcmp(value[0].data, "proxy") == 0) { |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
486 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
487 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
|
488 goto failed; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
489 } |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
490 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
491 rv = ngx_http_geo_add_proxy(cf, ctx, &cidr); |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
492 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
493 goto done; |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
494 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
495 |
| 3652 | 496 if (ctx->ranges) { |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
497 rv = ngx_http_geo_range(cf, ctx, value); |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
498 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
499 } else { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
500 rv = ngx_http_geo_cidr(cf, ctx, value); |
|
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 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
503 done: |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
504 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
505 ngx_reset_pool(cf->pool); |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
506 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
507 return rv; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
508 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
509 failed: |
|
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 ngx_reset_pool(cf->pool); |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
512 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
513 return NGX_CONF_ERROR; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
514 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
515 |
|
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 static char * |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
518 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
|
519 ngx_str_t *value) |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
520 { |
|
3650
c12b0dd5bd1c
change duplicate default geo range processing
Igor Sysoev <igor@sysoev.ru>
parents:
3645
diff
changeset
|
521 u_char *p, *last; |
|
c12b0dd5bd1c
change duplicate default geo range processing
Igor Sysoev <igor@sysoev.ru>
parents:
3645
diff
changeset
|
522 in_addr_t start, end; |
|
c12b0dd5bd1c
change duplicate default geo range processing
Igor Sysoev <igor@sysoev.ru>
parents:
3645
diff
changeset
|
523 ngx_str_t *net; |
|
c12b0dd5bd1c
change duplicate default geo range processing
Igor Sysoev <igor@sysoev.ru>
parents:
3645
diff
changeset
|
524 ngx_uint_t del; |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
525 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
526 if (ngx_strcmp(value[0].data, "default") == 0) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
527 |
| 3652 | 528 if (ctx->high.default_value) { |
|
3650
c12b0dd5bd1c
change duplicate default geo range processing
Igor Sysoev <igor@sysoev.ru>
parents:
3645
diff
changeset
|
529 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, |
|
c12b0dd5bd1c
change duplicate default geo range processing
Igor Sysoev <igor@sysoev.ru>
parents:
3645
diff
changeset
|
530 "duplicate default geo range value: \"%V\", old value: \"%v\"", |
| 3652 | 531 &value[1], ctx->high.default_value); |
|
3650
c12b0dd5bd1c
change duplicate default geo range processing
Igor Sysoev <igor@sysoev.ru>
parents:
3645
diff
changeset
|
532 } |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
533 |
| 3652 | 534 ctx->high.default_value = ngx_http_geo_value(cf, ctx, &value[1]); |
| 535 if (ctx->high.default_value == NULL) { | |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
536 return NGX_CONF_ERROR; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
537 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
538 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
539 return NGX_CONF_OK; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
540 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
541 |
| 3652 | 542 if (ctx->binary_include) { |
| 543 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 544 "binary geo range base \"%s\" may not be mixed with usual entries", | |
| 545 ctx->include_name.data); | |
| 546 return NGX_CONF_ERROR; | |
| 547 } | |
| 548 | |
| 549 if (ctx->high.low == NULL) { | |
| 550 ctx->high.low = ngx_pcalloc(ctx->pool, | |
| 551 0x10000 * sizeof(ngx_http_geo_range_t *)); | |
| 552 if (ctx->high.low == NULL) { | |
| 553 return NGX_CONF_ERROR; | |
| 554 } | |
| 555 } | |
| 556 | |
| 557 ctx->entries++; | |
| 558 ctx->outside_entries = 1; | |
| 559 | |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
560 if (ngx_strcmp(value[0].data, "delete") == 0) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
561 net = &value[1]; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
562 del = 1; |
|
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 } else { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
565 net = &value[0]; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
566 del = 0; |
|
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 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
569 last = net->data + net->len; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
570 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
571 p = ngx_strlchr(net->data, last, '-'); |
|
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 if (p == NULL) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
574 goto invalid; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
575 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
576 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
577 start = ngx_inet_addr(net->data, p - net->data); |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
578 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
579 if (start == INADDR_NONE) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
580 goto invalid; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
581 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
582 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
583 start = ntohl(start); |
|
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 p++; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
586 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
587 end = ngx_inet_addr(p, last - p); |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
588 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
589 if (end == INADDR_NONE) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
590 goto invalid; |
|
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 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
593 end = ntohl(end); |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
594 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
595 if (start > end) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
596 goto invalid; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
597 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
598 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
599 if (del) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
600 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
|
601 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
602 "no address range \"%V\" to delete", net); |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
603 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
604 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
605 return NGX_CONF_OK; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
606 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
607 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
608 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
|
609 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
610 if (ctx->value == NULL) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
611 return NGX_CONF_ERROR; |
|
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 ctx->net = net; |
|
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 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
|
617 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
618 invalid: |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
619 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
620 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
|
621 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
622 return NGX_CONF_ERROR; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
623 } |
|
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 /* 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
|
627 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
628 static char * |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
629 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
|
630 in_addr_t start, in_addr_t end) |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
631 { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
632 in_addr_t n; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
633 ngx_uint_t h, i, s, e; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
634 ngx_array_t *a; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
635 ngx_http_geo_range_t *range; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
636 |
|
3456
91cff7f97a50
fix a geo range if the range includes two or more /16 networks
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
637 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
|
638 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
639 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
|
640 |
|
3d868fc44879
fix range start for ranges those spread in two or more slots
Igor Sysoev <igor@sysoev.ru>
parents:
2442
diff
changeset
|
641 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
|
642 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
|
643 } else { |
|
3d868fc44879
fix range start for ranges those spread in two or more slots
Igor Sysoev <igor@sysoev.ru>
parents:
2442
diff
changeset
|
644 s = 0; |
|
3d868fc44879
fix range start for ranges those spread in two or more slots
Igor Sysoev <igor@sysoev.ru>
parents:
2442
diff
changeset
|
645 } |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
646 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
647 if ((n | 0xffff) > end) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
648 e = end & 0xffff; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
649 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
650 } else { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
651 e = 0xffff; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
652 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
653 |
| 3652 | 654 a = (ngx_array_t *) ctx->high.low[h]; |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
655 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
656 if (a == NULL) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
657 a = ngx_array_create(ctx->temp_pool, 64, |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
658 sizeof(ngx_http_geo_range_t)); |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
659 if (a == NULL) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
660 return NGX_CONF_ERROR; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
661 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
662 |
| 3652 | 663 ctx->high.low[h] = (ngx_http_geo_range_t *) a; |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
664 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
665 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
666 i = a->nelts; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
667 range = a->elts; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
668 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
669 while (i) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
670 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
671 i--; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
672 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
673 if (e < (ngx_uint_t) range[i].start) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
674 continue; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
675 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
676 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
677 if (s > (ngx_uint_t) range[i].end) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
678 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
679 /* add after the range */ |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
680 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
681 range = ngx_array_push(a); |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
682 if (range == NULL) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
683 return NGX_CONF_ERROR; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
684 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
685 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
686 range = a->elts; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
687 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
688 ngx_memcpy(&range[i + 2], &range[i + 1], |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
689 (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
|
690 |
| 2442 | 691 range[i + 1].start = (u_short) s; |
| 692 range[i + 1].end = (u_short) e; | |
| 693 range[i + 1].value = ctx->value; | |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
694 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
695 goto next; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
696 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
697 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
698 if (s == (ngx_uint_t) range[i].start |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
699 && e == (ngx_uint_t) range[i].end) |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
700 { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
701 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
702 "duplicate range \"%V\", value: \"%v\", old value: \"%v\"", |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
703 ctx->net, ctx->value, range[i].value); |
| 2442 | 704 |
| 705 range[i].value = ctx->value; | |
| 706 | |
| 707 goto next; | |
| 708 } | |
| 709 | |
| 710 if (s > (ngx_uint_t) range[i].start | |
| 711 && e < (ngx_uint_t) range[i].end) | |
| 712 { | |
| 713 /* split the range and insert the new one */ | |
| 714 | |
| 715 range = ngx_array_push(a); | |
| 716 if (range == NULL) { | |
| 717 return NGX_CONF_ERROR; | |
| 718 } | |
| 719 | |
| 720 range = ngx_array_push(a); | |
| 721 if (range == NULL) { | |
| 722 return NGX_CONF_ERROR; | |
| 723 } | |
| 724 | |
| 725 range = a->elts; | |
| 726 | |
| 727 ngx_memcpy(&range[i + 3], &range[i + 1], | |
| 728 (a->nelts - 3 - i) * sizeof(ngx_http_geo_range_t)); | |
| 729 | |
| 730 range[i + 2].start = (u_short) (e + 1); | |
| 731 range[i + 2].end = range[i].end; | |
| 732 range[i + 2].value = range[i].value; | |
| 733 | |
|
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
|
734 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
|
735 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
|
736 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
|
737 |
| 2442 | 738 range[i].end = (u_short) (s - 1); |
| 739 | |
|
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
|
740 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
|
741 } |
|
95f078e7d743
allow insertion range if its start or end is the same as existent one
Igor Sysoev <igor@sysoev.ru>
parents:
2451
diff
changeset
|
742 |
|
95f078e7d743
allow insertion range if its start or end is the same as existent one
Igor Sysoev <igor@sysoev.ru>
parents:
2451
diff
changeset
|
743 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
|
744 && 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
|
745 { |
|
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 /* 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
|
747 |
|
95f078e7d743
allow insertion range if its start or end is the same as existent one
Igor Sysoev <igor@sysoev.ru>
parents:
2451
diff
changeset
|
748 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
|
749 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
|
750 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
|
751 } |
|
95f078e7d743
allow insertion range if its start or end is the same as existent one
Igor Sysoev <igor@sysoev.ru>
parents:
2451
diff
changeset
|
752 |
|
95f078e7d743
allow insertion range if its start or end is the same as existent one
Igor Sysoev <igor@sysoev.ru>
parents:
2451
diff
changeset
|
753 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
|
754 |
|
2457
1aff348d9aa8
fix segfault when geo range replaces starting part of another range
Igor Sysoev <igor@sysoev.ru>
parents:
2452
diff
changeset
|
755 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
|
756 (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
|
757 |
|
95f078e7d743
allow insertion range if its start or end is the same as existent one
Igor Sysoev <igor@sysoev.ru>
parents:
2451
diff
changeset
|
758 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
|
759 |
|
95f078e7d743
allow insertion range if its start or end is the same as existent one
Igor Sysoev <igor@sysoev.ru>
parents:
2451
diff
changeset
|
760 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
|
761 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
|
762 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
|
763 |
|
95f078e7d743
allow insertion range if its start or end is the same as existent one
Igor Sysoev <igor@sysoev.ru>
parents:
2451
diff
changeset
|
764 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
|
765 } |
|
95f078e7d743
allow insertion range if its start or end is the same as existent one
Igor Sysoev <igor@sysoev.ru>
parents:
2451
diff
changeset
|
766 |
|
95f078e7d743
allow insertion range if its start or end is the same as existent one
Igor Sysoev <igor@sysoev.ru>
parents:
2451
diff
changeset
|
767 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
|
768 && 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
|
769 { |
|
95f078e7d743
allow insertion range if its start or end is the same as existent one
Igor Sysoev <igor@sysoev.ru>
parents:
2451
diff
changeset
|
770 /* 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
|
771 |
|
95f078e7d743
allow insertion range if its start or end is the same as existent one
Igor Sysoev <igor@sysoev.ru>
parents:
2451
diff
changeset
|
772 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
|
773 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
|
774 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
|
775 } |
|
95f078e7d743
allow insertion range if its start or end is the same as existent one
Igor Sysoev <igor@sysoev.ru>
parents:
2451
diff
changeset
|
776 |
|
95f078e7d743
allow insertion range if its start or end is the same as existent one
Igor Sysoev <igor@sysoev.ru>
parents:
2451
diff
changeset
|
777 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
|
778 |
|
95f078e7d743
allow insertion range if its start or end is the same as existent one
Igor Sysoev <igor@sysoev.ru>
parents:
2451
diff
changeset
|
779 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
|
780 (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
|
781 |
| 2442 | 782 range[i + 1].start = (u_short) s; |
| 783 range[i + 1].end = (u_short) e; | |
| 784 range[i + 1].value = ctx->value; | |
| 785 | |
|
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
|
786 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
|
787 |
| 2442 | 788 goto next; |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
789 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
790 |
| 2448 | 791 s = (ngx_uint_t) range[i].start; |
| 792 e = (ngx_uint_t) range[i].end; | |
| 793 | |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
794 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 2448 | 795 "range \"%V\" overlaps \"%d.%d.%d.%d-%d.%d.%d.%d\"", |
| 796 ctx->net, | |
| 797 h >> 8, h & 0xff, s >> 8, s & 0xff, | |
| 798 h >> 8, h & 0xff, e >> 8, e & 0xff); | |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
799 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
800 return NGX_CONF_ERROR; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
801 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
802 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
803 /* add the first range */ |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
804 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
805 range = ngx_array_push(a); |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
806 if (range == NULL) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
807 return NGX_CONF_ERROR; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
808 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
809 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
810 range->start = (u_short) s; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
811 range->end = (u_short) e; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
812 range->value = ctx->value; |
| 2442 | 813 |
| 814 next: | |
| 815 | |
| 816 continue; | |
|
2340
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 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
819 return NGX_CONF_OK; |
|
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 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
822 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
823 static ngx_uint_t |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
824 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
|
825 in_addr_t start, in_addr_t end) |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
826 { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
827 in_addr_t n; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
828 ngx_uint_t h, i, s, e, warn; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
829 ngx_array_t *a; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
830 ngx_http_geo_range_t *range; |
|
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 warn = 0; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
833 |
| 2451 | 834 for (n = start; n <= end; n += 0x10000) { |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
835 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
836 h = n >> 16; |
|
2449
450a277dad48
repeat r2448 for range deletion
Igor Sysoev <igor@sysoev.ru>
parents:
2448
diff
changeset
|
837 |
|
450a277dad48
repeat r2448 for range deletion
Igor Sysoev <igor@sysoev.ru>
parents:
2448
diff
changeset
|
838 if (n == start) { |
|
450a277dad48
repeat r2448 for range deletion
Igor Sysoev <igor@sysoev.ru>
parents:
2448
diff
changeset
|
839 s = n & 0xffff; |
|
450a277dad48
repeat r2448 for range deletion
Igor Sysoev <igor@sysoev.ru>
parents:
2448
diff
changeset
|
840 } else { |
|
450a277dad48
repeat r2448 for range deletion
Igor Sysoev <igor@sysoev.ru>
parents:
2448
diff
changeset
|
841 s = 0; |
|
450a277dad48
repeat r2448 for range deletion
Igor Sysoev <igor@sysoev.ru>
parents:
2448
diff
changeset
|
842 } |
|
2340
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 if ((n | 0xffff) > end) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
845 e = end & 0xffff; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
846 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
847 } else { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
848 e = 0xffff; |
|
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 |
| 3652 | 851 a = (ngx_array_t *) ctx->high.low[h]; |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
852 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
853 if (a == NULL) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
854 warn = 1; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
855 continue; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
856 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
857 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
858 range = a->elts; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
859 for (i = 0; i < a->nelts; i++) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
860 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
861 if (s == (ngx_uint_t) range[i].start |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
862 && e == (ngx_uint_t) range[i].end) |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
863 { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
864 ngx_memcpy(&range[i], &range[i + 1], |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
865 (a->nelts - 1 - i) * sizeof(ngx_http_geo_range_t)); |
| 2450 | 866 |
| 867 a->nelts--; | |
| 868 | |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
869 break; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
870 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
871 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
872 if (s != (ngx_uint_t) range[i].start |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
873 && e != (ngx_uint_t) range[i].end) |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
874 { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
875 continue; |
|
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 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
878 warn = 1; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
879 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
880 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
881 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
882 return warn; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
883 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
884 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
885 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
886 static char * |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
887 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
|
888 ngx_str_t *value) |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
889 { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
890 ngx_int_t rc, del; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
891 ngx_str_t *net; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
892 ngx_uint_t i; |
|
2537
a472d954c534
prepare ngx_ptocidr() for IPv6
Igor Sysoev <igor@sysoev.ru>
parents:
2512
diff
changeset
|
893 ngx_cidr_t cidr; |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
894 ngx_http_variable_value_t *val, *old; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
895 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
896 if (ctx->tree == NULL) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
897 ctx->tree = ngx_radix_tree_create(ctx->pool, -1); |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
898 if (ctx->tree == NULL) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
899 return NGX_CONF_ERROR; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
900 } |
| 485 | 901 } |
| 902 | |
| 903 if (ngx_strcmp(value[0].data, "default") == 0) { | |
|
2537
a472d954c534
prepare ngx_ptocidr() for IPv6
Igor Sysoev <igor@sysoev.ru>
parents:
2512
diff
changeset
|
904 cidr.u.in.addr = 0; |
|
a472d954c534
prepare ngx_ptocidr() for IPv6
Igor Sysoev <igor@sysoev.ru>
parents:
2512
diff
changeset
|
905 cidr.u.in.mask = 0; |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
906 net = &value[0]; |
| 485 | 907 |
| 908 } else { | |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
909 if (ngx_strcmp(value[0].data, "delete") == 0) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
910 net = &value[1]; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
911 del = 1; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
912 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
913 } else { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
914 net = &value[0]; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
915 del = 0; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
916 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
917 |
|
2992
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
918 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
|
919 return NGX_CONF_ERROR; |
|
1380
b590a528fd41
ignore meaningless bits in CIDR and warn about them
Igor Sysoev <igor@sysoev.ru>
parents:
1352
diff
changeset
|
920 } |
|
b590a528fd41
ignore meaningless bits in CIDR and warn about them
Igor Sysoev <igor@sysoev.ru>
parents:
1352
diff
changeset
|
921 |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
922 if (del) { |
|
2537
a472d954c534
prepare ngx_ptocidr() for IPv6
Igor Sysoev <igor@sysoev.ru>
parents:
2512
diff
changeset
|
923 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
|
924 cidr.u.in.mask) |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
925 != NGX_OK) |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
926 { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
927 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
928 "no network \"%V\" to delete", net); |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
929 } |
| 2365 | 930 |
| 931 return NGX_CONF_OK; | |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
932 } |
| 485 | 933 } |
| 934 | |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
935 val = ngx_http_geo_value(cf, ctx, &value[1]); |
| 485 | 936 |
|
2334
6e30d64f919b
use value rbtree instead of array in geo configuration
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
937 if (val == NULL) { |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
938 return NGX_CONF_ERROR; |
| 485 | 939 } |
| 940 | |
| 553 | 941 for (i = 2; i; i--) { |
|
2537
a472d954c534
prepare ngx_ptocidr() for IPv6
Igor Sysoev <igor@sysoev.ru>
parents:
2512
diff
changeset
|
942 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
|
943 (uintptr_t) val); |
| 553 | 944 if (rc == NGX_OK) { |
| 945 return NGX_CONF_OK; | |
| 946 } | |
| 947 | |
| 948 if (rc == NGX_ERROR) { | |
| 949 return NGX_CONF_ERROR; | |
| 950 } | |
| 951 | |
| 952 /* rc == NGX_BUSY */ | |
| 953 | |
| 3115 | 954 old = (ngx_http_variable_value_t *) |
|
2537
a472d954c534
prepare ngx_ptocidr() for IPv6
Igor Sysoev <igor@sysoev.ru>
parents:
2512
diff
changeset
|
955 ngx_radix32tree_find(ctx->tree, cidr.u.in.addr & cidr.u.in.mask); |
| 553 | 956 |
| 957 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
|
958 "duplicate network \"%V\", value: \"%v\", old value: \"%v\"", |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
959 net, val, old); |
| 553 | 960 |
|
2537
a472d954c534
prepare ngx_ptocidr() for IPv6
Igor Sysoev <igor@sysoev.ru>
parents:
2512
diff
changeset
|
961 rc = ngx_radix32tree_delete(ctx->tree, cidr.u.in.addr, cidr.u.in.mask); |
| 553 | 962 |
| 963 if (rc == NGX_ERROR) { | |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
964 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid radix tree"); |
| 553 | 965 return NGX_CONF_ERROR; |
| 966 } | |
| 485 | 967 } |
| 968 | |
| 553 | 969 return NGX_CONF_ERROR; |
| 485 | 970 } |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
971 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
972 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
973 static ngx_http_variable_value_t * |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
974 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
|
975 ngx_str_t *value) |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
976 { |
|
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
|
977 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
|
978 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
|
979 ngx_http_geo_variable_value_node_t *gvvn; |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
980 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
981 hash = ngx_crc32_long(value->data, value->len); |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
982 |
|
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
|
983 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
|
984 ngx_str_rbtree_lookup(&ctx->rbtree, value, hash); |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
985 |
|
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
|
986 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
|
987 return gvvn->value; |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
988 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
989 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
990 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
|
991 if (val == NULL) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
992 return NULL; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
993 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
994 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
995 val->len = value->len; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
996 val->data = ngx_pstrdup(ctx->pool, value); |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
997 if (val->data == NULL) { |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
998 return NULL; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
999 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
1000 |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
1001 val->valid = 1; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
1002 val->no_cacheable = 0; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
1003 val->not_found = 0; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
1004 |
|
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
|
1005 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
|
1006 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
|
1007 if (gvvn == NULL) { |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
1008 return NULL; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
1009 } |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
1010 |
|
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
|
1011 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
|
1012 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
|
1013 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
|
1014 gvvn->value = val; |
| 3652 | 1015 gvvn->offset = 0; |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
1016 |
|
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
|
1017 ngx_rbtree_insert(&ctx->rbtree, &gvvn->sn.node); |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
1018 |
| 3652 | 1019 ctx->data_size += ngx_align(sizeof(ngx_http_variable_value_t) + value->len, |
| 1020 sizeof(void *)); | |
| 1021 | |
|
2340
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
1022 return val; |
|
22d2b6609853
*) descrease geo configuration memory usage
Igor Sysoev <igor@sysoev.ru>
parents:
2334
diff
changeset
|
1023 } |
|
2992
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 static char * |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1027 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
|
1028 ngx_cidr_t *cidr) |
|
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 ngx_in_cidr_t *c; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1031 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1032 if (ctx->proxies == NULL) { |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1033 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
|
1034 if (ctx->proxies == NULL) { |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1035 return NGX_CONF_ERROR; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1036 } |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1037 } |
|
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 c = ngx_array_push(ctx->proxies); |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1040 if (c == NULL) { |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1041 return NGX_CONF_ERROR; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1042 } |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1043 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1044 c->addr = cidr->u.in.addr; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1045 c->mask = cidr->u.in.mask; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1046 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1047 return NGX_CONF_OK; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1048 } |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1049 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1050 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1051 static ngx_int_t |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1052 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
|
1053 { |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1054 ngx_int_t rc; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1055 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1056 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
|
1057 cidr->u.in.addr = 0xffffffff; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1058 cidr->u.in.mask = 0xffffffff; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1059 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1060 return NGX_OK; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1061 } |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1062 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1063 rc = ngx_ptocidr(net, cidr); |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1064 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1065 if (rc == NGX_ERROR) { |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1066 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
|
1067 return NGX_ERROR; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1068 } |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1069 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1070 if (cidr->family != AF_INET) { |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1071 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
|
1072 return NGX_ERROR; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1073 } |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1074 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1075 if (rc == NGX_DONE) { |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1076 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1077 "low address bits of %V are meaningless", net); |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1078 } |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1079 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1080 cidr->u.in.addr = ntohl(cidr->u.in.addr); |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1081 cidr->u.in.mask = ntohl(cidr->u.in.mask); |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1082 |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1083 return NGX_OK; |
|
2465ff3da161
geo module supports trusted proxies
Igor Sysoev <igor@sysoev.ru>
parents:
2537
diff
changeset
|
1084 } |
| 3652 | 1085 |
| 1086 | |
| 1087 static char * | |
| 1088 ngx_http_geo_include(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx, | |
| 1089 ngx_str_t *name) | |
| 1090 { | |
| 1091 char *rv; | |
| 1092 ngx_str_t file; | |
| 1093 | |
| 1094 file.len = name->len + 4; | |
| 1095 file.data = ngx_pnalloc(ctx->temp_pool, name->len + 5); | |
| 1096 if (file.data == NULL) { | |
| 1097 return NGX_CONF_ERROR; | |
| 1098 } | |
| 1099 | |
| 1100 ngx_sprintf(file.data, "%V.bin%Z", name); | |
| 1101 | |
| 1102 if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK) { | |
| 1103 return NGX_CONF_ERROR; | |
| 1104 } | |
| 1105 | |
|
3654
b56935e34273
test binary geo ranges base only for ranges
Igor Sysoev <igor@sysoev.ru>
parents:
3653
diff
changeset
|
1106 if (ctx->ranges) { |
|
b56935e34273
test binary geo ranges base only for ranges
Igor Sysoev <igor@sysoev.ru>
parents:
3653
diff
changeset
|
1107 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data); |
| 3652 | 1108 |
|
3654
b56935e34273
test binary geo ranges base only for ranges
Igor Sysoev <igor@sysoev.ru>
parents:
3653
diff
changeset
|
1109 switch (ngx_http_geo_include_binary_base(cf, ctx, &file)) { |
|
b56935e34273
test binary geo ranges base only for ranges
Igor Sysoev <igor@sysoev.ru>
parents:
3653
diff
changeset
|
1110 case NGX_OK: |
|
b56935e34273
test binary geo ranges base only for ranges
Igor Sysoev <igor@sysoev.ru>
parents:
3653
diff
changeset
|
1111 return NGX_CONF_OK; |
|
b56935e34273
test binary geo ranges base only for ranges
Igor Sysoev <igor@sysoev.ru>
parents:
3653
diff
changeset
|
1112 case NGX_ERROR: |
|
b56935e34273
test binary geo ranges base only for ranges
Igor Sysoev <igor@sysoev.ru>
parents:
3653
diff
changeset
|
1113 return NGX_CONF_ERROR; |
|
b56935e34273
test binary geo ranges base only for ranges
Igor Sysoev <igor@sysoev.ru>
parents:
3653
diff
changeset
|
1114 default: |
|
b56935e34273
test binary geo ranges base only for ranges
Igor Sysoev <igor@sysoev.ru>
parents:
3653
diff
changeset
|
1115 break; |
|
b56935e34273
test binary geo ranges base only for ranges
Igor Sysoev <igor@sysoev.ru>
parents:
3653
diff
changeset
|
1116 } |
| 3652 | 1117 } |
| 1118 | |
| 1119 file.len -= 4; | |
| 1120 file.data[file.len] = '\0'; | |
| 1121 | |
| 1122 ctx->include_name = file; | |
| 1123 | |
| 1124 if (ctx->outside_entries) { | |
| 1125 ctx->allow_binary_include = 0; | |
| 1126 } | |
| 1127 | |
| 1128 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data); | |
| 1129 | |
| 1130 rv = ngx_conf_parse(cf, &file); | |
| 1131 | |
| 1132 ctx->includes++; | |
| 1133 ctx->outside_entries = 0; | |
| 1134 | |
| 1135 return rv; | |
| 1136 } | |
| 1137 | |
| 1138 | |
| 1139 static ngx_int_t | |
| 1140 ngx_http_geo_include_binary_base(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx, | |
| 1141 ngx_str_t *name) | |
| 1142 { | |
|
3653
be3f716ba546
test binary gep range base mtime
Igor Sysoev <igor@sysoev.ru>
parents:
3652
diff
changeset
|
1143 u_char *base, ch; |
|
be3f716ba546
test binary gep range base mtime
Igor Sysoev <igor@sysoev.ru>
parents:
3652
diff
changeset
|
1144 time_t mtime; |
| 3652 | 1145 size_t size, len; |
| 1146 ssize_t n; | |
| 1147 uint32_t crc32; | |
| 1148 ngx_err_t err; | |
| 1149 ngx_int_t rc; | |
| 1150 ngx_uint_t i; | |
| 1151 ngx_file_t file; | |
| 1152 ngx_file_info_t fi; | |
| 1153 ngx_http_geo_range_t *range, **ranges; | |
| 1154 ngx_http_geo_header_t *header; | |
| 1155 ngx_http_variable_value_t *vv; | |
| 1156 | |
| 1157 ngx_memzero(&file, sizeof(ngx_file_t)); | |
| 1158 file.name = *name; | |
| 1159 file.log = cf->log; | |
| 1160 | |
| 1161 file.fd = ngx_open_file(name->data, NGX_FILE_RDONLY, 0, 0); | |
| 1162 if (file.fd == NGX_INVALID_FILE) { | |
| 1163 err = ngx_errno; | |
| 1164 if (err != NGX_ENOENT) { | |
| 1165 ngx_conf_log_error(NGX_LOG_CRIT, cf, err, | |
| 1166 ngx_open_file_n " \"%s\" failed", name->data); | |
| 1167 } | |
| 1168 return NGX_DECLINED; | |
| 1169 } | |
| 1170 | |
| 1171 if (ctx->outside_entries) { | |
| 1172 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 1173 "binary geo range base \"%s\" may not be mixed with usual entries", | |
| 1174 name->data); | |
| 1175 rc = NGX_ERROR; | |
| 1176 goto done; | |
| 1177 } | |
| 1178 | |
| 1179 if (ngx_fd_info(file.fd, &fi) == NGX_FILE_ERROR) { | |
| 1180 ngx_conf_log_error(NGX_LOG_CRIT, cf, ngx_errno, | |
| 1181 ngx_fd_info_n " \"%s\" failed", name->data); | |
| 1182 goto failed; | |
| 1183 } | |
| 1184 | |
| 1185 size = (size_t) ngx_file_size(&fi); | |
|
3653
be3f716ba546
test binary gep range base mtime
Igor Sysoev <igor@sysoev.ru>
parents:
3652
diff
changeset
|
1186 mtime = ngx_file_mtime(&fi); |
|
be3f716ba546
test binary gep range base mtime
Igor Sysoev <igor@sysoev.ru>
parents:
3652
diff
changeset
|
1187 |
|
be3f716ba546
test binary gep range base mtime
Igor Sysoev <igor@sysoev.ru>
parents:
3652
diff
changeset
|
1188 ch = name->data[name->len - 4]; |
|
be3f716ba546
test binary gep range base mtime
Igor Sysoev <igor@sysoev.ru>
parents:
3652
diff
changeset
|
1189 name->data[name->len - 4] = '\0'; |
|
be3f716ba546
test binary gep range base mtime
Igor Sysoev <igor@sysoev.ru>
parents:
3652
diff
changeset
|
1190 |
|
be3f716ba546
test binary gep range base mtime
Igor Sysoev <igor@sysoev.ru>
parents:
3652
diff
changeset
|
1191 if (ngx_file_info(name->data, &fi) == NGX_FILE_ERROR) { |
|
be3f716ba546
test binary gep range base mtime
Igor Sysoev <igor@sysoev.ru>
parents:
3652
diff
changeset
|
1192 ngx_conf_log_error(NGX_LOG_CRIT, cf, ngx_errno, |
|
be3f716ba546
test binary gep range base mtime
Igor Sysoev <igor@sysoev.ru>
parents:
3652
diff
changeset
|
1193 ngx_file_info_n " \"%s\" failed", name->data); |
|
be3f716ba546
test binary gep range base mtime
Igor Sysoev <igor@sysoev.ru>
parents:
3652
diff
changeset
|
1194 goto failed; |
|
be3f716ba546
test binary gep range base mtime
Igor Sysoev <igor@sysoev.ru>
parents:
3652
diff
changeset
|
1195 } |
|
be3f716ba546
test binary gep range base mtime
Igor Sysoev <igor@sysoev.ru>
parents:
3652
diff
changeset
|
1196 |
|
be3f716ba546
test binary gep range base mtime
Igor Sysoev <igor@sysoev.ru>
parents:
3652
diff
changeset
|
1197 name->data[name->len - 4] = ch; |
|
be3f716ba546
test binary gep range base mtime
Igor Sysoev <igor@sysoev.ru>
parents:
3652
diff
changeset
|
1198 |
|
be3f716ba546
test binary gep range base mtime
Igor Sysoev <igor@sysoev.ru>
parents:
3652
diff
changeset
|
1199 if (mtime < ngx_file_mtime(&fi)) { |
|
be3f716ba546
test binary gep range base mtime
Igor Sysoev <igor@sysoev.ru>
parents:
3652
diff
changeset
|
1200 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, |
|
be3f716ba546
test binary gep range base mtime
Igor Sysoev <igor@sysoev.ru>
parents:
3652
diff
changeset
|
1201 "stale binary geo range base \"%s\"", name->data); |
|
be3f716ba546
test binary gep range base mtime
Igor Sysoev <igor@sysoev.ru>
parents:
3652
diff
changeset
|
1202 goto failed; |
|
be3f716ba546
test binary gep range base mtime
Igor Sysoev <igor@sysoev.ru>
parents:
3652
diff
changeset
|
1203 } |
| 3652 | 1204 |
| 1205 base = ngx_palloc(ctx->pool, size); | |
| 1206 if (base == NULL) { | |
| 1207 goto failed; | |
| 1208 } | |
| 1209 | |
| 1210 n = ngx_read_file(&file, base, size, 0); | |
| 1211 | |
| 1212 if (n == NGX_ERROR) { | |
| 1213 ngx_conf_log_error(NGX_LOG_CRIT, cf, ngx_errno, | |
| 1214 ngx_read_file_n " \"%s\" failed", name->data); | |
| 1215 goto failed; | |
| 1216 } | |
| 1217 | |
| 1218 if ((size_t) n != size) { | |
| 1219 ngx_conf_log_error(NGX_LOG_CRIT, cf, 0, | |
| 1220 ngx_read_file_n " \"%s\" returned only %z bytes instead of %z", | |
| 1221 name->data, n, size); | |
| 1222 goto failed; | |
| 1223 } | |
| 1224 | |
| 1225 header = (ngx_http_geo_header_t *) base; | |
| 1226 | |
| 1227 if (ngx_memcmp(&ngx_http_geo_header, header, 12) != 0) { | |
| 1228 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, | |
| 1229 "incompatible binary geo range base \"%s\"", name->data); | |
| 1230 goto failed; | |
| 1231 } | |
| 1232 | |
| 1233 ngx_crc32_init(crc32); | |
| 1234 | |
| 1235 vv = (ngx_http_variable_value_t *) (base + sizeof(ngx_http_geo_header_t)); | |
| 1236 | |
| 1237 while(vv->data) { | |
| 1238 len = ngx_align(sizeof(ngx_http_variable_value_t) + vv->len, | |
| 1239 sizeof(void *)); | |
| 1240 ngx_crc32_update(&crc32, (u_char *) vv, len); | |
| 1241 vv->data += (size_t) base; | |
| 1242 vv = (ngx_http_variable_value_t *) ((u_char *) vv + len); | |
| 1243 } | |
| 1244 ngx_crc32_update(&crc32, (u_char *) vv, sizeof(ngx_http_variable_value_t)); | |
| 1245 vv++; | |
| 1246 | |
| 1247 ranges = (ngx_http_geo_range_t **) vv; | |
| 1248 | |
| 1249 for (i = 0; i < 0x10000; i++) { | |
| 1250 ngx_crc32_update(&crc32, (u_char *) &ranges[i], sizeof(void *)); | |
| 1251 if (ranges[i]) { | |
| 1252 ranges[i] = (ngx_http_geo_range_t *) | |
| 1253 ((u_char *) ranges[i] + (size_t) base); | |
| 1254 } | |
| 1255 } | |
| 1256 | |
| 1257 range = (ngx_http_geo_range_t *) &ranges[0x10000]; | |
| 1258 | |
| 1259 while ((u_char *) range < base + size) { | |
| 1260 while (range->value) { | |
| 1261 ngx_crc32_update(&crc32, (u_char *) range, | |
| 1262 sizeof(ngx_http_geo_range_t)); | |
| 1263 range->value = (ngx_http_variable_value_t *) | |
| 1264 ((u_char *) range->value + (size_t) base); | |
| 1265 range++; | |
| 1266 } | |
| 1267 ngx_crc32_update(&crc32, (u_char *) range, sizeof(void *)); | |
| 1268 range = (ngx_http_geo_range_t *) ((u_char *) range + sizeof(void *)); | |
| 1269 } | |
| 1270 | |
| 1271 ngx_crc32_final(crc32); | |
| 1272 | |
| 1273 if (crc32 != header->crc32) { | |
| 1274 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, | |
| 1275 "CRC32 mismatch in binary geo range base \"%s\"", name->data); | |
| 1276 goto failed; | |
| 1277 } | |
| 1278 | |
| 1279 ngx_conf_log_error(NGX_LOG_NOTICE, cf, 0, | |
| 1280 "using binary geo range base \"%s\"", name->data); | |
| 1281 | |
| 1282 ctx->include_name = *name; | |
| 1283 ctx->binary_include = 1; | |
| 1284 ctx->high.low = ranges; | |
| 1285 rc = NGX_OK; | |
| 1286 | |
| 1287 goto done; | |
| 1288 | |
| 1289 failed: | |
| 1290 | |
| 1291 rc = NGX_DECLINED; | |
| 1292 | |
| 1293 done: | |
| 1294 | |
| 1295 if (ngx_close_file(file.fd) == NGX_FILE_ERROR) { | |
| 1296 ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno, | |
| 1297 ngx_close_file_n " \"%s\" failed", name->data); | |
| 1298 } | |
| 1299 | |
| 1300 return rc; | |
| 1301 } | |
| 1302 | |
| 1303 | |
| 1304 static void | |
| 1305 ngx_http_geo_create_binary_base(ngx_http_geo_conf_ctx_t *ctx) | |
| 1306 { | |
| 1307 u_char *p; | |
| 1308 uint32_t hash; | |
| 1309 ngx_str_t s; | |
| 1310 ngx_uint_t i; | |
| 1311 ngx_file_mapping_t fm; | |
| 1312 ngx_http_geo_range_t *r, *range, **ranges; | |
| 1313 ngx_http_geo_header_t *header; | |
| 1314 ngx_http_geo_variable_value_node_t *gvvn; | |
| 1315 | |
| 1316 fm.name = ngx_pnalloc(ctx->temp_pool, ctx->include_name.len + 5); | |
| 1317 if (fm.name == NULL) { | |
| 1318 return; | |
| 1319 } | |
| 1320 | |
| 1321 ngx_sprintf(fm.name, "%V.bin%Z", &ctx->include_name); | |
| 1322 | |
| 1323 fm.size = ctx->data_size; | |
| 1324 fm.log = ctx->pool->log; | |
| 1325 | |
| 1326 ngx_log_error(NGX_LOG_NOTICE, fm.log, 0, | |
| 1327 "creating binary geo range base \"%s\"", fm.name); | |
| 1328 | |
| 1329 if (ngx_create_file_mapping(&fm) != NGX_OK) { | |
| 1330 return; | |
| 1331 } | |
| 1332 | |
| 1333 p = ngx_cpymem(fm.addr, &ngx_http_geo_header, | |
| 1334 sizeof(ngx_http_geo_header_t)); | |
| 1335 | |
| 1336 p = ngx_http_geo_copy_values(fm.addr, p, ctx->rbtree.root, | |
| 1337 ctx->rbtree.sentinel); | |
| 1338 | |
| 1339 p += sizeof(ngx_http_variable_value_t); | |
| 1340 | |
| 1341 ranges = (ngx_http_geo_range_t **) p; | |
| 1342 | |
| 1343 p += 0x10000 * sizeof(ngx_http_geo_range_t *); | |
| 1344 | |
| 1345 for (i = 0; i < 0x10000; i++) { | |
| 1346 r = ctx->high.low[i]; | |
| 1347 if (r == NULL) { | |
| 1348 continue; | |
| 1349 } | |
| 1350 | |
| 1351 range = (ngx_http_geo_range_t *) p; | |
| 1352 ranges[i] = (ngx_http_geo_range_t *) (p - (u_char *) fm.addr); | |
| 1353 | |
| 1354 do { | |
| 1355 s.len = r->value->len; | |
| 1356 s.data = r->value->data; | |
| 1357 hash = ngx_crc32_long(s.data, s.len); | |
| 1358 gvvn = (ngx_http_geo_variable_value_node_t *) | |
| 1359 ngx_str_rbtree_lookup(&ctx->rbtree, &s, hash); | |
| 1360 | |
| 1361 range->value = (ngx_http_variable_value_t *) gvvn->offset; | |
| 1362 range->start = r->start; | |
| 1363 range->end = r->end; | |
| 1364 range++; | |
| 1365 | |
| 1366 } while ((++r)->value); | |
| 1367 | |
| 1368 range->value = NULL; | |
| 1369 | |
| 1370 p = (u_char *) range + sizeof(void *); | |
| 1371 } | |
| 1372 | |
| 1373 header = fm.addr; | |
| 1374 header->crc32 = ngx_crc32_long((u_char *) fm.addr | |
| 1375 + sizeof(ngx_http_geo_header_t), | |
| 1376 fm.size - sizeof(ngx_http_geo_header_t)); | |
| 1377 | |
| 1378 ngx_close_file_mapping(&fm); | |
| 1379 } | |
| 1380 | |
| 1381 | |
| 1382 static u_char * | |
| 1383 ngx_http_geo_copy_values(u_char *base, u_char *p, ngx_rbtree_node_t *node, | |
| 1384 ngx_rbtree_node_t *sentinel) | |
| 1385 { | |
| 1386 ngx_http_variable_value_t *vv; | |
| 1387 ngx_http_geo_variable_value_node_t *gvvn; | |
| 1388 | |
| 1389 if (node == sentinel) { | |
| 1390 return p; | |
| 1391 } | |
| 1392 | |
| 1393 gvvn = (ngx_http_geo_variable_value_node_t *) node; | |
| 1394 gvvn->offset = p - base; | |
| 1395 | |
| 1396 vv = (ngx_http_variable_value_t *) p; | |
| 1397 *vv = *gvvn->value; | |
| 1398 p += sizeof(ngx_http_variable_value_t); | |
| 1399 vv->data = (u_char *) (p - base); | |
| 1400 | |
| 1401 p = ngx_cpymem(p, gvvn->sn.str.data, gvvn->sn.str.len); | |
| 1402 | |
| 1403 p = ngx_align_ptr(p, sizeof(void *)); | |
| 1404 | |
| 1405 p = ngx_http_geo_copy_values(base, p, node->left, sentinel); | |
| 1406 | |
| 1407 return ngx_http_geo_copy_values(base, p, node->right, sentinel); | |
| 1408 } |