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