Mercurial > hg > nginx

annotate src/http/modules/ngx_http_geo_module.c @ 4412:d620f497c50f

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