annotate src/http/modules/ngx_http_geo_module.c @ 684:660139fd80ca NGINX_1_3_5

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