nginx: src/core/ngx_resolver.c annotate

annotate src/core/ngx_resolver.c @ 6369:06459bc8b92f

Resolver: free TCP buffers on resolver cleanup.

author	Roman Arutyunyan <arut@nginx.com>
date	Tue, 02 Feb 2016 13:42:55 +0300
parents	d73f77bb5caf
children	8c8739bdd3f1

rev	line source
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2 /*
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3 * Copyright (C) Igor Sysoev
4412 d620f497c50f Copyright updated. Maxim Konovalov <maxim@nginx.com> parents: 4296 diff changeset	4 * Copyright (C) Nginx, Inc.
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	5 */
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	6
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	7
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	8 #include <ngx_config.h>
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	9 #include <ngx_core.h>
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	10 #include <ngx_event.h>
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	11
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	12
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	13 #define NGX_RESOLVER_UDP_SIZE 4096
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	14
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	15 #define NGX_RESOLVER_TCP_RSIZE (2 + 65535)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	16 #define NGX_RESOLVER_TCP_WSIZE 8192
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	17
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	18
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	19 typedef struct {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	20 u_char ident_hi;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	21 u_char ident_lo;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	22 u_char flags_hi;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	23 u_char flags_lo;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	24 u_char nqs_hi;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	25 u_char nqs_lo;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	26 u_char nan_hi;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	27 u_char nan_lo;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	28 u_char nns_hi;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	29 u_char nns_lo;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	30 u_char nar_hi;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	31 u_char nar_lo;
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	32 } ngx_resolver_hdr_t;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	33
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	34
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	35 typedef struct {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	36 u_char type_hi;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	37 u_char type_lo;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	38 u_char class_hi;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	39 u_char class_lo;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	40 } ngx_resolver_qs_t;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	41
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	42
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	43 typedef struct {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	44 u_char type_hi;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	45 u_char type_lo;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	46 u_char class_hi;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	47 u_char class_lo;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	48 u_char ttl[4];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	49 u_char len_hi;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	50 u_char len_lo;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	51 } ngx_resolver_an_t;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	52
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	53
5921 5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	54 #define ngx_resolver_node(n) \
5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	55 (ngx_resolver_node_t *) \
5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	56 ((u_char *) (n) - offsetof(ngx_resolver_node_t, node))
5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	57
5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	58
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	59 ngx_int_t ngx_udp_connect(ngx_resolver_connection_t *rec);
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	60 ngx_int_t ngx_tcp_connect(ngx_resolver_connection_t *rec);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	61
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	62
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	63 static void ngx_resolver_cleanup(void *data);
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	64 static void ngx_resolver_cleanup_tree(ngx_resolver_t r, ngx_rbtree_t tree);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	65 static ngx_int_t ngx_resolve_name_locked(ngx_resolver_t *r,
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	66 ngx_resolver_ctx_t ctx, ngx_str_t name);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	67 static void ngx_resolver_expire(ngx_resolver_t r, ngx_rbtree_t tree,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	68 ngx_queue_t *queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	69 static ngx_int_t ngx_resolver_send_query(ngx_resolver_t *r,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	70 ngx_resolver_node_t *rn);
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	71 static ngx_int_t ngx_resolver_send_udp_query(ngx_resolver_t *r,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	72 ngx_resolver_connection_t rec, u_char query, u_short qlen);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	73 static ngx_int_t ngx_resolver_send_tcp_query(ngx_resolver_t *r,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	74 ngx_resolver_connection_t rec, u_char query, u_short qlen);
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	75 static ngx_int_t ngx_resolver_create_name_query(ngx_resolver_t *r,
a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	76 ngx_resolver_node_t rn, ngx_str_t name);
a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	77 static ngx_int_t ngx_resolver_create_addr_query(ngx_resolver_t *r,
a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	78 ngx_resolver_node_t rn, ngx_addr_t addr);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	79 static void ngx_resolver_resend_handler(ngx_event_t *ev);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	80 static time_t ngx_resolver_resend(ngx_resolver_t r, ngx_rbtree_t tree,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	81 ngx_queue_t *queue);
6196 c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	82 static ngx_uint_t ngx_resolver_resend_empty(ngx_resolver_t *r);
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	83 static void ngx_resolver_udp_read(ngx_event_t *rev);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	84 static void ngx_resolver_tcp_write(ngx_event_t *wev);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	85 static void ngx_resolver_tcp_read(ngx_event_t *rev);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	86 static void ngx_resolver_process_response(ngx_resolver_t r, u_char buf,
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	87 size_t n, ngx_uint_t tcp);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	88 static void ngx_resolver_process_a(ngx_resolver_t r, u_char buf, size_t n,
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	89 ngx_uint_t ident, ngx_uint_t code, ngx_uint_t qtype,
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	90 ngx_uint_t nan, ngx_uint_t trunc, ngx_uint_t ans);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	91 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	92 ngx_uint_t ident, ngx_uint_t code, ngx_uint_t nan);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	93 static ngx_resolver_node_t ngx_resolver_lookup_name(ngx_resolver_t r,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	94 ngx_str_t *name, uint32_t hash);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	95 static ngx_resolver_node_t ngx_resolver_lookup_addr(ngx_resolver_t r,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	96 in_addr_t addr);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	97 static void ngx_resolver_rbtree_insert_value(ngx_rbtree_node_t *temp,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	98 ngx_rbtree_node_t node, ngx_rbtree_node_t sentinel);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	99 static ngx_int_t ngx_resolver_copy(ngx_resolver_t r, ngx_str_t name,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	100 u_char buf, u_char src, u_char *last);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	101 static void ngx_resolver_timeout_handler(ngx_event_t *ev);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	102 static void ngx_resolver_free_node(ngx_resolver_t r, ngx_resolver_node_t rn);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	103 static void ngx_resolver_alloc(ngx_resolver_t r, size_t size);
1903 1ea922585517 static ngx_resolver_calloc() Igor Sysoev <igor@sysoev.ru> parents: 1880 diff changeset	104 static void ngx_resolver_calloc(ngx_resolver_t r, size_t size);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	105 static void ngx_resolver_free(ngx_resolver_t r, void p);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	106 static void ngx_resolver_free_locked(ngx_resolver_t r, void p);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	107 static void ngx_resolver_dup(ngx_resolver_t r, void *src, size_t size);
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	108 static ngx_addr_t ngx_resolver_export(ngx_resolver_t r,
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	109 ngx_resolver_node_t *rn, ngx_uint_t rotate);
3408 71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	110 static u_char ngx_resolver_log_error(ngx_log_t log, u_char *buf, size_t len);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	111
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	112 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	113 static void ngx_resolver_rbtree_insert_addr6_value(ngx_rbtree_node_t *temp,
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	114 ngx_rbtree_node_t node, ngx_rbtree_node_t sentinel);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	115 static ngx_resolver_node_t ngx_resolver_lookup_addr6(ngx_resolver_t r,
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	116 struct in6_addr *addr, uint32_t hash);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	117 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	118
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	119
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	120 ngx_resolver_t *
4225 016352c19049 Support of several servers in the "resolver" directive. Igor Sysoev <igor@sysoev.ru> parents: 3902 diff changeset	121 ngx_resolver_create(ngx_conf_t cf, ngx_str_t names, ngx_uint_t n)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	122 {
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	123 ngx_str_t s;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	124 ngx_url_t u;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	125 ngx_uint_t i, j;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	126 ngx_resolver_t *r;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	127 ngx_pool_cleanup_t *cln;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	128 ngx_resolver_connection_t *rec;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	129
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	130 cln = ngx_pool_cleanup_add(cf->pool, 0);
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	131 if (cln == NULL) {
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	132 return NULL;
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	133 }
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	134
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	135 cln->handler = ngx_resolver_cleanup;
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	136
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	137 r = ngx_calloc(sizeof(ngx_resolver_t), cf->log);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	138 if (r == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	139 return NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	140 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	141
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	142 cln->data = r;
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	143
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	144 r->event = ngx_calloc(sizeof(ngx_event_t), cf->log);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	145 if (r->event == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	146 return NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	147 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	148
1687 568d432effb9 use ngx_rbtree_init() Igor Sysoev <igor@sysoev.ru> parents: 1685 diff changeset	149 ngx_rbtree_init(&r->name_rbtree, &r->name_sentinel,
568d432effb9 use ngx_rbtree_init() Igor Sysoev <igor@sysoev.ru> parents: 1685 diff changeset	150 ngx_resolver_rbtree_insert_value);
568d432effb9 use ngx_rbtree_init() Igor Sysoev <igor@sysoev.ru> parents: 1685 diff changeset	151
568d432effb9 use ngx_rbtree_init() Igor Sysoev <igor@sysoev.ru> parents: 1685 diff changeset	152 ngx_rbtree_init(&r->addr_rbtree, &r->addr_sentinel,
568d432effb9 use ngx_rbtree_init() Igor Sysoev <igor@sysoev.ru> parents: 1685 diff changeset	153 ngx_rbtree_insert_value);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	154
1685 a24c909ad879 use ngx_queue_init() Igor Sysoev <igor@sysoev.ru> parents: 1683 diff changeset	155 ngx_queue_init(&r->name_resend_queue);
a24c909ad879 use ngx_queue_init() Igor Sysoev <igor@sysoev.ru> parents: 1683 diff changeset	156 ngx_queue_init(&r->addr_resend_queue);
a24c909ad879 use ngx_queue_init() Igor Sysoev <igor@sysoev.ru> parents: 1683 diff changeset	157
a24c909ad879 use ngx_queue_init() Igor Sysoev <igor@sysoev.ru> parents: 1683 diff changeset	158 ngx_queue_init(&r->name_expire_queue);
a24c909ad879 use ngx_queue_init() Igor Sysoev <igor@sysoev.ru> parents: 1683 diff changeset	159 ngx_queue_init(&r->addr_expire_queue);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	160
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	161 #if (NGX_HAVE_INET6)
5478 3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	162 r->ipv6 = 1;
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	163
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	164 ngx_rbtree_init(&r->addr6_rbtree, &r->addr6_sentinel,
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	165 ngx_resolver_rbtree_insert_addr6_value);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	166
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	167 ngx_queue_init(&r->addr6_resend_queue);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	168
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	169 ngx_queue_init(&r->addr6_expire_queue);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	170 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	171
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	172 r->event->handler = ngx_resolver_resend_handler;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	173 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	174 r->event->log = &cf->cycle->new_log;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	175 r->ident = -1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	176
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	177 r->resend_timeout = 5;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	178 r->tcp_timeout = 5;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	179 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	180 r->valid = 0;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	181
2785 d478379e51ac ) refactor error_log processing: listen socket log might inherit built-in Igor Sysoev <igor@sysoev.ru>* parents: 2490 diff changeset	182 r->log = &cf->cycle->new_log;
3763 beca53d6ab3c decrease resolver errors level to error Igor Sysoev <igor@sysoev.ru> parents: 3642 diff changeset	183 r->log_level = NGX_LOG_ERR;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	184
4784 dd63abf20ba7 Resolver: fixed possible memory leak in ngx_resolver_create(). Maxim Dounin <mdounin@mdounin.ru> parents: 4684 diff changeset	185 if (n) {
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	186 if (ngx_array_init(&r->connections, cf->pool, n,
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	187 sizeof(ngx_resolver_connection_t))
4784 dd63abf20ba7 Resolver: fixed possible memory leak in ngx_resolver_create(). Maxim Dounin <mdounin@mdounin.ru> parents: 4684 diff changeset	188 != NGX_OK)
dd63abf20ba7 Resolver: fixed possible memory leak in ngx_resolver_create(). Maxim Dounin <mdounin@mdounin.ru> parents: 4684 diff changeset	189 {
dd63abf20ba7 Resolver: fixed possible memory leak in ngx_resolver_create(). Maxim Dounin <mdounin@mdounin.ru> parents: 4684 diff changeset	190 return NULL;
dd63abf20ba7 Resolver: fixed possible memory leak in ngx_resolver_create(). Maxim Dounin <mdounin@mdounin.ru> parents: 4684 diff changeset	191 }
dd63abf20ba7 Resolver: fixed possible memory leak in ngx_resolver_create(). Maxim Dounin <mdounin@mdounin.ru> parents: 4684 diff changeset	192 }
dd63abf20ba7 Resolver: fixed possible memory leak in ngx_resolver_create(). Maxim Dounin <mdounin@mdounin.ru> parents: 4684 diff changeset	193
4225 016352c19049 Support of several servers in the "resolver" directive. Igor Sysoev <igor@sysoev.ru> parents: 3902 diff changeset	194 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	195 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	196 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	197 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	198
05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	199 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	200
4474 41f640a693de Time parsing cleanup. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	201 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	202 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	203 "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	204 return NULL;
05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	205 }
05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	206
05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	207 continue;
05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	208 }
05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	209
5478 3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	210 #if (NGX_HAVE_INET6)
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	211 if (ngx_strncmp(names[i].data, "ipv6=", 5) == 0) {
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	212
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	213 if (ngx_strcmp(&names[i].data[5], "on") == 0) {
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	214 r->ipv6 = 1;
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	215
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	216 } else if (ngx_strcmp(&names[i].data[5], "off") == 0) {
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	217 r->ipv6 = 0;
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	218
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	219 } else {
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	220 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	221 "invalid parameter: %V", &names[i]);
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	222 return NULL;
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	223 }
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	224
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	225 continue;
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	226 }
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	227 #endif
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	228
4225 016352c19049 Support of several servers in the "resolver" directive. Igor Sysoev <igor@sysoev.ru> parents: 3902 diff changeset	229 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	230
4671 af9342747669 Support for IPv6 literals and an optional port in resolver. Ruslan Ermilov <ru@nginx.com> parents: 4653 diff changeset	231 u.url = names[i];
af9342747669 Support for IPv6 literals and an optional port in resolver. Ruslan Ermilov <ru@nginx.com> parents: 4653 diff changeset	232 u.default_port = 53;
af9342747669 Support for IPv6 literals and an optional port in resolver. Ruslan Ermilov <ru@nginx.com> parents: 4653 diff changeset	233
af9342747669 Support for IPv6 literals and an optional port in resolver. Ruslan Ermilov <ru@nginx.com> parents: 4653 diff changeset	234 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	235 if (u.err) {
bc5f881323b8 Fixed potential null pointer dereference in ngx_resolver_create(). Ruslan Ermilov <ru@nginx.com> parents: 4619 diff changeset	236 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	237 "%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	238 u.err, &u.url);
4643 bc5f881323b8 Fixed potential null pointer dereference in ngx_resolver_create(). Ruslan Ermilov <ru@nginx.com> parents: 4619 diff changeset	239 }
bc5f881323b8 Fixed potential null pointer dereference in ngx_resolver_create(). Ruslan Ermilov <ru@nginx.com> parents: 4619 diff changeset	240
4225 016352c19049 Support of several servers in the "resolver" directive. Igor Sysoev <igor@sysoev.ru> parents: 3902 diff changeset	241 return NULL;
016352c19049 Support of several servers in the "resolver" directive. Igor Sysoev <igor@sysoev.ru> parents: 3902 diff changeset	242 }
016352c19049 Support of several servers in the "resolver" directive. Igor Sysoev <igor@sysoev.ru> parents: 3902 diff changeset	243
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	244 rec = ngx_array_push_n(&r->connections, u.naddrs);
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	245 if (rec == NULL) {
1683 1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1679 diff changeset	246 return NULL;
1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1679 diff changeset	247 }
1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1679 diff changeset	248
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	249 ngx_memzero(rec, u.naddrs * sizeof(ngx_resolver_connection_t));
4684 f5c2c9d656f9 When "resolver" is configured with a domain name, only the first Ruslan Ermilov <ru@nginx.com> parents: 4683 diff changeset	250
f5c2c9d656f9 When "resolver" is configured with a domain name, only the first Ruslan Ermilov <ru@nginx.com> parents: 4683 diff changeset	251 for (j = 0; j < u.naddrs; j++) {
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	252 rec[j].sockaddr = u.addrs[j].sockaddr;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	253 rec[j].socklen = u.addrs[j].socklen;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	254 rec[j].server = u.addrs[j].name;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	255 rec[j].resolver = r;
4684 f5c2c9d656f9 When "resolver" is configured with a domain name, only the first Ruslan Ermilov <ru@nginx.com> parents: 4683 diff changeset	256 }
1683 1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1679 diff changeset	257 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	258
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	259 return r;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	260 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	261
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	262
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	263 static void
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	264 ngx_resolver_cleanup(void *data)
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	265 {
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	266 ngx_resolver_t *r = data;
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	267
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	268 ngx_uint_t i;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	269 ngx_resolver_connection_t *rec;
4225 016352c19049 Support of several servers in the "resolver" directive. Igor Sysoev <igor@sysoev.ru> parents: 3902 diff changeset	270
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	271 if (r) {
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	272 ngx_log_debug0(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0,
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	273 "cleanup resolver");
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	274
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	275 ngx_resolver_cleanup_tree(r, &r->name_rbtree);
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	276
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	277 ngx_resolver_cleanup_tree(r, &r->addr_rbtree);
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	278
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	279 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	280 ngx_resolver_cleanup_tree(r, &r->addr6_rbtree);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	281 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	282
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	283 if (r->event) {
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	284 ngx_free(r->event);
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	285 }
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	286
4225 016352c19049 Support of several servers in the "resolver" directive. Igor Sysoev <igor@sysoev.ru> parents: 3902 diff changeset	287
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	288 rec = r->connections.elts;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	289
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	290 for (i = 0; i < r->connections.nelts; i++) {
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	291 if (rec[i].udp) {
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	292 ngx_close_connection(rec[i].udp);
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	293 }
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	294
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	295 if (rec[i].tcp) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	296 ngx_close_connection(rec[i].tcp);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	297 }
6369 06459bc8b92f Resolver: free TCP buffers on resolver cleanup. Roman Arutyunyan <arut@nginx.com> parents: 6368 diff changeset	298
06459bc8b92f Resolver: free TCP buffers on resolver cleanup. Roman Arutyunyan <arut@nginx.com> parents: 6368 diff changeset	299 if (rec[i].read_buf) {
06459bc8b92f Resolver: free TCP buffers on resolver cleanup. Roman Arutyunyan <arut@nginx.com> parents: 6368 diff changeset	300 ngx_resolver_free(r, rec[i].read_buf->start);
06459bc8b92f Resolver: free TCP buffers on resolver cleanup. Roman Arutyunyan <arut@nginx.com> parents: 6368 diff changeset	301 ngx_resolver_free(r, rec[i].read_buf);
06459bc8b92f Resolver: free TCP buffers on resolver cleanup. Roman Arutyunyan <arut@nginx.com> parents: 6368 diff changeset	302 }
06459bc8b92f Resolver: free TCP buffers on resolver cleanup. Roman Arutyunyan <arut@nginx.com> parents: 6368 diff changeset	303
06459bc8b92f Resolver: free TCP buffers on resolver cleanup. Roman Arutyunyan <arut@nginx.com> parents: 6368 diff changeset	304 if (rec[i].write_buf) {
06459bc8b92f Resolver: free TCP buffers on resolver cleanup. Roman Arutyunyan <arut@nginx.com> parents: 6368 diff changeset	305 ngx_resolver_free(r, rec[i].write_buf->start);
06459bc8b92f Resolver: free TCP buffers on resolver cleanup. Roman Arutyunyan <arut@nginx.com> parents: 6368 diff changeset	306 ngx_resolver_free(r, rec[i].write_buf);
06459bc8b92f Resolver: free TCP buffers on resolver cleanup. Roman Arutyunyan <arut@nginx.com> parents: 6368 diff changeset	307 }
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	308 }
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	309
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	310 ngx_free(r);
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	311 }
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	312 }
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	313
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	314
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	315 static void
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	316 ngx_resolver_cleanup_tree(ngx_resolver_t r, ngx_rbtree_t tree)
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	317 {
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	318 ngx_resolver_ctx_t ctx, next;
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	319 ngx_resolver_node_t *rn;
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	320
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	321 while (tree->root != tree->sentinel) {
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	322
5921 5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	323 rn = ngx_resolver_node(ngx_rbtree_min(tree->root, tree->sentinel));
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	324
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	325 ngx_queue_remove(&rn->queue);
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	326
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	327 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	328 next = ctx->next;
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	329
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	330 if (ctx->event) {
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	331 ngx_resolver_free(r, ctx->event);
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	332 }
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	333
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	334 ngx_resolver_free(r, ctx);
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	335 }
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	336
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	337 ngx_rbtree_delete(tree, &rn->node);
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	338
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	339 ngx_resolver_free_node(r, rn);
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	340 }
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	341 }
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	342
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	343
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	344 ngx_resolver_ctx_t *
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	345 ngx_resolve_start(ngx_resolver_t r, ngx_resolver_ctx_t temp)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	346 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	347 in_addr_t addr;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	348 ngx_resolver_ctx_t *ctx;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	349
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	350 if (temp) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	351 addr = ngx_inet_addr(temp->name.data, temp->name.len);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	352
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	353 if (addr != INADDR_NONE) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	354 temp->resolver = r;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	355 temp->state = NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	356 temp->naddrs = 1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	357 temp->addrs = &temp->addr;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	358 temp->addr.sockaddr = (struct sockaddr *) &temp->sin;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	359 temp->addr.socklen = sizeof(struct sockaddr_in);
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	360 ngx_memzero(&temp->sin, sizeof(struct sockaddr_in));
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	361 temp->sin.sin_family = AF_INET;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	362 temp->sin.sin_addr.s_addr = addr;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	363 temp->quick = 1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	364
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	365 return temp;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	366 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	367 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	368
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	369 if (r->connections.nelts == 0) {
1683 1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1679 diff changeset	370 return NGX_NO_RESOLVER;
1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1679 diff changeset	371 }
1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1679 diff changeset	372
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	373 ctx = ngx_resolver_calloc(r, sizeof(ngx_resolver_ctx_t));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	374
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	375 if (ctx) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	376 ctx->resolver = r;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	377 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	378
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	379 return ctx;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	380 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	381
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	382
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	383 ngx_int_t
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	384 ngx_resolve_name(ngx_resolver_ctx_t *ctx)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	385 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	386 ngx_int_t rc;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	387 ngx_resolver_t *r;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	388
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	389 r = ctx->resolver;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	390
5505 d091d16ed398 Resolver: added support for domain names with a trailing dot. Yichun Zhang <agentzh@gmail.com> parents: 5485 diff changeset	391 if (ctx->name.len > 0 && ctx->name.data[ctx->name.len - 1] == '.') {
d091d16ed398 Resolver: added support for domain names with a trailing dot. Yichun Zhang <agentzh@gmail.com> parents: 5485 diff changeset	392 ctx->name.len--;
d091d16ed398 Resolver: added support for domain names with a trailing dot. Yichun Zhang <agentzh@gmail.com> parents: 5485 diff changeset	393 }
d091d16ed398 Resolver: added support for domain names with a trailing dot. Yichun Zhang <agentzh@gmail.com> parents: 5485 diff changeset	394
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	395 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	396 "resolve: \"%V\"", &ctx->name);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	397
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	398 if (ctx->quick) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	399 ctx->handler(ctx);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	400 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	401 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	402
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	403 /* lock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	404
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	405 rc = ngx_resolve_name_locked(r, ctx, &ctx->name);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	406
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	407 if (rc == NGX_OK) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	408 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	409 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	410
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	411 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	412
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	413 if (rc == NGX_AGAIN) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	414 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	415 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	416
1904 538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	417 /* NGX_ERROR */
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	418
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	419 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	420 ngx_resolver_free(r, ctx->event);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	421 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	422
1904 538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	423 ngx_resolver_free(r, ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	424
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	425 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	426 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	427
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	428
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	429 void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	430 ngx_resolve_name_done(ngx_resolver_ctx_t *ctx)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	431 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	432 ngx_resolver_t *r;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	433 ngx_resolver_ctx_t w, *p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	434 ngx_resolver_node_t *rn;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	435
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	436 r = ctx->resolver;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	437
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	438 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	439 "resolve name done: %i", ctx->state);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	440
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	441 if (ctx->quick) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	442 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	443 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	444
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	445 if (ctx->event && ctx->event->timer_set) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	446 ngx_del_timer(ctx->event);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	447 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	448
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	449 /* lock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	450
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	451 if (ctx->state == NGX_AGAIN \|\| ctx->state == NGX_RESOLVE_TIMEDOUT) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	452
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	453 rn = ctx->node;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	454
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	455 if (rn) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	456 p = &rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	457 w = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	458
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	459 while (w) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	460 if (w == ctx) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	461 *p = w->next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	462
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	463 goto done;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	464 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	465
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	466 p = &w->next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	467 w = w->next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	468 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	469 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	470
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	471 ngx_log_error(NGX_LOG_ALERT, r->log, 0,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	472 "could not cancel %V resolving", &ctx->name);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	473 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	474
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	475 done:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	476
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	477 ngx_resolver_expire(r, &r->name_rbtree, &r->name_expire_queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	478
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	479 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	480
1904 538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	481 /* 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	482
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	483 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	484 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	485 }
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	486
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	487 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	488
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	489 /* unlock alloc mutex */
6196 c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	490
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	491 if (r->event->timer_set && ngx_resolver_resend_empty(r)) {
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	492 ngx_del_timer(r->event);
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	493 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	494 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	495
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	496
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	497 static ngx_int_t
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	498 ngx_resolve_name_locked(ngx_resolver_t r, ngx_resolver_ctx_t ctx,
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	499 ngx_str_t *name)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	500 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	501 uint32_t hash;
1961 99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	502 ngx_int_t rc;
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	503 ngx_str_t cname;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	504 ngx_uint_t naddrs;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	505 ngx_addr_t *addrs;
6349 978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	506 ngx_resolver_ctx_t next, last;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	507 ngx_resolver_node_t *rn;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	508
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	509 ngx_strlow(name->data, name->data, name->len);
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	510
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	511 hash = ngx_crc32_short(name->data, name->len);
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	512
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	513 rn = ngx_resolver_lookup_name(r, name, hash);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	514
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	515 if (rn) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	516
6349 978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	517 /* ctx can be a list after NGX_RESOLVE_CNAME */
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	518 for (last = ctx; last->next; last = last->next);
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	519
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	520 if (rn->valid >= ngx_time()) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	521
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	522 ngx_log_debug0(NGX_LOG_DEBUG_CORE, r->log, 0, "resolve cached");
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	523
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	524 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	525
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	526 rn->expire = ngx_time() + r->expire;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	527
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	528 ngx_queue_insert_head(&r->name_expire_queue, &rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	529
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	530 naddrs = (rn->naddrs == (u_short) -1) ? 0 : rn->naddrs;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	531 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	532 naddrs += (rn->naddrs6 == (u_short) -1) ? 0 : rn->naddrs6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	533 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	534
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	535 if (naddrs) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	536
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	537 if (naddrs == 1 && rn->naddrs == 1) {
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	538 addrs = NULL;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	539
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	540 } else {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	541 addrs = ngx_resolver_export(r, rn, 1);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	542 if (addrs == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	543 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	544 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	545 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	546
6349 978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	547 last->next = rn->waiting;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	548 rn->waiting = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	549
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	550 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	551
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	552 do {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	553 ctx->state = NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	554 ctx->naddrs = naddrs;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	555
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	556 if (addrs == NULL) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	557 ctx->addrs = &ctx->addr;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	558 ctx->addr.sockaddr = (struct sockaddr *) &ctx->sin;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	559 ctx->addr.socklen = sizeof(struct sockaddr_in);
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	560 ngx_memzero(&ctx->sin, sizeof(struct sockaddr_in));
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	561 ctx->sin.sin_family = AF_INET;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	562 ctx->sin.sin_addr.s_addr = rn->u.addr;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	563
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	564 } else {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	565 ctx->addrs = addrs;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	566 }
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	567
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	568 next = ctx->next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	569
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	570 ctx->handler(ctx);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	571
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	572 ctx = next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	573 } while (ctx);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	574
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	575 if (addrs != NULL) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	576 ngx_resolver_free(r, addrs->sockaddr);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	577 ngx_resolver_free(r, addrs);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	578 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	579
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	580 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	581 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	582
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	583 /* NGX_RESOLVE_CNAME */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	584
1969 41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	585 if (ctx->recursion++ < NGX_RESOLVER_MAX_RECURSION) {
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	586
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	587 cname.len = rn->cnlen;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	588 cname.data = rn->u.cname;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	589
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	590 return ngx_resolve_name_locked(r, ctx, &cname);
1969 41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	591 }
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	592
6349 978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	593 last->next = rn->waiting;
1969 41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	594 rn->waiting = NULL;
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	595
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	596 /* unlock name mutex */
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	597
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	598 do {
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	599 ctx->state = NGX_RESOLVE_NXDOMAIN;
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	600 next = ctx->next;
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	601
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	602 ctx->handler(ctx);
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	603
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	604 ctx = next;
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	605 } while (ctx);
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	606
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	607 return NGX_OK;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	608 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	609
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	610 if (rn->waiting) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	611
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	612 if (ctx->event == NULL) {
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	613 ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t));
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	614 if (ctx->event == NULL) {
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	615 return NGX_ERROR;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	616 }
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	617
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	618 ctx->event->handler = ngx_resolver_timeout_handler;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	619 ctx->event->data = ctx;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	620 ctx->event->log = r->log;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	621 ctx->ident = -1;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	622
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	623 ngx_add_timer(ctx->event, ctx->timeout);
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	624 }
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	625
6349 978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	626 last->next = rn->waiting;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	627 rn->waiting = ctx;
3297 ebc5384479b4 fix segfault in resolver: Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	628 ctx->state = NGX_AGAIN;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	629
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	630 do {
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	631 ctx->node = rn;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	632 ctx = ctx->next;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	633 } while (ctx);
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	634
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	635 return NGX_AGAIN;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	636 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	637
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	638 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	639
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	640 /* lock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	641
4619 3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	642 if (rn->query) {
3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	643 ngx_resolver_free_locked(r, rn->query);
3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	644 rn->query = NULL;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	645 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	646 rn->query6 = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	647 #endif
4619 3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	648 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	649
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	650 if (rn->cnlen) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	651 ngx_resolver_free_locked(r, rn->u.cname);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	652 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	653
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	654 if (rn->naddrs > 1 && rn->naddrs != (u_short) -1) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	655 ngx_resolver_free_locked(r, rn->u.addrs);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	656 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	657
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	658 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	659 if (rn->naddrs6 > 1 && rn->naddrs6 != (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	660 ngx_resolver_free_locked(r, rn->u6.addrs6);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	661 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	662 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	663
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	664 /* unlock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	665
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	666 } else {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	667
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	668 rn = ngx_resolver_alloc(r, sizeof(ngx_resolver_node_t));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	669 if (rn == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	670 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	671 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	672
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	673 rn->name = ngx_resolver_dup(r, name->data, name->len);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	674 if (rn->name == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	675 ngx_resolver_free(r, rn);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	676 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	677 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	678
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	679 rn->node.key = hash;
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	680 rn->nlen = (u_short) name->len;
1960 1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	681 rn->query = NULL;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	682 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	683 rn->query6 = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	684 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	685
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	686 ngx_rbtree_insert(&r->name_rbtree, &rn->node);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	687 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	688
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	689 rc = ngx_resolver_create_name_query(r, rn, name);
1961 99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	690
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	691 if (rc == NGX_ERROR) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	692 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	693 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	694
1961 99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	695 if (rc == NGX_DECLINED) {
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	696 ngx_rbtree_delete(&r->name_rbtree, &rn->node);
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	697
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	698 ngx_resolver_free(r, rn->query);
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	699 ngx_resolver_free(r, rn->name);
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	700 ngx_resolver_free(r, rn);
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	701
6349 978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	702 do {
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	703 ctx->state = NGX_RESOLVE_NXDOMAIN;
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	704 next = ctx->next;
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	705
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	706 ctx->handler(ctx);
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	707
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	708 ctx = next;
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	709 } while (ctx);
1961 99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	710
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	711 return NGX_OK;
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	712 }
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	713
6366 2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	714 rn->last_connection = r->last_connection++;
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	715 if (r->last_connection == r->connections.nelts) {
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	716 r->last_connection = 0;
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	717 }
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	718
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	719 rn->naddrs = (u_short) -1;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	720 rn->tcp = 0;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	721 #if (NGX_HAVE_INET6)
5478 3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	722 rn->naddrs6 = r->ipv6 ? (u_short) -1 : 0;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	723 rn->tcp6 = 0;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	724 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	725
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	726 if (ngx_resolver_send_query(r, rn) != NGX_OK) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	727 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	728 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	729
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	730 if (ctx->event == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	731 ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	732 if (ctx->event == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	733 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	734 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	735
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	736 ctx->event->handler = ngx_resolver_timeout_handler;
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	737 ctx->event->data = ctx;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	738 ctx->event->log = r->log;
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	739 ctx->ident = -1;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	740
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	741 ngx_add_timer(ctx->event, ctx->timeout);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	742 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	743
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	744 if (ngx_queue_empty(&r->name_resend_queue)) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	745 ngx_add_timer(r->event, (ngx_msec_t) (r->resend_timeout * 1000));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	746 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	747
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	748 rn->expire = ngx_time() + r->resend_timeout;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	749
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	750 ngx_queue_insert_head(&r->name_resend_queue, &rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	751
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	752 rn->code = 0;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	753 rn->cnlen = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	754 rn->valid = 0;
5485 8958656a8060 Resolver: use minimum TTL for caching (ticket #329). Ruslan Ermilov <ru@nginx.com> parents: 5479 diff changeset	755 rn->ttl = NGX_MAX_UINT32_VALUE;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	756 rn->waiting = ctx;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	757
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	758 ctx->state = NGX_AGAIN;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	759
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	760 do {
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	761 ctx->node = rn;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	762 ctx = ctx->next;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	763 } while (ctx);
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	764
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	765 return NGX_AGAIN;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	766
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	767 failed:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	768
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	769 ngx_rbtree_delete(&r->name_rbtree, &rn->node);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	770
1960 1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	771 if (rn->query) {
1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	772 ngx_resolver_free(r, rn->query);
1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	773 }
1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	774
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	775 ngx_resolver_free(r, rn->name);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	776
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	777 ngx_resolver_free(r, rn);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	778
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	779 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	780 }
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	781
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	782
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	783 ngx_int_t
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	784 ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	785 {
2484 cf3cd450049c store name pointer in variable allocated on stack Igor Sysoev <igor@sysoev.ru> parents: 2483 diff changeset	786 u_char *name;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	787 in_addr_t addr;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	788 ngx_queue_t resend_queue, expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	789 ngx_rbtree_t *tree;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	790 ngx_resolver_t *r;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	791 struct sockaddr_in *sin;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	792 ngx_resolver_node_t *rn;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	793 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	794 uint32_t hash;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	795 struct sockaddr_in6 *sin6;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	796 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	797
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	798 #if (NGX_SUPPRESS_WARN)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	799 addr = 0;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	800 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	801 hash = 0;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	802 sin6 = NULL;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	803 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	804 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	805
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	806 r = ctx->resolver;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	807
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	808 switch (ctx->addr.sockaddr->sa_family) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	809
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	810 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	811 case AF_INET6:
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	812 sin6 = (struct sockaddr_in6 *) ctx->addr.sockaddr;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	813 hash = ngx_crc32_short(sin6->sin6_addr.s6_addr, 16);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	814
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	815 /* lock addr mutex */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	816
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	817 rn = ngx_resolver_lookup_addr6(r, &sin6->sin6_addr, hash);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	818
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	819 tree = &r->addr6_rbtree;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	820 resend_queue = &r->addr6_resend_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	821 expire_queue = &r->addr6_expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	822
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	823 break;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	824 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	825
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	826 default: /* AF_INET */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	827 sin = (struct sockaddr_in *) ctx->addr.sockaddr;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	828 addr = ntohl(sin->sin_addr.s_addr);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	829
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	830 /* lock addr mutex */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	831
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	832 rn = ngx_resolver_lookup_addr(r, addr);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	833
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	834 tree = &r->addr_rbtree;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	835 resend_queue = &r->addr_resend_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	836 expire_queue = &r->addr_expire_queue;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	837 }
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	838
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	839 if (rn) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	840
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	841 if (rn->valid >= ngx_time()) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	842
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	843 ngx_log_debug0(NGX_LOG_DEBUG_CORE, r->log, 0, "resolve cached");
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	844
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	845 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	846
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	847 rn->expire = ngx_time() + r->expire;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	848
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	849 ngx_queue_insert_head(expire_queue, &rn->queue);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	850
2484 cf3cd450049c store name pointer in variable allocated on stack Igor Sysoev <igor@sysoev.ru> parents: 2483 diff changeset	851 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	852 if (name == NULL) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	853 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	854 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	855
2484 cf3cd450049c store name pointer in variable allocated on stack Igor Sysoev <igor@sysoev.ru> parents: 2483 diff changeset	856 ctx->name.len = rn->nlen;
cf3cd450049c store name pointer in variable allocated on stack Igor Sysoev <igor@sysoev.ru> parents: 2483 diff changeset	857 ctx->name.data = name;
cf3cd450049c store name pointer in variable allocated on stack Igor Sysoev <igor@sysoev.ru> parents: 2483 diff changeset	858
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	859 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	860
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	861 ctx->state = NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	862
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	863 ctx->handler(ctx);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	864
2484 cf3cd450049c store name pointer in variable allocated on stack Igor Sysoev <igor@sysoev.ru> parents: 2483 diff changeset	865 ngx_resolver_free(r, name);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	866
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	867 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	868 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	869
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	870 if (rn->waiting) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	871
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	872 ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t));
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	873 if (ctx->event == NULL) {
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	874 return NGX_ERROR;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	875 }
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	876
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	877 ctx->event->handler = ngx_resolver_timeout_handler;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	878 ctx->event->data = ctx;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	879 ctx->event->log = r->log;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	880 ctx->ident = -1;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	881
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	882 ngx_add_timer(ctx->event, ctx->timeout);
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	883
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	884 ctx->next = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	885 rn->waiting = ctx;
3297 ebc5384479b4 fix segfault in resolver: Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	886 ctx->state = NGX_AGAIN;
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	887 ctx->node = rn;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	888
2487 9b4dce95c744 fix return code, this fixes segfault when two or more Igor Sysoev <igor@sysoev.ru> parents: 2486 diff changeset	889 /* unlock addr mutex */
9b4dce95c744 fix return code, this fixes segfault when two or more Igor Sysoev <igor@sysoev.ru> parents: 2486 diff changeset	890
9b4dce95c744 fix return code, this fixes segfault when two or more Igor Sysoev <igor@sysoev.ru> parents: 2486 diff changeset	891 return NGX_OK;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	892 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	893
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	894 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	895
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	896 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	897 rn->query = NULL;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	898 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	899 rn->query6 = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	900 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	901
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	902 } else {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	903 rn = ngx_resolver_alloc(r, sizeof(ngx_resolver_node_t));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	904 if (rn == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	905 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	906 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	907
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	908 switch (ctx->addr.sockaddr->sa_family) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	909
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	910 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	911 case AF_INET6:
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	912 rn->addr6 = sin6->sin6_addr;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	913 rn->node.key = hash;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	914 break;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	915 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	916
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	917 default: /* AF_INET */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	918 rn->node.key = addr;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	919 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	920
1960 1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	921 rn->query = NULL;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	922 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	923 rn->query6 = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	924 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	925
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	926 ngx_rbtree_insert(tree, &rn->node);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	927 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	928
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	929 if (ngx_resolver_create_addr_query(r, rn, &ctx->addr) != NGX_OK) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	930 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	931 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	932
6366 2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	933 rn->last_connection = r->last_connection++;
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	934 if (r->last_connection == r->connections.nelts) {
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	935 r->last_connection = 0;
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	936 }
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	937
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	938 rn->naddrs = (u_short) -1;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	939 rn->tcp = 0;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	940 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	941 rn->naddrs6 = (u_short) -1;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	942 rn->tcp6 = 0;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	943 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	944
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	945 if (ngx_resolver_send_query(r, rn) != NGX_OK) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	946 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	947 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	948
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	949 ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	950 if (ctx->event == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	951 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	952 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	953
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	954 ctx->event->handler = ngx_resolver_timeout_handler;
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	955 ctx->event->data = ctx;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	956 ctx->event->log = r->log;
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	957 ctx->ident = -1;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	958
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	959 ngx_add_timer(ctx->event, ctx->timeout);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	960
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	961 if (ngx_queue_empty(resend_queue)) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	962 ngx_add_timer(r->event, (ngx_msec_t) (r->resend_timeout * 1000));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	963 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	964
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	965 rn->expire = ngx_time() + r->resend_timeout;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	966
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	967 ngx_queue_insert_head(resend_queue, &rn->queue);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	968
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	969 rn->code = 0;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	970 rn->cnlen = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	971 rn->name = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	972 rn->nlen = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	973 rn->valid = 0;
5485 8958656a8060 Resolver: use minimum TTL for caching (ticket #329). Ruslan Ermilov <ru@nginx.com> parents: 5479 diff changeset	974 rn->ttl = NGX_MAX_UINT32_VALUE;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	975 rn->waiting = ctx;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	976
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	977 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	978
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	979 ctx->state = NGX_AGAIN;
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	980 ctx->node = rn;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	981
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	982 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	983
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	984 failed:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	985
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	986 if (rn) {
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	987 ngx_rbtree_delete(tree, &rn->node);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	988
1960 1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	989 if (rn->query) {
1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	990 ngx_resolver_free(r, rn->query);
1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	991 }
1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	992
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	993 ngx_resolver_free(r, rn);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	994 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	995
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	996 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	997
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	998 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	999 ngx_resolver_free(r, ctx->event);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1000 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1001
1904 538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	1002 ngx_resolver_free(r, ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1003
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1004 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1005 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1006
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1007
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1008 void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1009 ngx_resolve_addr_done(ngx_resolver_ctx_t *ctx)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1010 {
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1011 ngx_queue_t *expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1012 ngx_rbtree_t *tree;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1013 ngx_resolver_t *r;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1014 ngx_resolver_ctx_t w, *p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1015 ngx_resolver_node_t *rn;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	1016
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1017 r = ctx->resolver;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1018
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1019 switch (ctx->addr.sockaddr->sa_family) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1020
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1021 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1022 case AF_INET6:
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1023 tree = &r->addr6_rbtree;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1024 expire_queue = &r->addr6_expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1025 break;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1026 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1027
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1028 default: /* AF_INET */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1029 tree = &r->addr_rbtree;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1030 expire_queue = &r->addr_expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1031 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1032
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1033 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1034 "resolve addr done: %i", ctx->state);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1035
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1036 if (ctx->event && ctx->event->timer_set) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1037 ngx_del_timer(ctx->event);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1038 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1039
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1040 /* lock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1041
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	1042 if (ctx->state == NGX_AGAIN \|\| ctx->state == NGX_RESOLVE_TIMEDOUT) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1043
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	1044 rn = ctx->node;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1045
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1046 if (rn) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1047 p = &rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1048 w = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1049
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1050 while (w) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1051 if (w == ctx) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1052 *p = w->next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1053
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1054 goto done;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1055 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1056
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1057 p = &w->next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1058 w = w->next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1059 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1060 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1061
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1062 {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1063 u_char text[NGX_SOCKADDR_STRLEN];
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1064 ngx_str_t addrtext;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1065
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1066 addrtext.data = text;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1067 addrtext.len = ngx_sock_ntop(ctx->addr.sockaddr, ctx->addr.socklen,
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1068 text, NGX_SOCKADDR_STRLEN, 0);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1069
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1070 ngx_log_error(NGX_LOG_ALERT, r->log, 0,
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1071 "could not cancel %V resolving", &addrtext);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1072 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1073 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1074
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1075 done:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1076
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1077 ngx_resolver_expire(r, tree, expire_queue);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1078
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1079 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1080
1904 538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	1081 /* 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	1082
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	1083 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	1084 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	1085 }
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	1086
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	1087 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	1088
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	1089 /* unlock alloc mutex */
6196 c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1090
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1091 if (r->event->timer_set && ngx_resolver_resend_empty(r)) {
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1092 ngx_del_timer(r->event);
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1093 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1094 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1095
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1096
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1097 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1098 ngx_resolver_expire(ngx_resolver_t r, ngx_rbtree_t tree, ngx_queue_t *queue)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1099 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1100 time_t now;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1101 ngx_uint_t i;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1102 ngx_queue_t *q;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1103 ngx_resolver_node_t *rn;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1104
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1105 ngx_log_debug0(NGX_LOG_DEBUG_CORE, r->log, 0, "resolver expire");
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1106
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1107 now = ngx_time();
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1108
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1109 for (i = 0; i < 2; i++) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1110 if (ngx_queue_empty(queue)) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1111 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1112 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1113
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1114 q = ngx_queue_last(queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1115
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1116 rn = ngx_queue_data(q, ngx_resolver_node_t, queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1117
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1118 if (now <= rn->expire) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1119 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1120 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1121
1774 68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1742 diff changeset	1122 ngx_log_debug2(NGX_LOG_DEBUG_CORE, r->log, 0,
68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1742 diff changeset	1123 "resolver expire \"%*s\"", (size_t) rn->nlen, rn->name);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1124
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1125 ngx_queue_remove(q);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1126
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1127 ngx_rbtree_delete(tree, &rn->node);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1128
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1129 ngx_resolver_free_node(r, rn);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1130 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1131 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1132
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1133
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1134 static ngx_int_t
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1135 ngx_resolver_send_query(ngx_resolver_t r, ngx_resolver_node_t rn)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1136 {
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1137 ngx_int_t rc;
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1138 ngx_resolver_connection_t *rec;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1139
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1140 rec = r->connections.elts;
6366 2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1141 rec = &rec[rn->last_connection];
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1142
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1143 if (rec->log.handler == NULL) {
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1144 rec->log = *r->log;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1145 rec->log.handler = ngx_resolver_log_error;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1146 rec->log.data = rec;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1147 rec->log.action = "resolving";
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1148 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1149
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1150 if (rn->naddrs == (u_short) -1) {
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1151 rc = rn->tcp ? ngx_resolver_send_tcp_query(r, rec, rn->query, rn->qlen)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1152 : ngx_resolver_send_udp_query(r, rec, rn->query, rn->qlen);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1153
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1154 if (rc != NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1155 return rc;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1156 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1157 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1158
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1159 #if (NGX_HAVE_INET6)
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1160
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1161 if (rn->query6 && rn->naddrs6 == (u_short) -1) {
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1162 rc = rn->tcp6
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1163 ? ngx_resolver_send_tcp_query(r, rec, rn->query6, rn->qlen)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1164 : ngx_resolver_send_udp_query(r, rec, rn->query6, rn->qlen);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1165
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1166 if (rc != NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1167 return rc;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1168 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1169 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1170
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1171 #endif
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1172
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1173 return NGX_OK;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1174 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1175
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1176
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1177 static ngx_int_t
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1178 ngx_resolver_send_udp_query(ngx_resolver_t r, ngx_resolver_connection_t rec,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1179 u_char *query, u_short qlen)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1180 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1181 ssize_t n;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1182
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1183 if (rec->udp == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1184 if (ngx_udp_connect(rec) != NGX_OK) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1185 return NGX_ERROR;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1186 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1187
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1188 rec->udp->data = rec;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1189 rec->udp->read->handler = ngx_resolver_udp_read;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1190 rec->udp->read->resolver = 1;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1191 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1192
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1193 n = ngx_send(rec->udp, query, qlen);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1194
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1195 if (n == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1196 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1197 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1198
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1199 if ((size_t) n != (size_t) qlen) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1200 ngx_log_error(NGX_LOG_CRIT, &rec->log, 0, "send() incomplete");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1201 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1202 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1203
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1204 return NGX_OK;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1205 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1206
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1207
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1208 static ngx_int_t
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1209 ngx_resolver_send_tcp_query(ngx_resolver_t r, ngx_resolver_connection_t rec,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1210 u_char *query, u_short qlen)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1211 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1212 ngx_buf_t *b;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1213 ngx_int_t rc;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1214
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1215 rc = NGX_OK;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1216
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1217 if (rec->tcp == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1218 b = rec->read_buf;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1219
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1220 if (b == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1221 b = ngx_resolver_calloc(r, sizeof(ngx_buf_t));
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1222 if (b == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1223 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1224 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1225
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1226 b->start = ngx_resolver_alloc(r, NGX_RESOLVER_TCP_RSIZE);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1227 if (b->start == NULL) {
6368 d73f77bb5caf Resolver: fixed possible resource leak introduced in 5a16d40c63de. Ruslan Ermilov <ru@nginx.com> parents: 6367 diff changeset	1228 ngx_resolver_free(r, b);
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1229 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1230 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1231
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1232 b->end = b->start + NGX_RESOLVER_TCP_RSIZE;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1233
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1234 rec->read_buf = b;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1235 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1236
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1237 b->pos = b->start;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1238 b->last = b->start;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1239
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1240 b = rec->write_buf;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1241
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1242 if (b == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1243 b = ngx_resolver_calloc(r, sizeof(ngx_buf_t));
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1244 if (b == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1245 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1246 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1247
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1248 b->start = ngx_resolver_alloc(r, NGX_RESOLVER_TCP_WSIZE);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1249 if (b->start == NULL) {
6368 d73f77bb5caf Resolver: fixed possible resource leak introduced in 5a16d40c63de. Ruslan Ermilov <ru@nginx.com> parents: 6367 diff changeset	1250 ngx_resolver_free(r, b);
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1251 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1252 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1253
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1254 b->end = b->start + NGX_RESOLVER_TCP_WSIZE;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1255
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1256 rec->write_buf = b;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1257 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1258
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1259 b->pos = b->start;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1260 b->last = b->start;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1261
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1262 rc = ngx_tcp_connect(rec);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1263 if (rc == NGX_ERROR) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1264 return NGX_ERROR;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1265 }
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1266
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1267 rec->tcp->data = rec;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1268 rec->tcp->write->handler = ngx_resolver_tcp_write;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1269 rec->tcp->read->handler = ngx_resolver_tcp_read;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1270 rec->tcp->read->resolver = 1;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1271
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1272 ngx_add_timer(rec->tcp->write, (ngx_msec_t) (r->tcp_timeout * 1000));
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1273 }
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1274
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1275 b = rec->write_buf;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1276
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1277 if (b->end - b->last < 2 + qlen) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1278 ngx_log_error(NGX_LOG_CRIT, &rec->log, 0, "buffer overflow");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1279 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1280 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1281
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1282 *b->last++ = (u_char) (qlen >> 8);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1283 *b->last++ = (u_char) qlen;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1284 b->last = ngx_cpymem(b->last, query, qlen);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1285
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1286 if (rc == NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1287 ngx_resolver_tcp_write(rec->tcp->write);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1288 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1289
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1290 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1291 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1292
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1293
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1294 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1295 ngx_resolver_resend_handler(ngx_event_t *ev)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1296 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1297 time_t timer, atimer, ntimer;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1298 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1299 time_t a6timer;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1300 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1301 ngx_resolver_t *r;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1302
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1303 r = ev->data;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1304
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1305 ngx_log_debug0(NGX_LOG_DEBUG_CORE, r->log, 0,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1306 "resolver resend handler");
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1307
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1308 /* lock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1309
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1310 ntimer = ngx_resolver_resend(r, &r->name_rbtree, &r->name_resend_queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1311
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1312 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1313
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1314 /* lock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1315
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1316 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	1317
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1318 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1319
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1320 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1321
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1322 /* lock addr6 mutex */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1323
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1324 a6timer = ngx_resolver_resend(r, &r->addr6_rbtree, &r->addr6_resend_queue);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1325
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1326 /* unlock addr6 mutex */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1327
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1328 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1329
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1330 timer = ntimer;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1331
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1332 if (timer == 0) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1333 timer = atimer;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1334
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1335 } else if (atimer) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1336 timer = ngx_min(timer, atimer);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1337 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1338
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1339 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1340
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1341 if (timer == 0) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1342 timer = a6timer;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1343
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1344 } else if (a6timer) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1345 timer = ngx_min(timer, a6timer);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1346 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1347
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1348 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1349
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1350 if (timer) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1351 ngx_add_timer(r->event, (ngx_msec_t) (timer * 1000));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1352 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1353 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1354
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1355
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1356 static time_t
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1357 ngx_resolver_resend(ngx_resolver_t r, ngx_rbtree_t tree, ngx_queue_t *queue)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1358 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1359 time_t now;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1360 ngx_queue_t *q;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1361 ngx_resolver_node_t *rn;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1362
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1363 now = ngx_time();
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1364
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1365 for ( ;; ) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1366 if (ngx_queue_empty(queue)) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1367 return 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1368 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1369
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1370 q = ngx_queue_last(queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1371
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1372 rn = ngx_queue_data(q, ngx_resolver_node_t, queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1373
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1374 if (now < rn->expire) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1375 return rn->expire - now;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1376 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1377
1774 68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1742 diff changeset	1378 ngx_log_debug3(NGX_LOG_DEBUG_CORE, r->log, 0,
68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1742 diff changeset	1379 "resolver resend \"%*s\" %p",
68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1742 diff changeset	1380 (size_t) rn->nlen, rn->name, rn->waiting);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1381
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1382 ngx_queue_remove(q);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1383
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1384 if (rn->waiting) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1385
6366 2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1386 if (++rn->last_connection == r->connections.nelts) {
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1387 rn->last_connection = 0;
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1388 }
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1389
4683 84d8e60b65f0 Fixed crash in ngx_resolver_cleanup_tree(). Ruslan Ermilov <ru@nginx.com> parents: 4671 diff changeset	1390 (void) ngx_resolver_send_query(r, rn);
84d8e60b65f0 Fixed crash in ngx_resolver_cleanup_tree(). Ruslan Ermilov <ru@nginx.com> parents: 4671 diff changeset	1391
84d8e60b65f0 Fixed crash in ngx_resolver_cleanup_tree(). Ruslan Ermilov <ru@nginx.com> parents: 4671 diff changeset	1392 rn->expire = now + r->resend_timeout;
84d8e60b65f0 Fixed crash in ngx_resolver_cleanup_tree(). Ruslan Ermilov <ru@nginx.com> parents: 4671 diff changeset	1393
84d8e60b65f0 Fixed crash in ngx_resolver_cleanup_tree(). Ruslan Ermilov <ru@nginx.com> parents: 4671 diff changeset	1394 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	1395
cf4ee321d195 do not delete failed DNS request if there are waiting clients Igor Sysoev <igor@sysoev.ru> parents: 1878 diff changeset	1396 continue;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1397 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1398
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1399 ngx_rbtree_delete(tree, &rn->node);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1400
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1401 ngx_resolver_free_node(r, rn);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1402 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1403 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1404
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1405
6196 c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1406 static ngx_uint_t
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1407 ngx_resolver_resend_empty(ngx_resolver_t *r)
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1408 {
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1409 return ngx_queue_empty(&r->name_resend_queue)
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1410 #if (NGX_HAVE_INET6)
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1411 && ngx_queue_empty(&r->addr6_resend_queue)
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1412 #endif
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1413 && ngx_queue_empty(&r->addr_resend_queue);
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1414 }
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1415
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1416
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1417 static void
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1418 ngx_resolver_udp_read(ngx_event_t *rev)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1419 {
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1420 ssize_t n;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1421 ngx_connection_t *c;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1422 ngx_resolver_connection_t *rec;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1423 u_char buf[NGX_RESOLVER_UDP_SIZE];
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1424
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1425 c = rev->data;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1426 rec = c->data;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1427
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1428 do {
1689 0b592a68aade ngx_udp_recv() Igor Sysoev <igor@sysoev.ru> parents: 1687 diff changeset	1429 n = ngx_udp_recv(c, buf, NGX_RESOLVER_UDP_SIZE);
0b592a68aade ngx_udp_recv() Igor Sysoev <igor@sysoev.ru> parents: 1687 diff changeset	1430
0b592a68aade ngx_udp_recv() Igor Sysoev <igor@sysoev.ru> parents: 1687 diff changeset	1431 if (n < 0) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1432 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1433 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1434
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1435 ngx_resolver_process_response(rec->resolver, buf, n, 0);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1436
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1437 } while (rev->ready);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1438 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1439
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1440
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1441 static void
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1442 ngx_resolver_tcp_write(ngx_event_t *wev)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1443 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1444 off_t sent;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1445 ssize_t n;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1446 ngx_buf_t *b;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1447 ngx_resolver_t *r;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1448 ngx_connection_t *c;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1449 ngx_resolver_connection_t *rec;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1450
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1451 c = wev->data;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1452 rec = c->data;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1453 b = rec->write_buf;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1454 r = rec->resolver;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1455
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1456 if (wev->timedout) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1457 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1458 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1459
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1460 sent = c->sent;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1461
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1462 while (wev->ready && b->pos < b->last) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1463 n = ngx_send(c, b->pos, b->last - b->pos);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1464
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1465 if (n == NGX_AGAIN) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1466 break;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1467 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1468
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1469 if (n == NGX_ERROR) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1470 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1471 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1472
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1473 b->pos += n;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1474 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1475
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1476 if (b->pos != b->start) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1477 b->last = ngx_movemem(b->start, b->pos, b->last - b->pos);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1478 b->pos = b->start;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1479 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1480
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1481 if (c->sent != sent) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1482 ngx_add_timer(wev, (ngx_msec_t) (r->tcp_timeout * 1000));
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1483 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1484
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1485 if (ngx_handle_write_event(wev, 0) != NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1486 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1487 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1488
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1489 return;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1490
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1491 failed:
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1492
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1493 ngx_close_connection(c);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1494 rec->tcp = NULL;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1495 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1496
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1497
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1498 static void
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1499 ngx_resolver_tcp_read(ngx_event_t *rev)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1500 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1501 u_char *p;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1502 size_t size;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1503 ssize_t n;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1504 u_short qlen;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1505 ngx_buf_t *b;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1506 ngx_resolver_t *r;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1507 ngx_connection_t *c;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1508 ngx_resolver_connection_t *rec;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1509
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1510 c = rev->data;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1511 rec = c->data;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1512 b = rec->read_buf;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1513 r = rec->resolver;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1514
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1515 while (rev->ready) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1516 n = ngx_recv(c, b->last, b->end - b->last);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1517
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1518 if (n == NGX_AGAIN) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1519 break;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1520 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1521
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1522 if (n == NGX_ERROR \|\| n == 0) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1523 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1524 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1525
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1526 b->last += n;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1527
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1528 for ( ;; ) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1529 p = b->pos;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1530 size = b->last - p;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1531
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1532 if (size < 2) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1533 break;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1534 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1535
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1536 qlen = (u_short) *p++ << 8;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1537 qlen += *p++;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1538
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1539 if (size < (size_t) (2 + qlen)) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1540 break;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1541 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1542
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1543 ngx_resolver_process_response(r, p, qlen, 1);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1544
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1545 b->pos += 2 + qlen;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1546 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1547
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1548 if (b->pos != b->start) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1549 b->last = ngx_movemem(b->start, b->pos, b->last - b->pos);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1550 b->pos = b->start;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1551 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1552 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1553
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1554 if (ngx_handle_read_event(rev, 0) != NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1555 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1556 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1557
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1558 return;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1559
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1560 failed:
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1561
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1562 ngx_close_connection(c);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1563 rec->tcp = NULL;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1564 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1565
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1566
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1567 static void
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1568 ngx_resolver_process_response(ngx_resolver_t r, u_char buf, size_t n,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1569 ngx_uint_t tcp)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1570 {
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1571 char *err;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1572 ngx_uint_t i, times, ident, qident, flags, code, nqs, nan, trunc,
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1573 qtype, qclass;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1574 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1575 ngx_uint_t qident6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1576 #endif
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1577 ngx_queue_t *q;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1578 ngx_resolver_qs_t *qs;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1579 ngx_resolver_hdr_t *response;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1580 ngx_resolver_node_t *rn;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1581
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1582 if (n < sizeof(ngx_resolver_hdr_t)) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1583 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1584 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1585
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1586 response = (ngx_resolver_hdr_t *) buf;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1587
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1588 ident = (response->ident_hi << 8) + response->ident_lo;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1589 flags = (response->flags_hi << 8) + response->flags_lo;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1590 nqs = (response->nqs_hi << 8) + response->nqs_lo;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1591 nan = (response->nan_hi << 8) + response->nan_lo;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1592 trunc = flags & 0x0200;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1593
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1594 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	1595 "resolver DNS response %ui fl:%04Xui %ui/%ui/%ud/%ud",
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1596 ident, flags, nqs, nan,
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1597 (response->nns_hi << 8) + response->nns_lo,
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1598 (response->nar_hi << 8) + response->nar_lo);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1599
5470 aebdca7e8f8f Resolver: fixed response processing. Ruslan Ermilov <ru@nginx.com> parents: 5469 diff changeset	1600 /* response to a standard query */
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1601 if ((flags & 0xf870) != 0x8000 \|\| (trunc && tcp)) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1602 ngx_log_error(r->log_level, r->log, 0,
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1603 "invalid %s DNS response %ui fl:%04Xui",
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1604 tcp ? "TCP" : "UDP", ident, flags);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1605 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1606 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1607
5470 aebdca7e8f8f Resolver: fixed response processing. Ruslan Ermilov <ru@nginx.com> parents: 5469 diff changeset	1608 code = flags & 0xf;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1609
2282 ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1610 if (code == NGX_RESOLVE_FORMERR) {
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1611
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1612 times = 0;
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1613
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1614 for (q = ngx_queue_head(&r->name_resend_queue);
6347 81d44cd4044e Resolver: fixed possible segmentation fault on DNS format error. Roman Arutyunyan <arut@nginx.com> parents: 6196 diff changeset	1615 q != ngx_queue_sentinel(&r->name_resend_queue) && times++ < 100;
2282 ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1616 q = ngx_queue_next(q))
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1617 {
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1618 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	1619 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	1620
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1621 if (qident == ident) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1622 goto dns_error_name;
2282 ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1623 }
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1624
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1625 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1626 if (rn->query6) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1627 qident6 = (rn->query6[0] << 8) + rn->query6[1];
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1628
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1629 if (qident6 == ident) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1630 goto dns_error_name;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1631 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1632 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1633 #endif
2282 ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1634 }
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1635
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1636 goto dns_error;
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1637 }
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1638
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1639 if (code > NGX_RESOLVE_REFUSED) {
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1640 goto dns_error;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1641 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1642
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1643 if (nqs != 1) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1644 err = "invalid number of questions in DNS response";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1645 goto done;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1646 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1647
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1648 i = sizeof(ngx_resolver_hdr_t);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1649
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1650 while (i < (ngx_uint_t) n) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1651 if (buf[i] == '\0') {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1652 goto found;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1653 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1654
5470 aebdca7e8f8f Resolver: fixed response processing. Ruslan Ermilov <ru@nginx.com> parents: 5469 diff changeset	1655 i += 1 + buf[i];
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1656 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1657
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1658 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1659
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1660 found:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1661
5470 aebdca7e8f8f Resolver: fixed response processing. Ruslan Ermilov <ru@nginx.com> parents: 5469 diff changeset	1662 if (i++ == sizeof(ngx_resolver_hdr_t)) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1663 err = "zero-length domain name in DNS response";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1664 goto done;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1665 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1666
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1667 if (i + sizeof(ngx_resolver_qs_t) + nan * (2 + sizeof(ngx_resolver_an_t))
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1668 > (ngx_uint_t) n)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1669 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1670 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1671 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1672
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1673 qs = (ngx_resolver_qs_t *) &buf[i];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1674
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1675 qtype = (qs->type_hi << 8) + qs->type_lo;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1676 qclass = (qs->class_hi << 8) + qs->class_lo;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1677
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1678 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	1679 "resolver DNS response qt:%ui cl:%ui", qtype, qclass);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1680
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1681 if (qclass != 1) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1682 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	1683 "unknown query class %ui in DNS response", qclass);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1684 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1685 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1686
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1687 switch (qtype) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1688
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1689 case NGX_RESOLVE_A:
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1690 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1691 case NGX_RESOLVE_AAAA:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1692 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1693
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1694 ngx_resolver_process_a(r, buf, n, ident, code, qtype, nan, trunc,
1742 268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	1695 i + sizeof(ngx_resolver_qs_t));
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1696
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1697 break;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1698
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1699 case NGX_RESOLVE_PTR:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1700
1742 268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	1701 ngx_resolver_process_ptr(r, buf, n, ident, code, nan);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1702
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1703 break;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1704
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1705 default:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1706 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	1707 "unknown query type %ui in DNS response", qtype);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1708 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1709 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1710
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1711 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1712
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1713 short_response:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1714
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1715 err = "short DNS response";
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1716
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1717 done:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1718
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1719 ngx_log_error(r->log_level, r->log, 0, err);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1720
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1721 return;
2282 ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1722
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1723 dns_error_name:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1724
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1725 ngx_log_error(r->log_level, r->log, 0,
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1726 "DNS error (%ui: %s), query id:%ui, name:\"%*s\"",
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1727 code, ngx_resolver_strerror(code), ident,
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1728 rn->nlen, rn->name);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1729 return;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1730
2282 ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1731 dns_error:
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1732
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1733 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	1734 "DNS error (%ui: %s), query id:%ui",
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1735 code, ngx_resolver_strerror(code), ident);
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1736 return;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1737 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1738
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1739
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1740 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1741 ngx_resolver_process_a(ngx_resolver_t r, u_char buf, size_t last,
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1742 ngx_uint_t ident, ngx_uint_t code, ngx_uint_t qtype,
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1743 ngx_uint_t nan, ngx_uint_t trunc, ngx_uint_t ans)
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1744 {
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1745 char *err;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1746 u_char *cname;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1747 size_t len;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1748 int32_t ttl;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1749 uint32_t hash;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1750 in_addr_t *addr;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1751 ngx_str_t name;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1752 ngx_addr_t *addrs;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1753 ngx_uint_t type, class, qident, naddrs, a, i, n, start;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1754 #if (NGX_HAVE_INET6)
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1755 struct in6_addr *addr6;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1756 #endif
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1757 ngx_resolver_an_t *an;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1758 ngx_resolver_ctx_t ctx, next;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1759 ngx_resolver_node_t *rn;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1760 ngx_resolver_connection_t *rec;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1761
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1762 if (ngx_resolver_copy(r, &name, buf,
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1763 buf + sizeof(ngx_resolver_hdr_t), buf + last)
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1764 != NGX_OK)
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1765 {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1766 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1767 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1768
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1769 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0, "resolver qs:%V", &name);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1770
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1771 hash = ngx_crc32_short(name.data, name.len);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1772
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1773 /* lock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1774
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1775 rn = ngx_resolver_lookup_name(r, &name, hash);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1776
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1777 if (rn == NULL) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1778 ngx_log_error(r->log_level, r->log, 0,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1779 "unexpected response for %V", &name);
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	1780 ngx_resolver_free(r, name.data);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1781 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1782 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1783
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1784 switch (qtype) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1785
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1786 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1787 case NGX_RESOLVE_AAAA:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1788
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1789 if (rn->query6 == NULL \|\| rn->naddrs6 != (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1790 ngx_log_error(r->log_level, r->log, 0,
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1791 "unexpected response for %V", &name);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1792 ngx_resolver_free(r, name.data);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1793 goto failed;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1794 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1795
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1796 if (trunc && rn->tcp6) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1797 ngx_resolver_free(r, name.data);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1798 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1799 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1800
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1801 qident = (rn->query6[0] << 8) + rn->query6[1];
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1802
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1803 break;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1804 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1805
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1806 default: /* NGX_RESOLVE_A */
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1807
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1808 if (rn->query == NULL \|\| rn->naddrs != (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1809 ngx_log_error(r->log_level, r->log, 0,
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1810 "unexpected response for %V", &name);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1811 ngx_resolver_free(r, name.data);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1812 goto failed;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1813 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1814
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1815 if (trunc && rn->tcp) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1816 ngx_resolver_free(r, name.data);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1817 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1818 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1819
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1820 qident = (rn->query[0] << 8) + rn->query[1];
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1821 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1822
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1823 if (ident != qident) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1824 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	1825 "wrong ident %ui response for %V, expect %ui",
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1826 ident, &name, qident);
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	1827 ngx_resolver_free(r, name.data);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1828 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1829 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1830
3139 5f6144fc674d fix memory leak in resolver Igor Sysoev <igor@sysoev.ru> parents: 2785 diff changeset	1831 ngx_resolver_free(r, name.data);
5f6144fc674d fix memory leak in resolver Igor Sysoev <igor@sysoev.ru> parents: 2785 diff changeset	1832
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1833 if (trunc) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1834
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1835 ngx_queue_remove(&rn->queue);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1836
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1837 if (rn->waiting == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1838 ngx_rbtree_delete(&r->name_rbtree, &rn->node);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1839 ngx_resolver_free_node(r, rn);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1840 goto next;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1841 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1842
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1843 rec = r->connections.elts;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1844 rec = &rec[rn->last_connection];
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1845
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1846 switch (qtype) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1847
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1848 #if (NGX_HAVE_INET6)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1849 case NGX_RESOLVE_AAAA:
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1850
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1851 rn->tcp6 = 1;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1852
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1853 (void) ngx_resolver_send_tcp_query(r, rec, rn->query6, rn->qlen);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1854
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1855 break;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1856 #endif
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1857
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1858 default: /* NGX_RESOLVE_A */
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1859
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1860 rn->tcp = 1;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1861
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1862 (void) ngx_resolver_send_tcp_query(r, rec, rn->query, rn->qlen);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1863 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1864
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1865 rn->expire = ngx_time() + r->resend_timeout;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1866
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1867 ngx_queue_insert_head(&r->name_resend_queue, &rn->queue);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1868
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1869 goto next;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1870 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1871
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1872 if (code == 0 && rn->code) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1873 code = rn->code;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1874 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1875
1742 268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	1876 if (code == 0 && nan == 0) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1877
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1878 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1879 switch (qtype) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1880
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1881 case NGX_RESOLVE_AAAA:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1882
5768 70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	1883 rn->naddrs6 = 0;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	1884
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1885 if (rn->naddrs == (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1886 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1887 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1888
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1889 if (rn->naddrs) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1890 goto export;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1891 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1892
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1893 break;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1894
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1895 default: /* NGX_RESOLVE_A */
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1896
5768 70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	1897 rn->naddrs = 0;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	1898
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1899 if (rn->naddrs6 == (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1900 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1901 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1902
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1903 if (rn->naddrs6) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1904 goto export;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1905 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1906 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1907 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1908
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1909 code = NGX_RESOLVE_NXDOMAIN;
1742 268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	1910 }
268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	1911
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1912 if (code) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1913
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1914 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1915 switch (qtype) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1916
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1917 case NGX_RESOLVE_AAAA:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1918
5768 70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	1919 rn->naddrs6 = 0;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	1920
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1921 if (rn->naddrs == (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1922 rn->code = (u_char) code;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1923 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1924 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1925
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1926 break;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1927
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1928 default: /* NGX_RESOLVE_A */
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1929
5768 70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	1930 rn->naddrs = 0;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	1931
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1932 if (rn->naddrs6 == (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1933 rn->code = (u_char) code;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1934 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1935 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1936 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1937 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1938
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1939 next = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1940 rn->waiting = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1941
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1942 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1943
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1944 ngx_rbtree_delete(&r->name_rbtree, &rn->node);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1945
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1946 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1947
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1948 while (next) {
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	1949 ctx = next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	1950 ctx->state = code;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	1951 next = ctx->next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	1952
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	1953 ctx->handler(ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1954 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1955
5920 7420068c4d4b Resolver: fixed use-after-free memory access. Ruslan Ermilov <ru@nginx.com> parents: 5820 diff changeset	1956 ngx_resolver_free_node(r, rn);
7420068c4d4b Resolver: fixed use-after-free memory access. Ruslan Ermilov <ru@nginx.com> parents: 5820 diff changeset	1957
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1958 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1959 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1960
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1961 i = ans;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1962 naddrs = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1963 cname = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1964
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1965 for (a = 0; a < nan; a++) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1966
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1967 start = i;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1968
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1969 while (i < last) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1970
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1971 if (buf[i] & 0xc0) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1972 i += 2;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1973 goto found;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1974 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1975
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1976 if (buf[i] == 0) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1977 i++;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1978 goto test_length;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1979 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1980
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1981 i += 1 + buf[i];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1982 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1983
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1984 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1985
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1986 test_length:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1987
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1988 if (i - start < 2) {
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1989 err = "invalid name in DNS response";
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1990 goto invalid;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1991 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1992
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1993 found:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1994
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1995 if (i + sizeof(ngx_resolver_an_t) >= last) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1996 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1997 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1998
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1999 an = (ngx_resolver_an_t *) &buf[i];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2000
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2001 type = (an->type_hi << 8) + an->type_lo;
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2002 class = (an->class_hi << 8) + an->class_lo;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2003 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	2004 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	2005 + (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	2006
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2007 if (class != 1) {
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2008 ngx_log_error(r->log_level, r->log, 0,
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2009 "unexpected RR class %ui", class);
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2010 goto failed;
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2011 }
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2012
4295 05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	2013 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	2014 ttl = 0;
05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	2015 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2016
5485 8958656a8060 Resolver: use minimum TTL for caching (ticket #329). Ruslan Ermilov <ru@nginx.com> parents: 5479 diff changeset	2017 rn->ttl = ngx_min(rn->ttl, (uint32_t) ttl);
8958656a8060 Resolver: use minimum TTL for caching (ticket #329). Ruslan Ermilov <ru@nginx.com> parents: 5479 diff changeset	2018
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2019 i += sizeof(ngx_resolver_an_t);
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2020
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2021 switch (type) {
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2022
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2023 case NGX_RESOLVE_A:
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2024
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2025 if (qtype != NGX_RESOLVE_A) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2026 err = "unexpected A record in DNS response";
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2027 goto invalid;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2028 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2029
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2030 if (len != 4) {
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2031 err = "invalid A record in DNS response";
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2032 goto invalid;
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2033 }
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2034
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2035 if (i + 4 > last) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2036 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2037 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2038
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2039 naddrs++;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2040
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2041 break;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2042
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2043 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2044 case NGX_RESOLVE_AAAA:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2045
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2046 if (qtype != NGX_RESOLVE_AAAA) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2047 err = "unexpected AAAA record in DNS response";
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2048 goto invalid;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2049 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2050
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2051 if (len != 16) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2052 err = "invalid AAAA record in DNS response";
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2053 goto invalid;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2054 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2055
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2056 if (i + 16 > last) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2057 goto short_response;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2058 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2059
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2060 naddrs++;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2061
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2062 break;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2063 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2064
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2065 case NGX_RESOLVE_CNAME:
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2066
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2067 cname = &buf[i];
1965 14463ae77723 take into account DNAME Igor Sysoev <igor@sysoev.ru> parents: 1961 diff changeset	2068
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2069 break;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2070
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2071 case NGX_RESOLVE_DNAME:
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2072
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2073 break;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2074
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2075 default:
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2076
1966 fb02f63eafd6 log unexpected qtype Igor Sysoev <igor@sysoev.ru> parents: 1965 diff changeset	2077 ngx_log_error(r->log_level, r->log, 0,
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2078 "unexpected RR type %ui", type);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2079 }
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2080
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2081 i += len;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2082 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2083
4295 05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	2084 ngx_log_debug3(NGX_LOG_DEBUG_CORE, r->log, 0,
5485 8958656a8060 Resolver: use minimum TTL for caching (ticket #329). Ruslan Ermilov <ru@nginx.com> parents: 5479 diff changeset	2085 "resolver naddrs:%ui cname:%p ttl:%uD",
8958656a8060 Resolver: use minimum TTL for caching (ticket #329). Ruslan Ermilov <ru@nginx.com> parents: 5479 diff changeset	2086 naddrs, cname, rn->ttl);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2087
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2088 if (naddrs) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2089
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2090 switch (qtype) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2091
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2092 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2093 case NGX_RESOLVE_AAAA:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2094
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2095 if (naddrs == 1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2096 addr6 = &rn->u6.addr6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2097 rn->naddrs6 = 1;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2098
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2099 } else {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2100 addr6 = ngx_resolver_alloc(r, naddrs * sizeof(struct in6_addr));
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2101 if (addr6 == NULL) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2102 goto failed;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2103 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2104
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2105 rn->u6.addrs6 = addr6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2106 rn->naddrs6 = (u_short) naddrs;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2107 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2108
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2109 #if (NGX_SUPPRESS_WARN)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2110 addr = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2111 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2112
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2113 break;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2114 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2115
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2116 default: /* NGX_RESOLVE_A */
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2117
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2118 if (naddrs == 1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2119 addr = &rn->u.addr;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2120 rn->naddrs = 1;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2121
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2122 } else {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2123 addr = ngx_resolver_alloc(r, naddrs * sizeof(in_addr_t));
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2124 if (addr == NULL) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2125 goto failed;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2126 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2127
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2128 rn->u.addrs = addr;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2129 rn->naddrs = (u_short) naddrs;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2130 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2131
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2132 #if (NGX_HAVE_INET6 && NGX_SUPPRESS_WARN)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2133 addr6 = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2134 #endif
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2135 }
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2136
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2137 n = 0;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2138 i = ans;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2139
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2140 for (a = 0; a < nan; a++) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2141
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2142 for ( ;; ) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2143
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2144 if (buf[i] & 0xc0) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2145 i += 2;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2146 break;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2147 }
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2148
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2149 if (buf[i] == 0) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2150 i++;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2151 break;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2152 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2153
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2154 i += 1 + buf[i];
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2155 }
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2156
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2157 an = (ngx_resolver_an_t *) &buf[i];
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2158
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2159 type = (an->type_hi << 8) + an->type_lo;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2160 len = (an->len_hi << 8) + an->len_lo;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2161
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2162 i += sizeof(ngx_resolver_an_t);
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2163
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2164 if (type == NGX_RESOLVE_A) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2165
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2166 addr[n] = htonl((buf[i] << 24) + (buf[i + 1] << 16)
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2167 + (buf[i + 2] << 8) + (buf[i + 3]));
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2168
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2169 if (++n == naddrs) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2170
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2171 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2172 if (rn->naddrs6 == (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2173 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2174 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2175 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2176
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2177 break;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2178 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2179 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2180
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2181 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2182 else if (type == NGX_RESOLVE_AAAA) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2183
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2184 ngx_memcpy(addr6[n].s6_addr, &buf[i], 16);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2185
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2186 if (++n == naddrs) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2187
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2188 if (rn->naddrs == (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2189 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2190 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2191
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2192 break;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2193 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2194 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2195 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2196
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2197 i += len;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2198 }
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2199 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2200
5768 70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2201 switch (qtype) {
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2202
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2203 #if (NGX_HAVE_INET6)
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2204 case NGX_RESOLVE_AAAA:
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2205
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2206 if (rn->naddrs6 == (u_short) -1) {
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2207 rn->naddrs6 = 0;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2208 }
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2209
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2210 break;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2211 #endif
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2212
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2213 default: /* NGX_RESOLVE_A */
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2214
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2215 if (rn->naddrs == (u_short) -1) {
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2216 rn->naddrs = 0;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2217 }
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2218 }
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2219
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2220 if (rn->naddrs != (u_short) -1
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2221 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2222 && rn->naddrs6 != (u_short) -1
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2223 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2224 && rn->naddrs
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2225 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2226 + rn->naddrs6
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2227 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2228 > 0)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2229 {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2230
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2231 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2232 export:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2233 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2234
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2235 naddrs = rn->naddrs;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2236 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2237 naddrs += rn->naddrs6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2238 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2239
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2240 if (naddrs == 1 && rn->naddrs == 1) {
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2241 addrs = NULL;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2242
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2243 } else {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2244 addrs = ngx_resolver_export(r, rn, 0);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2245 if (addrs == NULL) {
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2246 goto failed;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2247 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2248 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2249
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2250 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2251
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2252 rn->valid = ngx_time() + (r->valid ? r->valid : (time_t) rn->ttl);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2253 rn->expire = ngx_time() + r->expire;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2254
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2255 ngx_queue_insert_head(&r->name_expire_queue, &rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2256
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2257 next = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2258 rn->waiting = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2259
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2260 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2261
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2262 while (next) {
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2263 ctx = next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2264 ctx->state = NGX_OK;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2265 ctx->naddrs = naddrs;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2266
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2267 if (addrs == NULL) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2268 ctx->addrs = &ctx->addr;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2269 ctx->addr.sockaddr = (struct sockaddr *) &ctx->sin;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2270 ctx->addr.socklen = sizeof(struct sockaddr_in);
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2271 ngx_memzero(&ctx->sin, sizeof(struct sockaddr_in));
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2272 ctx->sin.sin_family = AF_INET;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2273 ctx->sin.sin_addr.s_addr = rn->u.addr;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2274
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2275 } else {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2276 ctx->addrs = addrs;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2277 }
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2278
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2279 next = ctx->next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2280
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2281 ctx->handler(ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2282 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2283
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2284 if (addrs != NULL) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2285 ngx_resolver_free(r, addrs->sockaddr);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2286 ngx_resolver_free(r, addrs);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2287 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2288
4619 3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	2289 ngx_resolver_free(r, rn->query);
3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	2290 rn->query = NULL;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2291 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2292 rn->query6 = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2293 #endif
4619 3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	2294
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2295 return;
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2296 }
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2297
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2298 if (cname) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2299
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2300 /* CNAME only */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2301
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2302 if (rn->naddrs == (u_short) -1
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2303 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2304 \|\| rn->naddrs6 == (u_short) -1
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2305 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2306 )
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2307 {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2308 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2309 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2310
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2311 if (ngx_resolver_copy(r, &name, buf, cname, buf + last) != NGX_OK) {
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2312 goto failed;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2313 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2314
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2315 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2316 "resolver cname:\"%V\"", &name);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2317
1741 0829024c924d fix segfault if response will have CNAME only Igor Sysoev <igor@sysoev.ru> parents: 1689 diff changeset	2318 ngx_queue_remove(&rn->queue);
0829024c924d fix segfault if response will have CNAME only Igor Sysoev <igor@sysoev.ru> parents: 1689 diff changeset	2319
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2320 rn->cnlen = (u_short) name.len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2321 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	2322
5485 8958656a8060 Resolver: use minimum TTL for caching (ticket #329). Ruslan Ermilov <ru@nginx.com> parents: 5479 diff changeset	2323 rn->valid = ngx_time() + (r->valid ? r->valid : (time_t) rn->ttl);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2324 rn->expire = ngx_time() + r->expire;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2325
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2326 ngx_queue_insert_head(&r->name_expire_queue, &rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2327
6352 ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2328 ngx_resolver_free(r, rn->query);
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2329 rn->query = NULL;
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2330 #if (NGX_HAVE_INET6)
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2331 rn->query6 = NULL;
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2332 #endif
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2333
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2334 ctx = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2335 rn->waiting = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2336
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2337 if (ctx) {
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	2338
6352 ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2339 if (ctx->recursion++ >= NGX_RESOLVER_MAX_RECURSION) {
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2340
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2341 /* unlock name mutex */
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2342
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2343 do {
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2344 ctx->state = NGX_RESOLVE_NXDOMAIN;
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2345 next = ctx->next;
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2346
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2347 ctx->handler(ctx);
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2348
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2349 ctx = next;
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2350 } while (ctx);
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2351
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2352 return;
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2353 }
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2354
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	2355 for (next = ctx; next; next = next->next) {
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	2356 next->node = NULL;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	2357 }
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	2358
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	2359 (void) ngx_resolve_name_locked(r, ctx, &name);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2360 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2361
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2362 /* unlock name mutex */
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2363
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2364 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2365 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2366
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2367 ngx_log_error(r->log_level, r->log, 0,
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2368 "no A or CNAME types in DNS response");
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2369 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2370
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2371 short_response:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2372
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2373 err = "short DNS response";
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2374
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2375 invalid:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2376
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2377 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2378
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2379 ngx_log_error(r->log_level, r->log, 0, err);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2380
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2381 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2382
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2383 failed:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2384
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2385 next:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2386
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2387 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2388
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2389 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2390 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2391
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2392
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2393 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2394 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	2395 ngx_uint_t ident, ngx_uint_t code, ngx_uint_t nan)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2396 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2397 char *err;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2398 size_t len;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2399 u_char text[NGX_SOCKADDR_STRLEN];
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2400 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	2401 int32_t ttl;
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2402 ngx_int_t octet;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2403 ngx_str_t name;
5472 ab493c60d9ff Resolver: fixes in PTR processing. Ruslan Ermilov <ru@nginx.com> parents: 5471 diff changeset	2404 ngx_uint_t i, mask, qident, class;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2405 ngx_queue_t *expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2406 ngx_rbtree_t *tree;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2407 ngx_resolver_an_t *an;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2408 ngx_resolver_ctx_t ctx, next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2409 ngx_resolver_node_t *rn;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2410 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2411 uint32_t hash;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2412 ngx_int_t digit;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2413 struct in6_addr addr6;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2414 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2415
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2416 if (ngx_resolver_copy(r, NULL, buf,
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2417 buf + sizeof(ngx_resolver_hdr_t), buf + n)
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2418 != NGX_OK)
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2419 {
5472 ab493c60d9ff Resolver: fixes in PTR processing. Ruslan Ermilov <ru@nginx.com> parents: 5471 diff changeset	2420 return;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2421 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2422
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2423 /* AF_INET */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2424
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2425 addr = 0;
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2426 i = sizeof(ngx_resolver_hdr_t);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2427
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2428 for (mask = 0; mask < 32; mask += 8) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2429 len = buf[i++];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2430
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2431 octet = ngx_atoi(&buf[i], len);
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2432 if (octet == NGX_ERROR \|\| octet > 255) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2433 goto invalid_in_addr_arpa;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2434 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2435
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2436 addr += octet << mask;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2437 i += len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2438 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2439
5479 c0d6eae5a1c5 Resolver: lookups are case-insensitive. Ruslan Ermilov <ru@nginx.com> parents: 5478 diff changeset	2440 if (ngx_strcasecmp(&buf[i], (u_char *) "\7in-addr\4arpa") == 0) {
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2441 i += sizeof("\7in-addr\4arpa");
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2442
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2443 /* lock addr mutex */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2444
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2445 rn = ngx_resolver_lookup_addr(r, addr);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2446
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2447 tree = &r->addr_rbtree;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2448 expire_queue = &r->addr_expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2449
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2450 addr = htonl(addr);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2451 name.len = ngx_inet_ntop(AF_INET, &addr, text, NGX_SOCKADDR_STRLEN);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2452 name.data = text;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2453
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2454 goto valid;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2455 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2456
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2457 invalid_in_addr_arpa:
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2458
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2459 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2460
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2461 i = sizeof(ngx_resolver_hdr_t);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2462
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2463 for (octet = 15; octet >= 0; octet--) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2464 if (buf[i++] != '\1') {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2465 goto invalid_ip6_arpa;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2466 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2467
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2468 digit = ngx_hextoi(&buf[i++], 1);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2469 if (digit == NGX_ERROR) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2470 goto invalid_ip6_arpa;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2471 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2472
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2473 addr6.s6_addr[octet] = (u_char) digit;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2474
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2475 if (buf[i++] != '\1') {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2476 goto invalid_ip6_arpa;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2477 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2478
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2479 digit = ngx_hextoi(&buf[i++], 1);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2480 if (digit == NGX_ERROR) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2481 goto invalid_ip6_arpa;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2482 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2483
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2484 addr6.s6_addr[octet] += (u_char) (digit * 16);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2485 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2486
5479 c0d6eae5a1c5 Resolver: lookups are case-insensitive. Ruslan Ermilov <ru@nginx.com> parents: 5478 diff changeset	2487 if (ngx_strcasecmp(&buf[i], (u_char *) "\3ip6\4arpa") == 0) {
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2488 i += sizeof("\3ip6\4arpa");
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2489
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2490 /* lock addr mutex */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2491
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2492 hash = ngx_crc32_short(addr6.s6_addr, 16);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2493 rn = ngx_resolver_lookup_addr6(r, &addr6, hash);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2494
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2495 tree = &r->addr6_rbtree;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2496 expire_queue = &r->addr6_expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2497
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2498 name.len = ngx_inet6_ntop(addr6.s6_addr, text, NGX_SOCKADDR_STRLEN);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2499 name.data = text;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2500
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2501 goto valid;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2502 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2503
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2504 invalid_ip6_arpa:
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2505 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2506
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2507 ngx_log_error(r->log_level, r->log, 0,
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2508 "invalid in-addr.arpa or ip6.arpa name in DNS response");
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2509 return;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2510
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2511 valid:
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2512
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2513 if (rn == NULL \|\| rn->query == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2514 ngx_log_error(r->log_level, r->log, 0,
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2515 "unexpected response for %V", &name);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2516 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2517 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2518
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2519 qident = (rn->query[0] << 8) + rn->query[1];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2520
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2521 if (ident != qident) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2522 ngx_log_error(r->log_level, r->log, 0,
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2523 "wrong ident %ui response for %V, expect %ui",
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2524 ident, &name, qident);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2525 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2526 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2527
1742 268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	2528 if (code == 0 && nan == 0) {
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2529 code = NGX_RESOLVE_NXDOMAIN;
1742 268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	2530 }
268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	2531
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2532 if (code) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2533 next = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2534 rn->waiting = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2535
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2536 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2537
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2538 ngx_rbtree_delete(tree, &rn->node);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2539
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2540 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2541
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2542 while (next) {
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2543 ctx = next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2544 ctx->state = code;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2545 next = ctx->next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2546
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2547 ctx->handler(ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2548 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2549
5920 7420068c4d4b Resolver: fixed use-after-free memory access. Ruslan Ermilov <ru@nginx.com> parents: 5820 diff changeset	2550 ngx_resolver_free_node(r, rn);
7420068c4d4b Resolver: fixed use-after-free memory access. Ruslan Ermilov <ru@nginx.com> parents: 5820 diff changeset	2551
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2552 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2553 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2554
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2555 i += sizeof(ngx_resolver_qs_t);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2556
5472 ab493c60d9ff Resolver: fixes in PTR processing. Ruslan Ermilov <ru@nginx.com> parents: 5471 diff changeset	2557 if (i + 2 + sizeof(ngx_resolver_an_t) >= n) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2558 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2559 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2560
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2561 /* compression pointer to .arpa /
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2562
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2563 if (buf[i] != 0xc0 \|\| buf[i + 1] != sizeof(ngx_resolver_hdr_t)) {
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2564 err = "invalid in-addr.arpa or ip6.arpa name in DNS response";
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2565 goto invalid;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2566 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2567
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2568 an = (ngx_resolver_an_t *) &buf[i + 2];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2569
5472 ab493c60d9ff Resolver: fixes in PTR processing. Ruslan Ermilov <ru@nginx.com> parents: 5471 diff changeset	2570 class = (an->class_hi << 8) + an->class_lo;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2571 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	2572 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	2573 + (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	2574
5472 ab493c60d9ff Resolver: fixes in PTR processing. Ruslan Ermilov <ru@nginx.com> parents: 5471 diff changeset	2575 if (class != 1) {
ab493c60d9ff Resolver: fixes in PTR processing. Ruslan Ermilov <ru@nginx.com> parents: 5471 diff changeset	2576 ngx_log_error(r->log_level, r->log, 0,
ab493c60d9ff Resolver: fixes in PTR processing. Ruslan Ermilov <ru@nginx.com> parents: 5471 diff changeset	2577 "unexpected RR class %ui", class);
ab493c60d9ff Resolver: fixes in PTR processing. Ruslan Ermilov <ru@nginx.com> parents: 5471 diff changeset	2578 goto failed;
ab493c60d9ff Resolver: fixes in PTR processing. Ruslan Ermilov <ru@nginx.com> parents: 5471 diff changeset	2579 }
ab493c60d9ff Resolver: fixes in PTR processing. Ruslan Ermilov <ru@nginx.com> parents: 5471 diff changeset	2580
4295 05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	2581 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	2582 ttl = 0;
05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	2583 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2584
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2585 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	2586 "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	2587 (an->type_hi << 8) + an->type_lo,
5472 ab493c60d9ff Resolver: fixes in PTR processing. Ruslan Ermilov <ru@nginx.com> parents: 5471 diff changeset	2588 class, len);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2589
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2590 i += 2 + sizeof(ngx_resolver_an_t);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2591
5469 b2fc466a11a7 Resolver: removed unnecessary casts. Ruslan Ermilov <ru@nginx.com> parents: 5468 diff changeset	2592 if (i + len > n) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2593 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2594 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2595
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2596 if (ngx_resolver_copy(r, &name, buf, buf + i, buf + n) != NGX_OK) {
5472 ab493c60d9ff Resolver: fixes in PTR processing. Ruslan Ermilov <ru@nginx.com> parents: 5471 diff changeset	2597 goto failed;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2598 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2599
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2600 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0, "resolver an:%V", &name);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2601
2486 8de5dc3e7001 use length of uncompressed name Igor Sysoev <igor@sysoev.ru> parents: 2484 diff changeset	2602 if (name.len != (size_t) rn->nlen
8de5dc3e7001 use length of uncompressed name Igor Sysoev <igor@sysoev.ru> parents: 2484 diff changeset	2603 \|\| ngx_strncmp(name.data, rn->name, name.len) != 0)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2604 {
2482 30ec8c5ac75b fix reverse resolving cache: it stored zero length names Igor Sysoev <igor@sysoev.ru> parents: 2314 diff changeset	2605 if (rn->nlen) {
30ec8c5ac75b fix reverse resolving cache: it stored zero length names Igor Sysoev <igor@sysoev.ru> parents: 2314 diff changeset	2606 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	2607 }
30ec8c5ac75b fix reverse resolving cache: it stored zero length names Igor Sysoev <igor@sysoev.ru> parents: 2314 diff changeset	2608
2490 1c87647b7ca5 fix building by msvc, introduced in r2487 Igor Sysoev <igor@sysoev.ru> parents: 2487 diff changeset	2609 rn->nlen = (u_short) name.len;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2610 rn->name = name.data;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2611
2486 8de5dc3e7001 use length of uncompressed name Igor Sysoev <igor@sysoev.ru> parents: 2484 diff changeset	2612 name.data = ngx_resolver_dup(r, rn->name, name.len);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2613 if (name.data == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2614 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2615 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2616 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2617
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2618 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2619
4295 05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	2620 rn->valid = ngx_time() + (r->valid ? r->valid : ttl);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2621 rn->expire = ngx_time() + r->expire;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2622
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2623 ngx_queue_insert_head(expire_queue, &rn->queue);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2624
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2625 next = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2626 rn->waiting = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2627
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2628 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2629
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2630 while (next) {
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2631 ctx = next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2632 ctx->state = NGX_OK;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2633 ctx->name = name;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2634 next = ctx->next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2635
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2636 ctx->handler(ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2637 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2638
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2639 ngx_resolver_free(r, name.data);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2640
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2641 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2642
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2643 short_response:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2644
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2645 err = "short DNS response";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2646
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2647 invalid:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2648
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2649 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2650
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2651 ngx_log_error(r->log_level, r->log, 0, err);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2652
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2653 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2654
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2655 failed:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2656
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2657 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2658
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2659 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2660 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2661
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2662
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2663 static ngx_resolver_node_t *
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2664 ngx_resolver_lookup_name(ngx_resolver_t r, ngx_str_t name, uint32_t hash)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2665 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2666 ngx_int_t rc;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2667 ngx_rbtree_node_t node, sentinel;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2668 ngx_resolver_node_t *rn;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2669
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2670 node = r->name_rbtree.root;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2671 sentinel = r->name_rbtree.sentinel;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2672
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2673 while (node != sentinel) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2674
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2675 if (hash < node->key) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2676 node = node->left;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2677 continue;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2678 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2679
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2680 if (hash > node->key) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2681 node = node->right;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2682 continue;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2683 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2684
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2685 /* hash == node->key */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2686
5921 5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	2687 rn = ngx_resolver_node(node);
4497 95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	2688
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	2689 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	2690
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	2691 if (rc == 0) {
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	2692 return rn;
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	2693 }
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	2694
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	2695 node = (rc < 0) ? node->left : node->right;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2696 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2697
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2698 /* not found */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2699
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2700 return NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2701 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2702
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2703
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2704 static ngx_resolver_node_t *
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2705 ngx_resolver_lookup_addr(ngx_resolver_t *r, in_addr_t addr)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2706 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2707 ngx_rbtree_node_t node, sentinel;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2708
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2709 node = r->addr_rbtree.root;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2710 sentinel = r->addr_rbtree.sentinel;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2711
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2712 while (node != sentinel) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2713
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2714 if (addr < node->key) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2715 node = node->left;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2716 continue;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2717 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2718
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2719 if (addr > node->key) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2720 node = node->right;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2721 continue;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2722 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2723
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2724 /* addr == node->key */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2725
5921 5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	2726 return ngx_resolver_node(node);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2727 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2728
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2729 /* not found */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2730
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2731 return NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2732 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2733
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2734
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2735 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2736
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2737 static ngx_resolver_node_t *
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2738 ngx_resolver_lookup_addr6(ngx_resolver_t r, struct in6_addr addr,
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2739 uint32_t hash)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2740 {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2741 ngx_int_t rc;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2742 ngx_rbtree_node_t node, sentinel;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2743 ngx_resolver_node_t *rn;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2744
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2745 node = r->addr6_rbtree.root;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2746 sentinel = r->addr6_rbtree.sentinel;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2747
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2748 while (node != sentinel) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2749
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2750 if (hash < node->key) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2751 node = node->left;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2752 continue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2753 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2754
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2755 if (hash > node->key) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2756 node = node->right;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2757 continue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2758 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2759
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2760 /* hash == node->key */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2761
5921 5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	2762 rn = ngx_resolver_node(node);
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2763
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2764 rc = ngx_memcmp(addr, &rn->addr6, 16);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2765
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2766 if (rc == 0) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2767 return rn;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2768 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2769
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2770 node = (rc < 0) ? node->left : node->right;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2771 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2772
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2773 /* not found */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2774
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2775 return NULL;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2776 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2777
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2778 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2779
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2780
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2781 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2782 ngx_resolver_rbtree_insert_value(ngx_rbtree_node_t *temp,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2783 ngx_rbtree_node_t node, ngx_rbtree_node_t sentinel)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2784 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2785 ngx_rbtree_node_t **p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2786 ngx_resolver_node_t rn, rn_temp;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2787
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2788 for ( ;; ) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2789
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2790 if (node->key < temp->key) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2791
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2792 p = &temp->left;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2793
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2794 } else if (node->key > temp->key) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2795
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2796 p = &temp->right;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2797
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2798 } else { /* node->key == temp->key */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2799
5921 5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	2800 rn = ngx_resolver_node(node);
5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	2801 rn_temp = ngx_resolver_node(temp);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2802
3143 ab6258e18099 fix resolver cache rbtree comparison Igor Sysoev <igor@sysoev.ru> parents: 3139 diff changeset	2803 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	2804 < 0) ? &temp->left : &temp->right;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2805 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2806
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2807 if (*p == sentinel) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2808 break;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2809 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2810
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2811 temp = *p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2812 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2813
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2814 *p = node;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2815 node->parent = temp;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2816 node->left = sentinel;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2817 node->right = sentinel;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2818 ngx_rbt_red(node);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2819 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2820
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2821
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2822 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2823
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2824 static void
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2825 ngx_resolver_rbtree_insert_addr6_value(ngx_rbtree_node_t *temp,
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2826 ngx_rbtree_node_t node, ngx_rbtree_node_t sentinel)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2827 {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2828 ngx_rbtree_node_t **p;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2829 ngx_resolver_node_t rn, rn_temp;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2830
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2831 for ( ;; ) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2832
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2833 if (node->key < temp->key) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2834
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2835 p = &temp->left;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2836
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2837 } else if (node->key > temp->key) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2838
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2839 p = &temp->right;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2840
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2841 } else { /* node->key == temp->key */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2842
5921 5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	2843 rn = ngx_resolver_node(node);
5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	2844 rn_temp = ngx_resolver_node(temp);
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2845
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2846 p = (ngx_memcmp(&rn->addr6, &rn_temp->addr6, 16)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2847 < 0) ? &temp->left : &temp->right;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2848 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2849
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2850 if (*p == sentinel) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2851 break;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2852 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2853
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2854 temp = *p;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2855 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2856
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2857 *p = node;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2858 node->parent = temp;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2859 node->left = sentinel;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2860 node->right = sentinel;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2861 ngx_rbt_red(node);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2862 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2863
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2864 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2865
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2866
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2867 static ngx_int_t
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	2868 ngx_resolver_create_name_query(ngx_resolver_t r, ngx_resolver_node_t rn,
a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	2869 ngx_str_t *name)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2870 {
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2871 u_char p, s;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2872 size_t len, nlen;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2873 ngx_uint_t ident;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2874 ngx_resolver_qs_t *qs;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2875 ngx_resolver_hdr_t *query;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2876
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	2877 nlen = name->len ? (1 + name->len + 1) : 1;
3306 61bdaac6c668 fix resolving an empty name (".") Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	2878
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2879 len = sizeof(ngx_resolver_hdr_t) + nlen + sizeof(ngx_resolver_qs_t);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2880
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2881 #if (NGX_HAVE_INET6)
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	2882 p = ngx_resolver_alloc(r, r->ipv6 ? len * 2 : len);
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2883 #else
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	2884 p = ngx_resolver_alloc(r, len);
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2885 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2886 if (p == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2887 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2888 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2889
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2890 rn->qlen = (u_short) len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2891 rn->query = p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2892
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2893 #if (NGX_HAVE_INET6)
5478 3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	2894 if (r->ipv6) {
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	2895 rn->query6 = p + len;
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	2896 }
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2897 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2898
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2899 query = (ngx_resolver_hdr_t *) p;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2900
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2901 ident = ngx_random();
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2902
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	2903 ngx_log_debug2(NGX_LOG_DEBUG_CORE, r->log, 0,
a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	2904 "resolve: \"%V\" A %i", name, ident & 0xffff);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2905
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2906 query->ident_hi = (u_char) ((ident >> 8) & 0xff);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2907 query->ident_lo = (u_char) (ident & 0xff);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2908
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2909 /* recursion query */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2910 query->flags_hi = 1; query->flags_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2911
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2912 /* one question */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2913 query->nqs_hi = 0; query->nqs_lo = 1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2914 query->nan_hi = 0; query->nan_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2915 query->nns_hi = 0; query->nns_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2916 query->nar_hi = 0; query->nar_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2917
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2918 p += sizeof(ngx_resolver_hdr_t) + nlen;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2919
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2920 qs = (ngx_resolver_qs_t *) p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2921
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2922 /* query type */
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2923 qs->type_hi = 0; qs->type_lo = NGX_RESOLVE_A;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2924
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2925 /* IN query class */
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2926 qs->class_hi = 0; qs->class_lo = 1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2927
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2928 /* convert "www.example.com" to "\3www\7example\3com\0" */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2929
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2930 len = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2931 p--;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2932 *p-- = '\0';
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2933
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	2934 if (name->len == 0) {
4610 778d2cc03e22 Fixed segmentation fault in ngx_resolver_create_name_query(). Ruslan Ermilov <ru@nginx.com> parents: 4556 diff changeset	2935 return NGX_DECLINED;
778d2cc03e22 Fixed segmentation fault in ngx_resolver_create_name_query(). Ruslan Ermilov <ru@nginx.com> parents: 4556 diff changeset	2936 }
778d2cc03e22 Fixed segmentation fault in ngx_resolver_create_name_query(). Ruslan Ermilov <ru@nginx.com> parents: 4556 diff changeset	2937
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	2938 for (s = name->data + name->len - 1; s >= name->data; s--) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2939 if (*s != '.') {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2940 p = s;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2941 len++;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2942
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2943 } else {
4556 1bddc91e78d6 Resolver: added missing sanity checking when creating name queries. Maxim Dounin <mdounin@mdounin.ru> parents: 4497 diff changeset	2944 if (len == 0 \|\| len > 255) {
1961 99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	2945 return NGX_DECLINED;
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	2946 }
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	2947
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2948 *p = (u_char) len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2949 len = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2950 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2951
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2952 p--;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2953 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2954
4556 1bddc91e78d6 Resolver: added missing sanity checking when creating name queries. Maxim Dounin <mdounin@mdounin.ru> parents: 4497 diff changeset	2955 if (len == 0 \|\| len > 255) {
1bddc91e78d6 Resolver: added missing sanity checking when creating name queries. Maxim Dounin <mdounin@mdounin.ru> parents: 4497 diff changeset	2956 return NGX_DECLINED;
1bddc91e78d6 Resolver: added missing sanity checking when creating name queries. Maxim Dounin <mdounin@mdounin.ru> parents: 4497 diff changeset	2957 }
1bddc91e78d6 Resolver: added missing sanity checking when creating name queries. Maxim Dounin <mdounin@mdounin.ru> parents: 4497 diff changeset	2958
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2959 *p = (u_char) len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2960
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2961 #if (NGX_HAVE_INET6)
5478 3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	2962 if (!r->ipv6) {
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	2963 return NGX_OK;
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	2964 }
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	2965
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2966 p = rn->query6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2967
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2968 ngx_memcpy(p, rn->query, rn->qlen);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2969
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2970 query = (ngx_resolver_hdr_t *) p;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2971
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2972 ident = ngx_random();
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2973
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	2974 ngx_log_debug2(NGX_LOG_DEBUG_CORE, r->log, 0,
a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	2975 "resolve: \"%V\" AAAA %i", name, ident & 0xffff);
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2976
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2977 query->ident_hi = (u_char) ((ident >> 8) & 0xff);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2978 query->ident_lo = (u_char) (ident & 0xff);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2979
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2980 p += sizeof(ngx_resolver_hdr_t) + nlen;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2981
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2982 qs = (ngx_resolver_qs_t *) p;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2983
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2984 qs->type_lo = NGX_RESOLVE_AAAA;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2985 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2986
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2987 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2988 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2989
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2990
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2991 static ngx_int_t
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	2992 ngx_resolver_create_addr_query(ngx_resolver_t r, ngx_resolver_node_t rn,
a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	2993 ngx_addr_t *addr)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2994 {
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2995 u_char p, d;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2996 size_t len;
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	2997 in_addr_t inaddr;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2998 ngx_int_t n;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2999 ngx_uint_t ident;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3000 ngx_resolver_hdr_t *query;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3001 struct sockaddr_in *sin;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3002 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3003 struct sockaddr_in6 *sin6;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3004 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3005
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3006 switch (addr->sockaddr->sa_family) {
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3007
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3008 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3009 case AF_INET6:
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3010 len = sizeof(ngx_resolver_hdr_t)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3011 + 64 + sizeof(".ip6.arpa.") - 1
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3012 + sizeof(ngx_resolver_qs_t);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3013
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3014 break;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3015 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3016
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3017 default: /* AF_INET */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3018 len = sizeof(ngx_resolver_hdr_t)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3019 + sizeof(".255.255.255.255.in-addr.arpa.") - 1
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3020 + sizeof(ngx_resolver_qs_t);
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	3021 }
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3022
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3023 p = ngx_resolver_alloc(r, len);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3024 if (p == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3025 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3026 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3027
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3028 rn->query = p;
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3029 query = (ngx_resolver_hdr_t *) p;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3030
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3031 ident = ngx_random();
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3032
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3033 query->ident_hi = (u_char) ((ident >> 8) & 0xff);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3034 query->ident_lo = (u_char) (ident & 0xff);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3035
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3036 /* recursion query */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3037 query->flags_hi = 1; query->flags_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3038
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3039 /* one question */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3040 query->nqs_hi = 0; query->nqs_lo = 1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3041 query->nan_hi = 0; query->nan_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3042 query->nns_hi = 0; query->nns_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3043 query->nar_hi = 0; query->nar_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3044
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3045 p += sizeof(ngx_resolver_hdr_t);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3046
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3047 switch (addr->sockaddr->sa_family) {
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3048
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3049 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3050 case AF_INET6:
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3051 sin6 = (struct sockaddr_in6 *) addr->sockaddr;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3052
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3053 for (n = 15; n >= 0; n--) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3054 p = ngx_sprintf(p, "\1%xd\1%xd",
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3055 sin6->sin6_addr.s6_addr[n] & 0xf,
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3056 (sin6->sin6_addr.s6_addr[n] >> 4) & 0xf);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3057 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3058
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3059 p = ngx_cpymem(p, "\3ip6\4arpa\0", 10);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3060
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3061 break;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3062 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3063
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3064 default: /* AF_INET */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3065
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3066 sin = (struct sockaddr_in *) addr->sockaddr;
a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3067 inaddr = ntohl(sin->sin_addr.s_addr);
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3068
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3069 for (n = 0; n < 32; n += 8) {
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3070 d = ngx_sprintf(&p[1], "%ud", (inaddr >> n) & 0xff);
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3071 *p = (u_char) (d - &p[1]);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3072 p = d;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3073 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3074
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3075 p = ngx_cpymem(p, "\7in-addr\4arpa\0", 14);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3076 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3077
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3078 /* query type "PTR", IN query class */
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3079 p = ngx_cpymem(p, "\0\14\0\1", 4);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3080
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3081 rn->qlen = (u_short) (p - rn->query);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3082
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3083 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3084 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3085
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3086
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3087 static ngx_int_t
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3088 ngx_resolver_copy(ngx_resolver_t r, ngx_str_t name, u_char buf, u_char src,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3089 u_char *last)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3090 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3091 char *err;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3092 u_char p, dst;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3093 ssize_t len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3094 ngx_uint_t i, n;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3095
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3096 p = src;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3097 len = -1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3098
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3099 /*
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3100 * compression pointers allow to create endless loop, so we set limit;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3101 * 128 pointers should be enough to store 255-byte name
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3102 */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3103
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3104 for (i = 0; i < 128; i++) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3105 n = *p++;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3106
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3107 if (n == 0) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3108 goto done;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3109 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3110
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3111 if (n & 0xc0) {
2314 52987a023486 fix compression pointer for big (>255) DNS responses Igor Sysoev <igor@sysoev.ru> parents: 2282 diff changeset	3112 n = ((n & 0x3f) << 8) + *p;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3113 p = &buf[n];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3114
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3115 } else {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3116 len += 1 + n;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3117 p = &p[n];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3118 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3119
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3120 if (p >= last) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3121 err = "name is out of response";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3122 goto invalid;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3123 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3124 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3125
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3126 err = "compression pointers loop";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3127
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3128 invalid:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3129
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3130 ngx_log_error(r->log_level, r->log, 0, err);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3131
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3132 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3133
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3134 done:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3135
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3136 if (name == NULL) {
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3137 return NGX_OK;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3138 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3139
3298 847ab5a32307 fix "PTR ." case in address resolver Igor Sysoev <igor@sysoev.ru> parents: 3297 diff changeset	3140 if (len == -1) {
5764 f166c521b619 Style: use ngx_str_null(). Tatsuhiko Kubo <cubicdaiya@gmail.com> parents: 5600 diff changeset	3141 ngx_str_null(name);
3298 847ab5a32307 fix "PTR ." case in address resolver Igor Sysoev <igor@sysoev.ru> parents: 3297 diff changeset	3142 return NGX_OK;
847ab5a32307 fix "PTR ." case in address resolver Igor Sysoev <igor@sysoev.ru> parents: 3297 diff changeset	3143 }
847ab5a32307 fix "PTR ." case in address resolver Igor Sysoev <igor@sysoev.ru> parents: 3297 diff changeset	3144
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3145 dst = ngx_resolver_alloc(r, len);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3146 if (dst == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3147 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3148 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3149
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3150 name->data = dst;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3151
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3152 n = *src++;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3153
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3154 for ( ;; ) {
4267 768212ca0745 Fixed compression pointer processing in DNS response greater than 255 bytes. Igor Sysoev <igor@sysoev.ru> parents: 4225 diff changeset	3155 if (n & 0xc0) {
768212ca0745 Fixed compression pointer processing in DNS response greater than 255 bytes. Igor Sysoev <igor@sysoev.ru> parents: 4225 diff changeset	3156 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	3157 src = &buf[n];
768212ca0745 Fixed compression pointer processing in DNS response greater than 255 bytes. Igor Sysoev <igor@sysoev.ru> parents: 4225 diff changeset	3158
768212ca0745 Fixed compression pointer processing in DNS response greater than 255 bytes. Igor Sysoev <igor@sysoev.ru> parents: 4225 diff changeset	3159 n = *src++;
768212ca0745 Fixed compression pointer processing in DNS response greater than 255 bytes. Igor Sysoev <igor@sysoev.ru> parents: 4225 diff changeset	3160
768212ca0745 Fixed compression pointer processing in DNS response greater than 255 bytes. Igor Sysoev <igor@sysoev.ru> parents: 4225 diff changeset	3161 } else {
5479 c0d6eae5a1c5 Resolver: lookups are case-insensitive. Ruslan Ermilov <ru@nginx.com> parents: 5478 diff changeset	3162 ngx_strlow(dst, src, n);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3163 dst += n;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3164 src += n;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3165
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3166 n = *src++;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3167
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3168 if (n != 0) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3169 *dst++ = '.';
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3170 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3171 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3172
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3173 if (n == 0) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3174 name->len = dst - name->data;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3175 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3176 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3177 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3178 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3179
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3180
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3181 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3182 ngx_resolver_timeout_handler(ngx_event_t *ev)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3183 {
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	3184 ngx_resolver_ctx_t *ctx;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	3185
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	3186 ctx = ev->data;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	3187
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	3188 ctx->state = NGX_RESOLVE_TIMEDOUT;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	3189
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	3190 ctx->handler(ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3191 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3192
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3193
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3194 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3195 ngx_resolver_free_node(ngx_resolver_t r, ngx_resolver_node_t rn)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3196 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3197 /* lock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3198
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3199 if (rn->query) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3200 ngx_resolver_free_locked(r, rn->query);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3201 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3202
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3203 if (rn->name) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3204 ngx_resolver_free_locked(r, rn->name);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3205 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3206
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3207 if (rn->cnlen) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3208 ngx_resolver_free_locked(r, rn->u.cname);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3209 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3210
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3211 if (rn->naddrs > 1 && rn->naddrs != (u_short) -1) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3212 ngx_resolver_free_locked(r, rn->u.addrs);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3213 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3214
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3215 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3216 if (rn->naddrs6 > 1 && rn->naddrs6 != (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3217 ngx_resolver_free_locked(r, rn->u6.addrs6);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3218 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3219 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3220
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3221 ngx_resolver_free_locked(r, rn);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3222
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3223 /* unlock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3224 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3225
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3226
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3227 static void *
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3228 ngx_resolver_alloc(ngx_resolver_t *r, size_t size)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3229 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3230 u_char *p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3231
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3232 /* lock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3233
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3234 p = ngx_alloc(size, r->log);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3235
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3236 /* unlock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3237
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3238 return p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3239 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3240
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3241
1903 1ea922585517 static ngx_resolver_calloc() Igor Sysoev <igor@sysoev.ru> parents: 1880 diff changeset	3242 static void *
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3243 ngx_resolver_calloc(ngx_resolver_t *r, size_t size)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3244 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3245 u_char *p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3246
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3247 p = ngx_resolver_alloc(r, size);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3248
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3249 if (p) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3250 ngx_memzero(p, size);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3251 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3252
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3253 return p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3254 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3255
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3256
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3257 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3258 ngx_resolver_free(ngx_resolver_t r, void p)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3259 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3260 /* lock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3261
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3262 ngx_free(p);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3263
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3264 /* unlock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3265 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3266
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3267
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3268 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3269 ngx_resolver_free_locked(ngx_resolver_t r, void p)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3270 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3271 ngx_free(p);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3272 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3273
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3274
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3275 static void *
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3276 ngx_resolver_dup(ngx_resolver_t r, void src, size_t size)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3277 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3278 void *dst;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3279
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3280 dst = ngx_resolver_alloc(r, size);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3281
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3282 if (dst == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3283 return dst;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3284 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3285
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3286 ngx_memcpy(dst, src, size);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3287
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3288 return dst;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3289 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3290
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3291
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	3292 static ngx_addr_t *
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3293 ngx_resolver_export(ngx_resolver_t r, ngx_resolver_node_t rn,
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	3294 ngx_uint_t rotate)
4871 c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	3295 {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3296 ngx_addr_t *dst;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3297 ngx_uint_t d, i, j, n;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3298 u_char (*sockaddr)[NGX_SOCKADDRLEN];
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3299 in_addr_t *addr;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3300 struct sockaddr_in *sin;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3301 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3302 struct in6_addr *addr6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3303 struct sockaddr_in6 *sin6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3304 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3305
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3306 n = rn->naddrs;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3307 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3308 n += rn->naddrs6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3309 #endif
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	3310
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	3311 dst = ngx_resolver_calloc(r, n * sizeof(ngx_addr_t));
4892 063ac68d89dc Resolver: added missing memory allocation error handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4871 diff changeset	3312 if (dst == NULL) {
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	3313 return NULL;
4892 063ac68d89dc Resolver: added missing memory allocation error handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4871 diff changeset	3314 }
063ac68d89dc Resolver: added missing memory allocation error handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4871 diff changeset	3315
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3316 sockaddr = ngx_resolver_calloc(r, n * NGX_SOCKADDRLEN);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3317 if (sockaddr == NULL) {
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	3318 ngx_resolver_free(r, dst);
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	3319 return NULL;
4871 c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	3320 }
c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	3321
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3322 i = 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3323 d = rotate ? ngx_random() % n : 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3324
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3325 if (rn->naddrs) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3326 j = rotate ? ngx_random() % rn->naddrs : 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3327
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3328 addr = (rn->naddrs == 1) ? &rn->u.addr : rn->u.addrs;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3329
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3330 do {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3331 sin = (struct sockaddr_in *) sockaddr[d];
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3332 sin->sin_family = AF_INET;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3333 sin->sin_addr.s_addr = addr[j++];
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3334 dst[d].sockaddr = (struct sockaddr *) sin;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3335 dst[d++].socklen = sizeof(struct sockaddr_in);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3336
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3337 if (d == n) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3338 d = 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3339 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3340
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3341 if (j == rn->naddrs) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3342 j = 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3343 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3344 } while (++i < rn->naddrs);
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	3345 }
4871 c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	3346
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3347 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3348 if (rn->naddrs6) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3349 j = rotate ? ngx_random() % rn->naddrs6 : 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3350
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3351 addr6 = (rn->naddrs6 == 1) ? &rn->u6.addr6 : rn->u6.addrs6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3352
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3353 do {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3354 sin6 = (struct sockaddr_in6 *) sockaddr[d];
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3355 sin6->sin6_family = AF_INET6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3356 ngx_memcpy(sin6->sin6_addr.s6_addr, addr6[j++].s6_addr, 16);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3357 dst[d].sockaddr = (struct sockaddr *) sin6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3358 dst[d++].socklen = sizeof(struct sockaddr_in6);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3359
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3360 if (d == n) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3361 d = 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3362 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3363
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3364 if (j == rn->naddrs6) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3365 j = 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3366 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3367 } while (++i < n);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3368 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3369 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3370
4871 c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	3371 return dst;
c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	3372 }
c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	3373
c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	3374
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3375 char *
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3376 ngx_resolver_strerror(ngx_int_t err)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3377 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3378 static char *errors[] = {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3379 "Format error", /* FORMERR */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3380 "Server failure", /* SERVFAIL */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3381 "Host not found", /* NXDOMAIN */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3382 "Unimplemented", /* NOTIMP */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3383 "Operation refused" /* REFUSED */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3384 };
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3385
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3386 if (err > 0 && err < 6) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3387 return errors[err - 1];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3388 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3389
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3390 if (err == NGX_RESOLVE_TIMEDOUT) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3391 return "Operation timed out";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3392 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3393
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3394 return "Unknown error";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3395 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3396
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3397
3408 71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3398 static u_char *
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3399 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	3400 {
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3401 u_char *p;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3402 ngx_resolver_connection_t *rec;
3408 71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3403
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3404 p = buf;
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3405
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3406 if (log->action) {
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3407 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	3408 len -= p - buf;
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3409 }
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3410
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3411 rec = log->data;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3412
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3413 if (rec) {
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3414 p = ngx_snprintf(p, len, ", resolver: %V", &rec->server);
3408 71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3415 }
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3416
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3417 return p;
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3418 }
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3419
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3420
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3421 ngx_int_t
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3422 ngx_udp_connect(ngx_resolver_connection_t *rec)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3423 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3424 int rc;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3425 ngx_int_t event;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3426 ngx_event_t rev, wev;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3427 ngx_socket_t s;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3428 ngx_connection_t *c;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3429
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3430 s = ngx_socket(rec->sockaddr->sa_family, SOCK_DGRAM, 0);
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3431
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3432 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, &rec->log, 0, "UDP socket %d", s);
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3433
5360 3d2d3e1cf427 Win32: MinGW GCC compatibility. Maxim Dounin <mdounin@mdounin.ru> parents: 4892 diff changeset	3434 if (s == (ngx_socket_t) -1) {
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3435 ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3436 ngx_socket_n " failed");
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3437 return NGX_ERROR;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3438 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3439
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3440 c = ngx_get_connection(s, &rec->log);
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3441
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3442 if (c == NULL) {
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3443 if (ngx_close_socket(s) == -1) {
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3444 ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3445 ngx_close_socket_n "failed");
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3446 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3447
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3448 return NGX_ERROR;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3449 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3450
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3451 if (ngx_nonblocking(s) == -1) {
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3452 ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3453 ngx_nonblocking_n " failed");
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3454
5582 545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	3455 goto failed;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3456 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3457
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3458 rev = c->read;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3459 wev = c->write;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3460
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3461 rev->log = &rec->log;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3462 wev->log = &rec->log;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3463
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3464 rec->udp = c;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3465
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3466 c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3467
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3468 ngx_log_debug3(NGX_LOG_DEBUG_EVENT, &rec->log, 0,
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3469 "connect to %V, fd:%d #%uA", &rec->server, s, c->number);
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3470
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3471 rc = connect(s, rec->sockaddr, rec->socklen);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3472
6125 4dc8e7b62216 Removed the obsolete aio module. Ruslan Ermilov <ru@nginx.com> parents: 5921 diff changeset	3473 /* TODO: iocp */
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3474
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3475 if (rc == -1) {
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3476 ngx_log_error(NGX_LOG_CRIT, &rec->log, ngx_socket_errno,
3408 71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3477 "connect() failed");
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3478
5582 545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	3479 goto failed;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3480 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3481
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3482 /* UDP sockets are always ready to write */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3483 wev->ready = 1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3484
6126 adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	3485 event = (ngx_event_flags & NGX_USE_CLEAR_EVENT) ?
adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	3486 /* kqueue, epoll */ NGX_CLEAR_EVENT:
adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	3487 /* select, poll, /dev/poll */ NGX_LEVEL_EVENT;
adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	3488 /* eventport event type has no meaning: oneshot only */
adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	3489
adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	3490 if (ngx_add_event(rev, NGX_READ_EVENT, event) != NGX_OK) {
adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	3491 goto failed;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3492 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3493
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3494 return NGX_OK;
5582 545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	3495
545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	3496 failed:
545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	3497
545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	3498 ngx_close_connection(c);
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3499 rec->udp = NULL;
5582 545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	3500
545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	3501 return NGX_ERROR;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3502 }
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3503
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3504
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3505 ngx_int_t
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3506 ngx_tcp_connect(ngx_resolver_connection_t *rec)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3507 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3508 int rc;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3509 ngx_int_t event;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3510 ngx_err_t err;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3511 ngx_uint_t level;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3512 ngx_socket_t s;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3513 ngx_event_t rev, wev;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3514 ngx_connection_t *c;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3515
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3516 s = ngx_socket(rec->sockaddr->sa_family, SOCK_STREAM, 0);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3517
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3518 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, &rec->log, 0, "TCP socket %d", s);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3519
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3520 if (s == (ngx_socket_t) -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3521 ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3522 ngx_socket_n " failed");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3523 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3524 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3525
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3526 c = ngx_get_connection(s, &rec->log);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3527
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3528 if (c == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3529 if (ngx_close_socket(s) == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3530 ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3531 ngx_close_socket_n "failed");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3532 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3533
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3534 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3535 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3536
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3537 if (ngx_nonblocking(s) == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3538 ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3539 ngx_nonblocking_n " failed");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3540
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3541 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3542 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3543
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3544 rev = c->read;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3545 wev = c->write;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3546
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3547 rev->log = &rec->log;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3548 wev->log = &rec->log;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3549
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3550 rec->tcp = c;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3551
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3552 c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3553
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3554 if (ngx_add_conn) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3555 if (ngx_add_conn(c) == NGX_ERROR) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3556 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3557 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3558 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3559
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3560 ngx_log_debug3(NGX_LOG_DEBUG_EVENT, &rec->log, 0,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3561 "connect to %V, fd:%d #%uA", &rec->server, s, c->number);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3562
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3563 rc = connect(s, rec->sockaddr, rec->socklen);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3564
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3565 if (rc == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3566 err = ngx_socket_errno;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3567
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3568
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3569 if (err != NGX_EINPROGRESS
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3570 #if (NGX_WIN32)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3571 /* Winsock returns WSAEWOULDBLOCK (NGX_EAGAIN) */
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3572 && err != NGX_EAGAIN
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3573 #endif
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3574 )
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3575 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3576 if (err == NGX_ECONNREFUSED
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3577 #if (NGX_LINUX)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3578 /*
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3579 * Linux returns EAGAIN instead of ECONNREFUSED
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3580 * for unix sockets if listen queue is full
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3581 */
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3582 \|\| err == NGX_EAGAIN
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3583 #endif
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3584 \|\| err == NGX_ECONNRESET
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3585 \|\| err == NGX_ENETDOWN
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3586 \|\| err == NGX_ENETUNREACH
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3587 \|\| err == NGX_EHOSTDOWN
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3588 \|\| err == NGX_EHOSTUNREACH)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3589 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3590 level = NGX_LOG_ERR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3591
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3592 } else {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3593 level = NGX_LOG_CRIT;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3594 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3595
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3596 ngx_log_error(level, c->log, err, "connect() to %V failed",
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3597 &rec->server);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3598
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3599 ngx_close_connection(c);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3600 rec->tcp = NULL;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3601
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3602 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3603 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3604 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3605
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3606 if (ngx_add_conn) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3607 if (rc == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3608
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3609 /* NGX_EINPROGRESS */
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3610
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3611 return NGX_AGAIN;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3612 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3613
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3614 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, &rec->log, 0, "connected");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3615
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3616 wev->ready = 1;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3617
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3618 return NGX_OK;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3619 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3620
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3621 if (ngx_event_flags & NGX_USE_IOCP_EVENT) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3622
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3623 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, &rec->log, ngx_socket_errno,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3624 "connect(): %d", rc);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3625
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3626 if (ngx_blocking(s) == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3627 ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3628 ngx_blocking_n " failed");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3629 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3630 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3631
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3632 /*
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3633 * FreeBSD's aio allows to post an operation on non-connected socket.
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3634 * NT does not support it.
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3635 *
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3636 * TODO: check in Win32, etc. As workaround we can use NGX_ONESHOT_EVENT
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3637 */
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3638
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3639 rev->ready = 1;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3640 wev->ready = 1;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3641
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3642 return NGX_OK;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3643 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3644
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3645 if (ngx_event_flags & NGX_USE_CLEAR_EVENT) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3646
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3647 /* kqueue */
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3648
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3649 event = NGX_CLEAR_EVENT;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3650
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3651 } else {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3652
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3653 /* select, poll, /dev/poll */
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3654
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3655 event = NGX_LEVEL_EVENT;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3656 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3657
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3658 if (ngx_add_event(rev, NGX_READ_EVENT, event) != NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3659 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3660 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3661
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3662 if (rc == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3663
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3664 /* NGX_EINPROGRESS */
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3665
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3666 if (ngx_add_event(wev, NGX_WRITE_EVENT, event) != NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3667 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3668 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3669
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3670 return NGX_AGAIN;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3671 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3672
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3673 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, &rec->log, 0, "connected");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3674
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3675 wev->ready = 1;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3676
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3677 return NGX_OK;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3678
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3679 failed:
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3680
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3681 ngx_close_connection(c);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3682 rec->tcp = NULL;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3683
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3684 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3685 }

Mercurial > hg > nginx

annotate src/core/ngx_resolver.c @ 6369:06459bc8b92f