annotate src/http/modules/ngx_http_geo_module.c @ 422:88d3e895bdf9 NGINX_0_7_23

nginx 0.7.23 *) Feature: the "delete" and "ranges" parameters in the "geo" directive. *) Feature: speeding up loading of geo base with large number of values. *) Feature: decrease of memory required for geo base load.
author Igor Sysoev <http://sysoev.ru>
date Thu, 27 Nov 2008 00:00:00 +0300
parents 10cc350ed8a1
children 9da1d9d94d18
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 {
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
13 u_short start;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
14 u_short end;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
15 ngx_http_variable_value_t *value;
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 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
20 ngx_http_geo_range_t *ranges;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
21 ngx_uint_t n;
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 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
26 ngx_http_geo_low_ranges_t low[0x10000];
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
27 ngx_http_variable_value_t *default_value;
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 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
32 ngx_http_variable_value_t *value;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
33 ngx_str_t *net;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
34 ngx_http_geo_high_ranges_t *high;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
35 ngx_radix_tree_t *tree;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
36 ngx_rbtree_t rbtree;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
37 ngx_rbtree_node_t sentinel;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
38 ngx_pool_t *pool;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
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
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
43 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
44 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
45 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
46 ngx_str_t *value);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
47 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
48 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
49 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
50 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
51 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
52 ngx_str_t *value);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
53 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
54 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
55
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
56
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
57 static ngx_command_t ngx_http_geo_commands[] = {
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
58
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
59 { ngx_string("geo"),
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
60 NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE1,
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
61 ngx_http_geo_block,
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
62 NGX_HTTP_MAIN_CONF_OFFSET,
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
63 0,
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
64 NULL },
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
65
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
66 ngx_null_command
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
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
70 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
71 NULL, /* preconfiguration */
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
72 NULL, /* postconfiguration */
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
73
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
74 NULL, /* create main configuration */
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
75 NULL, /* init main configuration */
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
76
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
77 NULL, /* create server configuration */
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
78 NULL, /* merge server configuration */
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 NULL, /* create location configuration */
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
81 NULL /* merge location configuration */
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
82 };
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
83
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
84
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
85 ngx_module_t ngx_http_geo_module = {
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
86 NGX_MODULE_V1,
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
87 &ngx_http_geo_module_ctx, /* module context */
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
88 ngx_http_geo_commands, /* module directives */
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
89 NGX_HTTP_MODULE, /* module type */
90
71c46860eb55 nginx 0.1.45
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
90 NULL, /* init master */
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
91 NULL, /* init module */
90
71c46860eb55 nginx 0.1.45
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
92 NULL, /* init process */
71c46860eb55 nginx 0.1.45
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
93 NULL, /* init thread */
71c46860eb55 nginx 0.1.45
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
94 NULL, /* exit thread */
71c46860eb55 nginx 0.1.45
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
95 NULL, /* exit process */
71c46860eb55 nginx 0.1.45
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
96 NULL, /* exit master */
71c46860eb55 nginx 0.1.45
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
97 NGX_MODULE_V1_PADDING
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
98 };
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
99
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
100
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
101 /* AF_INET only */
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
102
122
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
103 static ngx_int_t
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
104 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
105 uintptr_t data)
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
106 {
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
107 ngx_radix_tree_t *tree = (ngx_radix_tree_t *) data;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
108
38
2879cd3a40cb nginx 0.1.19
Igor Sysoev <http://sysoev.ru>
parents: 36
diff changeset
109 struct sockaddr_in *sin;
122
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
110 ngx_http_variable_value_t *vv;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
111
38
2879cd3a40cb nginx 0.1.19
Igor Sysoev <http://sysoev.ru>
parents: 36
diff changeset
112 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
2879cd3a40cb nginx 0.1.19
Igor Sysoev <http://sysoev.ru>
parents: 36
diff changeset
113 "http geo started");
2879cd3a40cb nginx 0.1.19
Igor Sysoev <http://sysoev.ru>
parents: 36
diff changeset
114
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
115 sin = (struct sockaddr_in *) r->connection->sockaddr;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
116
122
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
117 vv = (ngx_http_variable_value_t *)
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
118 ngx_radix32tree_find(tree, ntohl(sin->sin_addr.s_addr));
38
2879cd3a40cb nginx 0.1.19
Igor Sysoev <http://sysoev.ru>
parents: 36
diff changeset
119
122
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
120 *v = *vv;
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
121
38
2879cd3a40cb nginx 0.1.19
Igor Sysoev <http://sysoev.ru>
parents: 36
diff changeset
122 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
328
390b8f8309d6 nginx 0.6.8
Igor Sysoev <http://sysoev.ru>
parents: 326
diff changeset
123 "http geo: %V %v", &r->connection->addr_text, v);
38
2879cd3a40cb nginx 0.1.19
Igor Sysoev <http://sysoev.ru>
parents: 36
diff changeset
124
122
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
125 return NGX_OK;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
126 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
127
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
128
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
129 static ngx_int_t
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
130 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
131 uintptr_t data)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
132 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
133 ngx_http_geo_high_ranges_t *high = (ngx_http_geo_high_ranges_t *) data;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
134
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
135 in_addr_t addr;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
136 ngx_uint_t i, n;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
137 struct sockaddr_in *sin;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
138 ngx_http_geo_range_t *range;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
139
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
140 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
141 "http geo started");
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
142
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
143 sin = (struct sockaddr_in *) r->connection->sockaddr;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
144
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
145 *v = *high->default_value;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
146
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
147 addr = ntohl(sin->sin_addr.s_addr);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
148
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
149 range = high->low[addr >> 16].ranges;
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
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
153 for (i = 0; i < high->low[addr >> 16].n; i++) {
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
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
161 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
162 "http geo: %V %v", &r->connection->addr_text, v);
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
38
2879cd3a40cb nginx 0.1.19
Igor Sysoev <http://sysoev.ru>
parents: 36
diff changeset
168 static char *
2879cd3a40cb nginx 0.1.19
Igor Sysoev <http://sysoev.ru>
parents: 36
diff changeset
169 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
170 {
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
171 char *rv;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
172 size_t len;
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
173 ngx_str_t *value, name;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
174 ngx_uint_t i;
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
175 ngx_conf_t save;
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
176 ngx_pool_t *pool;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
177 ngx_array_t *a;
328
390b8f8309d6 nginx 0.6.8
Igor Sysoev <http://sysoev.ru>
parents: 326
diff changeset
178 ngx_http_variable_t *var;
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
179 ngx_http_geo_conf_ctx_t ctx;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
180
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
181 value = cf->args->elts;
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
182
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
183 name = value[1];
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
184
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
185 if (name.data[0] != '$') {
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
186 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
187 "\"%V\" variable name should start with '$'",
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
188 &value[1]);
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
189 } else {
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
190 name.len--;
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
191 name.data++;
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
192 }
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
193
340
10cc350ed8a1 nginx 0.6.14
Igor Sysoev <http://sysoev.ru>
parents: 328
diff changeset
194 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
195 if (var == NULL) {
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
196 return NGX_CONF_ERROR;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
197 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
198
132
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
199 pool = ngx_create_pool(16384, cf->log);
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
200 if (pool == NULL) {
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
201 return NGX_CONF_ERROR;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
202 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
203
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
204 ctx.temp_pool = ngx_create_pool(16384, cf->log);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
205 if (ctx.temp_pool == NULL) {
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
206 return NGX_CONF_ERROR;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
207 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
208
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
209 ngx_rbtree_init(&ctx.rbtree, &ctx.sentinel,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
210 ngx_http_variable_value_rbtree_insert);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
211
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
212 ctx.high = NULL;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
213 ctx.tree = NULL;
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
214 ctx.pool = cf->pool;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
215
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
216 save = *cf;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
217 cf->pool = pool;
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
218 cf->ctx = &ctx;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
219 cf->handler = ngx_http_geo;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
220 cf->handler_conf = conf;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
221
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
222 rv = ngx_conf_parse(cf, NULL);
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
223
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
224 *cf = save;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
225
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
226 if (ctx.high) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
227
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
228 for (i = 0; i < 0x10000; i++) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
229 a = (ngx_array_t *) ctx.high->low[i].ranges;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
230
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
231 if (a == NULL || a->nelts == 0) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
232 continue;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
233 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
234
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
235 ctx.high->low[i].n = a->nelts;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
236
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
237 len = a->nelts * sizeof(ngx_http_geo_range_t);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
238
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
239 ctx.high->low[i].ranges = ngx_palloc(cf->pool, len);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
240 if (ctx.high->low[i].ranges == NULL ){
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
241 return NGX_CONF_ERROR;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
242 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
243
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
244 ngx_memcpy(ctx.high->low[i].ranges, a->elts, len);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
245 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
246
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
247 var->get_handler = ngx_http_geo_range_variable;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
248 var->data = (uintptr_t) ctx.high;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
249
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
250 ngx_destroy_pool(ctx.temp_pool);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
251 ngx_destroy_pool(pool);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
252
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
253 if (ctx.high->default_value == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
254 ctx.high->default_value = &ngx_http_variable_null_value;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
255 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
256
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
257 } else {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
258 var->get_handler = ngx_http_geo_cidr_variable;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
259 var->data = (uintptr_t) ctx.tree;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
260
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
261 ngx_destroy_pool(ctx.temp_pool);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
262 ngx_destroy_pool(pool);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
263
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
264 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
265 return rv;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
266 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
267
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
268 if (ngx_radix32tree_insert(ctx.tree, 0, 0,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
269 (uintptr_t) &ngx_http_variable_null_value)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
270 == NGX_ERROR)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
271 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
272 return NGX_CONF_ERROR;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
273 }
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
274 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
275
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
276 return rv;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
277 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
278
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
279
38
2879cd3a40cb nginx 0.1.19
Igor Sysoev <http://sysoev.ru>
parents: 36
diff changeset
280 static char *
2879cd3a40cb nginx 0.1.19
Igor Sysoev <http://sysoev.ru>
parents: 36
diff changeset
281 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
282 {
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
283 char *rv;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
284 ngx_str_t *value, file;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
285 ngx_http_geo_conf_ctx_t *ctx;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
286
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
287 ctx = cf->ctx;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
288
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
289 value = cf->args->elts;
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 if (cf->args->nelts == 1) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
292
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
293 if (ngx_strcmp(value[0].data, "ranges") == 0) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
294
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
295 if (ctx->tree) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
296 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
297 "the \"ranges\" directive must be "
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
298 "the first directive inside \"geo\" block");
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
299 goto failed;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
300 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
301
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
302 ctx->high = ngx_pcalloc(ctx->pool,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
303 sizeof(ngx_http_geo_high_ranges_t));
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
304 if (ctx->high == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
305 goto failed;
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
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
308 rv = NGX_CONF_OK;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
309
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
310 goto done;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
311 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
312 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
313
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
314 if (cf->args->nelts != 2) {
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
315 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
316 "invalid number of the geo parameters");
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
317 goto failed;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
318 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
319
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
320 if (ngx_strcmp(value[0].data, "include") == 0) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
321
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
322 file.len = value[1].len++;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
323
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
324 file.data = ngx_pstrdup(ctx->temp_pool, &value[1]);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
325 if (file.data == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
326 goto failed;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
327 }
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
328
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
329 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
330 goto failed;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
331 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
332
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
333 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
334
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
335 rv = ngx_conf_parse(cf, &file);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
336
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
337 goto done;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
338 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
339
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
340 if (ctx->high) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
341 rv = ngx_http_geo_range(cf, ctx, value);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
342
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
343 } else {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
344 rv = ngx_http_geo_cidr(cf, ctx, value);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
345 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
346
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
347 done:
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
348
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
349 ngx_reset_pool(cf->pool);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
350
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
351 return rv;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
352
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
353 failed:
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
354
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
355 ngx_reset_pool(cf->pool);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
356
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
357 return NGX_CONF_ERROR;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
358 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
359
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 static char *
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
362 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
363 ngx_str_t *value)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
364 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
365 u_char *p, *last;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
366 in_addr_t start, end;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
367 ngx_str_t *net;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
368 ngx_uint_t del;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
369 ngx_http_variable_value_t *old;
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 if (ngx_strcmp(value[0].data, "default") == 0) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
372
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
373 old = ctx->high->default_value;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
374
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
375 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
376 if (ctx->high->default_value == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
377 return NGX_CONF_ERROR;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
378 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
379
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
380 if (old) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
381 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
382 "duplicate range \"%V\", value: \"%v\", old value: \"%v\"",
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
383 &value[0], ctx->high->default_value, old);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
384 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
385
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
386 return NGX_CONF_OK;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
387 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
388
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
389 if (ngx_strcmp(value[0].data, "delete") == 0) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
390 net = &value[1];
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
391 del = 1;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
392
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
393 } else {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
394 net = &value[0];
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
395 del = 0;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
396 }
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 last = net->data + net->len;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
399
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
400 p = ngx_strlchr(net->data, last, '-');
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 if (p == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
403 goto invalid;
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 start = ngx_inet_addr(net->data, p - net->data);
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 if (start == INADDR_NONE) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
409 goto invalid;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
410 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
411
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
412 start = ntohl(start);
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 p++;
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 end = ngx_inet_addr(p, last - p);
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 if (end == INADDR_NONE) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
419 goto invalid;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
420 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
421
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
422 end = ntohl(end);
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 if (start > end) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
425 goto invalid;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
426 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
427
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
428 if (del) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
429 if (ngx_http_geo_delete_range(cf, ctx, start, end)) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
430 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
431 "no address range \"%V\" to delete", net);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
432 }
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 return NGX_CONF_OK;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
435 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
436
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
437 ctx->value = ngx_http_geo_value(cf, ctx, &value[1]);
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 (ctx->value == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
440 return NGX_CONF_ERROR;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
441 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
442
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
443 ctx->net = net;
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_http_geo_add_range(cf, ctx, start, end);
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 invalid:
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
448
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
449 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
450
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
451 return NGX_CONF_ERROR;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
452 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
453
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
454
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
455 /* 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
456
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
457 static char *
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
458 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
459 in_addr_t start, in_addr_t end)
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 in_addr_t n;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
462 ngx_uint_t h, i, s, e;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
463 ngx_array_t *a;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
464 ngx_http_geo_range_t *range;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
465
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
466 for (n = start; n < end; n += 0x10000) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
467
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
468 h = n >> 16;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
469 s = n & 0xffff;
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 if ((n | 0xffff) > end) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
472 e = end & 0xffff;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
473
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
474 } else {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
475 e = 0xffff;
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
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
478 a = (ngx_array_t *) ctx->high->low[h].ranges;
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 if (a == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
481 a = ngx_array_create(ctx->temp_pool, 64,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
482 sizeof(ngx_http_geo_range_t));
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
483 if (a == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
484 return NGX_CONF_ERROR;
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 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
488 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
489
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
490 i = a->nelts;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
491 range = a->elts;
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 while (i) {
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 i--;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
496
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
497 if (e < (ngx_uint_t) range[i].start) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
498 continue;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
499 }
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 if (s > (ngx_uint_t) range[i].end) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
502
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
503 /* add after the range */
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
504
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
505 range = ngx_array_push(a);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
506 if (range == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
507 return NGX_CONF_ERROR;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
508 }
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 range = a->elts;
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 ngx_memcpy(&range[i + 2], &range[i + 1],
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
513 (a->nelts - 2 - i) * sizeof(ngx_http_geo_range_t));
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
514
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
515 range = &range[i + 1];
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
516
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
517 goto next;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
518 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
519
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
520 if (s == (ngx_uint_t) range[i].start
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
521 && e == (ngx_uint_t) range[i].end)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
522 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
523 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
524 "duplicate range \"%V\", value: \"%v\", old value: \"%v\"",
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
525 ctx->net, ctx->value, range[i].value);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
526 continue;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
527 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
528
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
529 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
530 "overlapped range \"%V\"", ctx->net);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
531
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
532 return NGX_CONF_ERROR;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
533 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
534
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
535 /* add the first range */
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
536
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
537 range = ngx_array_push(a);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
538 if (range == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
539 return NGX_CONF_ERROR;
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 next:
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 range->start = (u_short) s;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
545 range->end = (u_short) e;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
546 range->value = ctx->value;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
547 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
548
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
549 return NGX_CONF_OK;
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
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 static ngx_uint_t
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
554 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
555 in_addr_t start, in_addr_t end)
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 in_addr_t n;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
558 ngx_uint_t h, i, s, e, warn;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
559 ngx_array_t *a;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
560 ngx_http_geo_range_t *range;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
561
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
562 warn = 0;
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 for (n = start; n < end; n += 0x10000) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
565
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
566 h = n >> 16;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
567 s = n & 0xffff;
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 if ((n | 0xffff) > end) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
570 e = end & 0xffff;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
571
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
572 } else {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
573 e = 0xffff;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
574 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
575
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
576 a = (ngx_array_t *) ctx->high->low[h].ranges;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
577
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
578 if (a == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
579 warn = 1;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
580 continue;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
581 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
582
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
583 range = a->elts;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
584 for (i = 0; i < a->nelts; i++) {
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_memcpy(&range[i], &range[i + 1],
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
590 (a->nelts - 1 - i) * sizeof(ngx_http_geo_range_t));
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
591 break;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
592 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
593
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
594 if (s != (ngx_uint_t) range[i].start
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
595 && e != (ngx_uint_t) range[i].end)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
596 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
597 continue;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
598 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
599
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
600 warn = 1;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
601 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
602 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
603
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
604 return warn;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
605 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
606
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
607
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
608 static char *
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
609 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
610 ngx_str_t *value)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
611 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
612 ngx_int_t rc, del;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
613 ngx_str_t *net;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
614 ngx_uint_t i;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
615 ngx_inet_cidr_t cidrin;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
616 ngx_http_variable_value_t *val, *old;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
617
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
618 if (ctx->tree == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
619 ctx->tree = ngx_radix_tree_create(ctx->pool, -1);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
620 if (ctx->tree == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
621 return NGX_CONF_ERROR;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
622 }
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
623 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
624
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
625 if (ngx_strcmp(value[0].data, "default") == 0) {
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
626 cidrin.addr = 0;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
627 cidrin.mask = 0;
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
628 net = &value[0];
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
629
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
630 } else {
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
631 if (ngx_strcmp(value[0].data, "delete") == 0) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
632 net = &value[1];
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
633 del = 1;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
634
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
635 } else {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
636 net = &value[0];
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
637 del = 0;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
638 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
639
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
640 rc = ngx_ptocidr(net, &cidrin);
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 324
diff changeset
641
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 324
diff changeset
642 if (rc == NGX_ERROR) {
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
643 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
644 "invalid network \"%V\"", net);
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
645 return NGX_CONF_ERROR;
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
646 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
647
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 324
diff changeset
648 if (rc == NGX_DONE) {
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 324
diff changeset
649 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
650 "low address bits of %V are meaningless", net);
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 324
diff changeset
651 }
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 324
diff changeset
652
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
653 cidrin.addr = ntohl(cidrin.addr);
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
654 cidrin.mask = ntohl(cidrin.mask);
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
655
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
656 if (del) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
657 if (ngx_radix32tree_delete(ctx->tree, cidrin.addr, cidrin.mask)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
658 != NGX_OK)
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
659 {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
660 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
661 "no network \"%V\" to delete", net);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
662 return NGX_CONF_OK;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
663 }
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
664 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
665 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
666
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
667 val = ngx_http_geo_value(cf, ctx, &value[1]);
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
668
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
669 if (val == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
670 return NGX_CONF_ERROR;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
671 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
672
102
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
673 for (i = 2; i; i--) {
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
674 rc = ngx_radix32tree_insert(ctx->tree, cidrin.addr, cidrin.mask,
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
675 (uintptr_t) val);
102
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
676 if (rc == NGX_OK) {
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
677 return NGX_CONF_OK;
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
678 }
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
679
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
680 if (rc == NGX_ERROR) {
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
681 return NGX_CONF_ERROR;
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
682 }
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
683
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
684 /* rc == NGX_BUSY */
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
685
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
686 old = (ngx_http_variable_value_t *)
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
687 ngx_radix32tree_find(ctx->tree, cidrin.addr & cidrin.mask);
102
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
688
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
689 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
690 "duplicate network \"%V\", value: \"%v\", old value: \"%v\"",
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
691 net, val, old);
102
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
692
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
693 rc = ngx_radix32tree_delete(ctx->tree, cidrin.addr, cidrin.mask);
102
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
694
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
695 if (rc == NGX_ERROR) {
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
696 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
697 return NGX_CONF_ERROR;
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
698 }
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
699 }
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
700
102
f63280c59dd5 nginx 0.2.5
Igor Sysoev <http://sysoev.ru>
parents: 96
diff changeset
701 return NGX_CONF_ERROR;
34
aab2ea7c0458 nginx 0.1.17
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
702 }
422
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
703
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
704
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
705 static ngx_http_variable_value_t *
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
706 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
707 ngx_str_t *value)
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 uint32_t hash;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
710 ngx_http_variable_value_t *val;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
711 ngx_http_variable_value_node_t *vvn;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
712
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
713 hash = ngx_crc32_long(value->data, value->len);
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 val = ngx_http_variable_value_lookup(&ctx->rbtree, value, hash);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
716
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
717 if (val) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
718 return val;
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
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
721 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
722 if (val == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
723 return NULL;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
724 }
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
725
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
726 val->len = value->len;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
727 val->data = ngx_pstrdup(ctx->pool, value);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
728 if (val->data == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
729 return NULL;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
730 }
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 val->valid = 1;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
733 val->no_cacheable = 0;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
734 val->not_found = 0;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
735
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
736 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
737 if (vvn == NULL) {
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
738 return NULL;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
739 }
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 vvn->node.key = hash;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
742 vvn->len = val->len;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
743 vvn->value = val;
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 ngx_rbtree_insert(&ctx->rbtree, &vvn->node);
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
746
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
747 return val;
88d3e895bdf9 nginx 0.7.23
Igor Sysoev <http://sysoev.ru>
parents: 340
diff changeset
748 }