Mercurial > hg > nginx
annotate src/core/ngx_resolver.c @ 5472:ab493c60d9ff
Resolver: fixes in PTR processing.
Verify that class of RR is "IN".
Verify that RR data length is non-zero.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Fri, 06 Dec 2013 14:30:27 +0400 |
parents | 9c96782d9d05 |
children | b43b02bb54db |
rev | line source |
---|---|
583 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4412 | 4 * Copyright (C) Nginx, Inc. |
583 | 5 */ |
6 | |
7 | |
8 #include <ngx_config.h> | |
9 #include <ngx_core.h> | |
10 #include <ngx_event.h> | |
11 | |
12 | |
1649 | 13 #define NGX_RESOLVER_UDP_SIZE 4096 |
14 | |
15 | |
583 | 16 typedef struct { |
1649 | 17 u_char ident_hi; |
18 u_char ident_lo; | |
19 u_char flags_hi; | |
20 u_char flags_lo; | |
21 u_char nqs_hi; | |
22 u_char nqs_lo; | |
23 u_char nan_hi; | |
24 u_char nan_lo; | |
25 u_char nns_hi; | |
26 u_char nns_lo; | |
27 u_char nar_hi; | |
28 u_char nar_lo; | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
29 } ngx_resolver_hdr_t; |
1649 | 30 |
31 | |
32 typedef struct { | |
33 u_char type_hi; | |
34 u_char type_lo; | |
35 u_char class_hi; | |
36 u_char class_lo; | |
37 } ngx_resolver_qs_t; | |
38 | |
39 | |
40 typedef struct { | |
41 u_char type_hi; | |
42 u_char type_lo; | |
43 u_char class_hi; | |
44 u_char class_lo; | |
45 u_char ttl[4]; | |
46 u_char len_hi; | |
47 u_char len_lo; | |
48 } ngx_resolver_an_t; | |
49 | |
50 | |
51 ngx_int_t ngx_udp_connect(ngx_udp_connection_t *uc); | |
52 | |
53 | |
1906 | 54 static void ngx_resolver_cleanup(void *data); |
55 static void ngx_resolver_cleanup_tree(ngx_resolver_t *r, ngx_rbtree_t *tree); | |
1649 | 56 static ngx_int_t ngx_resolve_name_locked(ngx_resolver_t *r, |
57 ngx_resolver_ctx_t *ctx); | |
58 static void ngx_resolver_expire(ngx_resolver_t *r, ngx_rbtree_t *tree, | |
59 ngx_queue_t *queue); | |
60 static ngx_int_t ngx_resolver_send_query(ngx_resolver_t *r, | |
61 ngx_resolver_node_t *rn); | |
62 static ngx_int_t ngx_resolver_create_name_query(ngx_resolver_node_t *rn, | |
63 ngx_resolver_ctx_t *ctx); | |
64 static ngx_int_t ngx_resolver_create_addr_query(ngx_resolver_node_t *rn, | |
65 ngx_resolver_ctx_t *ctx); | |
66 static void ngx_resolver_resend_handler(ngx_event_t *ev); | |
67 static time_t ngx_resolver_resend(ngx_resolver_t *r, ngx_rbtree_t *tree, | |
68 ngx_queue_t *queue); | |
69 static void ngx_resolver_read_response(ngx_event_t *rev); | |
70 static void ngx_resolver_process_response(ngx_resolver_t *r, u_char *buf, | |
71 size_t n); | |
72 static void ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t n, | |
1742
268b81386fe4
no answers in DNS response should be NXDOMAIN
Igor Sysoev <igor@sysoev.ru>
parents:
1741
diff
changeset
|
73 ngx_uint_t ident, ngx_uint_t code, ngx_uint_t nan, ngx_uint_t ans); |
1649 | 74 static void ngx_resolver_process_ptr(ngx_resolver_t *r, u_char *buf, size_t n, |
1742
268b81386fe4
no answers in DNS response should be NXDOMAIN
Igor Sysoev <igor@sysoev.ru>
parents:
1741
diff
changeset
|
75 ngx_uint_t ident, ngx_uint_t code, ngx_uint_t nan); |
1649 | 76 static ngx_resolver_node_t *ngx_resolver_lookup_name(ngx_resolver_t *r, |
77 ngx_str_t *name, uint32_t hash); | |
78 static ngx_resolver_node_t *ngx_resolver_lookup_addr(ngx_resolver_t *r, | |
79 in_addr_t addr); | |
80 static void ngx_resolver_rbtree_insert_value(ngx_rbtree_node_t *temp, | |
81 ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel); | |
82 static ngx_int_t ngx_resolver_copy(ngx_resolver_t *r, ngx_str_t *name, | |
83 u_char *buf, u_char *src, u_char *last); | |
84 static void ngx_resolver_timeout_handler(ngx_event_t *ev); | |
85 static void ngx_resolver_free_node(ngx_resolver_t *r, ngx_resolver_node_t *rn); | |
86 static void *ngx_resolver_alloc(ngx_resolver_t *r, size_t size); | |
1903 | 87 static void *ngx_resolver_calloc(ngx_resolver_t *r, size_t size); |
1649 | 88 static void ngx_resolver_free(ngx_resolver_t *r, void *p); |
89 static void ngx_resolver_free_locked(ngx_resolver_t *r, void *p); | |
90 static void *ngx_resolver_dup(ngx_resolver_t *r, void *src, size_t size); | |
4871
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
91 static in_addr_t *ngx_resolver_rotate(ngx_resolver_t *r, in_addr_t *src, |
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
92 ngx_uint_t n); |
3408
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
93 static u_char *ngx_resolver_log_error(ngx_log_t *log, u_char *buf, size_t len); |
1649 | 94 |
95 | |
96 ngx_resolver_t * | |
4225
016352c19049
Support of several servers in the "resolver" directive.
Igor Sysoev <igor@sysoev.ru>
parents:
3902
diff
changeset
|
97 ngx_resolver_create(ngx_conf_t *cf, ngx_str_t *names, ngx_uint_t n) |
1649 | 98 { |
4295
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
99 ngx_str_t s; |
4225
016352c19049
Support of several servers in the "resolver" directive.
Igor Sysoev <igor@sysoev.ru>
parents:
3902
diff
changeset
|
100 ngx_url_t u; |
4684
f5c2c9d656f9
When "resolver" is configured with a domain name, only the first
Ruslan Ermilov <ru@nginx.com>
parents:
4683
diff
changeset
|
101 ngx_uint_t i, j; |
1649 | 102 ngx_resolver_t *r; |
1906 | 103 ngx_pool_cleanup_t *cln; |
1649 | 104 ngx_udp_connection_t *uc; |
105 | |
1913
c0f873458e2b
use cf->cycle->new_log because at merge stage cf->pool->log is old log
Igor Sysoev <igor@sysoev.ru>
parents:
1906
diff
changeset
|
106 cln = ngx_pool_cleanup_add(cf->pool, 0); |
1906 | 107 if (cln == NULL) { |
108 return NULL; | |
109 } | |
110 | |
111 cln->handler = ngx_resolver_cleanup; | |
112 | |
1913
c0f873458e2b
use cf->cycle->new_log because at merge stage cf->pool->log is old log
Igor Sysoev <igor@sysoev.ru>
parents:
1906
diff
changeset
|
113 r = ngx_calloc(sizeof(ngx_resolver_t), cf->log); |
1649 | 114 if (r == NULL) { |
115 return NULL; | |
116 } | |
117 | |
1906 | 118 cln->data = r; |
119 | |
1913
c0f873458e2b
use cf->cycle->new_log because at merge stage cf->pool->log is old log
Igor Sysoev <igor@sysoev.ru>
parents:
1906
diff
changeset
|
120 r->event = ngx_calloc(sizeof(ngx_event_t), cf->log); |
1649 | 121 if (r->event == NULL) { |
122 return NULL; | |
123 } | |
124 | |
1687 | 125 ngx_rbtree_init(&r->name_rbtree, &r->name_sentinel, |
126 ngx_resolver_rbtree_insert_value); | |
127 | |
128 ngx_rbtree_init(&r->addr_rbtree, &r->addr_sentinel, | |
129 ngx_rbtree_insert_value); | |
1649 | 130 |
1685 | 131 ngx_queue_init(&r->name_resend_queue); |
132 ngx_queue_init(&r->addr_resend_queue); | |
133 | |
134 ngx_queue_init(&r->name_expire_queue); | |
135 ngx_queue_init(&r->addr_expire_queue); | |
1649 | 136 |
137 r->event->handler = ngx_resolver_resend_handler; | |
138 r->event->data = r; | |
2785
d478379e51ac
*) refactor error_log processing: listen socket log might inherit built-in
Igor Sysoev <igor@sysoev.ru>
parents:
2490
diff
changeset
|
139 r->event->log = &cf->cycle->new_log; |
1649 | 140 r->ident = -1; |
141 | |
142 r->resend_timeout = 5; | |
143 r->expire = 30; | |
4295
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
144 r->valid = 0; |
1649 | 145 |
2785
d478379e51ac
*) refactor error_log processing: listen socket log might inherit built-in
Igor Sysoev <igor@sysoev.ru>
parents:
2490
diff
changeset
|
146 r->log = &cf->cycle->new_log; |
3763
beca53d6ab3c
decrease resolver errors level to error
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
147 r->log_level = NGX_LOG_ERR; |
1649 | 148 |
4784
dd63abf20ba7
Resolver: fixed possible memory leak in ngx_resolver_create().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4684
diff
changeset
|
149 if (n) { |
dd63abf20ba7
Resolver: fixed possible memory leak in ngx_resolver_create().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4684
diff
changeset
|
150 if (ngx_array_init(&r->udp_connections, cf->pool, n, |
dd63abf20ba7
Resolver: fixed possible memory leak in ngx_resolver_create().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4684
diff
changeset
|
151 sizeof(ngx_udp_connection_t)) |
dd63abf20ba7
Resolver: fixed possible memory leak in ngx_resolver_create().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4684
diff
changeset
|
152 != NGX_OK) |
dd63abf20ba7
Resolver: fixed possible memory leak in ngx_resolver_create().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4684
diff
changeset
|
153 { |
dd63abf20ba7
Resolver: fixed possible memory leak in ngx_resolver_create().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4684
diff
changeset
|
154 return NULL; |
dd63abf20ba7
Resolver: fixed possible memory leak in ngx_resolver_create().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4684
diff
changeset
|
155 } |
dd63abf20ba7
Resolver: fixed possible memory leak in ngx_resolver_create().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4684
diff
changeset
|
156 } |
dd63abf20ba7
Resolver: fixed possible memory leak in ngx_resolver_create().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4684
diff
changeset
|
157 |
4225
016352c19049
Support of several servers in the "resolver" directive.
Igor Sysoev <igor@sysoev.ru>
parents:
3902
diff
changeset
|
158 for (i = 0; i < n; i++) { |
4295
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
159 if (ngx_strncmp(names[i].data, "valid=", 6) == 0) { |
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
160 s.len = names[i].len - 6; |
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
161 s.data = names[i].data + 6; |
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
162 |
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
163 r->valid = ngx_parse_time(&s, 1); |
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
164 |
4474 | 165 if (r->valid == (time_t) NGX_ERROR) { |
4295
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
166 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
167 "invalid parameter: %V", &names[i]); |
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
168 return NULL; |
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
169 } |
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
170 |
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
171 continue; |
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
172 } |
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
173 |
4225
016352c19049
Support of several servers in the "resolver" directive.
Igor Sysoev <igor@sysoev.ru>
parents:
3902
diff
changeset
|
174 ngx_memzero(&u, sizeof(ngx_url_t)); |
016352c19049
Support of several servers in the "resolver" directive.
Igor Sysoev <igor@sysoev.ru>
parents:
3902
diff
changeset
|
175 |
4671
af9342747669
Support for IPv6 literals and an optional port in resolver.
Ruslan Ermilov <ru@nginx.com>
parents:
4653
diff
changeset
|
176 u.url = names[i]; |
af9342747669
Support for IPv6 literals and an optional port in resolver.
Ruslan Ermilov <ru@nginx.com>
parents:
4653
diff
changeset
|
177 u.default_port = 53; |
af9342747669
Support for IPv6 literals and an optional port in resolver.
Ruslan Ermilov <ru@nginx.com>
parents:
4653
diff
changeset
|
178 |
af9342747669
Support for IPv6 literals and an optional port in resolver.
Ruslan Ermilov <ru@nginx.com>
parents:
4653
diff
changeset
|
179 if (ngx_parse_url(cf->pool, &u) != NGX_OK) { |
4643
bc5f881323b8
Fixed potential null pointer dereference in ngx_resolver_create().
Ruslan Ermilov <ru@nginx.com>
parents:
4619
diff
changeset
|
180 if (u.err) { |
bc5f881323b8
Fixed potential null pointer dereference in ngx_resolver_create().
Ruslan Ermilov <ru@nginx.com>
parents:
4619
diff
changeset
|
181 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
bc5f881323b8
Fixed potential null pointer dereference in ngx_resolver_create().
Ruslan Ermilov <ru@nginx.com>
parents:
4619
diff
changeset
|
182 "%s in resolver \"%V\"", |
4671
af9342747669
Support for IPv6 literals and an optional port in resolver.
Ruslan Ermilov <ru@nginx.com>
parents:
4653
diff
changeset
|
183 u.err, &u.url); |
4643
bc5f881323b8
Fixed potential null pointer dereference in ngx_resolver_create().
Ruslan Ermilov <ru@nginx.com>
parents:
4619
diff
changeset
|
184 } |
bc5f881323b8
Fixed potential null pointer dereference in ngx_resolver_create().
Ruslan Ermilov <ru@nginx.com>
parents:
4619
diff
changeset
|
185 |
4225
016352c19049
Support of several servers in the "resolver" directive.
Igor Sysoev <igor@sysoev.ru>
parents:
3902
diff
changeset
|
186 return NULL; |
016352c19049
Support of several servers in the "resolver" directive.
Igor Sysoev <igor@sysoev.ru>
parents:
3902
diff
changeset
|
187 } |
016352c19049
Support of several servers in the "resolver" directive.
Igor Sysoev <igor@sysoev.ru>
parents:
3902
diff
changeset
|
188 |
4684
f5c2c9d656f9
When "resolver" is configured with a domain name, only the first
Ruslan Ermilov <ru@nginx.com>
parents:
4683
diff
changeset
|
189 uc = ngx_array_push_n(&r->udp_connections, u.naddrs); |
1683
1e0b028055ec
allow to use IP addresses without defined resolver
Igor Sysoev <igor@sysoev.ru>
parents:
1679
diff
changeset
|
190 if (uc == NULL) { |
1e0b028055ec
allow to use IP addresses without defined resolver
Igor Sysoev <igor@sysoev.ru>
parents:
1679
diff
changeset
|
191 return NULL; |
1e0b028055ec
allow to use IP addresses without defined resolver
Igor Sysoev <igor@sysoev.ru>
parents:
1679
diff
changeset
|
192 } |
1e0b028055ec
allow to use IP addresses without defined resolver
Igor Sysoev <igor@sysoev.ru>
parents:
1679
diff
changeset
|
193 |
4684
f5c2c9d656f9
When "resolver" is configured with a domain name, only the first
Ruslan Ermilov <ru@nginx.com>
parents:
4683
diff
changeset
|
194 ngx_memzero(uc, u.naddrs * sizeof(ngx_udp_connection_t)); |
f5c2c9d656f9
When "resolver" is configured with a domain name, only the first
Ruslan Ermilov <ru@nginx.com>
parents:
4683
diff
changeset
|
195 |
f5c2c9d656f9
When "resolver" is configured with a domain name, only the first
Ruslan Ermilov <ru@nginx.com>
parents:
4683
diff
changeset
|
196 for (j = 0; j < u.naddrs; j++) { |
f5c2c9d656f9
When "resolver" is configured with a domain name, only the first
Ruslan Ermilov <ru@nginx.com>
parents:
4683
diff
changeset
|
197 uc[j].sockaddr = u.addrs[j].sockaddr; |
f5c2c9d656f9
When "resolver" is configured with a domain name, only the first
Ruslan Ermilov <ru@nginx.com>
parents:
4683
diff
changeset
|
198 uc[j].socklen = u.addrs[j].socklen; |
f5c2c9d656f9
When "resolver" is configured with a domain name, only the first
Ruslan Ermilov <ru@nginx.com>
parents:
4683
diff
changeset
|
199 uc[j].server = u.addrs[j].name; |
f5c2c9d656f9
When "resolver" is configured with a domain name, only the first
Ruslan Ermilov <ru@nginx.com>
parents:
4683
diff
changeset
|
200 } |
1683
1e0b028055ec
allow to use IP addresses without defined resolver
Igor Sysoev <igor@sysoev.ru>
parents:
1679
diff
changeset
|
201 } |
1649 | 202 |
203 return r; | |
204 } | |
205 | |
206 | |
1906 | 207 static void |
208 ngx_resolver_cleanup(void *data) | |
209 { | |
210 ngx_resolver_t *r = data; | |
211 | |
4225
016352c19049
Support of several servers in the "resolver" directive.
Igor Sysoev <igor@sysoev.ru>
parents:
3902
diff
changeset
|
212 ngx_uint_t i; |
016352c19049
Support of several servers in the "resolver" directive.
Igor Sysoev <igor@sysoev.ru>
parents:
3902
diff
changeset
|
213 ngx_udp_connection_t *uc; |
016352c19049
Support of several servers in the "resolver" directive.
Igor Sysoev <igor@sysoev.ru>
parents:
3902
diff
changeset
|
214 |
1906 | 215 if (r) { |
216 ngx_log_debug0(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0, | |
217 "cleanup resolver"); | |
218 | |
219 ngx_resolver_cleanup_tree(r, &r->name_rbtree); | |
220 | |
221 ngx_resolver_cleanup_tree(r, &r->addr_rbtree); | |
222 | |
223 if (r->event) { | |
224 ngx_free(r->event); | |
225 } | |
226 | |
4225
016352c19049
Support of several servers in the "resolver" directive.
Igor Sysoev <igor@sysoev.ru>
parents:
3902
diff
changeset
|
227 |
016352c19049
Support of several servers in the "resolver" directive.
Igor Sysoev <igor@sysoev.ru>
parents:
3902
diff
changeset
|
228 uc = r->udp_connections.elts; |
016352c19049
Support of several servers in the "resolver" directive.
Igor Sysoev <igor@sysoev.ru>
parents:
3902
diff
changeset
|
229 |
016352c19049
Support of several servers in the "resolver" directive.
Igor Sysoev <igor@sysoev.ru>
parents:
3902
diff
changeset
|
230 for (i = 0; i < r->udp_connections.nelts; i++) { |
016352c19049
Support of several servers in the "resolver" directive.
Igor Sysoev <igor@sysoev.ru>
parents:
3902
diff
changeset
|
231 if (uc[i].connection) { |
016352c19049
Support of several servers in the "resolver" directive.
Igor Sysoev <igor@sysoev.ru>
parents:
3902
diff
changeset
|
232 ngx_close_connection(uc[i].connection); |
1906 | 233 } |
234 } | |
235 | |
236 ngx_free(r); | |
237 } | |
238 } | |
239 | |
240 | |
241 static void | |
242 ngx_resolver_cleanup_tree(ngx_resolver_t *r, ngx_rbtree_t *tree) | |
243 { | |
244 ngx_resolver_ctx_t *ctx, *next; | |
245 ngx_resolver_node_t *rn; | |
246 | |
247 while (tree->root != tree->sentinel) { | |
248 | |
249 rn = (ngx_resolver_node_t *) ngx_rbtree_min(tree->root, tree->sentinel); | |
250 | |
251 ngx_queue_remove(&rn->queue); | |
252 | |
253 for (ctx = rn->waiting; ctx; ctx = next) { | |
2006
b52cb9bf2064
style fix: remove tabs and trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
1969
diff
changeset
|
254 next = ctx->next; |
1906 | 255 |
256 if (ctx->event) { | |
257 ngx_resolver_free(r, ctx->event); | |
258 } | |
259 | |
260 ngx_resolver_free(r, ctx); | |
261 } | |
262 | |
263 ngx_rbtree_delete(tree, &rn->node); | |
264 | |
265 ngx_resolver_free_node(r, rn); | |
266 } | |
267 } | |
268 | |
269 | |
1649 | 270 ngx_resolver_ctx_t * |
271 ngx_resolve_start(ngx_resolver_t *r, ngx_resolver_ctx_t *temp) | |
272 { | |
273 in_addr_t addr; | |
274 ngx_resolver_ctx_t *ctx; | |
275 | |
276 if (temp) { | |
277 addr = ngx_inet_addr(temp->name.data, temp->name.len); | |
278 | |
279 if (addr != INADDR_NONE) { | |
280 temp->resolver = r; | |
281 temp->state = NGX_OK; | |
282 temp->naddrs = 1; | |
283 temp->addrs = &temp->addr; | |
284 temp->addr = addr; | |
285 temp->quick = 1; | |
286 | |
287 return temp; | |
288 } | |
289 } | |
290 | |
4225
016352c19049
Support of several servers in the "resolver" directive.
Igor Sysoev <igor@sysoev.ru>
parents:
3902
diff
changeset
|
291 if (r->udp_connections.nelts == 0) { |
1683
1e0b028055ec
allow to use IP addresses without defined resolver
Igor Sysoev <igor@sysoev.ru>
parents:
1679
diff
changeset
|
292 return NGX_NO_RESOLVER; |
1e0b028055ec
allow to use IP addresses without defined resolver
Igor Sysoev <igor@sysoev.ru>
parents:
1679
diff
changeset
|
293 } |
1e0b028055ec
allow to use IP addresses without defined resolver
Igor Sysoev <igor@sysoev.ru>
parents:
1679
diff
changeset
|
294 |
1649 | 295 ctx = ngx_resolver_calloc(r, sizeof(ngx_resolver_ctx_t)); |
296 | |
297 if (ctx) { | |
298 ctx->resolver = r; | |
299 } | |
300 | |
301 return ctx; | |
302 } | |
303 | |
304 | |
305 ngx_int_t | |
306 ngx_resolve_name(ngx_resolver_ctx_t *ctx) | |
307 { | |
308 ngx_int_t rc; | |
309 ngx_resolver_t *r; | |
310 | |
311 r = ctx->resolver; | |
312 | |
313 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0, | |
314 "resolve: \"%V\"", &ctx->name); | |
315 | |
316 if (ctx->quick) { | |
317 ctx->handler(ctx); | |
318 return NGX_OK; | |
319 } | |
320 | |
321 /* lock name mutex */ | |
322 | |
323 rc = ngx_resolve_name_locked(r, ctx); | |
324 | |
325 if (rc == NGX_OK) { | |
326 return NGX_OK; | |
327 } | |
328 | |
329 /* unlock name mutex */ | |
330 | |
331 if (rc == NGX_AGAIN) { | |
332 return NGX_OK; | |
333 } | |
334 | |
1904
538f06aa8118
fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases
Igor Sysoev <igor@sysoev.ru>
parents:
1903
diff
changeset
|
335 /* NGX_ERROR */ |
1649 | 336 |
337 if (ctx->event) { | |
1904
538f06aa8118
fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases
Igor Sysoev <igor@sysoev.ru>
parents:
1903
diff
changeset
|
338 ngx_resolver_free(r, ctx->event); |
1649 | 339 } |
340 | |
1904
538f06aa8118
fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases
Igor Sysoev <igor@sysoev.ru>
parents:
1903
diff
changeset
|
341 ngx_resolver_free(r, ctx); |
1649 | 342 |
343 return NGX_ERROR; | |
344 } | |
345 | |
346 | |
347 void | |
348 ngx_resolve_name_done(ngx_resolver_ctx_t *ctx) | |
349 { | |
350 uint32_t hash; | |
351 ngx_resolver_t *r; | |
352 ngx_resolver_ctx_t *w, **p; | |
353 ngx_resolver_node_t *rn; | |
354 | |
355 r = ctx->resolver; | |
356 | |
357 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0, | |
358 "resolve name done: %i", ctx->state); | |
359 | |
360 if (ctx->quick) { | |
361 return; | |
362 } | |
363 | |
364 if (ctx->event && ctx->event->timer_set) { | |
365 ngx_del_timer(ctx->event); | |
366 } | |
367 | |
368 /* lock name mutex */ | |
369 | |
370 if (ctx->state == NGX_AGAIN || ctx->state == NGX_RESOLVE_TIMEDOUT) { | |
371 | |
372 hash = ngx_crc32_short(ctx->name.data, ctx->name.len); | |
373 | |
374 rn = ngx_resolver_lookup_name(r, &ctx->name, hash); | |
375 | |
376 if (rn) { | |
377 p = &rn->waiting; | |
378 w = rn->waiting; | |
379 | |
380 while (w) { | |
381 if (w == ctx) { | |
382 *p = w->next; | |
383 | |
384 goto done; | |
385 } | |
386 | |
387 p = &w->next; | |
388 w = w->next; | |
389 } | |
390 } | |
391 | |
392 ngx_log_error(NGX_LOG_ALERT, r->log, 0, | |
393 "could not cancel %V resolving", &ctx->name); | |
394 } | |
395 | |
396 done: | |
397 | |
398 ngx_resolver_expire(r, &r->name_rbtree, &r->name_expire_queue); | |
399 | |
400 /* unlock name mutex */ | |
401 | |
1904
538f06aa8118
fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases
Igor Sysoev <igor@sysoev.ru>
parents:
1903
diff
changeset
|
402 /* lock alloc mutex */ |
538f06aa8118
fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases
Igor Sysoev <igor@sysoev.ru>
parents:
1903
diff
changeset
|
403 |
538f06aa8118
fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases
Igor Sysoev <igor@sysoev.ru>
parents:
1903
diff
changeset
|
404 if (ctx->event) { |
538f06aa8118
fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases
Igor Sysoev <igor@sysoev.ru>
parents:
1903
diff
changeset
|
405 ngx_resolver_free_locked(r, ctx->event); |
538f06aa8118
fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases
Igor Sysoev <igor@sysoev.ru>
parents:
1903
diff
changeset
|
406 } |
538f06aa8118
fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases
Igor Sysoev <igor@sysoev.ru>
parents:
1903
diff
changeset
|
407 |
538f06aa8118
fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases
Igor Sysoev <igor@sysoev.ru>
parents:
1903
diff
changeset
|
408 ngx_resolver_free_locked(r, ctx); |
538f06aa8118
fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases
Igor Sysoev <igor@sysoev.ru>
parents:
1903
diff
changeset
|
409 |
538f06aa8118
fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases
Igor Sysoev <igor@sysoev.ru>
parents:
1903
diff
changeset
|
410 /* unlock alloc mutex */ |
1649 | 411 } |
412 | |
413 | |
414 /* NGX_RESOLVE_A only */ | |
415 | |
416 static ngx_int_t | |
417 ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx) | |
418 { | |
419 uint32_t hash; | |
420 in_addr_t addr, *addrs; | |
1961
99b9feacccb4
return NXDOMAIN for ".." in host name
Igor Sysoev <igor@sysoev.ru>
parents:
1960
diff
changeset
|
421 ngx_int_t rc; |
1649 | 422 ngx_uint_t naddrs; |
423 ngx_resolver_ctx_t *next; | |
424 ngx_resolver_node_t *rn; | |
425 | |
426 hash = ngx_crc32_short(ctx->name.data, ctx->name.len); | |
427 | |
428 rn = ngx_resolver_lookup_name(r, &ctx->name, hash); | |
429 | |
430 if (rn) { | |
431 | |
432 if (rn->valid >= ngx_time()) { | |
433 | |
434 ngx_log_debug0(NGX_LOG_DEBUG_CORE, r->log, 0, "resolve cached"); | |
435 | |
436 ngx_queue_remove(&rn->queue); | |
437 | |
438 rn->expire = ngx_time() + r->expire; | |
439 | |
440 ngx_queue_insert_head(&r->name_expire_queue, &rn->queue); | |
441 | |
442 naddrs = rn->naddrs; | |
443 | |
444 if (naddrs) { | |
445 | |
446 /* NGX_RESOLVE_A answer */ | |
447 | |
448 if (naddrs != 1) { | |
449 addr = 0; | |
4871
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
450 addrs = ngx_resolver_rotate(r, rn->u.addrs, naddrs); |
1649 | 451 if (addrs == NULL) { |
452 return NGX_ERROR; | |
453 } | |
454 | |
455 } else { | |
456 addr = rn->u.addr; | |
457 addrs = NULL; | |
458 } | |
459 | |
460 ctx->next = rn->waiting; | |
461 rn->waiting = NULL; | |
462 | |
463 /* unlock name mutex */ | |
464 | |
465 do { | |
466 ctx->state = NGX_OK; | |
467 ctx->naddrs = naddrs; | |
468 ctx->addrs = (naddrs == 1) ? &ctx->addr : addrs; | |
469 ctx->addr = addr; | |
470 next = ctx->next; | |
471 | |
472 ctx->handler(ctx); | |
473 | |
474 ctx = next; | |
475 } while (ctx); | |
476 | |
477 if (addrs) { | |
478 ngx_resolver_free(r, addrs); | |
479 } | |
480 | |
481 return NGX_OK; | |
482 } | |
483 | |
484 /* NGX_RESOLVE_CNAME */ | |
485 | |
1969 | 486 if (ctx->recursion++ < NGX_RESOLVER_MAX_RECURSION) { |
487 | |
488 ctx->name.len = rn->cnlen; | |
489 ctx->name.data = rn->u.cname; | |
490 | |
491 return ngx_resolve_name_locked(r, ctx); | |
492 } | |
493 | |
494 ctx->next = rn->waiting; | |
495 rn->waiting = NULL; | |
496 | |
497 /* unlock name mutex */ | |
498 | |
499 do { | |
500 ctx->state = NGX_RESOLVE_NXDOMAIN; | |
501 next = ctx->next; | |
502 | |
503 ctx->handler(ctx); | |
504 | |
505 ctx = next; | |
506 } while (ctx); | |
507 | |
508 return NGX_OK; | |
1649 | 509 } |
510 | |
511 if (rn->waiting) { | |
512 | |
513 ctx->next = rn->waiting; | |
514 rn->waiting = ctx; | |
3297 | 515 ctx->state = NGX_AGAIN; |
1649 | 516 |
517 return NGX_AGAIN; | |
518 } | |
519 | |
520 ngx_queue_remove(&rn->queue); | |
521 | |
522 /* lock alloc mutex */ | |
523 | |
4619
3171ec7d0d05
Resolver: protection from duplicate responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4610
diff
changeset
|
524 if (rn->query) { |
3171ec7d0d05
Resolver: protection from duplicate responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4610
diff
changeset
|
525 ngx_resolver_free_locked(r, rn->query); |
3171ec7d0d05
Resolver: protection from duplicate responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4610
diff
changeset
|
526 rn->query = NULL; |
3171ec7d0d05
Resolver: protection from duplicate responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4610
diff
changeset
|
527 } |
1649 | 528 |
529 if (rn->cnlen) { | |
530 ngx_resolver_free_locked(r, rn->u.cname); | |
531 } | |
532 | |
533 if (rn->naddrs > 1) { | |
534 ngx_resolver_free_locked(r, rn->u.addrs); | |
535 } | |
536 | |
537 /* unlock alloc mutex */ | |
538 | |
539 } else { | |
540 | |
541 rn = ngx_resolver_alloc(r, sizeof(ngx_resolver_node_t)); | |
542 if (rn == NULL) { | |
543 return NGX_ERROR; | |
544 } | |
545 | |
546 rn->name = ngx_resolver_dup(r, ctx->name.data, ctx->name.len); | |
547 if (rn->name == NULL) { | |
548 ngx_resolver_free(r, rn); | |
549 return NGX_ERROR; | |
550 } | |
551 | |
552 rn->node.key = hash; | |
553 rn->nlen = (u_short) ctx->name.len; | |
1960
1609b3c3d604
fix memory leak on resolver query send failure
Igor Sysoev <igor@sysoev.ru>
parents:
1914
diff
changeset
|
554 rn->query = NULL; |
1649 | 555 |
556 ngx_rbtree_insert(&r->name_rbtree, &rn->node); | |
557 } | |
558 | |
1961
99b9feacccb4
return NXDOMAIN for ".." in host name
Igor Sysoev <igor@sysoev.ru>
parents:
1960
diff
changeset
|
559 rc = ngx_resolver_create_name_query(rn, ctx); |
99b9feacccb4
return NXDOMAIN for ".." in host name
Igor Sysoev <igor@sysoev.ru>
parents:
1960
diff
changeset
|
560 |
99b9feacccb4
return NXDOMAIN for ".." in host name
Igor Sysoev <igor@sysoev.ru>
parents:
1960
diff
changeset
|
561 if (rc == NGX_ERROR) { |
1649 | 562 goto failed; |
563 } | |
564 | |
1961
99b9feacccb4
return NXDOMAIN for ".." in host name
Igor Sysoev <igor@sysoev.ru>
parents:
1960
diff
changeset
|
565 if (rc == NGX_DECLINED) { |
99b9feacccb4
return NXDOMAIN for ".." in host name
Igor Sysoev <igor@sysoev.ru>
parents:
1960
diff
changeset
|
566 ngx_rbtree_delete(&r->name_rbtree, &rn->node); |
99b9feacccb4
return NXDOMAIN for ".." in host name
Igor Sysoev <igor@sysoev.ru>
parents:
1960
diff
changeset
|
567 |
99b9feacccb4
return NXDOMAIN for ".." in host name
Igor Sysoev <igor@sysoev.ru>
parents:
1960
diff
changeset
|
568 ngx_resolver_free(r, rn->query); |
99b9feacccb4
return NXDOMAIN for ".." in host name
Igor Sysoev <igor@sysoev.ru>
parents:
1960
diff
changeset
|
569 ngx_resolver_free(r, rn->name); |
99b9feacccb4
return NXDOMAIN for ".." in host name
Igor Sysoev <igor@sysoev.ru>
parents:
1960
diff
changeset
|
570 ngx_resolver_free(r, rn); |
99b9feacccb4
return NXDOMAIN for ".." in host name
Igor Sysoev <igor@sysoev.ru>
parents:
1960
diff
changeset
|
571 |
99b9feacccb4
return NXDOMAIN for ".." in host name
Igor Sysoev <igor@sysoev.ru>
parents:
1960
diff
changeset
|
572 ctx->state = NGX_RESOLVE_NXDOMAIN; |
99b9feacccb4
return NXDOMAIN for ".." in host name
Igor Sysoev <igor@sysoev.ru>
parents:
1960
diff
changeset
|
573 ctx->handler(ctx); |
99b9feacccb4
return NXDOMAIN for ".." in host name
Igor Sysoev <igor@sysoev.ru>
parents:
1960
diff
changeset
|
574 |
99b9feacccb4
return NXDOMAIN for ".." in host name
Igor Sysoev <igor@sysoev.ru>
parents:
1960
diff
changeset
|
575 return NGX_OK; |
99b9feacccb4
return NXDOMAIN for ".." in host name
Igor Sysoev <igor@sysoev.ru>
parents:
1960
diff
changeset
|
576 } |
99b9feacccb4
return NXDOMAIN for ".." in host name
Igor Sysoev <igor@sysoev.ru>
parents:
1960
diff
changeset
|
577 |
1649 | 578 if (ngx_resolver_send_query(r, rn) != NGX_OK) { |
579 goto failed; | |
580 } | |
581 | |
582 if (ctx->event == NULL) { | |
583 ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t)); | |
584 if (ctx->event == NULL) { | |
585 goto failed; | |
586 } | |
587 | |
588 ctx->event->handler = ngx_resolver_timeout_handler; | |
589 ctx->event->data = ctx; | |
590 ctx->event->log = r->log; | |
591 ctx->ident = -1; | |
592 | |
593 ngx_add_timer(ctx->event, ctx->timeout); | |
594 } | |
595 | |
596 if (ngx_queue_empty(&r->name_resend_queue)) { | |
597 ngx_add_timer(r->event, (ngx_msec_t) (r->resend_timeout * 1000)); | |
598 } | |
599 | |
600 rn->expire = ngx_time() + r->resend_timeout; | |
601 | |
602 ngx_queue_insert_head(&r->name_resend_queue, &rn->queue); | |
603 | |
604 rn->cnlen = 0; | |
605 rn->naddrs = 0; | |
606 rn->valid = 0; | |
607 rn->waiting = ctx; | |
608 | |
609 ctx->state = NGX_AGAIN; | |
610 | |
611 return NGX_AGAIN; | |
612 | |
613 failed: | |
614 | |
615 ngx_rbtree_delete(&r->name_rbtree, &rn->node); | |
616 | |
1960
1609b3c3d604
fix memory leak on resolver query send failure
Igor Sysoev <igor@sysoev.ru>
parents:
1914
diff
changeset
|
617 if (rn->query) { |
1609b3c3d604
fix memory leak on resolver query send failure
Igor Sysoev <igor@sysoev.ru>
parents:
1914
diff
changeset
|
618 ngx_resolver_free(r, rn->query); |
1609b3c3d604
fix memory leak on resolver query send failure
Igor Sysoev <igor@sysoev.ru>
parents:
1914
diff
changeset
|
619 } |
1609b3c3d604
fix memory leak on resolver query send failure
Igor Sysoev <igor@sysoev.ru>
parents:
1914
diff
changeset
|
620 |
1649 | 621 ngx_resolver_free(r, rn->name); |
622 | |
623 ngx_resolver_free(r, rn); | |
624 | |
625 return NGX_ERROR; | |
626 } | |
583 | 627 |
628 | |
629 ngx_int_t | |
1649 | 630 ngx_resolve_addr(ngx_resolver_ctx_t *ctx) |
631 { | |
2484
cf3cd450049c
store name pointer in variable allocated on stack
Igor Sysoev <igor@sysoev.ru>
parents:
2483
diff
changeset
|
632 u_char *name; |
1649 | 633 ngx_resolver_t *r; |
634 ngx_resolver_node_t *rn; | |
635 | |
636 r = ctx->resolver; | |
637 | |
638 ctx->addr = ntohl(ctx->addr); | |
639 | |
640 /* lock addr mutex */ | |
641 | |
642 rn = ngx_resolver_lookup_addr(r, ctx->addr); | |
643 | |
644 if (rn) { | |
645 | |
646 if (rn->valid >= ngx_time()) { | |
647 | |
648 ngx_log_debug0(NGX_LOG_DEBUG_CORE, r->log, 0, "resolve cached"); | |
649 | |
650 ngx_queue_remove(&rn->queue); | |
651 | |
652 rn->expire = ngx_time() + r->expire; | |
653 | |
654 ngx_queue_insert_head(&r->addr_expire_queue, &rn->queue); | |
655 | |
2484
cf3cd450049c
store name pointer in variable allocated on stack
Igor Sysoev <igor@sysoev.ru>
parents:
2483
diff
changeset
|
656 name = ngx_resolver_dup(r, rn->name, rn->nlen); |
cf3cd450049c
store name pointer in variable allocated on stack
Igor Sysoev <igor@sysoev.ru>
parents:
2483
diff
changeset
|
657 if (name == NULL) { |
1649 | 658 goto failed; |
659 } | |
660 | |
2484
cf3cd450049c
store name pointer in variable allocated on stack
Igor Sysoev <igor@sysoev.ru>
parents:
2483
diff
changeset
|
661 ctx->name.len = rn->nlen; |
cf3cd450049c
store name pointer in variable allocated on stack
Igor Sysoev <igor@sysoev.ru>
parents:
2483
diff
changeset
|
662 ctx->name.data = name; |
cf3cd450049c
store name pointer in variable allocated on stack
Igor Sysoev <igor@sysoev.ru>
parents:
2483
diff
changeset
|
663 |
1649 | 664 /* unlock addr mutex */ |
665 | |
666 ctx->state = NGX_OK; | |
667 | |
668 ctx->handler(ctx); | |
669 | |
2484
cf3cd450049c
store name pointer in variable allocated on stack
Igor Sysoev <igor@sysoev.ru>
parents:
2483
diff
changeset
|
670 ngx_resolver_free(r, name); |
1649 | 671 |
672 return NGX_OK; | |
673 } | |
674 | |
675 if (rn->waiting) { | |
676 | |
677 ctx->next = rn->waiting; | |
678 rn->waiting = ctx; | |
3297 | 679 ctx->state = NGX_AGAIN; |
1649 | 680 |
2487
9b4dce95c744
fix return code, this fixes segfault when two or more
Igor Sysoev <igor@sysoev.ru>
parents:
2486
diff
changeset
|
681 /* unlock addr mutex */ |
9b4dce95c744
fix return code, this fixes segfault when two or more
Igor Sysoev <igor@sysoev.ru>
parents:
2486
diff
changeset
|
682 |
9b4dce95c744
fix return code, this fixes segfault when two or more
Igor Sysoev <igor@sysoev.ru>
parents:
2486
diff
changeset
|
683 return NGX_OK; |
1649 | 684 } |
685 | |
686 ngx_queue_remove(&rn->queue); | |
687 | |
688 ngx_resolver_free(r, rn->query); | |
1960
1609b3c3d604
fix memory leak on resolver query send failure
Igor Sysoev <igor@sysoev.ru>
parents:
1914
diff
changeset
|
689 rn->query = NULL; |
1649 | 690 |
691 } else { | |
692 rn = ngx_resolver_alloc(r, sizeof(ngx_resolver_node_t)); | |
693 if (rn == NULL) { | |
694 goto failed; | |
695 } | |
696 | |
697 rn->node.key = ctx->addr; | |
1960
1609b3c3d604
fix memory leak on resolver query send failure
Igor Sysoev <igor@sysoev.ru>
parents:
1914
diff
changeset
|
698 rn->query = NULL; |
1649 | 699 |
700 ngx_rbtree_insert(&r->addr_rbtree, &rn->node); | |
701 } | |
702 | |
703 if (ngx_resolver_create_addr_query(rn, ctx) != NGX_OK) { | |
704 goto failed; | |
705 } | |
706 | |
707 if (ngx_resolver_send_query(r, rn) != NGX_OK) { | |
708 goto failed; | |
709 } | |
710 | |
711 ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t)); | |
712 if (ctx->event == NULL) { | |
713 goto failed; | |
714 } | |
715 | |
716 ctx->event->handler = ngx_resolver_timeout_handler; | |
717 ctx->event->data = ctx; | |
718 ctx->event->log = r->log; | |
719 ctx->ident = -1; | |
720 | |
721 ngx_add_timer(ctx->event, ctx->timeout); | |
722 | |
723 if (ngx_queue_empty(&r->addr_resend_queue)) { | |
724 ngx_add_timer(r->event, (ngx_msec_t) (r->resend_timeout * 1000)); | |
725 } | |
726 | |
727 rn->expire = ngx_time() + r->resend_timeout; | |
728 | |
729 ngx_queue_insert_head(&r->addr_resend_queue, &rn->queue); | |
730 | |
731 rn->cnlen = 0; | |
732 rn->naddrs = 0; | |
733 rn->name = NULL; | |
734 rn->nlen = 0; | |
735 rn->valid = 0; | |
736 rn->waiting = ctx; | |
737 | |
738 /* unlock addr mutex */ | |
739 | |
740 ctx->state = NGX_AGAIN; | |
741 | |
742 return NGX_OK; | |
743 | |
744 failed: | |
745 | |
746 if (rn) { | |
747 ngx_rbtree_delete(&r->addr_rbtree, &rn->node); | |
748 | |
1960
1609b3c3d604
fix memory leak on resolver query send failure
Igor Sysoev <igor@sysoev.ru>
parents:
1914
diff
changeset
|
749 if (rn->query) { |
1609b3c3d604
fix memory leak on resolver query send failure
Igor Sysoev <igor@sysoev.ru>
parents:
1914
diff
changeset
|
750 ngx_resolver_free(r, rn->query); |
1609b3c3d604
fix memory leak on resolver query send failure
Igor Sysoev <igor@sysoev.ru>
parents:
1914
diff
changeset
|
751 } |
1609b3c3d604
fix memory leak on resolver query send failure
Igor Sysoev <igor@sysoev.ru>
parents:
1914
diff
changeset
|
752 |
1649 | 753 ngx_resolver_free(r, rn); |
754 } | |
755 | |
756 /* unlock addr mutex */ | |
757 | |
758 if (ctx->event) { | |
1904
538f06aa8118
fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases
Igor Sysoev <igor@sysoev.ru>
parents:
1903
diff
changeset
|
759 ngx_resolver_free(r, ctx->event); |
1649 | 760 } |
761 | |
1904
538f06aa8118
fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases
Igor Sysoev <igor@sysoev.ru>
parents:
1903
diff
changeset
|
762 ngx_resolver_free(r, ctx); |
1649 | 763 |
764 return NGX_ERROR; | |
765 } | |
766 | |
767 | |
768 void | |
769 ngx_resolve_addr_done(ngx_resolver_ctx_t *ctx) | |
770 { | |
771 in_addr_t addr; | |
772 ngx_resolver_t *r; | |
773 ngx_resolver_ctx_t *w, **p; | |
774 ngx_resolver_node_t *rn; | |
775 | |
776 r = ctx->resolver; | |
777 | |
778 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0, | |
779 "resolve addr done: %i", ctx->state); | |
780 | |
781 if (ctx->event && ctx->event->timer_set) { | |
782 ngx_del_timer(ctx->event); | |
783 } | |
784 | |
785 /* lock addr mutex */ | |
786 | |
787 if (ctx->state == NGX_AGAIN || ctx->state == NGX_RESOLVE_TIMEDOUT) { | |
788 | |
789 rn = ngx_resolver_lookup_addr(r, ctx->addr); | |
790 | |
791 if (rn) { | |
792 p = &rn->waiting; | |
793 w = rn->waiting; | |
794 | |
795 while (w) { | |
796 if (w == ctx) { | |
797 *p = w->next; | |
798 | |
799 goto done; | |
800 } | |
801 | |
802 p = &w->next; | |
803 w = w->next; | |
804 } | |
805 } | |
806 | |
807 addr = ntohl(ctx->addr); | |
808 | |
809 ngx_log_error(NGX_LOG_ALERT, r->log, 0, | |
810 "could not cancel %ud.%ud.%ud.%ud resolving", | |
811 (addr >> 24) & 0xff, (addr >> 16) & 0xff, | |
812 (addr >> 8) & 0xff, addr & 0xff); | |
813 } | |
814 | |
815 done: | |
816 | |
817 ngx_resolver_expire(r, &r->addr_rbtree, &r->addr_expire_queue); | |
818 | |
819 /* unlock addr mutex */ | |
820 | |
1904
538f06aa8118
fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases
Igor Sysoev <igor@sysoev.ru>
parents:
1903
diff
changeset
|
821 /* lock alloc mutex */ |
538f06aa8118
fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases
Igor Sysoev <igor@sysoev.ru>
parents:
1903
diff
changeset
|
822 |
538f06aa8118
fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases
Igor Sysoev <igor@sysoev.ru>
parents:
1903
diff
changeset
|
823 if (ctx->event) { |
538f06aa8118
fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases
Igor Sysoev <igor@sysoev.ru>
parents:
1903
diff
changeset
|
824 ngx_resolver_free_locked(r, ctx->event); |
538f06aa8118
fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases
Igor Sysoev <igor@sysoev.ru>
parents:
1903
diff
changeset
|
825 } |
538f06aa8118
fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases
Igor Sysoev <igor@sysoev.ru>
parents:
1903
diff
changeset
|
826 |
538f06aa8118
fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases
Igor Sysoev <igor@sysoev.ru>
parents:
1903
diff
changeset
|
827 ngx_resolver_free_locked(r, ctx); |
538f06aa8118
fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases
Igor Sysoev <igor@sysoev.ru>
parents:
1903
diff
changeset
|
828 |
538f06aa8118
fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases
Igor Sysoev <igor@sysoev.ru>
parents:
1903
diff
changeset
|
829 /* unlock alloc mutex */ |
1649 | 830 } |
831 | |
832 | |
833 static void | |
834 ngx_resolver_expire(ngx_resolver_t *r, ngx_rbtree_t *tree, ngx_queue_t *queue) | |
835 { | |
836 time_t now; | |
837 ngx_uint_t i; | |
838 ngx_queue_t *q; | |
839 ngx_resolver_node_t *rn; | |
840 | |
841 ngx_log_debug0(NGX_LOG_DEBUG_CORE, r->log, 0, "resolver expire"); | |
842 | |
843 now = ngx_time(); | |
844 | |
845 for (i = 0; i < 2; i++) { | |
846 if (ngx_queue_empty(queue)) { | |
847 return; | |
848 } | |
849 | |
850 q = ngx_queue_last(queue); | |
851 | |
852 rn = ngx_queue_data(q, ngx_resolver_node_t, queue); | |
853 | |
854 if (now <= rn->expire) { | |
855 return; | |
856 } | |
857 | |
1774 | 858 ngx_log_debug2(NGX_LOG_DEBUG_CORE, r->log, 0, |
859 "resolver expire \"%*s\"", (size_t) rn->nlen, rn->name); | |
1649 | 860 |
861 ngx_queue_remove(q); | |
862 | |
863 ngx_rbtree_delete(tree, &rn->node); | |
864 | |
865 ngx_resolver_free_node(r, rn); | |
866 } | |
867 } | |
868 | |
869 | |
870 static ngx_int_t | |
871 ngx_resolver_send_query(ngx_resolver_t *r, ngx_resolver_node_t *rn) | |
872 { | |
873 ssize_t n; | |
874 ngx_udp_connection_t *uc; | |
875 | |
4225
016352c19049
Support of several servers in the "resolver" directive.
Igor Sysoev <igor@sysoev.ru>
parents:
3902
diff
changeset
|
876 uc = r->udp_connections.elts; |
016352c19049
Support of several servers in the "resolver" directive.
Igor Sysoev <igor@sysoev.ru>
parents:
3902
diff
changeset
|
877 |
016352c19049
Support of several servers in the "resolver" directive.
Igor Sysoev <igor@sysoev.ru>
parents:
3902
diff
changeset
|
878 uc = &uc[r->last_connection++]; |
016352c19049
Support of several servers in the "resolver" directive.
Igor Sysoev <igor@sysoev.ru>
parents:
3902
diff
changeset
|
879 if (r->last_connection == r->udp_connections.nelts) { |
016352c19049
Support of several servers in the "resolver" directive.
Igor Sysoev <igor@sysoev.ru>
parents:
3902
diff
changeset
|
880 r->last_connection = 0; |
016352c19049
Support of several servers in the "resolver" directive.
Igor Sysoev <igor@sysoev.ru>
parents:
3902
diff
changeset
|
881 } |
1649 | 882 |
883 if (uc->connection == NULL) { | |
4496
be6c250b827b
Fixed null pointer dereference in resolver (ticket #91).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4474
diff
changeset
|
884 |
be6c250b827b
Fixed null pointer dereference in resolver (ticket #91).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4474
diff
changeset
|
885 uc->log = *r->log; |
be6c250b827b
Fixed null pointer dereference in resolver (ticket #91).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4474
diff
changeset
|
886 uc->log.handler = ngx_resolver_log_error; |
be6c250b827b
Fixed null pointer dereference in resolver (ticket #91).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4474
diff
changeset
|
887 uc->log.data = uc; |
be6c250b827b
Fixed null pointer dereference in resolver (ticket #91).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4474
diff
changeset
|
888 uc->log.action = "resolving"; |
be6c250b827b
Fixed null pointer dereference in resolver (ticket #91).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4474
diff
changeset
|
889 |
1649 | 890 if (ngx_udp_connect(uc) != NGX_OK) { |
891 return NGX_ERROR; | |
892 } | |
893 | |
894 uc->connection->data = r; | |
895 uc->connection->read->handler = ngx_resolver_read_response; | |
1906 | 896 uc->connection->read->resolver = 1; |
1649 | 897 } |
898 | |
899 n = ngx_send(uc->connection, rn->query, rn->qlen); | |
900 | |
901 if (n == -1) { | |
902 return NGX_ERROR; | |
903 } | |
904 | |
905 if ((size_t) n != (size_t) rn->qlen) { | |
3408
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
906 ngx_log_error(NGX_LOG_CRIT, &uc->log, 0, "send() incomplete"); |
1649 | 907 return NGX_ERROR; |
908 } | |
909 | |
910 return NGX_OK; | |
911 } | |
912 | |
913 | |
914 static void | |
915 ngx_resolver_resend_handler(ngx_event_t *ev) | |
916 { | |
917 time_t timer, atimer, ntimer; | |
918 ngx_resolver_t *r; | |
919 | |
920 r = ev->data; | |
921 | |
922 ngx_log_debug0(NGX_LOG_DEBUG_CORE, r->log, 0, | |
923 "resolver resend handler"); | |
924 | |
925 /* lock name mutex */ | |
926 | |
927 ntimer = ngx_resolver_resend(r, &r->name_rbtree, &r->name_resend_queue); | |
928 | |
929 /* unlock name mutex */ | |
930 | |
931 /* lock addr mutex */ | |
932 | |
933 atimer = ngx_resolver_resend(r, &r->addr_rbtree, &r->addr_resend_queue); | |
1679
ca317d9b5c09
style fix: remove trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
1649
diff
changeset
|
934 |
1649 | 935 /* unlock addr mutex */ |
936 | |
937 if (ntimer == 0) { | |
938 timer = atimer; | |
939 | |
940 } else if (atimer == 0) { | |
941 timer = ntimer; | |
942 | |
943 } else { | |
944 timer = (atimer < ntimer) ? atimer : ntimer; | |
945 } | |
946 | |
947 if (timer) { | |
948 ngx_add_timer(r->event, (ngx_msec_t) (timer * 1000)); | |
949 } | |
950 } | |
951 | |
952 | |
953 static time_t | |
954 ngx_resolver_resend(ngx_resolver_t *r, ngx_rbtree_t *tree, ngx_queue_t *queue) | |
955 { | |
956 time_t now; | |
957 ngx_queue_t *q; | |
958 ngx_resolver_node_t *rn; | |
959 | |
960 now = ngx_time(); | |
961 | |
962 for ( ;; ) { | |
963 if (ngx_queue_empty(queue)) { | |
964 return 0; | |
965 } | |
966 | |
967 q = ngx_queue_last(queue); | |
968 | |
969 rn = ngx_queue_data(q, ngx_resolver_node_t, queue); | |
970 | |
971 if (now < rn->expire) { | |
972 return rn->expire - now; | |
973 } | |
974 | |
1774 | 975 ngx_log_debug3(NGX_LOG_DEBUG_CORE, r->log, 0, |
976 "resolver resend \"%*s\" %p", | |
977 (size_t) rn->nlen, rn->name, rn->waiting); | |
1649 | 978 |
979 ngx_queue_remove(q); | |
980 | |
981 if (rn->waiting) { | |
982 | |
4683
84d8e60b65f0
Fixed crash in ngx_resolver_cleanup_tree().
Ruslan Ermilov <ru@nginx.com>
parents:
4671
diff
changeset
|
983 (void) ngx_resolver_send_query(r, rn); |
84d8e60b65f0
Fixed crash in ngx_resolver_cleanup_tree().
Ruslan Ermilov <ru@nginx.com>
parents:
4671
diff
changeset
|
984 |
84d8e60b65f0
Fixed crash in ngx_resolver_cleanup_tree().
Ruslan Ermilov <ru@nginx.com>
parents:
4671
diff
changeset
|
985 rn->expire = now + r->resend_timeout; |
84d8e60b65f0
Fixed crash in ngx_resolver_cleanup_tree().
Ruslan Ermilov <ru@nginx.com>
parents:
4671
diff
changeset
|
986 |
84d8e60b65f0
Fixed crash in ngx_resolver_cleanup_tree().
Ruslan Ermilov <ru@nginx.com>
parents:
4671
diff
changeset
|
987 ngx_queue_insert_head(queue, q); |
1879
cf4ee321d195
do not delete failed DNS request if there are waiting clients
Igor Sysoev <igor@sysoev.ru>
parents:
1878
diff
changeset
|
988 |
cf4ee321d195
do not delete failed DNS request if there are waiting clients
Igor Sysoev <igor@sysoev.ru>
parents:
1878
diff
changeset
|
989 continue; |
1649 | 990 } |
991 | |
992 ngx_rbtree_delete(tree, &rn->node); | |
993 | |
994 ngx_resolver_free_node(r, rn); | |
995 } | |
996 } | |
997 | |
998 | |
999 static void | |
1000 ngx_resolver_read_response(ngx_event_t *rev) | |
1001 { | |
1002 ssize_t n; | |
1003 ngx_connection_t *c; | |
1004 u_char buf[NGX_RESOLVER_UDP_SIZE]; | |
1005 | |
1006 c = rev->data; | |
1007 | |
1008 do { | |
1689 | 1009 n = ngx_udp_recv(c, buf, NGX_RESOLVER_UDP_SIZE); |
1010 | |
1011 if (n < 0) { | |
1649 | 1012 return; |
1013 } | |
1014 | |
1015 ngx_resolver_process_response(c->data, buf, n); | |
1016 | |
1017 } while (rev->ready); | |
1018 } | |
1019 | |
1020 | |
1021 static void | |
1022 ngx_resolver_process_response(ngx_resolver_t *r, u_char *buf, size_t n) | |
1023 { | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1024 char *err; |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1025 ngx_uint_t i, times, ident, qident, flags, code, nqs, nan, |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1026 qtype, qclass; |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1027 ngx_queue_t *q; |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1028 ngx_resolver_qs_t *qs; |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1029 ngx_resolver_hdr_t *response; |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1030 ngx_resolver_node_t *rn; |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1031 |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1032 if (n < sizeof(ngx_resolver_hdr_t)) { |
1649 | 1033 goto short_response; |
1034 } | |
1035 | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1036 response = (ngx_resolver_hdr_t *) buf; |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1037 |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1038 ident = (response->ident_hi << 8) + response->ident_lo; |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1039 flags = (response->flags_hi << 8) + response->flags_lo; |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1040 nqs = (response->nqs_hi << 8) + response->nqs_lo; |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1041 nan = (response->nan_hi << 8) + response->nan_lo; |
1649 | 1042 |
1043 ngx_log_debug6(NGX_LOG_DEBUG_CORE, r->log, 0, | |
4653
134ccdf44647
Resolver: fixed format specification.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4643
diff
changeset
|
1044 "resolver DNS response %ui fl:%04Xui %ui/%ui/%ud/%ud", |
1649 | 1045 ident, flags, nqs, nan, |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1046 (response->nns_hi << 8) + response->nns_lo, |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1047 (response->nar_hi << 8) + response->nar_lo); |
1649 | 1048 |
5470
aebdca7e8f8f
Resolver: fixed response processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5469
diff
changeset
|
1049 /* response to a standard query */ |
aebdca7e8f8f
Resolver: fixed response processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5469
diff
changeset
|
1050 if ((flags & 0xf870) != 0x8000) { |
1649 | 1051 ngx_log_error(r->log_level, r->log, 0, |
1967
4a4b15c9c474
use correct ngx_sprintf() formats
Igor Sysoev <igor@sysoev.ru>
parents:
1966
diff
changeset
|
1052 "invalid DNS response %ui fl:%04Xui", ident, flags); |
1649 | 1053 return; |
1054 } | |
1055 | |
5470
aebdca7e8f8f
Resolver: fixed response processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5469
diff
changeset
|
1056 code = flags & 0xf; |
1649 | 1057 |
2282
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1058 if (code == NGX_RESOLVE_FORMERR) { |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1059 |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1060 times = 0; |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1061 |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1062 for (q = ngx_queue_head(&r->name_resend_queue); |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1063 q != ngx_queue_sentinel(&r->name_resend_queue) || times++ < 100; |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1064 q = ngx_queue_next(q)) |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1065 { |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1066 rn = ngx_queue_data(q, ngx_resolver_node_t, queue); |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1067 qident = (rn->query[0] << 8) + rn->query[1]; |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1068 |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1069 if (qident == ident) { |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1070 ngx_log_error(r->log_level, r->log, 0, |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1071 "DNS error (%ui: %s), query id:%ui, name:\"%*s\"", |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1072 code, ngx_resolver_strerror(code), ident, |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1073 rn->nlen, rn->name); |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1074 return; |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1075 } |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1076 } |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1077 |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1078 goto dns_error; |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1079 } |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1080 |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1081 if (code > NGX_RESOLVE_REFUSED) { |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1082 goto dns_error; |
1649 | 1083 } |
1084 | |
1085 if (nqs != 1) { | |
1086 err = "invalid number of questions in DNS response"; | |
1087 goto done; | |
1088 } | |
1089 | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1090 i = sizeof(ngx_resolver_hdr_t); |
1649 | 1091 |
1092 while (i < (ngx_uint_t) n) { | |
1093 if (buf[i] == '\0') { | |
1094 goto found; | |
1095 } | |
1096 | |
5470
aebdca7e8f8f
Resolver: fixed response processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5469
diff
changeset
|
1097 i += 1 + buf[i]; |
1649 | 1098 } |
1099 | |
1100 goto short_response; | |
1101 | |
1102 found: | |
1103 | |
5470
aebdca7e8f8f
Resolver: fixed response processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5469
diff
changeset
|
1104 if (i++ == sizeof(ngx_resolver_hdr_t)) { |
1649 | 1105 err = "zero-length domain name in DNS response"; |
1106 goto done; | |
1107 } | |
1108 | |
1109 if (i + sizeof(ngx_resolver_qs_t) + nan * (2 + sizeof(ngx_resolver_an_t)) | |
1110 > (ngx_uint_t) n) | |
1111 { | |
1112 goto short_response; | |
1113 } | |
1114 | |
1115 qs = (ngx_resolver_qs_t *) &buf[i]; | |
1116 | |
1117 qtype = (qs->type_hi << 8) + qs->type_lo; | |
1118 qclass = (qs->class_hi << 8) + qs->class_lo; | |
1119 | |
1120 ngx_log_debug2(NGX_LOG_DEBUG_CORE, r->log, 0, | |
1967
4a4b15c9c474
use correct ngx_sprintf() formats
Igor Sysoev <igor@sysoev.ru>
parents:
1966
diff
changeset
|
1121 "resolver DNS response qt:%ui cl:%ui", qtype, qclass); |
1649 | 1122 |
1123 if (qclass != 1) { | |
1124 ngx_log_error(r->log_level, r->log, 0, | |
1967
4a4b15c9c474
use correct ngx_sprintf() formats
Igor Sysoev <igor@sysoev.ru>
parents:
1966
diff
changeset
|
1125 "unknown query class %ui in DNS response", qclass); |
1649 | 1126 return; |
1127 } | |
1128 | |
1129 switch (qtype) { | |
1130 | |
1131 case NGX_RESOLVE_A: | |
1132 | |
1133 ngx_resolver_process_a(r, buf, n, ident, code, nan, | |
1742
268b81386fe4
no answers in DNS response should be NXDOMAIN
Igor Sysoev <igor@sysoev.ru>
parents:
1741
diff
changeset
|
1134 i + sizeof(ngx_resolver_qs_t)); |
1649 | 1135 |
1136 break; | |
1137 | |
1138 case NGX_RESOLVE_PTR: | |
1139 | |
1742
268b81386fe4
no answers in DNS response should be NXDOMAIN
Igor Sysoev <igor@sysoev.ru>
parents:
1741
diff
changeset
|
1140 ngx_resolver_process_ptr(r, buf, n, ident, code, nan); |
1649 | 1141 |
1142 break; | |
1143 | |
1144 default: | |
1145 ngx_log_error(r->log_level, r->log, 0, | |
1967
4a4b15c9c474
use correct ngx_sprintf() formats
Igor Sysoev <igor@sysoev.ru>
parents:
1966
diff
changeset
|
1146 "unknown query type %ui in DNS response", qtype); |
1649 | 1147 return; |
1148 } | |
1149 | |
1150 return; | |
1151 | |
1152 short_response: | |
1153 | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1154 err = "short DNS response"; |
1649 | 1155 |
1156 done: | |
1157 | |
1158 ngx_log_error(r->log_level, r->log, 0, err); | |
1159 | |
1160 return; | |
2282
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1161 |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1162 dns_error: |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1163 |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1164 ngx_log_error(r->log_level, r->log, 0, |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1165 "DNS error (%ui: %s), query id:%ui", |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1166 code, ngx_resolver_strerror(code), ident); |
ec97eb9a8038
show name for a FORMERR DNS response
Igor Sysoev <igor@sysoev.ru>
parents:
2281
diff
changeset
|
1167 return; |
1649 | 1168 } |
1169 | |
1170 | |
1171 static void | |
1172 ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last, | |
1173 ngx_uint_t ident, ngx_uint_t code, ngx_uint_t nan, ngx_uint_t ans) | |
583 | 1174 { |
1649 | 1175 char *err; |
1176 u_char *cname; | |
1177 size_t len; | |
4295
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
1178 int32_t ttl; |
1649 | 1179 uint32_t hash; |
1180 in_addr_t addr, *addrs; | |
1181 ngx_str_t name; | |
5471
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1182 ngx_uint_t type, class, qident, naddrs, a, i, n, start; |
1649 | 1183 ngx_resolver_an_t *an; |
1184 ngx_resolver_ctx_t *ctx, *next; | |
1185 ngx_resolver_node_t *rn; | |
1186 | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1187 if (ngx_resolver_copy(r, &name, buf, |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1188 buf + sizeof(ngx_resolver_hdr_t), buf + last) |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1189 != NGX_OK) |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1190 { |
1649 | 1191 return; |
1192 } | |
1193 | |
1194 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0, "resolver qs:%V", &name); | |
1195 | |
1196 hash = ngx_crc32_short(name.data, name.len); | |
1197 | |
1198 /* lock name mutex */ | |
1199 | |
1200 rn = ngx_resolver_lookup_name(r, &name, hash); | |
1201 | |
1202 if (rn == NULL || rn->query == NULL) { | |
1203 ngx_log_error(r->log_level, r->log, 0, | |
1204 "unexpected response for %V", &name); | |
5471
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1205 ngx_resolver_free(r, name.data); |
1649 | 1206 goto failed; |
1207 } | |
1208 | |
1209 qident = (rn->query[0] << 8) + rn->query[1]; | |
1210 | |
1211 if (ident != qident) { | |
1212 ngx_log_error(r->log_level, r->log, 0, | |
1967
4a4b15c9c474
use correct ngx_sprintf() formats
Igor Sysoev <igor@sysoev.ru>
parents:
1966
diff
changeset
|
1213 "wrong ident %ui response for %V, expect %ui", |
1649 | 1214 ident, &name, qident); |
5471
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1215 ngx_resolver_free(r, name.data); |
1649 | 1216 goto failed; |
1217 } | |
1218 | |
3139 | 1219 ngx_resolver_free(r, name.data); |
1220 | |
1742
268b81386fe4
no answers in DNS response should be NXDOMAIN
Igor Sysoev <igor@sysoev.ru>
parents:
1741
diff
changeset
|
1221 if (code == 0 && nan == 0) { |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1222 code = NGX_RESOLVE_NXDOMAIN; |
1742
268b81386fe4
no answers in DNS response should be NXDOMAIN
Igor Sysoev <igor@sysoev.ru>
parents:
1741
diff
changeset
|
1223 } |
268b81386fe4
no answers in DNS response should be NXDOMAIN
Igor Sysoev <igor@sysoev.ru>
parents:
1741
diff
changeset
|
1224 |
1649 | 1225 if (code) { |
1226 next = rn->waiting; | |
1227 rn->waiting = NULL; | |
1228 | |
1229 ngx_queue_remove(&rn->queue); | |
1230 | |
1231 ngx_rbtree_delete(&r->name_rbtree, &rn->node); | |
1232 | |
1233 ngx_resolver_free_node(r, rn); | |
1234 | |
1235 /* unlock name mutex */ | |
1236 | |
1237 while (next) { | |
1238 ctx = next; | |
1239 ctx->state = code; | |
1240 next = ctx->next; | |
1241 | |
1242 ctx->handler(ctx); | |
1243 } | |
1244 | |
1245 return; | |
1246 } | |
1247 | |
1248 i = ans; | |
1249 naddrs = 0; | |
1250 addr = 0; | |
1251 addrs = NULL; | |
1252 cname = NULL; | |
4296
783fd9c38d98
Silenced a warning for some compilers.
Ruslan Ermilov <ru@nginx.com>
parents:
4295
diff
changeset
|
1253 ttl = 0; |
1649 | 1254 |
1255 for (a = 0; a < nan; a++) { | |
1256 | |
1257 start = i; | |
1258 | |
1259 while (i < last) { | |
1260 | |
1261 if (buf[i] & 0xc0) { | |
1262 i += 2; | |
1263 goto found; | |
1264 } | |
1265 | |
1266 if (buf[i] == 0) { | |
1267 i++; | |
1268 goto test_length; | |
1269 } | |
1270 | |
1271 i += 1 + buf[i]; | |
1272 } | |
1273 | |
1274 goto short_response; | |
1275 | |
1276 test_length: | |
1277 | |
1278 if (i - start < 2) { | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1279 err = "invalid name in DNS response"; |
1649 | 1280 goto invalid; |
1281 } | |
1282 | |
1283 found: | |
1284 | |
1285 if (i + sizeof(ngx_resolver_an_t) >= last) { | |
1286 goto short_response; | |
1287 } | |
1288 | |
1289 an = (ngx_resolver_an_t *) &buf[i]; | |
1290 | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1291 type = (an->type_hi << 8) + an->type_lo; |
5471
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1292 class = (an->class_hi << 8) + an->class_lo; |
1649 | 1293 len = (an->len_hi << 8) + an->len_lo; |
4295
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
1294 ttl = (an->ttl[0] << 24) + (an->ttl[1] << 16) |
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
1295 + (an->ttl[2] << 8) + (an->ttl[3]); |
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
1296 |
5471
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1297 if (class != 1) { |
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1298 ngx_log_error(r->log_level, r->log, 0, |
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1299 "unexpected RR class %ui", class); |
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1300 goto failed; |
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1301 } |
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1302 |
4295
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
1303 if (ttl < 0) { |
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
1304 ttl = 0; |
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
1305 } |
1649 | 1306 |
5471
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1307 i += sizeof(ngx_resolver_an_t); |
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1308 |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1309 switch (type) { |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1310 |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1311 case NGX_RESOLVE_A: |
1649 | 1312 |
5471
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1313 if (len != 4) { |
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1314 err = "invalid A record in DNS response"; |
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1315 goto invalid; |
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1316 } |
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1317 |
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1318 if (i + 4 > last) { |
1649 | 1319 goto short_response; |
1320 } | |
1321 | |
1322 addr = htonl((buf[i] << 24) + (buf[i + 1] << 16) | |
1323 + (buf[i + 2] << 8) + (buf[i + 3])); | |
1324 | |
1325 naddrs++; | |
1326 | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1327 break; |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1328 |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1329 case NGX_RESOLVE_CNAME: |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1330 |
5471
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1331 cname = &buf[i]; |
1965 | 1332 |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1333 break; |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1334 |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1335 case NGX_RESOLVE_DNAME: |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1336 |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1337 break; |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1338 |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1339 default: |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1340 |
1966 | 1341 ngx_log_error(r->log_level, r->log, 0, |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1342 "unexpected RR type %ui", type); |
1649 | 1343 } |
5471
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1344 |
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1345 i += len; |
1649 | 1346 } |
1347 | |
4295
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
1348 ngx_log_debug3(NGX_LOG_DEBUG_CORE, r->log, 0, |
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
1349 "resolver naddrs:%ui cname:%p ttl:%d", |
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
1350 naddrs, cname, ttl); |
1649 | 1351 |
1352 if (naddrs) { | |
1353 | |
1354 if (naddrs == 1) { | |
1355 rn->u.addr = addr; | |
1356 | |
1357 } else { | |
1358 | |
1359 addrs = ngx_resolver_alloc(r, naddrs * sizeof(in_addr_t)); | |
1360 if (addrs == NULL) { | |
5471
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1361 goto failed; |
1649 | 1362 } |
1363 | |
1364 n = 0; | |
1365 i = ans; | |
1366 | |
1367 for (a = 0; a < nan; a++) { | |
1368 | |
1369 for ( ;; ) { | |
1370 | |
1371 if (buf[i] & 0xc0) { | |
1372 i += 2; | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1373 break; |
1649 | 1374 } |
1375 | |
1376 if (buf[i] == 0) { | |
1377 i++; | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1378 break; |
1649 | 1379 } |
1380 | |
1381 i += 1 + buf[i]; | |
1382 } | |
1383 | |
1384 an = (ngx_resolver_an_t *) &buf[i]; | |
1385 | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1386 type = (an->type_hi << 8) + an->type_lo; |
1649 | 1387 len = (an->len_hi << 8) + an->len_lo; |
1388 | |
1389 i += sizeof(ngx_resolver_an_t); | |
1390 | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1391 if (type == NGX_RESOLVE_A) { |
1649 | 1392 |
1393 addrs[n++] = htonl((buf[i] << 24) + (buf[i + 1] << 16) | |
1394 + (buf[i + 2] << 8) + (buf[i + 3])); | |
1395 | |
1396 if (n == naddrs) { | |
1397 break; | |
1398 } | |
1399 } | |
1400 | |
1401 i += len; | |
1402 } | |
1403 | |
1404 rn->u.addrs = addrs; | |
1405 | |
1406 addrs = ngx_resolver_dup(r, rn->u.addrs, | |
1407 naddrs * sizeof(in_addr_t)); | |
1408 if (addrs == NULL) { | |
5471
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1409 goto failed; |
1649 | 1410 } |
1411 } | |
1412 | |
1413 rn->naddrs = (u_short) naddrs; | |
1414 | |
1415 ngx_queue_remove(&rn->queue); | |
1416 | |
4295
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
1417 rn->valid = ngx_time() + (r->valid ? r->valid : ttl); |
1649 | 1418 rn->expire = ngx_time() + r->expire; |
1419 | |
1420 ngx_queue_insert_head(&r->name_expire_queue, &rn->queue); | |
1421 | |
1422 next = rn->waiting; | |
1423 rn->waiting = NULL; | |
1424 | |
1425 /* unlock name mutex */ | |
1426 | |
1427 while (next) { | |
1428 ctx = next; | |
1429 ctx->state = NGX_OK; | |
1430 ctx->naddrs = naddrs; | |
1431 ctx->addrs = (naddrs == 1) ? &ctx->addr : addrs; | |
1432 ctx->addr = addr; | |
1433 next = ctx->next; | |
1434 | |
1435 ctx->handler(ctx); | |
1436 } | |
1437 | |
2483
29494780d978
free addrs only it has been allocated before: non single address
Igor Sysoev <igor@sysoev.ru>
parents:
2482
diff
changeset
|
1438 if (naddrs > 1) { |
1649 | 1439 ngx_resolver_free(r, addrs); |
1440 } | |
1441 | |
4619
3171ec7d0d05
Resolver: protection from duplicate responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4610
diff
changeset
|
1442 ngx_resolver_free(r, rn->query); |
3171ec7d0d05
Resolver: protection from duplicate responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4610
diff
changeset
|
1443 rn->query = NULL; |
3171ec7d0d05
Resolver: protection from duplicate responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4610
diff
changeset
|
1444 |
1649 | 1445 return; |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1446 } |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1447 |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1448 if (cname) { |
1649 | 1449 |
1450 /* CNAME only */ | |
1451 | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1452 if (ngx_resolver_copy(r, &name, buf, cname, buf + last) != NGX_OK) { |
5471
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1453 goto failed; |
1649 | 1454 } |
1455 | |
1456 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0, | |
1457 "resolver cname:\"%V\"", &name); | |
1458 | |
1741
0829024c924d
fix segfault if response will have CNAME only
Igor Sysoev <igor@sysoev.ru>
parents:
1689
diff
changeset
|
1459 ngx_queue_remove(&rn->queue); |
0829024c924d
fix segfault if response will have CNAME only
Igor Sysoev <igor@sysoev.ru>
parents:
1689
diff
changeset
|
1460 |
1649 | 1461 rn->cnlen = (u_short) name.len; |
1462 rn->u.cname = name.data; | |
4295
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
1463 |
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
1464 rn->valid = ngx_time() + (r->valid ? r->valid : ttl); |
1649 | 1465 rn->expire = ngx_time() + r->expire; |
1466 | |
1467 ngx_queue_insert_head(&r->name_expire_queue, &rn->queue); | |
1468 | |
1469 ctx = rn->waiting; | |
1470 rn->waiting = NULL; | |
1471 | |
1472 if (ctx) { | |
1473 ctx->name = name; | |
1474 | |
1475 (void) ngx_resolve_name_locked(r, ctx); | |
1476 } | |
1477 | |
4619
3171ec7d0d05
Resolver: protection from duplicate responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4610
diff
changeset
|
1478 ngx_resolver_free(r, rn->query); |
3171ec7d0d05
Resolver: protection from duplicate responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4610
diff
changeset
|
1479 rn->query = NULL; |
3171ec7d0d05
Resolver: protection from duplicate responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4610
diff
changeset
|
1480 |
5471
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1481 /* unlock name mutex */ |
9c96782d9d05
Resolver: fixes in A processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5470
diff
changeset
|
1482 |
1649 | 1483 return; |
1484 } | |
1485 | |
1486 ngx_log_error(r->log_level, r->log, 0, | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1487 "no A or CNAME types in DNS response"); |
1649 | 1488 return; |
1489 | |
1490 short_response: | |
1491 | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1492 err = "short DNS response"; |
1649 | 1493 |
1494 invalid: | |
1495 | |
1496 /* unlock name mutex */ | |
1497 | |
1498 ngx_log_error(r->log_level, r->log, 0, err); | |
1499 | |
1500 return; | |
1501 | |
1502 failed: | |
1503 | |
1504 /* unlock name mutex */ | |
1505 | |
1506 return; | |
1507 } | |
1508 | |
1509 | |
1510 static void | |
1511 ngx_resolver_process_ptr(ngx_resolver_t *r, u_char *buf, size_t n, | |
1742
268b81386fe4
no answers in DNS response should be NXDOMAIN
Igor Sysoev <igor@sysoev.ru>
parents:
1741
diff
changeset
|
1512 ngx_uint_t ident, ngx_uint_t code, ngx_uint_t nan) |
1649 | 1513 { |
1514 char *err; | |
1515 size_t len; | |
1516 in_addr_t addr; | |
4295
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
1517 int32_t ttl; |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1518 ngx_int_t octet; |
1649 | 1519 ngx_str_t name; |
5472
ab493c60d9ff
Resolver: fixes in PTR processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5471
diff
changeset
|
1520 ngx_uint_t i, mask, qident, class; |
1649 | 1521 ngx_resolver_an_t *an; |
1522 ngx_resolver_ctx_t *ctx, *next; | |
1523 ngx_resolver_node_t *rn; | |
1524 | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1525 if (ngx_resolver_copy(r, NULL, buf, |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1526 buf + sizeof(ngx_resolver_hdr_t), buf + n) |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1527 != NGX_OK) |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1528 { |
5472
ab493c60d9ff
Resolver: fixes in PTR processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5471
diff
changeset
|
1529 return; |
1649 | 1530 } |
1531 | |
1532 addr = 0; | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1533 i = sizeof(ngx_resolver_hdr_t); |
1649 | 1534 |
1535 for (mask = 0; mask < 32; mask += 8) { | |
1536 len = buf[i++]; | |
1537 | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1538 octet = ngx_atoi(&buf[i], len); |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1539 if (octet == NGX_ERROR || octet > 255) { |
1649 | 1540 goto invalid_in_addr_arpa; |
1541 } | |
1542 | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1543 addr += octet << mask; |
1649 | 1544 i += len; |
1545 } | |
1546 | |
1547 if (ngx_strcmp(&buf[i], "\7in-addr\4arpa") != 0) { | |
1548 goto invalid_in_addr_arpa; | |
1549 } | |
1550 | |
1551 /* lock addr mutex */ | |
1552 | |
1553 rn = ngx_resolver_lookup_addr(r, addr); | |
1554 | |
1555 if (rn == NULL || rn->query == NULL) { | |
1556 ngx_log_error(r->log_level, r->log, 0, | |
1557 "unexpected response for %ud.%ud.%ud.%ud", | |
1558 (addr >> 24) & 0xff, (addr >> 16) & 0xff, | |
1559 (addr >> 8) & 0xff, addr & 0xff); | |
1560 goto failed; | |
1561 } | |
1562 | |
1563 qident = (rn->query[0] << 8) + rn->query[1]; | |
1564 | |
1565 if (ident != qident) { | |
1566 ngx_log_error(r->log_level, r->log, 0, | |
1967
4a4b15c9c474
use correct ngx_sprintf() formats
Igor Sysoev <igor@sysoev.ru>
parents:
1966
diff
changeset
|
1567 "wrong ident %ui response for %ud.%ud.%ud.%ud, expect %ui", |
4a4b15c9c474
use correct ngx_sprintf() formats
Igor Sysoev <igor@sysoev.ru>
parents:
1966
diff
changeset
|
1568 ident, (addr >> 24) & 0xff, (addr >> 16) & 0xff, |
4a4b15c9c474
use correct ngx_sprintf() formats
Igor Sysoev <igor@sysoev.ru>
parents:
1966
diff
changeset
|
1569 (addr >> 8) & 0xff, addr & 0xff, qident); |
1649 | 1570 goto failed; |
1571 } | |
1572 | |
1742
268b81386fe4
no answers in DNS response should be NXDOMAIN
Igor Sysoev <igor@sysoev.ru>
parents:
1741
diff
changeset
|
1573 if (code == 0 && nan == 0) { |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1574 code = NGX_RESOLVE_NXDOMAIN; |
1742
268b81386fe4
no answers in DNS response should be NXDOMAIN
Igor Sysoev <igor@sysoev.ru>
parents:
1741
diff
changeset
|
1575 } |
268b81386fe4
no answers in DNS response should be NXDOMAIN
Igor Sysoev <igor@sysoev.ru>
parents:
1741
diff
changeset
|
1576 |
1649 | 1577 if (code) { |
1578 next = rn->waiting; | |
1579 rn->waiting = NULL; | |
1580 | |
1581 ngx_queue_remove(&rn->queue); | |
1582 | |
1583 ngx_rbtree_delete(&r->addr_rbtree, &rn->node); | |
1584 | |
1585 ngx_resolver_free_node(r, rn); | |
1586 | |
1587 /* unlock addr mutex */ | |
1588 | |
1589 while (next) { | |
1590 ctx = next; | |
1591 ctx->state = code; | |
1592 next = ctx->next; | |
1593 | |
1594 ctx->handler(ctx); | |
1595 } | |
1596 | |
1597 return; | |
1598 } | |
1599 | |
1600 i += sizeof("\7in-addr\4arpa") + sizeof(ngx_resolver_qs_t); | |
1601 | |
5472
ab493c60d9ff
Resolver: fixes in PTR processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5471
diff
changeset
|
1602 if (i + 2 + sizeof(ngx_resolver_an_t) >= n) { |
1649 | 1603 goto short_response; |
1604 } | |
1605 | |
1606 /* compression pointer to "XX.XX.XX.XX.in-addr.arpa */ | |
1607 | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1608 if (buf[i] != 0xc0 || buf[i + 1] != sizeof(ngx_resolver_hdr_t)) { |
1649 | 1609 err = "invalid in-addr.arpa name in DNS response"; |
1610 goto invalid; | |
1611 } | |
1612 | |
1613 an = (ngx_resolver_an_t *) &buf[i + 2]; | |
1614 | |
5472
ab493c60d9ff
Resolver: fixes in PTR processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5471
diff
changeset
|
1615 class = (an->class_hi << 8) + an->class_lo; |
1649 | 1616 len = (an->len_hi << 8) + an->len_lo; |
4295
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
1617 ttl = (an->ttl[0] << 24) + (an->ttl[1] << 16) |
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
1618 + (an->ttl[2] << 8) + (an->ttl[3]); |
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
1619 |
5472
ab493c60d9ff
Resolver: fixes in PTR processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5471
diff
changeset
|
1620 if (class != 1) { |
ab493c60d9ff
Resolver: fixes in PTR processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5471
diff
changeset
|
1621 ngx_log_error(r->log_level, r->log, 0, |
ab493c60d9ff
Resolver: fixes in PTR processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5471
diff
changeset
|
1622 "unexpected RR class %ui", class); |
ab493c60d9ff
Resolver: fixes in PTR processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5471
diff
changeset
|
1623 goto failed; |
ab493c60d9ff
Resolver: fixes in PTR processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5471
diff
changeset
|
1624 } |
ab493c60d9ff
Resolver: fixes in PTR processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5471
diff
changeset
|
1625 |
4295
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
1626 if (ttl < 0) { |
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
1627 ttl = 0; |
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
1628 } |
1649 | 1629 |
1630 ngx_log_debug3(NGX_LOG_DEBUG_CORE, r->log, 0, | |
3902
159b58f9c0bd
fix building by gcc 4.6 without --with-debug
Igor Sysoev <igor@sysoev.ru>
parents:
3763
diff
changeset
|
1631 "resolver qt:%ui cl:%ui len:%uz", |
159b58f9c0bd
fix building by gcc 4.6 without --with-debug
Igor Sysoev <igor@sysoev.ru>
parents:
3763
diff
changeset
|
1632 (an->type_hi << 8) + an->type_lo, |
5472
ab493c60d9ff
Resolver: fixes in PTR processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5471
diff
changeset
|
1633 class, len); |
1649 | 1634 |
1635 i += 2 + sizeof(ngx_resolver_an_t); | |
1636 | |
5469
b2fc466a11a7
Resolver: removed unnecessary casts.
Ruslan Ermilov <ru@nginx.com>
parents:
5468
diff
changeset
|
1637 if (i + len > n) { |
1649 | 1638 goto short_response; |
1639 } | |
1640 | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1641 if (ngx_resolver_copy(r, &name, buf, buf + i, buf + n) != NGX_OK) { |
5472
ab493c60d9ff
Resolver: fixes in PTR processing.
Ruslan Ermilov <ru@nginx.com>
parents:
5471
diff
changeset
|
1642 goto failed; |
1649 | 1643 } |
1644 | |
1645 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0, "resolver an:%V", &name); | |
1646 | |
2486
8de5dc3e7001
use length of uncompressed name
Igor Sysoev <igor@sysoev.ru>
parents:
2484
diff
changeset
|
1647 if (name.len != (size_t) rn->nlen |
8de5dc3e7001
use length of uncompressed name
Igor Sysoev <igor@sysoev.ru>
parents:
2484
diff
changeset
|
1648 || ngx_strncmp(name.data, rn->name, name.len) != 0) |
1649 | 1649 { |
2482
30ec8c5ac75b
fix reverse resolving cache: it stored zero length names
Igor Sysoev <igor@sysoev.ru>
parents:
2314
diff
changeset
|
1650 if (rn->nlen) { |
30ec8c5ac75b
fix reverse resolving cache: it stored zero length names
Igor Sysoev <igor@sysoev.ru>
parents:
2314
diff
changeset
|
1651 ngx_resolver_free(r, rn->name); |
30ec8c5ac75b
fix reverse resolving cache: it stored zero length names
Igor Sysoev <igor@sysoev.ru>
parents:
2314
diff
changeset
|
1652 } |
30ec8c5ac75b
fix reverse resolving cache: it stored zero length names
Igor Sysoev <igor@sysoev.ru>
parents:
2314
diff
changeset
|
1653 |
2490
1c87647b7ca5
fix building by msvc, introduced in r2487
Igor Sysoev <igor@sysoev.ru>
parents:
2487
diff
changeset
|
1654 rn->nlen = (u_short) name.len; |
1649 | 1655 rn->name = name.data; |
1656 | |
2486
8de5dc3e7001
use length of uncompressed name
Igor Sysoev <igor@sysoev.ru>
parents:
2484
diff
changeset
|
1657 name.data = ngx_resolver_dup(r, rn->name, name.len); |
1649 | 1658 if (name.data == NULL) { |
1659 goto failed; | |
1660 } | |
1661 } | |
1662 | |
1663 ngx_queue_remove(&rn->queue); | |
1664 | |
4295
05031fce7ce8
Now nginx uses TTL of a DNS response when calculating cache validity.
Ruslan Ermilov <ru@nginx.com>
parents:
4267
diff
changeset
|
1665 rn->valid = ngx_time() + (r->valid ? r->valid : ttl); |
1649 | 1666 rn->expire = ngx_time() + r->expire; |
1667 | |
1668 ngx_queue_insert_head(&r->addr_expire_queue, &rn->queue); | |
1669 | |
1670 next = rn->waiting; | |
1671 rn->waiting = NULL; | |
1672 | |
1673 /* unlock addr mutex */ | |
1674 | |
1675 while (next) { | |
1676 ctx = next; | |
1677 ctx->state = NGX_OK; | |
1678 ctx->name = name; | |
1679 next = ctx->next; | |
1680 | |
1681 ctx->handler(ctx); | |
1682 } | |
1683 | |
1684 ngx_resolver_free(r, name.data); | |
1685 | |
1686 return; | |
1687 | |
1688 invalid_in_addr_arpa: | |
1689 | |
1690 ngx_log_error(r->log_level, r->log, 0, | |
1691 "invalid in-addr.arpa name in DNS response"); | |
1692 return; | |
1693 | |
1694 short_response: | |
1695 | |
1696 err = "short DNS response"; | |
1697 | |
1698 invalid: | |
1699 | |
1700 /* unlock addr mutex */ | |
1701 | |
1702 ngx_log_error(r->log_level, r->log, 0, err); | |
1703 | |
1704 return; | |
1705 | |
1706 failed: | |
1707 | |
1708 /* unlock addr mutex */ | |
1709 | |
1710 return; | |
1711 } | |
1712 | |
1713 | |
1714 static ngx_resolver_node_t * | |
1715 ngx_resolver_lookup_name(ngx_resolver_t *r, ngx_str_t *name, uint32_t hash) | |
1716 { | |
1717 ngx_int_t rc; | |
1718 ngx_rbtree_node_t *node, *sentinel; | |
1719 ngx_resolver_node_t *rn; | |
1720 | |
1721 node = r->name_rbtree.root; | |
1722 sentinel = r->name_rbtree.sentinel; | |
1723 | |
1724 while (node != sentinel) { | |
1725 | |
1726 if (hash < node->key) { | |
1727 node = node->left; | |
1728 continue; | |
1729 } | |
1730 | |
1731 if (hash > node->key) { | |
1732 node = node->right; | |
1733 continue; | |
1734 } | |
1735 | |
1736 /* hash == node->key */ | |
1737 | |
4497
95ab6658654a
Fix of rbtree lookup on hash collisions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4496
diff
changeset
|
1738 rn = (ngx_resolver_node_t *) node; |
95ab6658654a
Fix of rbtree lookup on hash collisions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4496
diff
changeset
|
1739 |
95ab6658654a
Fix of rbtree lookup on hash collisions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4496
diff
changeset
|
1740 rc = ngx_memn2cmp(name->data, rn->name, name->len, rn->nlen); |
95ab6658654a
Fix of rbtree lookup on hash collisions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4496
diff
changeset
|
1741 |
95ab6658654a
Fix of rbtree lookup on hash collisions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4496
diff
changeset
|
1742 if (rc == 0) { |
95ab6658654a
Fix of rbtree lookup on hash collisions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4496
diff
changeset
|
1743 return rn; |
95ab6658654a
Fix of rbtree lookup on hash collisions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4496
diff
changeset
|
1744 } |
95ab6658654a
Fix of rbtree lookup on hash collisions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4496
diff
changeset
|
1745 |
95ab6658654a
Fix of rbtree lookup on hash collisions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4496
diff
changeset
|
1746 node = (rc < 0) ? node->left : node->right; |
1649 | 1747 } |
1748 | |
1749 /* not found */ | |
1750 | |
1751 return NULL; | |
1752 } | |
1753 | |
1754 | |
1755 static ngx_resolver_node_t * | |
1756 ngx_resolver_lookup_addr(ngx_resolver_t *r, in_addr_t addr) | |
1757 { | |
1758 ngx_rbtree_node_t *node, *sentinel; | |
1759 | |
1760 node = r->addr_rbtree.root; | |
1761 sentinel = r->addr_rbtree.sentinel; | |
1762 | |
1763 while (node != sentinel) { | |
1764 | |
1765 if (addr < node->key) { | |
1766 node = node->left; | |
1767 continue; | |
1768 } | |
1769 | |
1770 if (addr > node->key) { | |
1771 node = node->right; | |
1772 continue; | |
1773 } | |
1774 | |
1775 /* addr == node->key */ | |
1776 | |
1777 return (ngx_resolver_node_t *) node; | |
1778 } | |
1779 | |
1780 /* not found */ | |
1781 | |
1782 return NULL; | |
1783 } | |
1784 | |
1785 | |
1786 static void | |
1787 ngx_resolver_rbtree_insert_value(ngx_rbtree_node_t *temp, | |
1788 ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel) | |
1789 { | |
1790 ngx_rbtree_node_t **p; | |
1791 ngx_resolver_node_t *rn, *rn_temp; | |
1792 | |
1793 for ( ;; ) { | |
1794 | |
1795 if (node->key < temp->key) { | |
1796 | |
1797 p = &temp->left; | |
1798 | |
1799 } else if (node->key > temp->key) { | |
1800 | |
1801 p = &temp->right; | |
1802 | |
1803 } else { /* node->key == temp->key */ | |
1804 | |
1805 rn = (ngx_resolver_node_t *) node; | |
1806 rn_temp = (ngx_resolver_node_t *) temp; | |
1807 | |
3143
ab6258e18099
fix resolver cache rbtree comparison
Igor Sysoev <igor@sysoev.ru>
parents:
3139
diff
changeset
|
1808 p = (ngx_memn2cmp(rn->name, rn_temp->name, rn->nlen, rn_temp->nlen) |
ab6258e18099
fix resolver cache rbtree comparison
Igor Sysoev <igor@sysoev.ru>
parents:
3139
diff
changeset
|
1809 < 0) ? &temp->left : &temp->right; |
1649 | 1810 } |
1811 | |
1812 if (*p == sentinel) { | |
1813 break; | |
1814 } | |
1815 | |
1816 temp = *p; | |
1817 } | |
1818 | |
1819 *p = node; | |
1820 node->parent = temp; | |
1821 node->left = sentinel; | |
1822 node->right = sentinel; | |
1823 ngx_rbt_red(node); | |
1824 } | |
1825 | |
1826 | |
1827 static ngx_int_t | |
1828 ngx_resolver_create_name_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx) | |
1829 { | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1830 u_char *p, *s; |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1831 size_t len, nlen; |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1832 ngx_uint_t ident; |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1833 ngx_resolver_qs_t *qs; |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1834 ngx_resolver_hdr_t *query; |
1649 | 1835 |
3306
61bdaac6c668
fix resolving an empty name (".")
Igor Sysoev <igor@sysoev.ru>
parents:
3299
diff
changeset
|
1836 nlen = ctx->name.len ? (1 + ctx->name.len + 1) : 1; |
61bdaac6c668
fix resolving an empty name (".")
Igor Sysoev <igor@sysoev.ru>
parents:
3299
diff
changeset
|
1837 |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1838 len = sizeof(ngx_resolver_hdr_t) + nlen + sizeof(ngx_resolver_qs_t); |
1649 | 1839 |
3307
34e99a97fbd6
use ngx_resolver_alloc() instead of ngx_resolver_calloc()
Igor Sysoev <igor@sysoev.ru>
parents:
3306
diff
changeset
|
1840 p = ngx_resolver_alloc(ctx->resolver, len); |
1649 | 1841 if (p == NULL) { |
1842 return NGX_ERROR; | |
1843 } | |
1844 | |
1845 rn->qlen = (u_short) len; | |
1846 rn->query = p; | |
1847 | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1848 query = (ngx_resolver_hdr_t *) p; |
1649 | 1849 |
1850 ident = ngx_random(); | |
1851 | |
1852 ngx_log_debug2(NGX_LOG_DEBUG_CORE, ctx->resolver->log, 0, | |
1853 "resolve: \"%V\" %i", &ctx->name, ident & 0xffff); | |
1854 | |
1855 query->ident_hi = (u_char) ((ident >> 8) & 0xff); | |
1856 query->ident_lo = (u_char) (ident & 0xff); | |
1857 | |
1858 /* recursion query */ | |
1859 query->flags_hi = 1; query->flags_lo = 0; | |
1860 | |
1861 /* one question */ | |
1862 query->nqs_hi = 0; query->nqs_lo = 1; | |
1863 query->nan_hi = 0; query->nan_lo = 0; | |
1864 query->nns_hi = 0; query->nns_lo = 0; | |
1865 query->nar_hi = 0; query->nar_lo = 0; | |
1866 | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1867 p += sizeof(ngx_resolver_hdr_t) + nlen; |
1649 | 1868 |
1869 qs = (ngx_resolver_qs_t *) p; | |
1870 | |
1871 /* query type */ | |
1872 qs->type_hi = 0; qs->type_lo = (u_char) ctx->type; | |
1873 | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1874 /* IN query class */ |
1649 | 1875 qs->class_hi = 0; qs->class_lo = 1; |
1876 | |
1877 /* convert "www.example.com" to "\3www\7example\3com\0" */ | |
1878 | |
1879 len = 0; | |
1880 p--; | |
1881 *p-- = '\0'; | |
1882 | |
4610
778d2cc03e22
Fixed segmentation fault in ngx_resolver_create_name_query().
Ruslan Ermilov <ru@nginx.com>
parents:
4556
diff
changeset
|
1883 if (ctx->name.len == 0) { |
778d2cc03e22
Fixed segmentation fault in ngx_resolver_create_name_query().
Ruslan Ermilov <ru@nginx.com>
parents:
4556
diff
changeset
|
1884 return NGX_DECLINED; |
778d2cc03e22
Fixed segmentation fault in ngx_resolver_create_name_query().
Ruslan Ermilov <ru@nginx.com>
parents:
4556
diff
changeset
|
1885 } |
778d2cc03e22
Fixed segmentation fault in ngx_resolver_create_name_query().
Ruslan Ermilov <ru@nginx.com>
parents:
4556
diff
changeset
|
1886 |
1649 | 1887 for (s = ctx->name.data + ctx->name.len - 1; s >= ctx->name.data; s--) { |
1888 if (*s != '.') { | |
1889 *p = *s; | |
1890 len++; | |
1891 | |
1892 } else { | |
4556
1bddc91e78d6
Resolver: added missing sanity checking when creating name queries.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4497
diff
changeset
|
1893 if (len == 0 || len > 255) { |
1961
99b9feacccb4
return NXDOMAIN for ".." in host name
Igor Sysoev <igor@sysoev.ru>
parents:
1960
diff
changeset
|
1894 return NGX_DECLINED; |
99b9feacccb4
return NXDOMAIN for ".." in host name
Igor Sysoev <igor@sysoev.ru>
parents:
1960
diff
changeset
|
1895 } |
99b9feacccb4
return NXDOMAIN for ".." in host name
Igor Sysoev <igor@sysoev.ru>
parents:
1960
diff
changeset
|
1896 |
1649 | 1897 *p = (u_char) len; |
1898 len = 0; | |
1899 } | |
1900 | |
1901 p--; | |
1902 } | |
1903 | |
4556
1bddc91e78d6
Resolver: added missing sanity checking when creating name queries.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4497
diff
changeset
|
1904 if (len == 0 || len > 255) { |
1bddc91e78d6
Resolver: added missing sanity checking when creating name queries.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4497
diff
changeset
|
1905 return NGX_DECLINED; |
1bddc91e78d6
Resolver: added missing sanity checking when creating name queries.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4497
diff
changeset
|
1906 } |
1bddc91e78d6
Resolver: added missing sanity checking when creating name queries.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4497
diff
changeset
|
1907 |
1649 | 1908 *p = (u_char) len; |
1909 | |
1910 return NGX_OK; | |
1911 } | |
1912 | |
1913 | |
1914 /* AF_INET only */ | |
1915 | |
1916 static ngx_int_t | |
1917 ngx_resolver_create_addr_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx) | |
1918 { | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1919 u_char *p, *d; |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1920 size_t len; |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1921 ngx_int_t n; |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1922 ngx_uint_t ident; |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1923 ngx_resolver_hdr_t *query; |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1924 |
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1925 len = sizeof(ngx_resolver_hdr_t) |
1649 | 1926 + sizeof(".255.255.255.255.in-addr.arpa.") - 1 |
1927 + sizeof(ngx_resolver_qs_t); | |
1928 | |
3307
34e99a97fbd6
use ngx_resolver_alloc() instead of ngx_resolver_calloc()
Igor Sysoev <igor@sysoev.ru>
parents:
3306
diff
changeset
|
1929 p = ngx_resolver_alloc(ctx->resolver, len); |
1649 | 1930 if (p == NULL) { |
1931 return NGX_ERROR; | |
1932 } | |
1933 | |
1934 rn->query = p; | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1935 query = (ngx_resolver_hdr_t *) p; |
1649 | 1936 |
1937 ident = ngx_random(); | |
1938 | |
1939 query->ident_hi = (u_char) ((ident >> 8) & 0xff); | |
1940 query->ident_lo = (u_char) (ident & 0xff); | |
1941 | |
1942 /* recursion query */ | |
1943 query->flags_hi = 1; query->flags_lo = 0; | |
1944 | |
1945 /* one question */ | |
1946 query->nqs_hi = 0; query->nqs_lo = 1; | |
1947 query->nan_hi = 0; query->nan_lo = 0; | |
1948 query->nns_hi = 0; query->nns_lo = 0; | |
1949 query->nar_hi = 0; query->nar_lo = 0; | |
1950 | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1951 p += sizeof(ngx_resolver_hdr_t); |
1649 | 1952 |
3642 | 1953 for (n = 0; n < 32; n += 8) { |
1649 | 1954 d = ngx_sprintf(&p[1], "%ud", (ctx->addr >> n) & 0xff); |
1955 *p = (u_char) (d - &p[1]); | |
1956 p = d; | |
1957 } | |
1958 | |
5468
5c410d6ca7dd
Resolver: improved code readability.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
1959 /* query type "PTR", IN query class */ |
1649 | 1960 ngx_memcpy(p, "\7in-addr\4arpa\0\0\14\0\1", 18); |
1961 | |
1962 rn->qlen = (u_short) | |
1963 (p + sizeof("\7in-addr\4arpa") + sizeof(ngx_resolver_qs_t) | |
1964 - rn->query); | |
1965 | |
1966 return NGX_OK; | |
1967 } | |
1968 | |
1969 | |
1970 static ngx_int_t | |
1971 ngx_resolver_copy(ngx_resolver_t *r, ngx_str_t *name, u_char *buf, u_char *src, | |
1972 u_char *last) | |
1973 { | |
1974 char *err; | |
1975 u_char *p, *dst; | |
1976 ssize_t len; | |
1977 ngx_uint_t i, n; | |
1978 | |
1979 p = src; | |
1980 len = -1; | |
1981 | |
1982 /* | |
1983 * compression pointers allow to create endless loop, so we set limit; | |
1984 * 128 pointers should be enough to store 255-byte name | |
1985 */ | |
1986 | |
1987 for (i = 0; i < 128; i++) { | |
1988 n = *p++; | |
1989 | |
1990 if (n == 0) { | |
1991 goto done; | |
1992 } | |
1993 | |
1994 if (n & 0xc0) { | |
2314
52987a023486
fix compression pointer for big (>255) DNS responses
Igor Sysoev <igor@sysoev.ru>
parents:
2282
diff
changeset
|
1995 n = ((n & 0x3f) << 8) + *p; |
1649 | 1996 p = &buf[n]; |
1997 | |
1998 } else { | |
1999 len += 1 + n; | |
2000 p = &p[n]; | |
2001 } | |
2002 | |
2003 if (p >= last) { | |
2004 err = "name is out of response"; | |
2005 goto invalid; | |
2006 } | |
2007 } | |
2008 | |
2009 err = "compression pointers loop"; | |
2010 | |
2011 invalid: | |
2012 | |
2013 ngx_log_error(r->log_level, r->log, 0, err); | |
2014 | |
2015 return NGX_ERROR; | |
2016 | |
2017 done: | |
2018 | |
2019 if (name == NULL) { | |
583 | 2020 return NGX_OK; |
2021 } | |
2022 | |
3298
847ab5a32307
fix "PTR ." case in address resolver
Igor Sysoev <igor@sysoev.ru>
parents:
3297
diff
changeset
|
2023 if (len == -1) { |
847ab5a32307
fix "PTR ." case in address resolver
Igor Sysoev <igor@sysoev.ru>
parents:
3297
diff
changeset
|
2024 name->len = 0; |
847ab5a32307
fix "PTR ." case in address resolver
Igor Sysoev <igor@sysoev.ru>
parents:
3297
diff
changeset
|
2025 name->data = NULL; |
847ab5a32307
fix "PTR ." case in address resolver
Igor Sysoev <igor@sysoev.ru>
parents:
3297
diff
changeset
|
2026 return NGX_OK; |
847ab5a32307
fix "PTR ." case in address resolver
Igor Sysoev <igor@sysoev.ru>
parents:
3297
diff
changeset
|
2027 } |
847ab5a32307
fix "PTR ." case in address resolver
Igor Sysoev <igor@sysoev.ru>
parents:
3297
diff
changeset
|
2028 |
1649 | 2029 dst = ngx_resolver_alloc(r, len); |
2030 if (dst == NULL) { | |
2031 return NGX_ERROR; | |
2032 } | |
2033 | |
2034 name->data = dst; | |
2035 | |
2036 n = *src++; | |
2037 | |
2038 for ( ;; ) { | |
4267
768212ca0745
Fixed compression pointer processing in DNS response greater than 255 bytes.
Igor Sysoev <igor@sysoev.ru>
parents:
4225
diff
changeset
|
2039 if (n & 0xc0) { |
768212ca0745
Fixed compression pointer processing in DNS response greater than 255 bytes.
Igor Sysoev <igor@sysoev.ru>
parents:
4225
diff
changeset
|
2040 n = ((n & 0x3f) << 8) + *src; |
768212ca0745
Fixed compression pointer processing in DNS response greater than 255 bytes.
Igor Sysoev <igor@sysoev.ru>
parents:
4225
diff
changeset
|
2041 src = &buf[n]; |
768212ca0745
Fixed compression pointer processing in DNS response greater than 255 bytes.
Igor Sysoev <igor@sysoev.ru>
parents:
4225
diff
changeset
|
2042 |
768212ca0745
Fixed compression pointer processing in DNS response greater than 255 bytes.
Igor Sysoev <igor@sysoev.ru>
parents:
4225
diff
changeset
|
2043 n = *src++; |
768212ca0745
Fixed compression pointer processing in DNS response greater than 255 bytes.
Igor Sysoev <igor@sysoev.ru>
parents:
4225
diff
changeset
|
2044 |
768212ca0745
Fixed compression pointer processing in DNS response greater than 255 bytes.
Igor Sysoev <igor@sysoev.ru>
parents:
4225
diff
changeset
|
2045 } else { |
1649 | 2046 ngx_memcpy(dst, src, n); |
2047 dst += n; | |
2048 src += n; | |
2049 | |
2050 n = *src++; | |
2051 | |
2052 if (n != 0) { | |
2053 *dst++ = '.'; | |
2054 } | |
2055 } | |
2056 | |
2057 if (n == 0) { | |
2058 name->len = dst - name->data; | |
2059 return NGX_OK; | |
2060 } | |
2061 } | |
2062 } | |
2063 | |
2064 | |
2065 static void | |
2066 ngx_resolver_timeout_handler(ngx_event_t *ev) | |
2067 { | |
2068 ngx_resolver_ctx_t *ctx; | |
2069 | |
2070 ctx = ev->data; | |
2071 | |
2072 ctx->state = NGX_RESOLVE_TIMEDOUT; | |
2073 | |
2074 ctx->handler(ctx); | |
2075 } | |
2076 | |
2077 | |
2078 static void | |
2079 ngx_resolver_free_node(ngx_resolver_t *r, ngx_resolver_node_t *rn) | |
2080 { | |
2081 /* lock alloc mutex */ | |
2082 | |
2083 if (rn->query) { | |
2084 ngx_resolver_free_locked(r, rn->query); | |
2085 } | |
2086 | |
2087 if (rn->name) { | |
2088 ngx_resolver_free_locked(r, rn->name); | |
2089 } | |
2090 | |
2091 if (rn->cnlen) { | |
2092 ngx_resolver_free_locked(r, rn->u.cname); | |
2093 } | |
2094 | |
2095 if (rn->naddrs > 1) { | |
2096 ngx_resolver_free_locked(r, rn->u.addrs); | |
2097 } | |
2098 | |
2099 ngx_resolver_free_locked(r, rn); | |
2100 | |
2101 /* unlock alloc mutex */ | |
2102 } | |
2103 | |
2104 | |
2105 static void * | |
2106 ngx_resolver_alloc(ngx_resolver_t *r, size_t size) | |
2107 { | |
2108 u_char *p; | |
2109 | |
2110 /* lock alloc mutex */ | |
2111 | |
2112 p = ngx_alloc(size, r->log); | |
2113 | |
2114 /* unlock alloc mutex */ | |
2115 | |
2116 return p; | |
2117 } | |
2118 | |
2119 | |
1903 | 2120 static void * |
1649 | 2121 ngx_resolver_calloc(ngx_resolver_t *r, size_t size) |
2122 { | |
2123 u_char *p; | |
2124 | |
2125 p = ngx_resolver_alloc(r, size); | |
2126 | |
2127 if (p) { | |
2128 ngx_memzero(p, size); | |
2129 } | |
2130 | |
2131 return p; | |
2132 } | |
2133 | |
2134 | |
2135 static void | |
2136 ngx_resolver_free(ngx_resolver_t *r, void *p) | |
2137 { | |
2138 /* lock alloc mutex */ | |
2139 | |
2140 ngx_free(p); | |
2141 | |
2142 /* unlock alloc mutex */ | |
2143 } | |
2144 | |
2145 | |
2146 static void | |
2147 ngx_resolver_free_locked(ngx_resolver_t *r, void *p) | |
2148 { | |
2149 ngx_free(p); | |
2150 } | |
2151 | |
2152 | |
2153 static void * | |
2154 ngx_resolver_dup(ngx_resolver_t *r, void *src, size_t size) | |
2155 { | |
2156 void *dst; | |
2157 | |
2158 dst = ngx_resolver_alloc(r, size); | |
2159 | |
2160 if (dst == NULL) { | |
2161 return dst; | |
2162 } | |
2163 | |
2164 ngx_memcpy(dst, src, size); | |
2165 | |
2166 return dst; | |
2167 } | |
2168 | |
2169 | |
4871
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
2170 static in_addr_t * |
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
2171 ngx_resolver_rotate(ngx_resolver_t *r, in_addr_t *src, ngx_uint_t n) |
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
2172 { |
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
2173 void *dst, *p; |
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
2174 ngx_uint_t j; |
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
2175 |
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
2176 dst = ngx_resolver_alloc(r, n * sizeof(in_addr_t)); |
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
2177 |
4892
063ac68d89dc
Resolver: added missing memory allocation error handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4871
diff
changeset
|
2178 if (dst == NULL) { |
063ac68d89dc
Resolver: added missing memory allocation error handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4871
diff
changeset
|
2179 return dst; |
063ac68d89dc
Resolver: added missing memory allocation error handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4871
diff
changeset
|
2180 } |
063ac68d89dc
Resolver: added missing memory allocation error handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4871
diff
changeset
|
2181 |
4871
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
2182 j = ngx_random() % n; |
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
2183 |
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
2184 if (j == 0) { |
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
2185 ngx_memcpy(dst, src, n * sizeof(in_addr_t)); |
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
2186 return dst; |
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
2187 } |
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
2188 |
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
2189 p = ngx_cpymem(dst, &src[j], (n - j) * sizeof(in_addr_t)); |
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
2190 ngx_memcpy(p, src, j * sizeof(in_addr_t)); |
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
2191 |
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
2192 return dst; |
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
2193 } |
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
2194 |
c85cefbdaafe
Resolver: cached addresses are returned with random rotation now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4784
diff
changeset
|
2195 |
1649 | 2196 char * |
2197 ngx_resolver_strerror(ngx_int_t err) | |
2198 { | |
2199 static char *errors[] = { | |
2200 "Format error", /* FORMERR */ | |
2201 "Server failure", /* SERVFAIL */ | |
2202 "Host not found", /* NXDOMAIN */ | |
2203 "Unimplemented", /* NOTIMP */ | |
2204 "Operation refused" /* REFUSED */ | |
2205 }; | |
2206 | |
2207 if (err > 0 && err < 6) { | |
2208 return errors[err - 1]; | |
2209 } | |
2210 | |
2211 if (err == NGX_RESOLVE_TIMEDOUT) { | |
2212 return "Operation timed out"; | |
2213 } | |
2214 | |
2215 return "Unknown error"; | |
2216 } | |
2217 | |
2218 | |
3408
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2219 static u_char * |
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2220 ngx_resolver_log_error(ngx_log_t *log, u_char *buf, size_t len) |
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2221 { |
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2222 u_char *p; |
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2223 ngx_udp_connection_t *uc; |
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2224 |
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2225 p = buf; |
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2226 |
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2227 if (log->action) { |
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2228 p = ngx_snprintf(buf, len, " while %s", log->action); |
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2229 len -= p - buf; |
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2230 } |
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2231 |
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2232 uc = log->data; |
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2233 |
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2234 if (uc) { |
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2235 p = ngx_snprintf(p, len, ", resolver: %V", &uc->server); |
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2236 } |
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2237 |
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2238 return p; |
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2239 } |
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2240 |
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2241 |
1649 | 2242 ngx_int_t |
2243 ngx_udp_connect(ngx_udp_connection_t *uc) | |
2244 { | |
2245 int rc; | |
2246 ngx_int_t event; | |
2247 ngx_event_t *rev, *wev; | |
2248 ngx_socket_t s; | |
2249 ngx_connection_t *c; | |
2250 | |
4671
af9342747669
Support for IPv6 literals and an optional port in resolver.
Ruslan Ermilov <ru@nginx.com>
parents:
4653
diff
changeset
|
2251 s = ngx_socket(uc->sockaddr->sa_family, SOCK_DGRAM, 0); |
583 | 2252 |
3408
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2253 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, &uc->log, 0, "UDP socket %d", s); |
583 | 2254 |
5360
3d2d3e1cf427
Win32: MinGW GCC compatibility.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4892
diff
changeset
|
2255 if (s == (ngx_socket_t) -1) { |
3408
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2256 ngx_log_error(NGX_LOG_ALERT, &uc->log, ngx_socket_errno, |
583 | 2257 ngx_socket_n " failed"); |
2258 return NGX_ERROR; | |
2259 } | |
2260 | |
3408
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2261 c = ngx_get_connection(s, &uc->log); |
583 | 2262 |
2263 if (c == NULL) { | |
2264 if (ngx_close_socket(s) == -1) { | |
3408
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2265 ngx_log_error(NGX_LOG_ALERT, &uc->log, ngx_socket_errno, |
583 | 2266 ngx_close_socket_n "failed"); |
2267 } | |
2268 | |
2269 return NGX_ERROR; | |
2270 } | |
2271 | |
1649 | 2272 if (ngx_nonblocking(s) == -1) { |
3408
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2273 ngx_log_error(NGX_LOG_ALERT, &uc->log, ngx_socket_errno, |
1649 | 2274 ngx_nonblocking_n " failed"); |
2275 | |
2276 ngx_free_connection(c); | |
2277 | |
2278 if (ngx_close_socket(s) == -1) { | |
3408
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2279 ngx_log_error(NGX_LOG_ALERT, &uc->log, ngx_socket_errno, |
1649 | 2280 ngx_close_socket_n " failed"); |
2281 } | |
2282 | |
2283 return NGX_ERROR; | |
2284 } | |
2285 | |
583 | 2286 rev = c->read; |
2287 wev = c->write; | |
2288 | |
3408
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2289 rev->log = &uc->log; |
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2290 wev->log = &uc->log; |
1649 | 2291 |
2292 uc->connection = c; | |
583 | 2293 |
2294 c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1); | |
2295 | |
2296 #if (NGX_THREADS) | |
1649 | 2297 |
2298 /* TODO: lock event when call completion handler */ | |
2299 | |
2300 rev->lock = &c->lock; | |
2301 wev->lock = &c->lock; | |
583 | 2302 rev->own_lock = &c->lock; |
2303 wev->own_lock = &c->lock; | |
1649 | 2304 |
583 | 2305 #endif |
2306 | |
3408
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2307 ngx_log_debug3(NGX_LOG_DEBUG_EVENT, &uc->log, 0, |
1649 | 2308 "connect to %V, fd:%d #%d", &uc->server, s, c->number); |
2309 | |
2310 rc = connect(s, uc->sockaddr, uc->socklen); | |
2311 | |
2312 /* TODO: aio, iocp */ | |
583 | 2313 |
2314 if (rc == -1) { | |
3408
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2315 ngx_log_error(NGX_LOG_CRIT, &uc->log, ngx_socket_errno, |
71193a456616
add context to a resolver log
Igor Sysoev <igor@sysoev.ru>
parents:
3376
diff
changeset
|
2316 "connect() failed"); |
583 | 2317 |
2318 return NGX_ERROR; | |
2319 } | |
2320 | |
1649 | 2321 /* UDP sockets are always ready to write */ |
2322 wev->ready = 1; | |
2323 | |
2324 if (ngx_add_event) { | |
2325 | |
2326 event = (ngx_event_flags & NGX_USE_CLEAR_EVENT) ? | |
2327 /* kqueue, epoll */ NGX_CLEAR_EVENT: | |
2328 /* select, poll, /dev/poll */ NGX_LEVEL_EVENT; | |
2329 /* eventport event type has no meaning: oneshot only */ | |
2330 | |
2331 if (ngx_add_event(rev, NGX_READ_EVENT, event) != NGX_OK) { | |
2332 return NGX_ERROR; | |
2333 } | |
2334 | |
2335 } else { | |
2336 /* rtsig */ | |
2337 | |
583 | 2338 if (ngx_add_conn(c) == NGX_ERROR) { |
2339 return NGX_ERROR; | |
2340 } | |
2341 } | |
2342 | |
2343 return NGX_OK; | |
2344 } |