annotate src/http/modules/ngx_http_geo_module.c @ 526:0161f3197817 NGINX_0_8_15

nginx 0.8.15 *) Security: a segmentation fault might occur in worker process while specially crafted request handling. Thanks to Chris Ries. *) Bugfix: if names .domain.tld, .sub.domain.tld, and .domain-some.tld were defined, then the name .sub.domain.tld was matched by .domain.tld. *) Bugfix: in transparency support in the ngx_http_image_filter_module. *) Bugfix: in file AIO. *) Bugfix: in X-Accel-Redirect usage; the bug had appeared in 0.8.11. *) Bugfix: in embedded perl module; the bug had appeared in 0.8.11.
author Igor Sysoev <http://sysoev.ru>
date Mon, 14 Sep 2009 00:00:00 +0400
parents 24b676623d4f
children da3c99095432
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
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
4 */
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 #include <ngx_config.h>
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
8 #include <ngx_core.h>
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
9 #include <ngx_http.h>
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
10
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 typedef struct {
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
13 u_short start;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
14 u_short end;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
15 ngx_http_variable_value_t *value;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
16 } ngx_http_geo_range_t;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
17
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 typedef struct {
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
20 ngx_http_geo_range_t *ranges;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
21 ngx_uint_t n;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
22 } ngx_http_geo_low_ranges_t;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
23
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 typedef struct {
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
26 ngx_http_geo_low_ranges_t low[0x10000];
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
27 ngx_http_variable_value_t *default_value;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
28 } ngx_http_geo_high_ranges_t;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
29
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
30
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
31 typedef struct {
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
32 ngx_http_variable_value_t *value;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
33 ngx_str_t *net;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
34 ngx_http_geo_high_ranges_t *high;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
35 ngx_radix_tree_t *tree;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
36 ngx_rbtree_t rbtree;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
37 ngx_rbtree_node_t sentinel;
510
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
38 ngx_array_t *proxies;
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
39 ngx_pool_t *pool;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
40 ngx_pool_t *temp_pool;
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
41 } ngx_http_geo_conf_ctx_t;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
42
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
43
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
44 typedef struct {
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
45 union {
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
46 ngx_radix_tree_t *tree;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
47 ngx_http_geo_high_ranges_t *high;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
48 } u;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
49
510
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
50 ngx_array_t *proxies;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
51
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
52 ngx_int_t index;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
53 } ngx_http_geo_ctx_t;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
54
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
55
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
56 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
57 ngx_http_geo_ctx_t *ctx);
510
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
58 static in_addr_t ngx_http_geo_real_addr(ngx_http_request_t *r,
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
59 ngx_http_geo_ctx_t *ctx);
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
60 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
61 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
62 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
63 ngx_str_t *value);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
64 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
65 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
66 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
67 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
68 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
69 ngx_str_t *value);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
70 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
71 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
72 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
73 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
74 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
75 ngx_cidr_t *cidr);
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
76
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
77
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
78 static ngx_command_t ngx_http_geo_commands[] = {
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
79
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
80 { ngx_string("geo"),
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
81 NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE12,
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
82 ngx_http_geo_block,
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
83 NGX_HTTP_MAIN_CONF_OFFSET,
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
84 0,
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
85 NULL },
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
86
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
87 ngx_null_command
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
88 };
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
89
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
90
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
91 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
92 NULL, /* preconfiguration */
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
93 NULL, /* postconfiguration */
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
94
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
95 NULL, /* create main configuration */
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
96 NULL, /* init main configuration */
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
97
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
98 NULL, /* create server configuration */
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
99 NULL, /* merge server configuration */
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
100
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
101 NULL, /* create location configuration */
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
102 NULL /* merge location configuration */
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
103 };
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
104
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
105
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
106 ngx_module_t ngx_http_geo_module = {
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
107 NGX_MODULE_V1,
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
108 &ngx_http_geo_module_ctx, /* module context */
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
109 ngx_http_geo_commands, /* module directives */
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
110 NGX_HTTP_MODULE, /* module type */
90
71c46860eb55 nginx 0.1.45
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
111 NULL, /* init master */
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
112 NULL, /* init module */
90
71c46860eb55 nginx 0.1.45
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
113 NULL, /* init process */
71c46860eb55 nginx 0.1.45
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
114 NULL, /* init thread */
71c46860eb55 nginx 0.1.45
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
115 NULL, /* exit thread */
71c46860eb55 nginx 0.1.45
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
116 NULL, /* exit process */
71c46860eb55 nginx 0.1.45
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
117 NULL, /* exit master */
71c46860eb55 nginx 0.1.45
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
118 NGX_MODULE_V1_PADDING
34
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
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
121
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
122 /* AF_INET only */
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
123
122
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
124 static ngx_int_t
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
125 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
126 uintptr_t data)
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
127 {
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
128 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
129
122
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
130 ngx_http_variable_value_t *vv;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
131
122
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
132 vv = (ngx_http_variable_value_t *)
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
133 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
134
122
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
135 *v = *vv;
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
136
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
137 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
138 "http geo: %v", v);
38
2879cd3a40cb nginx 0.1.19
Igor Sysoev <http://sysoev.ru>
parents: 36
diff changeset
139
122
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
140 return NGX_OK;
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
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
144 static ngx_int_t
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
145 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
146 uintptr_t data)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
147 {
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
148 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
149
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
150 in_addr_t addr;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
151 ngx_uint_t i, n;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
152 ngx_http_geo_range_t *range;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
153
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
154 *v = *ctx->u.high->default_value;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
155
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
156 addr = ngx_http_geo_addr(r, ctx);
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
157
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
158 range = ctx->u.high->low[addr >> 16].ranges;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
159
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
160 n = addr & 0xffff;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
161
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
162 for (i = 0; i < ctx->u.high->low[addr >> 16].n; i++) {
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
163 if (n >= (ngx_uint_t) range[i].start
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
164 && n <= (ngx_uint_t) range[i].end)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
165 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
166 *v = *range[i].value;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
167 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
168 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
169
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
170 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
171 "http geo: %v", v);
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
172
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
173 return NGX_OK;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
174 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
175
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
176
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
177 static in_addr_t
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
178 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
179 {
510
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
180 u_char *p, *ip;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
181 size_t len;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
182 in_addr_t addr;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
183 ngx_uint_t i, n;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
184 ngx_in_cidr_t *proxies;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
185 ngx_table_elt_t *xfwd;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
186
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
187 addr = ngx_http_geo_real_addr(r, ctx);
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
188
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
189 xfwd = r->headers_in.x_forwarded_for;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
190
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
191 if (xfwd == NULL || ctx->proxies == NULL) {
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
192 return addr;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
193 }
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
194
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
195 proxies = ctx->proxies->elts;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
196 n = ctx->proxies->nelts;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
197
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
198 for (i = 0; i < n; i++) {
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
199 if ((addr & proxies[i].mask) == proxies[i].addr) {
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
200
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
201 len = xfwd->value.len;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
202 ip = xfwd->value.data;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
203
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
204 for (p = ip + len - 1; p > ip; p--) {
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
205 if (*p == ' ' || *p == ',') {
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
206 p++;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
207 len -= p - ip;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
208 ip = p;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
209 break;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
210 }
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
211 }
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
212
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
213 return ntohl(ngx_inet_addr(ip, len));
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
214 }
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
215 }
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
216
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
217 return addr;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
218 }
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
219
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
220
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
221 static in_addr_t
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
222 ngx_http_geo_real_addr(ngx_http_request_t *r, ngx_http_geo_ctx_t *ctx)
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
223 {
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
224 struct sockaddr_in *sin;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
225 ngx_http_variable_value_t *v;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
226
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
227 if (ctx->index == -1) {
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
228 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
229 "http geo started: %V", &r->connection->addr_text);
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
230
448
76a79816b771 nginx 0.7.36
Igor Sysoev <http://sysoev.ru>
parents: 440
diff changeset
231 if (r->connection->sockaddr->sa_family != AF_INET) {
76a79816b771 nginx 0.7.36
Igor Sysoev <http://sysoev.ru>
parents: 440
diff changeset
232 return 0;
76a79816b771 nginx 0.7.36
Igor Sysoev <http://sysoev.ru>
parents: 440
diff changeset
233 }
76a79816b771 nginx 0.7.36
Igor Sysoev <http://sysoev.ru>
parents: 440
diff changeset
234
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
235 sin = (struct sockaddr_in *) r->connection->sockaddr;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
236 return ntohl(sin->sin_addr.s_addr);
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
237 }
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
238
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
239 v = ngx_http_get_flushed_variable(r, ctx->index);
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
240
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
241 if (v == NULL || v->not_found) {
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
242 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
243 "http geo not found");
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
244
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
245 return 0;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
246 }
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
247
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
248 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
249 "http geo started: %v", v);
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
250
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
251 return ntohl(ngx_inet_addr(v->data, v->len));
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
252 }
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
253
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
254
38
2879cd3a40cb nginx 0.1.19
Igor Sysoev <http://sysoev.ru>
parents: 36
diff changeset
255 static char *
2879cd3a40cb nginx 0.1.19
Igor Sysoev <http://sysoev.ru>
parents: 36
diff changeset
256 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
257 {
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
258 char *rv;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
259 size_t len;
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
260 ngx_str_t *value, name;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
261 ngx_uint_t i;
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
262 ngx_conf_t save;
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
263 ngx_pool_t *pool;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
264 ngx_array_t *a;
328
390b8f8309d6 nginx 0.6.8
Igor Sysoev <http://sysoev.ru>
parents: 326
diff changeset
265 ngx_http_variable_t *var;
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
266 ngx_http_geo_ctx_t *geo;
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
267 ngx_http_geo_conf_ctx_t ctx;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
268
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
269 value = cf->args->elts;
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
270
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
271 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
272 if (geo == NULL) {
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
273 return NGX_CONF_ERROR;
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
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
276 name = value[1];
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
277 name.len--;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
278 name.data++;
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
279
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
280 if (cf->args->nelts == 3) {
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 geo->index = ngx_http_get_variable_index(cf, &name);
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
283 if (geo->index == NGX_ERROR) {
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
284 return NGX_CONF_ERROR;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
285 }
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
286
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
287 name = value[2];
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
288 name.len--;
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
289 name.data++;
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 } else {
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
292 geo->index = -1;
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
293 }
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
294
340
10cc350ed8a1 nginx 0.6.14
Igor Sysoev <http://sysoev.ru>
parents: 328
diff changeset
295 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
296 if (var == NULL) {
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
297 return NGX_CONF_ERROR;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
298 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
299
132
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
300 pool = ngx_create_pool(16384, cf->log);
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
301 if (pool == NULL) {
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
302 return NGX_CONF_ERROR;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
303 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
304
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
305 ctx.temp_pool = ngx_create_pool(16384, cf->log);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
306 if (ctx.temp_pool == NULL) {
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
307 return NGX_CONF_ERROR;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
308 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
309
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
310 ngx_rbtree_init(&ctx.rbtree, &ctx.sentinel,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
311 ngx_http_variable_value_rbtree_insert);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
312
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
313 ctx.high = NULL;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
314 ctx.tree = NULL;
510
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
315 ctx.proxies = NULL;
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
316 ctx.pool = cf->pool;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
317
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
318 save = *cf;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
319 cf->pool = pool;
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
320 cf->ctx = &ctx;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
321 cf->handler = ngx_http_geo;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
322 cf->handler_conf = conf;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
323
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
324 rv = ngx_conf_parse(cf, NULL);
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
325
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
326 *cf = save;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
327
510
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
328 geo->proxies = ctx.proxies;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
329
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
330 if (ctx.high) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
331
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
332 for (i = 0; i < 0x10000; i++) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
333 a = (ngx_array_t *) ctx.high->low[i].ranges;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
334
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
335 if (a == NULL || a->nelts == 0) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
336 continue;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
337 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
338
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
339 ctx.high->low[i].n = a->nelts;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
340
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
341 len = a->nelts * sizeof(ngx_http_geo_range_t);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
342
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
343 ctx.high->low[i].ranges = ngx_palloc(cf->pool, len);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
344 if (ctx.high->low[i].ranges == NULL ){
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
345 return NGX_CONF_ERROR;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
346 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
347
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
348 ngx_memcpy(ctx.high->low[i].ranges, a->elts, len);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
349 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
350
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
351 geo->u.high = ctx.high;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
352
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
353 var->get_handler = ngx_http_geo_range_variable;
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
354 var->data = (uintptr_t) geo;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
355
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
356 ngx_destroy_pool(ctx.temp_pool);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
357 ngx_destroy_pool(pool);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
358
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
359 if (ctx.high->default_value == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
360 ctx.high->default_value = &ngx_http_variable_null_value;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
361 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
362
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
363 } else {
424
9da1d9d94d18 nginx 0.7.24
Igor Sysoev <http://sysoev.ru>
parents: 422
diff changeset
364 if (ctx.tree == NULL) {
9da1d9d94d18 nginx 0.7.24
Igor Sysoev <http://sysoev.ru>
parents: 422
diff changeset
365 ctx.tree = ngx_radix_tree_create(cf->pool, -1);
9da1d9d94d18 nginx 0.7.24
Igor Sysoev <http://sysoev.ru>
parents: 422
diff changeset
366 if (ctx.tree == NULL) {
9da1d9d94d18 nginx 0.7.24
Igor Sysoev <http://sysoev.ru>
parents: 422
diff changeset
367 return NGX_CONF_ERROR;
9da1d9d94d18 nginx 0.7.24
Igor Sysoev <http://sysoev.ru>
parents: 422
diff changeset
368 }
9da1d9d94d18 nginx 0.7.24
Igor Sysoev <http://sysoev.ru>
parents: 422
diff changeset
369 }
9da1d9d94d18 nginx 0.7.24
Igor Sysoev <http://sysoev.ru>
parents: 422
diff changeset
370
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
371 geo->u.tree = ctx.tree;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
372
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
373 var->get_handler = ngx_http_geo_cidr_variable;
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
374 var->data = (uintptr_t) geo;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
375
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
376 ngx_destroy_pool(ctx.temp_pool);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
377 ngx_destroy_pool(pool);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
378
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
379 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
380 return rv;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
381 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
382
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
383 if (ngx_radix32tree_insert(ctx.tree, 0, 0,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
384 (uintptr_t) &ngx_http_variable_null_value)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
385 == NGX_ERROR)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
386 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
387 return NGX_CONF_ERROR;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
388 }
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
389 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
390
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
391 return rv;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
392 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
393
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
394
38
2879cd3a40cb nginx 0.1.19
Igor Sysoev <http://sysoev.ru>
parents: 36
diff changeset
395 static char *
2879cd3a40cb nginx 0.1.19
Igor Sysoev <http://sysoev.ru>
parents: 36
diff changeset
396 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
397 {
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
398 char *rv;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
399 ngx_str_t *value, file;
510
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
400 ngx_cidr_t cidr;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
401 ngx_http_geo_conf_ctx_t *ctx;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
402
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
403 ctx = cf->ctx;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
404
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
405 value = cf->args->elts;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
406
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
407 if (cf->args->nelts == 1) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
408
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
409 if (ngx_strcmp(value[0].data, "ranges") == 0) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
410
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
411 if (ctx->tree) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
412 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
413 "the \"ranges\" directive must be "
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
414 "the first directive inside \"geo\" block");
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
415 goto failed;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
416 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
417
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
418 ctx->high = ngx_pcalloc(ctx->pool,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
419 sizeof(ngx_http_geo_high_ranges_t));
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
420 if (ctx->high == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
421 goto failed;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
422 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
423
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
424 rv = NGX_CONF_OK;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
425
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
426 goto done;
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 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
429
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
430 if (cf->args->nelts != 2) {
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
431 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
432 "invalid number of the geo parameters");
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
433 goto failed;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
434 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
435
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
436 if (ngx_strcmp(value[0].data, "include") == 0) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
437
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
438 file.len = value[1].len++;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
439
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
440 file.data = ngx_pstrdup(ctx->temp_pool, &value[1]);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
441 if (file.data == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
442 goto failed;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
443 }
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
444
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
445 if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK){
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
446 goto failed;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
447 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
448
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
449 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data);
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
450
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
451 rv = ngx_conf_parse(cf, &file);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
452
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
453 goto done;
510
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
454
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
455 } else if (ngx_strcmp(value[0].data, "proxy") == 0) {
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
456
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
457 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
458 goto failed;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
459 }
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
460
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
461 rv = ngx_http_geo_add_proxy(cf, ctx, &cidr);
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
462
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
463 goto done;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
464 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
465
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
466 if (ctx->high) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
467 rv = ngx_http_geo_range(cf, ctx, value);
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 } else {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
470 rv = ngx_http_geo_cidr(cf, ctx, value);
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
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
473 done:
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
474
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
475 ngx_reset_pool(cf->pool);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
476
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
477 return rv;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
478
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
479 failed:
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
480
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
481 ngx_reset_pool(cf->pool);
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 return NGX_CONF_ERROR;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
484 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
485
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
486
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
487 static char *
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
488 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
489 ngx_str_t *value)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
490 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
491 u_char *p, *last;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
492 in_addr_t start, end;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
493 ngx_str_t *net;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
494 ngx_uint_t del;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
495 ngx_http_variable_value_t *old;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
496
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
497 if (ngx_strcmp(value[0].data, "default") == 0) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
498
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
499 old = ctx->high->default_value;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
500
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
501 ctx->high->default_value = ngx_http_geo_value(cf, ctx, &value[1]);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
502 if (ctx->high->default_value == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
503 return NGX_CONF_ERROR;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
504 }
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 if (old) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
507 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
508 "duplicate range \"%V\", value: \"%v\", old value: \"%v\"",
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
509 &value[0], ctx->high->default_value, old);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
510 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
511
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
512 return NGX_CONF_OK;
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
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
515 if (ngx_strcmp(value[0].data, "delete") == 0) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
516 net = &value[1];
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
517 del = 1;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
518
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
519 } else {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
520 net = &value[0];
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
521 del = 0;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
522 }
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 last = net->data + net->len;
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 p = ngx_strlchr(net->data, last, '-');
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 if (p == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
529 goto invalid;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
530 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
531
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
532 start = ngx_inet_addr(net->data, p - net->data);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
533
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
534 if (start == INADDR_NONE) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
535 goto invalid;
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
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
538 start = ntohl(start);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
539
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
540 p++;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
541
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
542 end = ngx_inet_addr(p, last - p);
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 if (end == INADDR_NONE) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
545 goto invalid;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
546 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
547
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
548 end = ntohl(end);
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 if (start > end) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
551 goto invalid;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
552 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
553
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
554 if (del) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
555 if (ngx_http_geo_delete_range(cf, ctx, start, end)) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
556 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
557 "no address range \"%V\" to delete", net);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
558 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
559
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
560 return NGX_CONF_OK;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
561 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
562
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
563 ctx->value = ngx_http_geo_value(cf, ctx, &value[1]);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
564
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
565 if (ctx->value == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
566 return NGX_CONF_ERROR;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
567 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
568
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
569 ctx->net = net;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
570
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
571 return ngx_http_geo_add_range(cf, ctx, start, end);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
572
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
573 invalid:
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 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
576
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
577 return NGX_CONF_ERROR;
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
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
581 /* 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
582
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
583 static char *
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
584 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
585 in_addr_t start, in_addr_t end)
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 in_addr_t n;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
588 ngx_uint_t h, i, s, e;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
589 ngx_array_t *a;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
590 ngx_http_geo_range_t *range;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
591
438
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
592 for (n = start; n <= end; n += 0x10000) {
422
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 h = n >> 16;
438
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
595
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
596 if (n == start) {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
597 s = n & 0xffff;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
598 } else {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
599 s = 0;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
600 }
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
601
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
602 if ((n | 0xffff) > end) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
603 e = end & 0xffff;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
604
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
605 } else {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
606 e = 0xffff;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
607 }
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 a = (ngx_array_t *) ctx->high->low[h].ranges;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
610
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
611 if (a == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
612 a = ngx_array_create(ctx->temp_pool, 64,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
613 sizeof(ngx_http_geo_range_t));
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
614 if (a == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
615 return NGX_CONF_ERROR;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
616 }
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 ctx->high->low[h].ranges = (ngx_http_geo_range_t *) a;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
619 }
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 i = a->nelts;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
622 range = a->elts;
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 while (i) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
625
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
626 i--;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
627
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
628 if (e < (ngx_uint_t) range[i].start) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
629 continue;
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
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
632 if (s > (ngx_uint_t) range[i].end) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
633
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
634 /* add after the range */
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 range = ngx_array_push(a);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
637 if (range == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
638 return NGX_CONF_ERROR;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
639 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
640
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
641 range = a->elts;
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 ngx_memcpy(&range[i + 2], &range[i + 1],
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
644 (a->nelts - 2 - i) * sizeof(ngx_http_geo_range_t));
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
645
438
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
646 range[i + 1].start = (u_short) s;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
647 range[i + 1].end = (u_short) e;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
648 range[i + 1].value = ctx->value;
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 goto next;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
651 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
652
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
653 if (s == (ngx_uint_t) range[i].start
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
654 && e == (ngx_uint_t) range[i].end)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
655 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
656 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
657 "duplicate range \"%V\", value: \"%v\", old value: \"%v\"",
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
658 ctx->net, ctx->value, range[i].value);
438
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
659
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
660 range[i].value = ctx->value;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
661
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
662 goto next;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
663 }
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
664
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
665 if (s > (ngx_uint_t) range[i].start
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
666 && e < (ngx_uint_t) range[i].end)
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
667 {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
668 /* split the range and insert the new one */
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
669
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
670 range = ngx_array_push(a);
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
671 if (range == NULL) {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
672 return NGX_CONF_ERROR;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
673 }
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
674
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
675 range = ngx_array_push(a);
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
676 if (range == NULL) {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
677 return NGX_CONF_ERROR;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
678 }
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
679
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
680 range = a->elts;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
681
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
682 ngx_memcpy(&range[i + 3], &range[i + 1],
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
683 (a->nelts - 3 - i) * sizeof(ngx_http_geo_range_t));
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
684
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
685 range[i + 2].start = (u_short) (e + 1);
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
686 range[i + 2].end = range[i].end;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
687 range[i + 2].value = range[i].value;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
688
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
689 range[i + 1].start = (u_short) s;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
690 range[i + 1].end = (u_short) e;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
691 range[i + 1].value = ctx->value;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
692
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
693 range[i].end = (u_short) (s - 1);
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
694
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
695 goto next;
422
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
438
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
698 if (s == (ngx_uint_t) range[i].start
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
699 && e < (ngx_uint_t) range[i].end)
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
700 {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
701 /* shift the range start and insert the new range */
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
702
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
703 range = ngx_array_push(a);
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
704 if (range == NULL) {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
705 return NGX_CONF_ERROR;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
706 }
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
707
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
708 range = a->elts;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
709
440
6281966854a5 nginx 0.7.32
Igor Sysoev <http://sysoev.ru>
parents: 438
diff changeset
710 ngx_memcpy(&range[i + 1], &range[i],
6281966854a5 nginx 0.7.32
Igor Sysoev <http://sysoev.ru>
parents: 438
diff changeset
711 (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
712
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
713 range[i + 1].start = (u_short) (e + 1);
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
714
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
715 range[i].start = (u_short) s;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
716 range[i].end = (u_short) e;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
717 range[i].value = ctx->value;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
718
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
719 goto next;
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
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
722 if (s > (ngx_uint_t) range[i].start
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
723 && e == (ngx_uint_t) range[i].end)
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
724 {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
725 /* shift the range end and insert the new range */
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
726
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
727 range = ngx_array_push(a);
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
728 if (range == NULL) {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
729 return NGX_CONF_ERROR;
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
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
732 range = a->elts;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
733
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
734 ngx_memcpy(&range[i + 2], &range[i + 1],
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
735 (a->nelts - 2 - i) * sizeof(ngx_http_geo_range_t));
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
736
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
737 range[i + 1].start = (u_short) s;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
738 range[i + 1].end = (u_short) e;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
739 range[i + 1].value = ctx->value;
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].end = (u_short) (s - 1);
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
742
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
743 goto next;
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
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
746 s = (ngx_uint_t) range[i].start;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
747 e = (ngx_uint_t) range[i].end;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
748
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
749 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
438
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
750 "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
751 ctx->net,
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
752 h >> 8, h & 0xff, s >> 8, s & 0xff,
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
753 h >> 8, h & 0xff, e >> 8, e & 0xff);
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
754
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
755 return NGX_CONF_ERROR;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
756 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
757
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
758 /* add the first range */
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
759
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
760 range = ngx_array_push(a);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
761 if (range == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
762 return NGX_CONF_ERROR;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
763 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
764
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
765 range->start = (u_short) s;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
766 range->end = (u_short) e;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
767 range->value = ctx->value;
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 next:
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 continue;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
772 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
773
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
774 return NGX_CONF_OK;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
775 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
776
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
777
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
778 static ngx_uint_t
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
779 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
780 in_addr_t start, in_addr_t end)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
781 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
782 in_addr_t n;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
783 ngx_uint_t h, i, s, e, warn;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
784 ngx_array_t *a;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
785 ngx_http_geo_range_t *range;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
786
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
787 warn = 0;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
788
438
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
789 for (n = start; n <= end; n += 0x10000) {
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
790
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
791 h = n >> 16;
438
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 if (n == start) {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
794 s = n & 0xffff;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
795 } else {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
796 s = 0;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
797 }
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
798
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
799 if ((n | 0xffff) > end) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
800 e = end & 0xffff;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
801
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
802 } else {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
803 e = 0xffff;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
804 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
805
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
806 a = (ngx_array_t *) ctx->high->low[h].ranges;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
807
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
808 if (a == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
809 warn = 1;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
810 continue;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
811 }
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 range = a->elts;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
814 for (i = 0; i < a->nelts; i++) {
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 if (s == (ngx_uint_t) range[i].start
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
817 && e == (ngx_uint_t) range[i].end)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
818 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
819 ngx_memcpy(&range[i], &range[i + 1],
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
820 (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
821
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
822 a->nelts--;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
823
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
824 break;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
825 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
826
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
827 if (s != (ngx_uint_t) range[i].start
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
828 && e != (ngx_uint_t) range[i].end)
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 continue;
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 warn = 1;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
834 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
835 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
836
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
837 return warn;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
838 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
839
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
840
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
841 static char *
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
842 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
843 ngx_str_t *value)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
844 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
845 ngx_int_t rc, del;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
846 ngx_str_t *net;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
847 ngx_uint_t i;
454
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
848 ngx_cidr_t cidr;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
849 ngx_http_variable_value_t *val, *old;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
850
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
851 if (ctx->tree == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
852 ctx->tree = ngx_radix_tree_create(ctx->pool, -1);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
853 if (ctx->tree == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
854 return NGX_CONF_ERROR;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
855 }
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
856 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
857
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
858 if (ngx_strcmp(value[0].data, "default") == 0) {
454
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
859 cidr.u.in.addr = 0;
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
860 cidr.u.in.mask = 0;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
861 net = &value[0];
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
862
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
863 } else {
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
864 if (ngx_strcmp(value[0].data, "delete") == 0) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
865 net = &value[1];
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
866 del = 1;
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 } else {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
869 net = &value[0];
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
870 del = 0;
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
510
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
873 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
874 return NGX_CONF_ERROR;
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 324
diff changeset
875 }
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 324
diff changeset
876
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
877 if (del) {
454
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
878 if (ngx_radix32tree_delete(ctx->tree, cidr.u.in.addr,
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
879 cidr.u.in.mask)
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
880 != NGX_OK)
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 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
883 "no network \"%V\" to delete", net);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
884 }
426
e7dbea1ee115 nginx 0.7.25
Igor Sysoev <http://sysoev.ru>
parents: 424
diff changeset
885
e7dbea1ee115 nginx 0.7.25
Igor Sysoev <http://sysoev.ru>
parents: 424
diff changeset
886 return NGX_CONF_OK;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
887 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
888 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
889
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
890 val = ngx_http_geo_value(cf, ctx, &value[1]);
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
891
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
892 if (val == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
893 return NGX_CONF_ERROR;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
894 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
895
102
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
896 for (i = 2; i; i--) {
454
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
897 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
898 (uintptr_t) val);
102
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
899 if (rc == NGX_OK) {
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
900 return NGX_CONF_OK;
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
901 }
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
902
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
903 if (rc == NGX_ERROR) {
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
904 return NGX_CONF_ERROR;
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
905 }
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
906
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
907 /* rc == NGX_BUSY */
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
908
526
0161f3197817 nginx 0.8.15
Igor Sysoev <http://sysoev.ru>
parents: 510
diff changeset
909 old = (ngx_http_variable_value_t *)
454
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
910 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
911
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
912 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
913 "duplicate network \"%V\", value: \"%v\", old value: \"%v\"",
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
914 net, val, old);
102
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
915
454
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
916 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
917
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
918 if (rc == NGX_ERROR) {
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
919 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
920 return NGX_CONF_ERROR;
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
921 }
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
922 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
923
102
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
924 return NGX_CONF_ERROR;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
925 }
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
926
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
927
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
928 static ngx_http_variable_value_t *
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
929 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
930 ngx_str_t *value)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
931 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
932 uint32_t hash;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
933 ngx_http_variable_value_t *val;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
934 ngx_http_variable_value_node_t *vvn;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
935
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
936 hash = ngx_crc32_long(value->data, value->len);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
937
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
938 val = ngx_http_variable_value_lookup(&ctx->rbtree, value, hash);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
939
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
940 if (val) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
941 return val;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
942 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
943
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
944 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
945 if (val == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
946 return NULL;
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
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
949 val->len = value->len;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
950 val->data = ngx_pstrdup(ctx->pool, value);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
951 if (val->data == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
952 return NULL;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
953 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
954
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
955 val->valid = 1;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
956 val->no_cacheable = 0;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
957 val->not_found = 0;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
958
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
959 vvn = ngx_palloc(ctx->temp_pool, sizeof(ngx_http_variable_value_node_t));
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
960 if (vvn == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
961 return NULL;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
962 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
963
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
964 vvn->node.key = hash;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
965 vvn->len = val->len;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
966 vvn->value = val;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
967
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
968 ngx_rbtree_insert(&ctx->rbtree, &vvn->node);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
969
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
970 return val;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
971 }
510
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
972
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
973
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
974 static char *
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
975 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
976 ngx_cidr_t *cidr)
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
977 {
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
978 ngx_in_cidr_t *c;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
979
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
980 if (ctx->proxies == NULL) {
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
981 ctx->proxies = ngx_array_create(ctx->pool, 4, sizeof(ngx_in_cidr_t));
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
982 if (ctx->proxies == NULL) {
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
983 return NGX_CONF_ERROR;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
984 }
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
985 }
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
986
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
987 c = ngx_array_push(ctx->proxies);
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
988 if (c == NULL) {
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
989 return NGX_CONF_ERROR;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
990 }
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
991
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
992 c->addr = cidr->u.in.addr;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
993 c->mask = cidr->u.in.mask;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
994
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
995 return NGX_CONF_OK;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
996 }
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
997
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
998
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
999 static ngx_int_t
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1000 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
1001 {
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1002 ngx_int_t rc;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1003
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1004 if (ngx_strcmp(net->data, "255.255.255.255") == 0) {
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1005 cidr->u.in.addr = 0xffffffff;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1006 cidr->u.in.mask = 0xffffffff;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1007
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1008 return NGX_OK;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1009 }
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1010
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1011 rc = ngx_ptocidr(net, cidr);
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1012
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1013 if (rc == NGX_ERROR) {
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1014 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
1015 return NGX_ERROR;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1016 }
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1017
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1018 if (cidr->family != AF_INET) {
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1019 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "\"geo\" supports IPv4 only");
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1020 return NGX_ERROR;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1021 }
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1022
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1023 if (rc == NGX_DONE) {
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1024 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1025 "low address bits of %V are meaningless", net);
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1026 }
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1027
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1028 cidr->u.in.addr = ntohl(cidr->u.in.addr);
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1029 cidr->u.in.mask = ntohl(cidr->u.in.mask);
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1030
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1031 return NGX_OK;
24b676623d4f nginx 0.8.7
Igor Sysoev <http://sysoev.ru>
parents: 454
diff changeset
1032 }