annotate src/http/modules/ngx_http_geo_module.c @ 454:a8424ffa495c NGINX_0_7_39

nginx 0.7.39 *) Bugfix: large response with SSI might hang, if gzipping was enabled; the bug had appeared in 0.7.28. Thanks to Artem Bokhan. *) Bugfix: a segmentation fault might occur in worker process, if short static variants are used in a "try_files" directive.
author Igor Sysoev <http://sysoev.ru>
date Mon, 02 Mar 2009 00:00:00 +0300
parents 76a79816b771
children 24b676623d4f
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;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
38 ngx_pool_t *pool;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
39 ngx_pool_t *temp_pool;
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
40 } ngx_http_geo_conf_ctx_t;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
41
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
42
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
43 typedef struct {
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
44 union {
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
45 ngx_radix_tree_t *tree;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
46 ngx_http_geo_high_ranges_t *high;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
47 } u;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
48
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
49 ngx_int_t index;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
50 } ngx_http_geo_ctx_t;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
51
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
52
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
53 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
54 ngx_http_geo_ctx_t *ctx);
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
55 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
56 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
57 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
58 ngx_str_t *value);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
59 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
60 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
61 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
62 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
63 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
64 ngx_str_t *value);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
65 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
66 ngx_http_geo_conf_ctx_t *ctx, ngx_str_t *value);
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
67
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
68
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
69 static ngx_command_t ngx_http_geo_commands[] = {
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
70
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
71 { ngx_string("geo"),
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
72 NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE12,
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
73 ngx_http_geo_block,
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
74 NGX_HTTP_MAIN_CONF_OFFSET,
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
75 0,
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
76 NULL },
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 ngx_null_command
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
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
81
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
82 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
83 NULL, /* preconfiguration */
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
84 NULL, /* postconfiguration */
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
85
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
86 NULL, /* create main configuration */
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
87 NULL, /* init main configuration */
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 NULL, /* create server configuration */
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
90 NULL, /* merge server configuration */
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
91
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
92 NULL, /* create location configuration */
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
93 NULL /* merge location configuration */
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
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
96
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
97 ngx_module_t ngx_http_geo_module = {
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
98 NGX_MODULE_V1,
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
99 &ngx_http_geo_module_ctx, /* module context */
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
100 ngx_http_geo_commands, /* module directives */
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
101 NGX_HTTP_MODULE, /* module type */
90
71c46860eb55 nginx 0.1.45
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
102 NULL, /* init master */
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
103 NULL, /* init module */
90
71c46860eb55 nginx 0.1.45
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
104 NULL, /* init process */
71c46860eb55 nginx 0.1.45
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
105 NULL, /* init thread */
71c46860eb55 nginx 0.1.45
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
106 NULL, /* exit thread */
71c46860eb55 nginx 0.1.45
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
107 NULL, /* exit process */
71c46860eb55 nginx 0.1.45
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
108 NULL, /* exit master */
71c46860eb55 nginx 0.1.45
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
109 NGX_MODULE_V1_PADDING
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
110 };
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
111
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
112
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
113 /* AF_INET only */
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
114
122
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
115 static ngx_int_t
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
116 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
117 uintptr_t data)
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
118 {
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
119 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
120
122
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
121 ngx_http_variable_value_t *vv;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
122
122
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
123 vv = (ngx_http_variable_value_t *)
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
124 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
125
122
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
126 *v = *vv;
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
127
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
128 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
129 "http geo: %v", v);
38
2879cd3a40cb nginx 0.1.19
Igor Sysoev <http://sysoev.ru>
parents: 36
diff changeset
130
122
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
131 return NGX_OK;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
132 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
133
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
134
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
135 static ngx_int_t
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
136 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
137 uintptr_t data)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
138 {
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
139 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
140
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
141 in_addr_t addr;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
142 ngx_uint_t i, n;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
143 ngx_http_geo_range_t *range;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
144
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
145 *v = *ctx->u.high->default_value;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
146
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
147 addr = ngx_http_geo_addr(r, ctx);
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
148
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
149 range = ctx->u.high->low[addr >> 16].ranges;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
150
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
151 n = addr & 0xffff;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
152
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
153 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
154 if (n >= (ngx_uint_t) range[i].start
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
155 && n <= (ngx_uint_t) range[i].end)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
156 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
157 *v = *range[i].value;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
158 }
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
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
161 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
162 "http geo: %v", v);
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
163
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
164 return NGX_OK;
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
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
167
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
168 static in_addr_t
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
169 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
170 {
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
171 struct sockaddr_in *sin;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
172 ngx_http_variable_value_t *v;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
173
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
174 if (ctx->index == -1) {
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
175 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
176 "http geo started: %V", &r->connection->addr_text);
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
177
448
76a79816b771 nginx 0.7.36
Igor Sysoev <http://sysoev.ru>
parents: 440
diff changeset
178 if (r->connection->sockaddr->sa_family != AF_INET) {
76a79816b771 nginx 0.7.36
Igor Sysoev <http://sysoev.ru>
parents: 440
diff changeset
179 return 0;
76a79816b771 nginx 0.7.36
Igor Sysoev <http://sysoev.ru>
parents: 440
diff changeset
180 }
76a79816b771 nginx 0.7.36
Igor Sysoev <http://sysoev.ru>
parents: 440
diff changeset
181
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
182 sin = (struct sockaddr_in *) r->connection->sockaddr;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
183 return ntohl(sin->sin_addr.s_addr);
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
184 }
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
185
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
186 v = ngx_http_get_flushed_variable(r, ctx->index);
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
187
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
188 if (v == NULL || v->not_found) {
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
189 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
190 "http geo not found");
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
191
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
192 return 0;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
193 }
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
194
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
195 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
196 "http geo started: %v", v);
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
197
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
198 return ntohl(ngx_inet_addr(v->data, v->len));
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
199 }
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
200
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
201
38
2879cd3a40cb nginx 0.1.19
Igor Sysoev <http://sysoev.ru>
parents: 36
diff changeset
202 static char *
2879cd3a40cb nginx 0.1.19
Igor Sysoev <http://sysoev.ru>
parents: 36
diff changeset
203 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
204 {
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
205 char *rv;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
206 size_t len;
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
207 ngx_str_t *value, name;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
208 ngx_uint_t i;
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
209 ngx_conf_t save;
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
210 ngx_pool_t *pool;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
211 ngx_array_t *a;
328
390b8f8309d6 nginx 0.6.8
Igor Sysoev <http://sysoev.ru>
parents: 326
diff changeset
212 ngx_http_variable_t *var;
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
213 ngx_http_geo_ctx_t *geo;
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
214 ngx_http_geo_conf_ctx_t ctx;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
215
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
216 value = cf->args->elts;
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
217
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
218 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
219 if (geo == NULL) {
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
220 return NGX_CONF_ERROR;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
221 }
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
222
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
223 name = value[1];
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
224 name.len--;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
225 name.data++;
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
226
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
227 if (cf->args->nelts == 3) {
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
228
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
229 geo->index = ngx_http_get_variable_index(cf, &name);
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
230 if (geo->index == NGX_ERROR) {
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
231 return NGX_CONF_ERROR;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
232 }
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
233
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
234 name = value[2];
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
235 name.len--;
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
236 name.data++;
430
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 } else {
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
239 geo->index = -1;
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
240 }
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
241
340
10cc350ed8a1 nginx 0.6.14
Igor Sysoev <http://sysoev.ru>
parents: 328
diff changeset
242 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
243 if (var == NULL) {
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
244 return NGX_CONF_ERROR;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
245 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
246
132
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
247 pool = ngx_create_pool(16384, cf->log);
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
248 if (pool == NULL) {
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
249 return NGX_CONF_ERROR;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
250 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
251
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
252 ctx.temp_pool = ngx_create_pool(16384, cf->log);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
253 if (ctx.temp_pool == NULL) {
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
254 return NGX_CONF_ERROR;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
255 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
256
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
257 ngx_rbtree_init(&ctx.rbtree, &ctx.sentinel,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
258 ngx_http_variable_value_rbtree_insert);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
259
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
260 ctx.high = NULL;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
261 ctx.tree = NULL;
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
262 ctx.pool = cf->pool;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
263
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
264 save = *cf;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
265 cf->pool = pool;
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
266 cf->ctx = &ctx;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
267 cf->handler = ngx_http_geo;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
268 cf->handler_conf = conf;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
269
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
270 rv = ngx_conf_parse(cf, NULL);
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
271
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
272 *cf = save;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
273
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
274 if (ctx.high) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
275
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
276 for (i = 0; i < 0x10000; i++) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
277 a = (ngx_array_t *) ctx.high->low[i].ranges;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
278
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
279 if (a == NULL || a->nelts == 0) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
280 continue;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
281 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
282
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
283 ctx.high->low[i].n = a->nelts;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
284
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
285 len = a->nelts * sizeof(ngx_http_geo_range_t);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
286
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
287 ctx.high->low[i].ranges = ngx_palloc(cf->pool, len);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
288 if (ctx.high->low[i].ranges == NULL ){
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
289 return NGX_CONF_ERROR;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
290 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
291
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
292 ngx_memcpy(ctx.high->low[i].ranges, a->elts, len);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
293 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
294
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
295 geo->u.high = ctx.high;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
296
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
297 var->get_handler = ngx_http_geo_range_variable;
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
298 var->data = (uintptr_t) geo;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
299
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
300 ngx_destroy_pool(ctx.temp_pool);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
301 ngx_destroy_pool(pool);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
302
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
303 if (ctx.high->default_value == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
304 ctx.high->default_value = &ngx_http_variable_null_value;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
305 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
306
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
307 } else {
424
9da1d9d94d18 nginx 0.7.24
Igor Sysoev <http://sysoev.ru>
parents: 422
diff changeset
308 if (ctx.tree == NULL) {
9da1d9d94d18 nginx 0.7.24
Igor Sysoev <http://sysoev.ru>
parents: 422
diff changeset
309 ctx.tree = ngx_radix_tree_create(cf->pool, -1);
9da1d9d94d18 nginx 0.7.24
Igor Sysoev <http://sysoev.ru>
parents: 422
diff changeset
310 if (ctx.tree == NULL) {
9da1d9d94d18 nginx 0.7.24
Igor Sysoev <http://sysoev.ru>
parents: 422
diff changeset
311 return NGX_CONF_ERROR;
9da1d9d94d18 nginx 0.7.24
Igor Sysoev <http://sysoev.ru>
parents: 422
diff changeset
312 }
9da1d9d94d18 nginx 0.7.24
Igor Sysoev <http://sysoev.ru>
parents: 422
diff changeset
313 }
9da1d9d94d18 nginx 0.7.24
Igor Sysoev <http://sysoev.ru>
parents: 422
diff changeset
314
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
315 geo->u.tree = ctx.tree;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
316
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
317 var->get_handler = ngx_http_geo_cidr_variable;
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
318 var->data = (uintptr_t) geo;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
319
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
320 ngx_destroy_pool(ctx.temp_pool);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
321 ngx_destroy_pool(pool);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
322
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
323 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
324 return rv;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
325 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
326
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
327 if (ngx_radix32tree_insert(ctx.tree, 0, 0,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
328 (uintptr_t) &ngx_http_variable_null_value)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
329 == NGX_ERROR)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
330 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
331 return NGX_CONF_ERROR;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
332 }
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
333 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
334
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
335 return rv;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
336 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
337
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
338
38
2879cd3a40cb nginx 0.1.19
Igor Sysoev <http://sysoev.ru>
parents: 36
diff changeset
339 static char *
2879cd3a40cb nginx 0.1.19
Igor Sysoev <http://sysoev.ru>
parents: 36
diff changeset
340 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
341 {
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
342 char *rv;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
343 ngx_str_t *value, file;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
344 ngx_http_geo_conf_ctx_t *ctx;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
345
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
346 ctx = cf->ctx;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
347
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
348 value = cf->args->elts;
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 if (cf->args->nelts == 1) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
351
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
352 if (ngx_strcmp(value[0].data, "ranges") == 0) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
353
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
354 if (ctx->tree) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
355 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
356 "the \"ranges\" directive must be "
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
357 "the first directive inside \"geo\" block");
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
358 goto failed;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
359 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
360
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
361 ctx->high = ngx_pcalloc(ctx->pool,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
362 sizeof(ngx_http_geo_high_ranges_t));
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
363 if (ctx->high == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
364 goto failed;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
365 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
366
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
367 rv = NGX_CONF_OK;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
368
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
369 goto done;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
370 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
371 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
372
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
373 if (cf->args->nelts != 2) {
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
374 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
375 "invalid number of the geo parameters");
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
376 goto failed;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
377 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
378
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
379 if (ngx_strcmp(value[0].data, "include") == 0) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
380
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
381 file.len = value[1].len++;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
382
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
383 file.data = ngx_pstrdup(ctx->temp_pool, &value[1]);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
384 if (file.data == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
385 goto failed;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
386 }
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
387
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
388 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
389 goto failed;
34
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
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
392 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
393
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
394 rv = ngx_conf_parse(cf, &file);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
395
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
396 goto done;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
397 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
398
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
399 if (ctx->high) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
400 rv = ngx_http_geo_range(cf, ctx, value);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
401
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
402 } else {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
403 rv = ngx_http_geo_cidr(cf, ctx, value);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
404 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
405
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
406 done:
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
407
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
408 ngx_reset_pool(cf->pool);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
409
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
410 return rv;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
411
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
412 failed:
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
413
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
414 ngx_reset_pool(cf->pool);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
415
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
416 return NGX_CONF_ERROR;
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
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
419
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
420 static char *
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
421 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
422 ngx_str_t *value)
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 u_char *p, *last;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
425 in_addr_t start, end;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
426 ngx_str_t *net;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
427 ngx_uint_t del;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
428 ngx_http_variable_value_t *old;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
429
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
430 if (ngx_strcmp(value[0].data, "default") == 0) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
431
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
432 old = ctx->high->default_value;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
433
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
434 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
435 if (ctx->high->default_value == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
436 return NGX_CONF_ERROR;
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
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
439 if (old) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
440 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
441 "duplicate range \"%V\", value: \"%v\", old value: \"%v\"",
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
442 &value[0], ctx->high->default_value, old);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
443 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
444
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
445 return NGX_CONF_OK;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
446 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
447
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
448 if (ngx_strcmp(value[0].data, "delete") == 0) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
449 net = &value[1];
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
450 del = 1;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
451
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
452 } else {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
453 net = &value[0];
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
454 del = 0;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
455 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
456
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
457 last = net->data + net->len;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
458
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
459 p = ngx_strlchr(net->data, last, '-');
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
460
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
461 if (p == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
462 goto invalid;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
463 }
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 start = ngx_inet_addr(net->data, p - net->data);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
466
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
467 if (start == INADDR_NONE) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
468 goto invalid;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
469 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
470
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
471 start = ntohl(start);
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 p++;
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 end = ngx_inet_addr(p, last - p);
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 if (end == INADDR_NONE) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
478 goto invalid;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
479 }
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 end = ntohl(end);
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 if (start > end) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
484 goto invalid;
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 if (del) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
488 if (ngx_http_geo_delete_range(cf, ctx, start, end)) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
489 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
490 "no address range \"%V\" to delete", net);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
491 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
492
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
493 return NGX_CONF_OK;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
494 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
495
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
496 ctx->value = ngx_http_geo_value(cf, ctx, &value[1]);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
497
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
498 if (ctx->value == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
499 return NGX_CONF_ERROR;
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
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
502 ctx->net = net;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
503
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
504 return ngx_http_geo_add_range(cf, ctx, start, end);
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 invalid:
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
507
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
508 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
509
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
510 return NGX_CONF_ERROR;
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
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 /* 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
515
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
516 static char *
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
517 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
518 in_addr_t start, in_addr_t end)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
519 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
520 in_addr_t n;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
521 ngx_uint_t h, i, s, e;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
522 ngx_array_t *a;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
523 ngx_http_geo_range_t *range;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
524
438
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
525 for (n = start; n <= end; n += 0x10000) {
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
526
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
527 h = n >> 16;
438
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
528
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
529 if (n == start) {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
530 s = n & 0xffff;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
531 } else {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
532 s = 0;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
533 }
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
534
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
535 if ((n | 0xffff) > end) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
536 e = end & 0xffff;
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 } else {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
539 e = 0xffff;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
540 }
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 a = (ngx_array_t *) ctx->high->low[h].ranges;
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 (a == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
545 a = ngx_array_create(ctx->temp_pool, 64,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
546 sizeof(ngx_http_geo_range_t));
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
547 if (a == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
548 return NGX_CONF_ERROR;
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
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
551 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
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 i = a->nelts;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
555 range = a->elts;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
556
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
557 while (i) {
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 i--;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
560
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
561 if (e < (ngx_uint_t) range[i].start) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
562 continue;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
563 }
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 (s > (ngx_uint_t) range[i].end) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
566
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
567 /* add after the range */
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 range = ngx_array_push(a);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
570 if (range == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
571 return NGX_CONF_ERROR;
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
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
574 range = a->elts;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
575
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
576 ngx_memcpy(&range[i + 2], &range[i + 1],
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
577 (a->nelts - 2 - i) * sizeof(ngx_http_geo_range_t));
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
578
438
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
579 range[i + 1].start = (u_short) s;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
580 range[i + 1].end = (u_short) e;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
581 range[i + 1].value = ctx->value;
422
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 goto next;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
584 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
585
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
586 if (s == (ngx_uint_t) range[i].start
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
587 && e == (ngx_uint_t) range[i].end)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
588 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
589 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
590 "duplicate range \"%V\", value: \"%v\", old value: \"%v\"",
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
591 ctx->net, ctx->value, range[i].value);
438
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
592
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
593 range[i].value = ctx->value;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
594
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
595 goto next;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
596 }
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
597
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
598 if (s > (ngx_uint_t) range[i].start
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
599 && e < (ngx_uint_t) range[i].end)
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
600 {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
601 /* split the range and insert the new one */
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
602
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
603 range = ngx_array_push(a);
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
604 if (range == NULL) {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
605 return NGX_CONF_ERROR;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
606 }
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
607
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
608 range = ngx_array_push(a);
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
609 if (range == NULL) {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
610 return NGX_CONF_ERROR;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
611 }
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
612
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
613 range = a->elts;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
614
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
615 ngx_memcpy(&range[i + 3], &range[i + 1],
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
616 (a->nelts - 3 - i) * sizeof(ngx_http_geo_range_t));
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
617
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
618 range[i + 2].start = (u_short) (e + 1);
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
619 range[i + 2].end = range[i].end;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
620 range[i + 2].value = range[i].value;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
621
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
622 range[i + 1].start = (u_short) s;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
623 range[i + 1].end = (u_short) e;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
624 range[i + 1].value = ctx->value;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
625
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
626 range[i].end = (u_short) (s - 1);
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
627
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
628 goto next;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
629 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
630
438
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
631 if (s == (ngx_uint_t) range[i].start
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
632 && e < (ngx_uint_t) range[i].end)
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
633 {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
634 /* shift the range start and insert the new range */
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
635
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
636 range = ngx_array_push(a);
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
637 if (range == NULL) {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
638 return NGX_CONF_ERROR;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
639 }
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
640
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
641 range = a->elts;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
642
440
6281966854a5 nginx 0.7.32
Igor Sysoev <http://sysoev.ru>
parents: 438
diff changeset
643 ngx_memcpy(&range[i + 1], &range[i],
6281966854a5 nginx 0.7.32
Igor Sysoev <http://sysoev.ru>
parents: 438
diff changeset
644 (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
645
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
646 range[i + 1].start = (u_short) (e + 1);
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
647
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
648 range[i].start = (u_short) s;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
649 range[i].end = (u_short) e;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
650 range[i].value = ctx->value;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
651
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
652 goto next;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
653 }
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
654
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
655 if (s > (ngx_uint_t) range[i].start
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
656 && e == (ngx_uint_t) range[i].end)
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
657 {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
658 /* shift the range end and insert the new range */
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 = ngx_array_push(a);
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
661 if (range == NULL) {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
662 return NGX_CONF_ERROR;
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 range = a->elts;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
666
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
667 ngx_memcpy(&range[i + 2], &range[i + 1],
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
668 (a->nelts - 2 - i) * sizeof(ngx_http_geo_range_t));
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[i + 1].start = (u_short) s;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
671 range[i + 1].end = (u_short) e;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
672 range[i + 1].value = ctx->value;
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 range[i].end = (u_short) (s - 1);
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
675
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
676 goto next;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
677 }
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 s = (ngx_uint_t) range[i].start;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
680 e = (ngx_uint_t) range[i].end;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
681
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
682 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
438
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
683 "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
684 ctx->net,
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
685 h >> 8, h & 0xff, s >> 8, s & 0xff,
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
686 h >> 8, h & 0xff, e >> 8, e & 0xff);
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
687
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
688 return NGX_CONF_ERROR;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
689 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
690
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
691 /* add the first range */
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
692
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
693 range = ngx_array_push(a);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
694 if (range == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
695 return NGX_CONF_ERROR;
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
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
698 range->start = (u_short) s;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
699 range->end = (u_short) e;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
700 range->value = ctx->value;
438
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
701
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
702 next:
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
703
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
704 continue;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
705 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
706
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
707 return NGX_CONF_OK;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
708 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
709
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
710
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
711 static ngx_uint_t
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
712 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
713 in_addr_t start, in_addr_t end)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
714 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
715 in_addr_t n;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
716 ngx_uint_t h, i, s, e, warn;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
717 ngx_array_t *a;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
718 ngx_http_geo_range_t *range;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
719
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
720 warn = 0;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
721
438
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
722 for (n = start; n <= end; n += 0x10000) {
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
723
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
724 h = n >> 16;
438
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
725
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
726 if (n == start) {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
727 s = n & 0xffff;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
728 } else {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
729 s = 0;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
730 }
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
731
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
732 if ((n | 0xffff) > end) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
733 e = end & 0xffff;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
734
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
735 } else {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
736 e = 0xffff;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
737 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
738
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
739 a = (ngx_array_t *) ctx->high->low[h].ranges;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
740
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
741 if (a == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
742 warn = 1;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
743 continue;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
744 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
745
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
746 range = a->elts;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
747 for (i = 0; i < a->nelts; i++) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
748
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
749 if (s == (ngx_uint_t) range[i].start
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
750 && e == (ngx_uint_t) range[i].end)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
751 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
752 ngx_memcpy(&range[i], &range[i + 1],
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
753 (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
754
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
755 a->nelts--;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
756
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
757 break;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
758 }
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 if (s != (ngx_uint_t) range[i].start
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
761 && e != (ngx_uint_t) range[i].end)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
762 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
763 continue;
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
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
766 warn = 1;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
767 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
768 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
769
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
770 return warn;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
771 }
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 static char *
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
775 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
776 ngx_str_t *value)
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 ngx_int_t rc, del;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
779 ngx_str_t *net;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
780 ngx_uint_t i;
454
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
781 ngx_cidr_t cidr;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
782 ngx_http_variable_value_t *val, *old;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
783
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
784 if (ctx->tree == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
785 ctx->tree = ngx_radix_tree_create(ctx->pool, -1);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
786 if (ctx->tree == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
787 return NGX_CONF_ERROR;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
788 }
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
789 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
790
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
791 if (ngx_strcmp(value[0].data, "default") == 0) {
454
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
792 cidr.u.in.addr = 0;
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
793 cidr.u.in.mask = 0;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
794 net = &value[0];
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
795
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
796 } else {
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
797 if (ngx_strcmp(value[0].data, "delete") == 0) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
798 net = &value[1];
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
799 del = 1;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
800
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
801 } else {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
802 net = &value[0];
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
803 del = 0;
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
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
806 if (ngx_strcmp(net->data, "255.255.255.255") == 0) {
454
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
807 cidr.u.in.addr = 0xffffffff;
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
808 cidr.u.in.mask = 0xffffffff;
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 324
diff changeset
809
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
810 } else {
454
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
811 rc = ngx_ptocidr(net, &cidr);
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
812
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
813 if (rc == NGX_ERROR) {
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
814 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
815 "invalid network \"%V\"", net);
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
816 return NGX_CONF_ERROR;
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
817 }
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
818
454
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
819 if (cidr.family != AF_INET) {
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
820 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
821 "\"geo\" supports IPv4 only");
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
822 return NGX_CONF_ERROR;
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
823 }
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
824
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
825 if (rc == NGX_DONE) {
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
826 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
827 "low address bits of %V are meaningless",
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
828 net);
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
829 }
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 426
diff changeset
830
454
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
831 cidr.u.in.addr = ntohl(cidr.u.in.addr);
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
832 cidr.u.in.mask = ntohl(cidr.u.in.mask);
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 324
diff changeset
833 }
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 324
diff changeset
834
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
835 if (del) {
454
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
836 if (ngx_radix32tree_delete(ctx->tree, cidr.u.in.addr,
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
837 cidr.u.in.mask)
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
838 != NGX_OK)
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 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
841 "no network \"%V\" to delete", net);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
842 }
426
e7dbea1ee115 nginx 0.7.25
Igor Sysoev <http://sysoev.ru>
parents: 424
diff changeset
843
e7dbea1ee115 nginx 0.7.25
Igor Sysoev <http://sysoev.ru>
parents: 424
diff changeset
844 return NGX_CONF_OK;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
845 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
846 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
847
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
848 val = ngx_http_geo_value(cf, ctx, &value[1]);
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
849
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
850 if (val == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
851 return NGX_CONF_ERROR;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
852 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
853
102
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
854 for (i = 2; i; i--) {
454
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
855 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
856 (uintptr_t) val);
102
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
857 if (rc == NGX_OK) {
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
858 return NGX_CONF_OK;
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
859 }
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
860
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
861 if (rc == NGX_ERROR) {
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
862 return NGX_CONF_ERROR;
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
863 }
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
864
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
865 /* rc == NGX_BUSY */
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
866
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
867 old = (ngx_http_variable_value_t *)
454
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
868 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
869
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
870 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
871 "duplicate network \"%V\", value: \"%v\", old value: \"%v\"",
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
872 net, val, old);
102
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
873
454
a8424ffa495c nginx 0.7.39
Igor Sysoev <http://sysoev.ru>
parents: 448
diff changeset
874 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
875
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
876 if (rc == NGX_ERROR) {
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
877 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
878 return NGX_CONF_ERROR;
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
879 }
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
880 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
881
102
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
882 return NGX_CONF_ERROR;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
883 }
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
884
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
885
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
886 static ngx_http_variable_value_t *
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
887 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
888 ngx_str_t *value)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
889 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
890 uint32_t hash;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
891 ngx_http_variable_value_t *val;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
892 ngx_http_variable_value_node_t *vvn;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
893
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
894 hash = ngx_crc32_long(value->data, value->len);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
895
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
896 val = ngx_http_variable_value_lookup(&ctx->rbtree, value, hash);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
897
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
898 if (val) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
899 return val;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
900 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
901
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
902 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
903 if (val == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
904 return NULL;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
905 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
906
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
907 val->len = value->len;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
908 val->data = ngx_pstrdup(ctx->pool, value);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
909 if (val->data == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
910 return NULL;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
911 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
912
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
913 val->valid = 1;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
914 val->no_cacheable = 0;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
915 val->not_found = 0;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
916
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
917 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
918 if (vvn == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
919 return NULL;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
920 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
921
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
922 vvn->node.key = hash;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
923 vvn->len = val->len;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
924 vvn->value = val;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
925
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
926 ngx_rbtree_insert(&ctx->rbtree, &vvn->node);
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 return val;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
929 }