nginx: src/core/ngx_resolver.c annotate

annotate src/core/ngx_resolver.c @ 6457:a6711b85da83

Resolver: do not enable resolve timer if provided timeout is zero.

author	Dmitry Volyntsev <xeioex@nginx.com>
date	Wed, 23 Mar 2016 17:44:36 +0300
parents	c94aba230a5a
children	384154fc634f

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;
6456 c94aba230a5a Resolver: introduced valid field in resolver responses. Dmitry Volyntsev <xeioex@nginx.com> parents: 6372 diff changeset	554 ctx->valid = rn->valid;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	555 ctx->naddrs = naddrs;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	556
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	557 if (addrs == NULL) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	558 ctx->addrs = &ctx->addr;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	559 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	560 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	561 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	562 ctx->sin.sin_family = AF_INET;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	563 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	564
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	565 } else {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	566 ctx->addrs = addrs;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	567 }
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	568
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	569 next = ctx->next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	570
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	571 ctx->handler(ctx);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	572
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	573 ctx = next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	574 } while (ctx);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	575
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	576 if (addrs != NULL) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	577 ngx_resolver_free(r, addrs->sockaddr);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	578 ngx_resolver_free(r, addrs);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	579 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	580
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	581 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	582 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	583
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	584 /* NGX_RESOLVE_CNAME */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	585
1969 41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	586 if (ctx->recursion++ < NGX_RESOLVER_MAX_RECURSION) {
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	587
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	588 cname.len = rn->cnlen;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	589 cname.data = rn->u.cname;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	590
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	591 return ngx_resolve_name_locked(r, ctx, &cname);
1969 41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	592 }
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	593
6349 978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	594 last->next = rn->waiting;
1969 41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	595 rn->waiting = NULL;
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	596
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	597 /* unlock name mutex */
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	598
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	599 do {
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	600 ctx->state = NGX_RESOLVE_NXDOMAIN;
6456 c94aba230a5a Resolver: introduced valid field in resolver responses. Dmitry Volyntsev <xeioex@nginx.com> parents: 6372 diff changeset	601 ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
1969 41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	602 next = ctx->next;
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->handler(ctx);
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	605
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	606 ctx = next;
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	607 } while (ctx);
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	608
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	609 return NGX_OK;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	610 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	611
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	612 if (rn->waiting) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	613
6457 a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	614 if (ctx->event == NULL && ctx->timeout) {
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	615 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	616 if (ctx->event == NULL) {
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	617 return NGX_ERROR;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	618 }
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	619
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	620 ctx->event->handler = ngx_resolver_timeout_handler;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	621 ctx->event->data = ctx;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	622 ctx->event->log = r->log;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	623 ctx->ident = -1;
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 ngx_add_timer(ctx->event, ctx->timeout);
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	626 }
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	627
6349 978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	628 last->next = rn->waiting;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	629 rn->waiting = ctx;
3297 ebc5384479b4 fix segfault in resolver: Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	630 ctx->state = NGX_AGAIN;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	631
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	632 do {
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	633 ctx->node = rn;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	634 ctx = ctx->next;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	635 } while (ctx);
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	636
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	637 return NGX_AGAIN;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	638 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	639
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	640 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	641
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	642 /* lock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	643
4619 3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	644 if (rn->query) {
3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	645 ngx_resolver_free_locked(r, rn->query);
3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	646 rn->query = NULL;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	647 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	648 rn->query6 = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	649 #endif
4619 3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	650 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	651
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	652 if (rn->cnlen) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	653 ngx_resolver_free_locked(r, rn->u.cname);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	654 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	655
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	656 if (rn->naddrs > 1 && rn->naddrs != (u_short) -1) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	657 ngx_resolver_free_locked(r, rn->u.addrs);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	658 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	659
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	660 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	661 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	662 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	663 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	664 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	665
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	666 /* unlock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	667
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	668 } else {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	669
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	670 rn = ngx_resolver_alloc(r, sizeof(ngx_resolver_node_t));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	671 if (rn == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	672 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	673 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	674
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	675 rn->name = ngx_resolver_dup(r, name->data, name->len);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	676 if (rn->name == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	677 ngx_resolver_free(r, rn);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	678 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	679 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	680
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	681 rn->node.key = hash;
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	682 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	683 rn->query = NULL;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	684 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	685 rn->query6 = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	686 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	687
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	688 ngx_rbtree_insert(&r->name_rbtree, &rn->node);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	689 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	690
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	691 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	692
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	693 if (rc == NGX_ERROR) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	694 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	695 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	696
1961 99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	697 if (rc == NGX_DECLINED) {
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	698 ngx_rbtree_delete(&r->name_rbtree, &rn->node);
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	699
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	700 ngx_resolver_free(r, rn->query);
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	701 ngx_resolver_free(r, rn->name);
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	702 ngx_resolver_free(r, rn);
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	703
6349 978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	704 do {
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	705 ctx->state = NGX_RESOLVE_NXDOMAIN;
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	706 next = ctx->next;
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->handler(ctx);
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	709
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	710 ctx = next;
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	711 } while (ctx);
1961 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 return NGX_OK;
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	714 }
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	715
6366 2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	716 rn->last_connection = r->last_connection++;
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	717 if (r->last_connection == r->connections.nelts) {
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	718 r->last_connection = 0;
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	719 }
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	720
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	721 rn->naddrs = (u_short) -1;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	722 rn->tcp = 0;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	723 #if (NGX_HAVE_INET6)
5478 3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	724 rn->naddrs6 = r->ipv6 ? (u_short) -1 : 0;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	725 rn->tcp6 = 0;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	726 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	727
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	728 if (ngx_resolver_send_query(r, rn) != NGX_OK) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	729 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	730 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	731
6457 a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	732 if (ctx->event == NULL && ctx->timeout) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	733 ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	734 if (ctx->event == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	735 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	736 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	737
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	738 ctx->event->handler = ngx_resolver_timeout_handler;
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	739 ctx->event->data = ctx;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	740 ctx->event->log = r->log;
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	741 ctx->ident = -1;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	742
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	743 ngx_add_timer(ctx->event, ctx->timeout);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	744 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	745
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	746 if (ngx_queue_empty(&r->name_resend_queue)) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	747 ngx_add_timer(r->event, (ngx_msec_t) (r->resend_timeout * 1000));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	748 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	749
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	750 rn->expire = ngx_time() + r->resend_timeout;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	751
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	752 ngx_queue_insert_head(&r->name_resend_queue, &rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	753
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	754 rn->code = 0;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	755 rn->cnlen = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	756 rn->valid = 0;
5485 8958656a8060 Resolver: use minimum TTL for caching (ticket #329). Ruslan Ermilov <ru@nginx.com> parents: 5479 diff changeset	757 rn->ttl = NGX_MAX_UINT32_VALUE;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	758 rn->waiting = ctx;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	759
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	760 ctx->state = NGX_AGAIN;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	761
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	762 do {
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	763 ctx->node = rn;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	764 ctx = ctx->next;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	765 } while (ctx);
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	766
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	767 return NGX_AGAIN;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	768
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	769 failed:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	770
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	771 ngx_rbtree_delete(&r->name_rbtree, &rn->node);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	772
1960 1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	773 if (rn->query) {
1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	774 ngx_resolver_free(r, rn->query);
1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	775 }
1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	776
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	777 ngx_resolver_free(r, rn->name);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	778
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	779 ngx_resolver_free(r, rn);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	780
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	781 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	782 }
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	783
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	784
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	785 ngx_int_t
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	786 ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	787 {
2484 cf3cd450049c store name pointer in variable allocated on stack Igor Sysoev <igor@sysoev.ru> parents: 2483 diff changeset	788 u_char *name;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	789 in_addr_t addr;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	790 ngx_queue_t resend_queue, expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	791 ngx_rbtree_t *tree;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	792 ngx_resolver_t *r;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	793 struct sockaddr_in *sin;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	794 ngx_resolver_node_t *rn;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	795 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	796 uint32_t hash;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	797 struct sockaddr_in6 *sin6;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	798 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	799
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	800 #if (NGX_SUPPRESS_WARN)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	801 addr = 0;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	802 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	803 hash = 0;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	804 sin6 = NULL;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	805 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	806 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	807
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	808 r = ctx->resolver;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	809
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	810 switch (ctx->addr.sockaddr->sa_family) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	811
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	812 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	813 case AF_INET6:
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	814 sin6 = (struct sockaddr_in6 *) ctx->addr.sockaddr;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	815 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	816
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	817 /* lock addr mutex */
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 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	820
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	821 tree = &r->addr6_rbtree;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	822 resend_queue = &r->addr6_resend_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	823 expire_queue = &r->addr6_expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	824
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	825 break;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	826 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	827
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	828 default: /* AF_INET */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	829 sin = (struct sockaddr_in *) ctx->addr.sockaddr;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	830 addr = ntohl(sin->sin_addr.s_addr);
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 /* lock addr mutex */
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 rn = ngx_resolver_lookup_addr(r, addr);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	835
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	836 tree = &r->addr_rbtree;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	837 resend_queue = &r->addr_resend_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	838 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	839 }
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	840
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	841 if (rn) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	842
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	843 if (rn->valid >= ngx_time()) {
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_log_debug0(NGX_LOG_DEBUG_CORE, r->log, 0, "resolve cached");
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	846
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	847 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	848
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	849 rn->expire = ngx_time() + r->expire;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	850
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	851 ngx_queue_insert_head(expire_queue, &rn->queue);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	852
2484 cf3cd450049c store name pointer in variable allocated on stack Igor Sysoev <igor@sysoev.ru> parents: 2483 diff changeset	853 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	854 if (name == NULL) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	855 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	856 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	857
2484 cf3cd450049c store name pointer in variable allocated on stack Igor Sysoev <igor@sysoev.ru> parents: 2483 diff changeset	858 ctx->name.len = rn->nlen;
cf3cd450049c store name pointer in variable allocated on stack Igor Sysoev <igor@sysoev.ru> parents: 2483 diff changeset	859 ctx->name.data = name;
cf3cd450049c store name pointer in variable allocated on stack Igor Sysoev <igor@sysoev.ru> parents: 2483 diff changeset	860
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	861 /* unlock addr mutex */
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->state = NGX_OK;
6456 c94aba230a5a Resolver: introduced valid field in resolver responses. Dmitry Volyntsev <xeioex@nginx.com> parents: 6372 diff changeset	864 ctx->valid = rn->valid;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	865
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	866 ctx->handler(ctx);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	867
2484 cf3cd450049c store name pointer in variable allocated on stack Igor Sysoev <igor@sysoev.ru> parents: 2483 diff changeset	868 ngx_resolver_free(r, name);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	869
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	870 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	871 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	872
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	873 if (rn->waiting) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	874
6457 a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	875 if (ctx->event == NULL && ctx->timeout) {
a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	876 ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t));
a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	877 if (ctx->event == NULL) {
a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	878 return NGX_ERROR;
a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	879 }
a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	880
a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	881 ctx->event->handler = ngx_resolver_timeout_handler;
a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	882 ctx->event->data = ctx;
a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	883 ctx->event->log = r->log;
a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	884 ctx->ident = -1;
a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	885
a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	886 ngx_add_timer(ctx->event, ctx->timeout);
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	887 }
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	888
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	889 ctx->next = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	890 rn->waiting = ctx;
3297 ebc5384479b4 fix segfault in resolver: Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	891 ctx->state = NGX_AGAIN;
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	892 ctx->node = rn;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	893
2487 9b4dce95c744 fix return code, this fixes segfault when two or more Igor Sysoev <igor@sysoev.ru> parents: 2486 diff changeset	894 /* unlock addr mutex */
9b4dce95c744 fix return code, this fixes segfault when two or more Igor Sysoev <igor@sysoev.ru> parents: 2486 diff changeset	895
9b4dce95c744 fix return code, this fixes segfault when two or more Igor Sysoev <igor@sysoev.ru> parents: 2486 diff changeset	896 return NGX_OK;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	897 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	898
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	899 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	900
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	901 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	902 rn->query = NULL;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	903 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	904 rn->query6 = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	905 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	906
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	907 } else {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	908 rn = ngx_resolver_alloc(r, sizeof(ngx_resolver_node_t));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	909 if (rn == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	910 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	911 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	912
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	913 switch (ctx->addr.sockaddr->sa_family) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	914
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	915 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	916 case AF_INET6:
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	917 rn->addr6 = sin6->sin6_addr;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	918 rn->node.key = hash;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	919 break;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	920 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	921
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	922 default: /* AF_INET */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	923 rn->node.key = addr;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	924 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	925
1960 1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	926 rn->query = NULL;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	927 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	928 rn->query6 = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	929 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	930
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	931 ngx_rbtree_insert(tree, &rn->node);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	932 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	933
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	934 if (ngx_resolver_create_addr_query(r, rn, &ctx->addr) != NGX_OK) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	935 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	936 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	937
6366 2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	938 rn->last_connection = r->last_connection++;
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	939 if (r->last_connection == r->connections.nelts) {
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	940 r->last_connection = 0;
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	941 }
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	942
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	943 rn->naddrs = (u_short) -1;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	944 rn->tcp = 0;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	945 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	946 rn->naddrs6 = (u_short) -1;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	947 rn->tcp6 = 0;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	948 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	949
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	950 if (ngx_resolver_send_query(r, rn) != NGX_OK) {
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
6457 a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	954 if (ctx->event == NULL && ctx->timeout) {
a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	955 ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t));
a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	956 if (ctx->event == NULL) {
a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	957 goto failed;
a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	958 }
a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	959
a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	960 ctx->event->handler = ngx_resolver_timeout_handler;
a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	961 ctx->event->data = ctx;
a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	962 ctx->event->log = r->log;
a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	963 ctx->ident = -1;
a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	964
a6711b85da83 Resolver: do not enable resolve timer if provided timeout is zero. Dmitry Volyntsev <xeioex@nginx.com> parents: 6456 diff changeset	965 ngx_add_timer(ctx->event, ctx->timeout);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	966 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	967
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	968 if (ngx_queue_empty(resend_queue)) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	969 ngx_add_timer(r->event, (ngx_msec_t) (r->resend_timeout * 1000));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	970 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	971
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	972 rn->expire = ngx_time() + r->resend_timeout;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	973
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	974 ngx_queue_insert_head(resend_queue, &rn->queue);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	975
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	976 rn->code = 0;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	977 rn->cnlen = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	978 rn->name = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	979 rn->nlen = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	980 rn->valid = 0;
5485 8958656a8060 Resolver: use minimum TTL for caching (ticket #329). Ruslan Ermilov <ru@nginx.com> parents: 5479 diff changeset	981 rn->ttl = NGX_MAX_UINT32_VALUE;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	982 rn->waiting = ctx;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	983
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	984 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	985
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	986 ctx->state = NGX_AGAIN;
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	987 ctx->node = rn;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	988
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	989 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	990
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	991 failed:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	992
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	993 if (rn) {
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	994 ngx_rbtree_delete(tree, &rn->node);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	995
1960 1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	996 if (rn->query) {
1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	997 ngx_resolver_free(r, rn->query);
1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	998 }
1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	999
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1000 ngx_resolver_free(r, rn);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1001 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1002
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1003 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1004
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1005 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	1006 ngx_resolver_free(r, ctx->event);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1007 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1008
1904 538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	1009 ngx_resolver_free(r, ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1010
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1011 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1012 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1013
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1014
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1015 void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1016 ngx_resolve_addr_done(ngx_resolver_ctx_t *ctx)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1017 {
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1018 ngx_queue_t *expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1019 ngx_rbtree_t *tree;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1020 ngx_resolver_t *r;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1021 ngx_resolver_ctx_t w, *p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1022 ngx_resolver_node_t *rn;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	1023
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1024 r = ctx->resolver;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1025
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1026 switch (ctx->addr.sockaddr->sa_family) {
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 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1029 case AF_INET6:
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1030 tree = &r->addr6_rbtree;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1031 expire_queue = &r->addr6_expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1032 break;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1033 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1034
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1035 default: /* AF_INET */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1036 tree = &r->addr_rbtree;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1037 expire_queue = &r->addr_expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1038 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1039
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1040 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1041 "resolve addr done: %i", ctx->state);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1042
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1043 if (ctx->event && ctx->event->timer_set) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1044 ngx_del_timer(ctx->event);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1045 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1046
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1047 /* lock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1048
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	1049 if (ctx->state == NGX_AGAIN \|\| ctx->state == NGX_RESOLVE_TIMEDOUT) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1050
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	1051 rn = ctx->node;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1052
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1053 if (rn) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1054 p = &rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1055 w = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1056
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1057 while (w) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1058 if (w == ctx) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1059 *p = w->next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1060
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1061 goto done;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1062 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1063
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1064 p = &w->next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1065 w = w->next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1066 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1067 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1068
5476 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 u_char text[NGX_SOCKADDR_STRLEN];
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1071 ngx_str_t addrtext;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1072
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1073 addrtext.data = text;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1074 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	1075 text, NGX_SOCKADDR_STRLEN, 0);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1076
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1077 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	1078 "could not cancel %V resolving", &addrtext);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1079 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1080 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1081
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1082 done:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1083
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1084 ngx_resolver_expire(r, tree, expire_queue);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1085
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1086 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1087
1904 538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	1088 /* 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	1089
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	1090 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	1091 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	1092 }
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	1093
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	1094 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	1095
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	1096 /* unlock alloc mutex */
6196 c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1097
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1098 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	1099 ngx_del_timer(r->event);
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1100 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1101 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1102
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1103
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1104 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1105 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	1106 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1107 time_t now;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1108 ngx_uint_t i;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1109 ngx_queue_t *q;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1110 ngx_resolver_node_t *rn;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1111
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1112 ngx_log_debug0(NGX_LOG_DEBUG_CORE, r->log, 0, "resolver expire");
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1113
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1114 now = ngx_time();
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1115
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1116 for (i = 0; i < 2; i++) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1117 if (ngx_queue_empty(queue)) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1118 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1119 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1120
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1121 q = ngx_queue_last(queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1122
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1123 rn = ngx_queue_data(q, ngx_resolver_node_t, queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1124
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1125 if (now <= rn->expire) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1126 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1127 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1128
1774 68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1742 diff changeset	1129 ngx_log_debug2(NGX_LOG_DEBUG_CORE, r->log, 0,
68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1742 diff changeset	1130 "resolver expire \"%*s\"", (size_t) rn->nlen, rn->name);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1131
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1132 ngx_queue_remove(q);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1133
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1134 ngx_rbtree_delete(tree, &rn->node);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1135
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1136 ngx_resolver_free_node(r, rn);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1137 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1138 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1139
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1140
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1141 static ngx_int_t
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1142 ngx_resolver_send_query(ngx_resolver_t r, ngx_resolver_node_t rn)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1143 {
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1144 ngx_int_t rc;
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1145 ngx_resolver_connection_t *rec;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1146
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1147 rec = r->connections.elts;
6366 2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1148 rec = &rec[rn->last_connection];
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1149
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1150 if (rec->log.handler == NULL) {
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1151 rec->log = *r->log;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1152 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	1153 rec->log.data = rec;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1154 rec->log.action = "resolving";
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1155 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1156
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1157 if (rn->naddrs == (u_short) -1) {
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1158 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	1159 : ngx_resolver_send_udp_query(r, rec, rn->query, rn->qlen);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1160
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1161 if (rc != NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1162 return rc;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1163 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1164 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1165
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1166 #if (NGX_HAVE_INET6)
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1167
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1168 if (rn->query6 && rn->naddrs6 == (u_short) -1) {
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1169 rc = rn->tcp6
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1170 ? ngx_resolver_send_tcp_query(r, rec, rn->query6, rn->qlen)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1171 : ngx_resolver_send_udp_query(r, rec, rn->query6, rn->qlen);
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 if (rc != NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1174 return rc;
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
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1178 #endif
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1179
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1180 return NGX_OK;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1181 }
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
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1184 static ngx_int_t
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1185 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	1186 u_char *query, u_short qlen)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1187 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1188 ssize_t n;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1189
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1190 if (rec->udp == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1191 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	1192 return NGX_ERROR;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1193 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1194
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1195 rec->udp->data = rec;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1196 rec->udp->read->handler = ngx_resolver_udp_read;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1197 rec->udp->read->resolver = 1;
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
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1200 n = ngx_send(rec->udp, query, qlen);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1201
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1202 if (n == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1203 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1204 }
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 if ((size_t) n != (size_t) qlen) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1207 ngx_log_error(NGX_LOG_CRIT, &rec->log, 0, "send() incomplete");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1208 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1209 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1210
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1211 return NGX_OK;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1212 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1213
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 static ngx_int_t
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1216 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	1217 u_char *query, u_short qlen)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1218 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1219 ngx_buf_t *b;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1220 ngx_int_t rc;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1221
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1222 rc = NGX_OK;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1223
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1224 if (rec->tcp == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1225 b = rec->read_buf;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1226
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1227 if (b == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1228 b = ngx_resolver_calloc(r, sizeof(ngx_buf_t));
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1229 if (b == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1230 return NGX_ERROR;
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
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1233 b->start = ngx_resolver_alloc(r, NGX_RESOLVER_TCP_RSIZE);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1234 if (b->start == NULL) {
6368 d73f77bb5caf Resolver: fixed possible resource leak introduced in 5a16d40c63de. Ruslan Ermilov <ru@nginx.com> parents: 6367 diff changeset	1235 ngx_resolver_free(r, b);
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1236 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1237 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1238
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1239 b->end = b->start + NGX_RESOLVER_TCP_RSIZE;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1240
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1241 rec->read_buf = b;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1242 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1243
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1244 b->pos = b->start;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1245 b->last = b->start;
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 b = rec->write_buf;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1248
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1249 if (b == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1250 b = ngx_resolver_calloc(r, sizeof(ngx_buf_t));
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1251 if (b == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1252 return NGX_ERROR;
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
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1255 b->start = ngx_resolver_alloc(r, NGX_RESOLVER_TCP_WSIZE);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1256 if (b->start == NULL) {
6368 d73f77bb5caf Resolver: fixed possible resource leak introduced in 5a16d40c63de. Ruslan Ermilov <ru@nginx.com> parents: 6367 diff changeset	1257 ngx_resolver_free(r, b);
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1258 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1259 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1260
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1261 b->end = b->start + NGX_RESOLVER_TCP_WSIZE;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1262
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1263 rec->write_buf = b;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1264 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1265
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1266 b->pos = b->start;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1267 b->last = b->start;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1268
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1269 rc = ngx_tcp_connect(rec);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1270 if (rc == NGX_ERROR) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1271 return NGX_ERROR;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1272 }
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1273
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1274 rec->tcp->data = rec;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1275 rec->tcp->write->handler = ngx_resolver_tcp_write;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1276 rec->tcp->read->handler = ngx_resolver_tcp_read;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1277 rec->tcp->read->resolver = 1;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1278
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1279 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	1280 }
6367 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 = rec->write_buf;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1283
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1284 if (b->end - b->last < 2 + qlen) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1285 ngx_log_error(NGX_LOG_CRIT, &rec->log, 0, "buffer overflow");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1286 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1287 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1288
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1289 *b->last++ = (u_char) (qlen >> 8);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1290 *b->last++ = (u_char) qlen;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1291 b->last = ngx_cpymem(b->last, query, qlen);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1292
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1293 if (rc == NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1294 ngx_resolver_tcp_write(rec->tcp->write);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1295 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1296
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1297 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1298 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1299
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1300
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1301 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1302 ngx_resolver_resend_handler(ngx_event_t *ev)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1303 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1304 time_t timer, atimer, ntimer;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1305 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1306 time_t a6timer;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1307 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1308 ngx_resolver_t *r;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1309
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1310 r = ev->data;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1311
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1312 ngx_log_debug0(NGX_LOG_DEBUG_CORE, r->log, 0,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1313 "resolver resend handler");
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1314
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1315 /* lock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1316
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1317 ntimer = ngx_resolver_resend(r, &r->name_rbtree, &r->name_resend_queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1318
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1319 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1320
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1321 /* lock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1322
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1323 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	1324
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1325 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1326
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1327 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1328
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1329 /* lock addr6 mutex */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1330
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1331 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	1332
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1333 /* unlock addr6 mutex */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1334
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1335 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1336
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1337 timer = ntimer;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1338
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1339 if (timer == 0) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1340 timer = atimer;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1341
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1342 } else if (atimer) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1343 timer = ngx_min(timer, atimer);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1344 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1345
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1346 #if (NGX_HAVE_INET6)
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 if (timer == 0) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1349 timer = a6timer;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1350
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1351 } else if (a6timer) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1352 timer = ngx_min(timer, a6timer);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1353 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1354
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1355 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1356
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1357 if (timer) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1358 ngx_add_timer(r->event, (ngx_msec_t) (timer * 1000));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1359 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1360 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1361
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1362
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1363 static time_t
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1364 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	1365 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1366 time_t now;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1367 ngx_queue_t *q;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1368 ngx_resolver_node_t *rn;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1369
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1370 now = ngx_time();
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1371
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1372 for ( ;; ) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1373 if (ngx_queue_empty(queue)) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1374 return 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1375 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1376
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1377 q = ngx_queue_last(queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1378
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1379 rn = ngx_queue_data(q, ngx_resolver_node_t, queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1380
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1381 if (now < rn->expire) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1382 return rn->expire - now;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1383 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1384
1774 68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1742 diff changeset	1385 ngx_log_debug3(NGX_LOG_DEBUG_CORE, r->log, 0,
68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1742 diff changeset	1386 "resolver resend \"%*s\" %p",
68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1742 diff changeset	1387 (size_t) rn->nlen, rn->name, rn->waiting);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1388
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1389 ngx_queue_remove(q);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1390
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1391 if (rn->waiting) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1392
6366 2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1393 if (++rn->last_connection == r->connections.nelts) {
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1394 rn->last_connection = 0;
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1395 }
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1396
4683 84d8e60b65f0 Fixed crash in ngx_resolver_cleanup_tree(). Ruslan Ermilov <ru@nginx.com> parents: 4671 diff changeset	1397 (void) ngx_resolver_send_query(r, rn);
84d8e60b65f0 Fixed crash in ngx_resolver_cleanup_tree(). Ruslan Ermilov <ru@nginx.com> parents: 4671 diff changeset	1398
84d8e60b65f0 Fixed crash in ngx_resolver_cleanup_tree(). Ruslan Ermilov <ru@nginx.com> parents: 4671 diff changeset	1399 rn->expire = now + r->resend_timeout;
84d8e60b65f0 Fixed crash in ngx_resolver_cleanup_tree(). Ruslan Ermilov <ru@nginx.com> parents: 4671 diff changeset	1400
84d8e60b65f0 Fixed crash in ngx_resolver_cleanup_tree(). Ruslan Ermilov <ru@nginx.com> parents: 4671 diff changeset	1401 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	1402
cf4ee321d195 do not delete failed DNS request if there are waiting clients Igor Sysoev <igor@sysoev.ru> parents: 1878 diff changeset	1403 continue;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1404 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1405
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1406 ngx_rbtree_delete(tree, &rn->node);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1407
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1408 ngx_resolver_free_node(r, rn);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1409 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1410 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1411
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1412
6196 c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1413 static ngx_uint_t
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1414 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	1415 {
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1416 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	1417 #if (NGX_HAVE_INET6)
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1418 && 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	1419 #endif
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1420 && 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	1421 }
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1422
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1423
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1424 static void
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1425 ngx_resolver_udp_read(ngx_event_t *rev)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1426 {
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1427 ssize_t n;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1428 ngx_connection_t *c;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1429 ngx_resolver_connection_t *rec;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1430 u_char buf[NGX_RESOLVER_UDP_SIZE];
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1431
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1432 c = rev->data;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1433 rec = c->data;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1434
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1435 do {
1689 0b592a68aade ngx_udp_recv() Igor Sysoev <igor@sysoev.ru> parents: 1687 diff changeset	1436 n = ngx_udp_recv(c, buf, NGX_RESOLVER_UDP_SIZE);
0b592a68aade ngx_udp_recv() Igor Sysoev <igor@sysoev.ru> parents: 1687 diff changeset	1437
0b592a68aade ngx_udp_recv() Igor Sysoev <igor@sysoev.ru> parents: 1687 diff changeset	1438 if (n < 0) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1439 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1440 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1441
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1442 ngx_resolver_process_response(rec->resolver, buf, n, 0);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1443
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1444 } while (rev->ready);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1445 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1446
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1447
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1448 static void
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1449 ngx_resolver_tcp_write(ngx_event_t *wev)
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 off_t sent;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1452 ssize_t n;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1453 ngx_buf_t *b;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1454 ngx_resolver_t *r;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1455 ngx_connection_t *c;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1456 ngx_resolver_connection_t *rec;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1457
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1458 c = wev->data;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1459 rec = c->data;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1460 b = rec->write_buf;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1461 r = rec->resolver;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1462
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1463 if (wev->timedout) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1464 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1465 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1466
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1467 sent = c->sent;
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 while (wev->ready && b->pos < b->last) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1470 n = ngx_send(c, b->pos, b->last - b->pos);
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 if (n == NGX_AGAIN) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1473 break;
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 (n == NGX_ERROR) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1477 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1478 }
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 b->pos += n;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1481 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1482
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1483 if (b->pos != b->start) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1484 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	1485 b->pos = b->start;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1486 }
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 if (c->sent != sent) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1489 ngx_add_timer(wev, (ngx_msec_t) (r->tcp_timeout * 1000));
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
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1492 if (ngx_handle_write_event(wev, 0) != NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1493 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1494 }
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 return;
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 failed:
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1499
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1500 ngx_close_connection(c);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1501 rec->tcp = NULL;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1502 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1503
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1504
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1505 static void
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1506 ngx_resolver_tcp_read(ngx_event_t *rev)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1507 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1508 u_char *p;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1509 size_t size;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1510 ssize_t n;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1511 u_short qlen;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1512 ngx_buf_t *b;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1513 ngx_resolver_t *r;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1514 ngx_connection_t *c;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1515 ngx_resolver_connection_t *rec;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1516
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1517 c = rev->data;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1518 rec = c->data;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1519 b = rec->read_buf;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1520 r = rec->resolver;
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 while (rev->ready) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1523 n = ngx_recv(c, b->last, b->end - b->last);
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 if (n == NGX_AGAIN) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1526 break;
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
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1529 if (n == NGX_ERROR \|\| n == 0) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1530 goto failed;
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
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1533 b->last += n;
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 for ( ;; ) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1536 p = b->pos;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1537 size = b->last - 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 < 2) {
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 qlen = (u_short) *p++ << 8;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1544 qlen += *p++;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1545
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1546 if (size < (size_t) (2 + qlen)) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1547 break;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1548 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1549
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1550 ngx_resolver_process_response(r, p, qlen, 1);
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 b->pos += 2 + qlen;
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
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1555 if (b->pos != b->start) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1556 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	1557 b->pos = b->start;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1558 }
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
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1561 if (ngx_handle_read_event(rev, 0) != NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1562 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1563 }
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 return;
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 failed:
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1568
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1569 ngx_close_connection(c);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1570 rec->tcp = NULL;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1571 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1572
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1573
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1574 static void
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1575 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	1576 ngx_uint_t tcp)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1577 {
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1578 char *err;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1579 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	1580 qtype, qclass;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1581 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1582 ngx_uint_t qident6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1583 #endif
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1584 ngx_queue_t *q;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1585 ngx_resolver_qs_t *qs;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1586 ngx_resolver_hdr_t *response;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1587 ngx_resolver_node_t *rn;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1588
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1589 if (n < sizeof(ngx_resolver_hdr_t)) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1590 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1591 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1592
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1593 response = (ngx_resolver_hdr_t *) buf;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1594
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1595 ident = (response->ident_hi << 8) + response->ident_lo;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1596 flags = (response->flags_hi << 8) + response->flags_lo;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1597 nqs = (response->nqs_hi << 8) + response->nqs_lo;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1598 nan = (response->nan_hi << 8) + response->nan_lo;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1599 trunc = flags & 0x0200;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1600
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1601 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	1602 "resolver DNS response %ui fl:%04Xui %ui/%ui/%ud/%ud",
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1603 ident, flags, nqs, nan,
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1604 (response->nns_hi << 8) + response->nns_lo,
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1605 (response->nar_hi << 8) + response->nar_lo);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1606
5470 aebdca7e8f8f Resolver: fixed response processing. Ruslan Ermilov <ru@nginx.com> parents: 5469 diff changeset	1607 /* response to a standard query */
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1608 if ((flags & 0xf870) != 0x8000 \|\| (trunc && tcp)) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1609 ngx_log_error(r->log_level, r->log, 0,
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1610 "invalid %s DNS response %ui fl:%04Xui",
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1611 tcp ? "TCP" : "UDP", ident, flags);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1612 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1613 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1614
5470 aebdca7e8f8f Resolver: fixed response processing. Ruslan Ermilov <ru@nginx.com> parents: 5469 diff changeset	1615 code = flags & 0xf;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1616
2282 ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1617 if (code == NGX_RESOLVE_FORMERR) {
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1618
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1619 times = 0;
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 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	1622 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	1623 q = ngx_queue_next(q))
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1624 {
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1625 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	1626 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	1627
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1628 if (qident == ident) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1629 goto dns_error_name;
2282 ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1630 }
5477 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 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1633 if (rn->query6) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1634 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	1635
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1636 if (qident6 == ident) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1637 goto dns_error_name;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1638 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1639 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1640 #endif
2282 ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1641 }
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1642
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1643 goto dns_error;
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1644 }
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1645
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1646 if (code > NGX_RESOLVE_REFUSED) {
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1647 goto dns_error;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1648 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1649
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1650 if (nqs != 1) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1651 err = "invalid number of questions in DNS response";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1652 goto done;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1653 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1654
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1655 i = sizeof(ngx_resolver_hdr_t);
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 while (i < (ngx_uint_t) n) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1658 if (buf[i] == '\0') {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1659 goto found;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1660 }
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 i += 1 + buf[i];
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1663 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1664
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1665 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1666
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1667 found:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1668
5470 aebdca7e8f8f Resolver: fixed response processing. Ruslan Ermilov <ru@nginx.com> parents: 5469 diff changeset	1669 if (i++ == sizeof(ngx_resolver_hdr_t)) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1670 err = "zero-length domain name in DNS response";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1671 goto done;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1672 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1673
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1674 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	1675 > (ngx_uint_t) n)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1676 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1677 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1678 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1679
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1680 qs = (ngx_resolver_qs_t *) &buf[i];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1681
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1682 qtype = (qs->type_hi << 8) + qs->type_lo;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1683 qclass = (qs->class_hi << 8) + qs->class_lo;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1684
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1685 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	1686 "resolver DNS response qt:%ui cl:%ui", qtype, qclass);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1687
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1688 if (qclass != 1) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1689 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	1690 "unknown query class %ui in DNS response", qclass);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1691 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1692 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1693
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1694 switch (qtype) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1695
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1696 case NGX_RESOLVE_A:
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1697 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1698 case NGX_RESOLVE_AAAA:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1699 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1700
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1701 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	1702 i + sizeof(ngx_resolver_qs_t));
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1703
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1704 break;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1705
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1706 case NGX_RESOLVE_PTR:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1707
1742 268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	1708 ngx_resolver_process_ptr(r, buf, n, ident, code, nan);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1709
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1710 break;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1711
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1712 default:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1713 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	1714 "unknown query type %ui in DNS response", qtype);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1715 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1716 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1717
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1718 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1719
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1720 short_response:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1721
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1722 err = "short DNS response";
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1723
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1724 done:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1725
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1726 ngx_log_error(r->log_level, r->log, 0, err);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1727
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1728 return;
2282 ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1729
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1730 dns_error_name:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1731
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1732 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	1733 "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	1734 code, ngx_resolver_strerror(code), ident,
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1735 rn->nlen, rn->name);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1736 return;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1737
2282 ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1738 dns_error:
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1739
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1740 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	1741 "DNS error (%ui: %s), query id:%ui",
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1742 code, ngx_resolver_strerror(code), ident);
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1743 return;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1744 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1745
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1746
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1747 static void
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	1748 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	1749 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	1750 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	1751 {
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1752 char *err;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1753 u_char *cname;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1754 size_t len;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1755 int32_t ttl;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1756 uint32_t hash;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1757 in_addr_t *addr;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1758 ngx_str_t name;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1759 ngx_addr_t *addrs;
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	1760 ngx_uint_t type, class, qident, naddrs, a, i, j, start;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1761 #if (NGX_HAVE_INET6)
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1762 struct in6_addr *addr6;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1763 #endif
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1764 ngx_resolver_an_t *an;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1765 ngx_resolver_ctx_t ctx, next;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1766 ngx_resolver_node_t *rn;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1767 ngx_resolver_connection_t *rec;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1768
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1769 if (ngx_resolver_copy(r, &name, buf,
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	1770 buf + sizeof(ngx_resolver_hdr_t), buf + n)
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1771 != NGX_OK)
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1772 {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1773 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1774 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1775
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1776 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	1777
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1778 hash = ngx_crc32_short(name.data, name.len);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1779
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1780 /* lock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1781
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1782 rn = ngx_resolver_lookup_name(r, &name, hash);
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 if (rn == NULL) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1785 ngx_log_error(r->log_level, r->log, 0,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1786 "unexpected response for %V", &name);
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	1787 ngx_resolver_free(r, name.data);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1788 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1789 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1790
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1791 switch (qtype) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1792
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1793 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1794 case NGX_RESOLVE_AAAA:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1795
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1796 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	1797 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	1798 "unexpected response for %V", &name);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1799 ngx_resolver_free(r, name.data);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1800 goto failed;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1801 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1802
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1803 if (trunc && rn->tcp6) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1804 ngx_resolver_free(r, name.data);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1805 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1806 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1807
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1808 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	1809
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1810 break;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1811 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1812
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1813 default: /* NGX_RESOLVE_A */
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1814
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1815 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	1816 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	1817 "unexpected response for %V", &name);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1818 ngx_resolver_free(r, name.data);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1819 goto failed;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1820 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1821
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1822 if (trunc && rn->tcp) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1823 ngx_resolver_free(r, name.data);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1824 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1825 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1826
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1827 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	1828 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1829
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1830 if (ident != qident) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1831 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	1832 "wrong ident %ui response for %V, expect %ui",
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1833 ident, &name, qident);
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	1834 ngx_resolver_free(r, name.data);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1835 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1836 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1837
3139 5f6144fc674d fix memory leak in resolver Igor Sysoev <igor@sysoev.ru> parents: 2785 diff changeset	1838 ngx_resolver_free(r, name.data);
5f6144fc674d fix memory leak in resolver Igor Sysoev <igor@sysoev.ru> parents: 2785 diff changeset	1839
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1840 if (trunc) {
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 ngx_queue_remove(&rn->queue);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1843
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1844 if (rn->waiting == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1845 ngx_rbtree_delete(&r->name_rbtree, &rn->node);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1846 ngx_resolver_free_node(r, rn);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1847 goto next;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1848 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1849
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1850 rec = r->connections.elts;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1851 rec = &rec[rn->last_connection];
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 switch (qtype) {
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 #if (NGX_HAVE_INET6)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1856 case NGX_RESOLVE_AAAA:
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 rn->tcp6 = 1;
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 (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	1861
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1862 break;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1863 #endif
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 default: /* NGX_RESOLVE_A */
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 rn->tcp = 1;
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 (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	1870 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1871
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1872 rn->expire = ngx_time() + r->resend_timeout;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1873
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1874 ngx_queue_insert_head(&r->name_resend_queue, &rn->queue);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1875
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1876 goto next;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1877 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1878
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1879 if (code == 0 && rn->code) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1880 code = rn->code;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1881 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1882
1742 268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	1883 if (code == 0 && nan == 0) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1884
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1885 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1886 switch (qtype) {
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 case NGX_RESOLVE_AAAA:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1889
5768 70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	1890 rn->naddrs6 = 0;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	1891
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1892 if (rn->naddrs == (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1893 goto next;
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
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1896 if (rn->naddrs) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1897 goto export;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1898 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1899
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1900 break;
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 default: /* NGX_RESOLVE_A */
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1903
5768 70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	1904 rn->naddrs = 0;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	1905
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1906 if (rn->naddrs6 == (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1907 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1908 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1909
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1910 if (rn->naddrs6) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1911 goto export;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1912 }
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 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1915
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1916 code = NGX_RESOLVE_NXDOMAIN;
1742 268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	1917 }
268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	1918
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1919 if (code) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1920
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1921 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1922 switch (qtype) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1923
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1924 case NGX_RESOLVE_AAAA:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1925
5768 70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	1926 rn->naddrs6 = 0;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	1927
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1928 if (rn->naddrs == (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1929 rn->code = (u_char) code;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1930 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1931 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1932
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1933 break;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1934
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1935 default: /* NGX_RESOLVE_A */
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1936
5768 70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	1937 rn->naddrs = 0;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	1938
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1939 if (rn->naddrs6 == (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1940 rn->code = (u_char) code;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1941 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1942 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1943 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1944 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1945
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1946 next = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1947 rn->waiting = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1948
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1949 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1950
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1951 ngx_rbtree_delete(&r->name_rbtree, &rn->node);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1952
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1953 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1954
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1955 while (next) {
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	1956 ctx = next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	1957 ctx->state = code;
6456 c94aba230a5a Resolver: introduced valid field in resolver responses. Dmitry Volyntsev <xeioex@nginx.com> parents: 6372 diff changeset	1958 ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	1959 next = ctx->next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	1960
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	1961 ctx->handler(ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1962 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1963
5920 7420068c4d4b Resolver: fixed use-after-free memory access. Ruslan Ermilov <ru@nginx.com> parents: 5820 diff changeset	1964 ngx_resolver_free_node(r, rn);
7420068c4d4b Resolver: fixed use-after-free memory access. Ruslan Ermilov <ru@nginx.com> parents: 5820 diff changeset	1965
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1966 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1967 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1968
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1969 i = ans;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1970 naddrs = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1971 cname = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1972
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1973 for (a = 0; a < nan; a++) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1974
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1975 start = i;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1976
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	1977 while (i < n) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1978
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1979 if (buf[i] & 0xc0) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1980 i += 2;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1981 goto found;
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 if (buf[i] == 0) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1985 i++;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1986 goto 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
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1989 i += 1 + buf[i];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1990 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1991
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1992 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1993
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1994 test_length:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1995
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1996 if (i - start < 2) {
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1997 err = "invalid name in DNS response";
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1998 goto invalid;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1999 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2000
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2001 found:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2002
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2003 if (i + sizeof(ngx_resolver_an_t) >= n) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2004 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2005 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2006
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2007 an = (ngx_resolver_an_t *) &buf[i];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2008
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2009 type = (an->type_hi << 8) + an->type_lo;
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2010 class = (an->class_hi << 8) + an->class_lo;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2011 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	2012 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	2013 + (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	2014
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2015 if (class != 1) {
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2016 ngx_log_error(r->log_level, r->log, 0,
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2017 "unexpected RR class %ui", class);
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2018 goto failed;
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2019 }
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2020
4295 05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	2021 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	2022 ttl = 0;
05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	2023 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2024
5485 8958656a8060 Resolver: use minimum TTL for caching (ticket #329). Ruslan Ermilov <ru@nginx.com> parents: 5479 diff changeset	2025 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	2026
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2027 i += sizeof(ngx_resolver_an_t);
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2028
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2029 switch (type) {
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2030
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2031 case NGX_RESOLVE_A:
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2032
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2033 if (qtype != NGX_RESOLVE_A) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2034 err = "unexpected A record in DNS response";
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2035 goto invalid;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2036 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2037
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2038 if (len != 4) {
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2039 err = "invalid A record in DNS response";
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2040 goto invalid;
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2041 }
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2042
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2043 if (i + 4 > n) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2044 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2045 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2046
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2047 naddrs++;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2048
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2049 break;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2050
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2051 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2052 case NGX_RESOLVE_AAAA:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2053
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2054 if (qtype != NGX_RESOLVE_AAAA) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2055 err = "unexpected AAAA record in DNS response";
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2056 goto invalid;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2057 }
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 if (len != 16) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2060 err = "invalid AAAA record in DNS response";
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2061 goto invalid;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2062 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2063
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2064 if (i + 16 > n) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2065 goto short_response;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2066 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2067
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2068 naddrs++;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2069
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2070 break;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2071 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2072
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2073 case NGX_RESOLVE_CNAME:
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2074
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2075 cname = &buf[i];
1965 14463ae77723 take into account DNAME Igor Sysoev <igor@sysoev.ru> parents: 1961 diff changeset	2076
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2077 break;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2078
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2079 case NGX_RESOLVE_DNAME:
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2080
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2081 break;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2082
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2083 default:
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2084
1966 fb02f63eafd6 log unexpected qtype Igor Sysoev <igor@sysoev.ru> parents: 1965 diff changeset	2085 ngx_log_error(r->log_level, r->log, 0,
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2086 "unexpected RR type %ui", type);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2087 }
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2088
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2089 i += len;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2090 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2091
4295 05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	2092 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	2093 "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	2094 naddrs, cname, rn->ttl);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2095
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2096 if (naddrs) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2097
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2098 switch (qtype) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2099
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2100 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2101 case NGX_RESOLVE_AAAA:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2102
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2103 if (naddrs == 1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2104 addr6 = &rn->u6.addr6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2105 rn->naddrs6 = 1;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2106
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2107 } else {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2108 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	2109 if (addr6 == NULL) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2110 goto failed;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2111 }
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 rn->u6.addrs6 = addr6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2114 rn->naddrs6 = (u_short) naddrs;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2115 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2116
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2117 #if (NGX_SUPPRESS_WARN)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2118 addr = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2119 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2120
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2121 break;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2122 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2123
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2124 default: /* NGX_RESOLVE_A */
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2125
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2126 if (naddrs == 1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2127 addr = &rn->u.addr;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2128 rn->naddrs = 1;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2129
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2130 } else {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2131 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	2132 if (addr == NULL) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2133 goto failed;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2134 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2135
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2136 rn->u.addrs = addr;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2137 rn->naddrs = (u_short) naddrs;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2138 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2139
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2140 #if (NGX_HAVE_INET6 && NGX_SUPPRESS_WARN)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2141 addr6 = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2142 #endif
5475 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
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2145 j = 0;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2146 i = ans;
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 for (a = 0; a < nan; a++) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2149
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2150 for ( ;; ) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2151
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2152 if (buf[i] & 0xc0) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2153 i += 2;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2154 break;
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 if (buf[i] == 0) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2158 i++;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2159 break;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2160 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2161
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2162 i += 1 + buf[i];
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
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2165 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	2166
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2167 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	2168 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	2169
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2170 i += sizeof(ngx_resolver_an_t);
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2171
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2172 if (type == NGX_RESOLVE_A) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2173
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2174 addr[j] = htonl((buf[i] << 24) + (buf[i + 1] << 16)
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2175 + (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	2176
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2177 if (++j == naddrs) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2178
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2179 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2180 if (rn->naddrs6 == (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2181 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2182 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2183 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2184
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2185 break;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2186 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2187 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2188
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2189 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2190 else if (type == NGX_RESOLVE_AAAA) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2191
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2192 ngx_memcpy(addr6[j].s6_addr, &buf[i], 16);
8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2193
8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2194 if (++j == naddrs) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2195
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2196 if (rn->naddrs == (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2197 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2198 }
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 break;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2201 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2202 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2203 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2204
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2205 i += len;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2206 }
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2207 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2208
5768 70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2209 switch (qtype) {
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2210
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2211 #if (NGX_HAVE_INET6)
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2212 case NGX_RESOLVE_AAAA:
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2213
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2214 if (rn->naddrs6 == (u_short) -1) {
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2215 rn->naddrs6 = 0;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2216 }
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 break;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2219 #endif
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2220
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2221 default: /* NGX_RESOLVE_A */
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2222
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2223 if (rn->naddrs == (u_short) -1) {
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2224 rn->naddrs = 0;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2225 }
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2226 }
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2227
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2228 if (rn->naddrs != (u_short) -1
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2229 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2230 && rn->naddrs6 != (u_short) -1
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2231 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2232 && rn->naddrs
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2233 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2234 + rn->naddrs6
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2235 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2236 > 0)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2237 {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2238
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2239 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2240 export:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2241 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2242
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2243 naddrs = rn->naddrs;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2244 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2245 naddrs += rn->naddrs6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2246 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2247
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2248 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	2249 addrs = NULL;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2250
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2251 } else {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2252 addrs = ngx_resolver_export(r, rn, 0);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2253 if (addrs == NULL) {
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2254 goto failed;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2255 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2256 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2257
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2258 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2259
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2260 rn->valid = ngx_time() + (r->valid ? r->valid : (time_t) rn->ttl);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2261 rn->expire = ngx_time() + r->expire;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2262
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2263 ngx_queue_insert_head(&r->name_expire_queue, &rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2264
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2265 next = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2266 rn->waiting = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2267
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2268 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2269
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2270 while (next) {
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2271 ctx = next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2272 ctx->state = NGX_OK;
6456 c94aba230a5a Resolver: introduced valid field in resolver responses. Dmitry Volyntsev <xeioex@nginx.com> parents: 6372 diff changeset	2273 ctx->valid = rn->valid;
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2274 ctx->naddrs = naddrs;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2275
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2276 if (addrs == NULL) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2277 ctx->addrs = &ctx->addr;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2278 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	2279 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	2280 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	2281 ctx->sin.sin_family = AF_INET;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2282 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	2283
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2284 } else {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2285 ctx->addrs = addrs;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2286 }
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2287
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2288 next = ctx->next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2289
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2290 ctx->handler(ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2291 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2292
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2293 if (addrs != NULL) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2294 ngx_resolver_free(r, addrs->sockaddr);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2295 ngx_resolver_free(r, addrs);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2296 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2297
4619 3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	2298 ngx_resolver_free(r, rn->query);
3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	2299 rn->query = NULL;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2300 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2301 rn->query6 = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2302 #endif
4619 3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	2303
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2304 return;
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2305 }
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2306
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2307 if (cname) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2308
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2309 /* CNAME only */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2310
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2311 if (rn->naddrs == (u_short) -1
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2312 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2313 \|\| rn->naddrs6 == (u_short) -1
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2314 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2315 )
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2316 {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2317 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2318 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2319
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2320 if (ngx_resolver_copy(r, &name, buf, cname, buf + n) != NGX_OK) {
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2321 goto failed;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2322 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2323
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2324 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2325 "resolver cname:\"%V\"", &name);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2326
1741 0829024c924d fix segfault if response will have CNAME only Igor Sysoev <igor@sysoev.ru> parents: 1689 diff changeset	2327 ngx_queue_remove(&rn->queue);
0829024c924d fix segfault if response will have CNAME only Igor Sysoev <igor@sysoev.ru> parents: 1689 diff changeset	2328
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2329 rn->cnlen = (u_short) name.len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2330 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	2331
5485 8958656a8060 Resolver: use minimum TTL for caching (ticket #329). Ruslan Ermilov <ru@nginx.com> parents: 5479 diff changeset	2332 rn->valid = ngx_time() + (r->valid ? r->valid : (time_t) rn->ttl);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2333 rn->expire = ngx_time() + r->expire;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2334
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2335 ngx_queue_insert_head(&r->name_expire_queue, &rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2336
6352 ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2337 ngx_resolver_free(r, rn->query);
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2338 rn->query = NULL;
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2339 #if (NGX_HAVE_INET6)
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2340 rn->query6 = NULL;
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2341 #endif
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2342
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2343 ctx = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2344 rn->waiting = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2345
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2346 if (ctx) {
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	2347
6352 ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2348 if (ctx->recursion++ >= NGX_RESOLVER_MAX_RECURSION) {
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2349
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2350 /* unlock name mutex */
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 do {
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2353 ctx->state = NGX_RESOLVE_NXDOMAIN;
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2354 next = ctx->next;
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2355
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2356 ctx->handler(ctx);
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2357
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2358 ctx = next;
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2359 } while (ctx);
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2360
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2361 return;
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2362 }
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2363
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	2364 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	2365 next->node = NULL;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	2366 }
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	2367
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	2368 (void) ngx_resolve_name_locked(r, ctx, &name);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2369 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2370
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2371 /* unlock name mutex */
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2372
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2373 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2374 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2375
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2376 ngx_log_error(r->log_level, r->log, 0,
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2377 "no A or CNAME types in DNS response");
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2378 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2379
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2380 short_response:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2381
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2382 err = "short DNS response";
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2383
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2384 invalid:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2385
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2386 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2387
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2388 ngx_log_error(r->log_level, r->log, 0, err);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2389
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2390 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2391
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2392 failed:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2393
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2394 next:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2395
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2396 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2397
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2398 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2399 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2400
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2401
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2402 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2403 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	2404 ngx_uint_t ident, ngx_uint_t code, ngx_uint_t nan)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2405 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2406 char *err;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2407 size_t len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2408 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	2409 int32_t ttl;
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2410 ngx_int_t octet;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2411 ngx_str_t name;
6371 33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2412 ngx_uint_t mask, type, class, qident, a, i, start;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2413 ngx_queue_t *expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2414 ngx_rbtree_t *tree;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2415 ngx_resolver_an_t *an;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2416 ngx_resolver_ctx_t ctx, next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2417 ngx_resolver_node_t *rn;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2418 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2419 uint32_t hash;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2420 ngx_int_t digit;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2421 struct in6_addr addr6;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2422 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2423
6372 a6a5bacf6b74 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6371 diff changeset	2424 if (ngx_resolver_copy(r, &name, buf,
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2425 buf + sizeof(ngx_resolver_hdr_t), buf + n)
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2426 != NGX_OK)
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2427 {
5472 ab493c60d9ff Resolver: fixes in PTR processing. Ruslan Ermilov <ru@nginx.com> parents: 5471 diff changeset	2428 return;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2429 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2430
6372 a6a5bacf6b74 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6371 diff changeset	2431 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0, "resolver qs:%V", &name);
a6a5bacf6b74 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6371 diff changeset	2432
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2433 /* AF_INET */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2434
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2435 addr = 0;
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2436 i = sizeof(ngx_resolver_hdr_t);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2437
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2438 for (mask = 0; mask < 32; mask += 8) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2439 len = buf[i++];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2440
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2441 octet = ngx_atoi(&buf[i], len);
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2442 if (octet == NGX_ERROR \|\| octet > 255) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2443 goto invalid_in_addr_arpa;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2444 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2445
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2446 addr += octet << mask;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2447 i += len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2448 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2449
5479 c0d6eae5a1c5 Resolver: lookups are case-insensitive. Ruslan Ermilov <ru@nginx.com> parents: 5478 diff changeset	2450 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	2451 i += sizeof("\7in-addr\4arpa");
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2452
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2453 /* lock addr mutex */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2454
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2455 rn = ngx_resolver_lookup_addr(r, addr);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2456
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2457 tree = &r->addr_rbtree;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2458 expire_queue = &r->addr_expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2459
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2460 goto valid;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2461 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2462
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2463 invalid_in_addr_arpa:
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2464
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2465 #if (NGX_HAVE_INET6)
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 i = sizeof(ngx_resolver_hdr_t);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2468
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2469 for (octet = 15; octet >= 0; octet--) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2470 if (buf[i++] != '\1') {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2471 goto invalid_ip6_arpa;
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
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2474 digit = ngx_hextoi(&buf[i++], 1);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2475 if (digit == NGX_ERROR) {
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 addr6.s6_addr[octet] = (u_char) digit;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2480
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2481 if (buf[i++] != '\1') {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2482 goto invalid_ip6_arpa;
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
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2485 digit = ngx_hextoi(&buf[i++], 1);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2486 if (digit == NGX_ERROR) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2487 goto invalid_ip6_arpa;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2488 }
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 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	2491 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2492
5479 c0d6eae5a1c5 Resolver: lookups are case-insensitive. Ruslan Ermilov <ru@nginx.com> parents: 5478 diff changeset	2493 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	2494 i += sizeof("\3ip6\4arpa");
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2495
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2496 /* lock addr mutex */
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 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	2499 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	2500
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2501 tree = &r->addr6_rbtree;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2502 expire_queue = &r->addr6_expire_queue;
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 goto valid;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2505 }
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 invalid_ip6_arpa:
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2508 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2509
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2510 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	2511 "invalid in-addr.arpa or ip6.arpa name in DNS response");
6372 a6a5bacf6b74 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6371 diff changeset	2512 ngx_resolver_free(r, name.data);
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2513 return;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2514
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2515 valid:
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2516
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2517 if (rn == NULL \|\| rn->query == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2518 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	2519 "unexpected response for %V", &name);
6372 a6a5bacf6b74 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6371 diff changeset	2520 ngx_resolver_free(r, name.data);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2521 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2522 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2523
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2524 qident = (rn->query[0] << 8) + rn->query[1];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2525
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2526 if (ident != qident) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2527 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	2528 "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	2529 ident, &name, qident);
6372 a6a5bacf6b74 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6371 diff changeset	2530 ngx_resolver_free(r, name.data);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2531 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2532 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2533
6372 a6a5bacf6b74 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6371 diff changeset	2534 ngx_resolver_free(r, name.data);
a6a5bacf6b74 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6371 diff changeset	2535
1742 268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	2536 if (code == 0 && nan == 0) {
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2537 code = NGX_RESOLVE_NXDOMAIN;
1742 268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	2538 }
268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	2539
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2540 if (code) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2541 next = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2542 rn->waiting = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2543
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2544 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2545
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2546 ngx_rbtree_delete(tree, &rn->node);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2547
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2548 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2549
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2550 while (next) {
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2551 ctx = next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2552 ctx->state = code;
6456 c94aba230a5a Resolver: introduced valid field in resolver responses. Dmitry Volyntsev <xeioex@nginx.com> parents: 6372 diff changeset	2553 ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2554 next = ctx->next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2555
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2556 ctx->handler(ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2557 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2558
5920 7420068c4d4b Resolver: fixed use-after-free memory access. Ruslan Ermilov <ru@nginx.com> parents: 5820 diff changeset	2559 ngx_resolver_free_node(r, rn);
7420068c4d4b Resolver: fixed use-after-free memory access. Ruslan Ermilov <ru@nginx.com> parents: 5820 diff changeset	2560
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2561 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2562 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2563
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2564 i += sizeof(ngx_resolver_qs_t);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2565
6371 33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2566 for (a = 0; a < nan; a++) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2567
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2568 start = i;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2569
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2570 while (i < n) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2571
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2572 if (buf[i] & 0xc0) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2573 i += 2;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2574 goto found;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2575 }
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2576
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2577 if (buf[i] == 0) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2578 i++;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2579 goto test_length;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2580 }
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2581
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2582 i += 1 + buf[i];
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2583 }
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2584
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2585 goto short_response;
6371 33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2586
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2587 test_length:
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2588
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2589 if (i - start < 2) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2590 err = "invalid name in DNS response";
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2591 goto invalid;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2592 }
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2593
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2594 found:
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2595
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2596 if (i + sizeof(ngx_resolver_an_t) >= n) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2597 goto short_response;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2598 }
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2599
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2600 an = (ngx_resolver_an_t *) &buf[i];
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2601
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2602 type = (an->type_hi << 8) + an->type_lo;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2603 class = (an->class_hi << 8) + an->class_lo;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2604 len = (an->len_hi << 8) + an->len_lo;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2605 ttl = (an->ttl[0] << 24) + (an->ttl[1] << 16)
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2606 + (an->ttl[2] << 8) + (an->ttl[3]);
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2607
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2608 if (class != 1) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2609 ngx_log_error(r->log_level, r->log, 0,
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2610 "unexpected RR class %ui", class);
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2611 goto failed;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2612 }
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2613
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2614 if (ttl < 0) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2615 ttl = 0;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2616 }
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2617
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2618 ngx_log_debug3(NGX_LOG_DEBUG_CORE, r->log, 0,
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2619 "resolver qt:%ui cl:%ui len:%uz",
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2620 type, class, len);
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2621
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2622 i += sizeof(ngx_resolver_an_t);
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2623
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2624 switch (type) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2625
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2626 case NGX_RESOLVE_PTR:
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2627
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2628 goto ptr;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2629
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2630 case NGX_RESOLVE_CNAME:
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2631
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2632 break;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2633
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2634 default:
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2635
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2636 ngx_log_error(r->log_level, r->log, 0,
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2637 "unexpected RR type %ui", type);
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2638 }
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2639
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2640 i += len;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2641 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2642
6371 33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2643 /* unlock addr mutex */
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2644
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2645 ngx_log_error(r->log_level, r->log, 0,
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2646 "no PTR type in DNS response");
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2647 return;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2648
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	2649 ptr:
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2650
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2651 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	2652 goto failed;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2653 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2654
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2655 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	2656
2486 8de5dc3e7001 use length of uncompressed name Igor Sysoev <igor@sysoev.ru> parents: 2484 diff changeset	2657 if (name.len != (size_t) rn->nlen
8de5dc3e7001 use length of uncompressed name Igor Sysoev <igor@sysoev.ru> parents: 2484 diff changeset	2658 \|\| ngx_strncmp(name.data, rn->name, name.len) != 0)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2659 {
2482 30ec8c5ac75b fix reverse resolving cache: it stored zero length names Igor Sysoev <igor@sysoev.ru> parents: 2314 diff changeset	2660 if (rn->nlen) {
30ec8c5ac75b fix reverse resolving cache: it stored zero length names Igor Sysoev <igor@sysoev.ru> parents: 2314 diff changeset	2661 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	2662 }
30ec8c5ac75b fix reverse resolving cache: it stored zero length names Igor Sysoev <igor@sysoev.ru> parents: 2314 diff changeset	2663
2490 1c87647b7ca5 fix building by msvc, introduced in r2487 Igor Sysoev <igor@sysoev.ru> parents: 2487 diff changeset	2664 rn->nlen = (u_short) name.len;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2665 rn->name = name.data;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2666
2486 8de5dc3e7001 use length of uncompressed name Igor Sysoev <igor@sysoev.ru> parents: 2484 diff changeset	2667 name.data = ngx_resolver_dup(r, rn->name, name.len);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2668 if (name.data == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2669 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2670 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2671 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2672
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2673 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2674
4295 05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	2675 rn->valid = ngx_time() + (r->valid ? r->valid : ttl);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2676 rn->expire = ngx_time() + r->expire;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2677
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2678 ngx_queue_insert_head(expire_queue, &rn->queue);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2679
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2680 next = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2681 rn->waiting = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2682
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2683 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2684
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2685 while (next) {
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2686 ctx = next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2687 ctx->state = NGX_OK;
6456 c94aba230a5a Resolver: introduced valid field in resolver responses. Dmitry Volyntsev <xeioex@nginx.com> parents: 6372 diff changeset	2688 ctx->valid = rn->valid;
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2689 ctx->name = name;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2690 next = ctx->next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2691
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2692 ctx->handler(ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2693 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2694
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2695 ngx_resolver_free(r, name.data);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2696
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2697 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2698
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2699 short_response:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2700
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2701 err = "short DNS response";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2702
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2703 invalid:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2704
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2705 /* unlock addr mutex */
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_log_error(r->log_level, r->log, 0, err);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2708
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2709 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2710
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2711 failed:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2712
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2713 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2714
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2715 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2716 }
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 static ngx_resolver_node_t *
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2720 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	2721 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2722 ngx_int_t rc;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2723 ngx_rbtree_node_t node, sentinel;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2724 ngx_resolver_node_t *rn;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2725
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2726 node = r->name_rbtree.root;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2727 sentinel = r->name_rbtree.sentinel;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2728
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2729 while (node != sentinel) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2730
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2731 if (hash < node->key) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2732 node = node->left;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2733 continue;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2734 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2735
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2736 if (hash > node->key) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2737 node = node->right;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2738 continue;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2739 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2740
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2741 /* hash == node->key */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2742
5921 5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	2743 rn = ngx_resolver_node(node);
4497 95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	2744
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	2745 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	2746
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	2747 if (rc == 0) {
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	2748 return rn;
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	2749 }
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	2750
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	2751 node = (rc < 0) ? node->left : node->right;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2752 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2753
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2754 /* not found */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2755
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2756 return NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2757 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2758
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2759
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2760 static ngx_resolver_node_t *
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2761 ngx_resolver_lookup_addr(ngx_resolver_t *r, in_addr_t addr)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2762 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2763 ngx_rbtree_node_t node, sentinel;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2764
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2765 node = r->addr_rbtree.root;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2766 sentinel = r->addr_rbtree.sentinel;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2767
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2768 while (node != sentinel) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2769
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2770 if (addr < node->key) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2771 node = node->left;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2772 continue;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2773 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2774
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2775 if (addr > node->key) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2776 node = node->right;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2777 continue;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2778 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2779
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2780 /* addr == node->key */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2781
5921 5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	2782 return ngx_resolver_node(node);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2783 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2784
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2785 /* not found */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2786
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2787 return NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2788 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2789
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2790
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2791 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2792
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2793 static ngx_resolver_node_t *
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2794 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	2795 uint32_t hash)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2796 {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2797 ngx_int_t rc;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2798 ngx_rbtree_node_t node, sentinel;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2799 ngx_resolver_node_t *rn;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2800
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2801 node = r->addr6_rbtree.root;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2802 sentinel = r->addr6_rbtree.sentinel;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2803
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2804 while (node != sentinel) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2805
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2806 if (hash < node->key) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2807 node = node->left;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2808 continue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2809 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2810
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2811 if (hash > node->key) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2812 node = node->right;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2813 continue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2814 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2815
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2816 /* hash == node->key */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2817
5921 5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	2818 rn = ngx_resolver_node(node);
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2819
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2820 rc = ngx_memcmp(addr, &rn->addr6, 16);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2821
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2822 if (rc == 0) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2823 return rn;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2824 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2825
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2826 node = (rc < 0) ? node->left : node->right;
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
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2829 /* not found */
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 return NULL;
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
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2834 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2835
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2836
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2837 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2838 ngx_resolver_rbtree_insert_value(ngx_rbtree_node_t *temp,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2839 ngx_rbtree_node_t node, ngx_rbtree_node_t sentinel)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2840 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2841 ngx_rbtree_node_t **p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2842 ngx_resolver_node_t rn, rn_temp;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2843
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2844 for ( ;; ) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2845
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2846 if (node->key < temp->key) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2847
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2848 p = &temp->left;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2849
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2850 } else if (node->key > temp->key) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2851
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2852 p = &temp->right;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2853
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2854 } else { /* node->key == temp->key */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2855
5921 5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	2856 rn = ngx_resolver_node(node);
5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	2857 rn_temp = ngx_resolver_node(temp);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2858
3143 ab6258e18099 fix resolver cache rbtree comparison Igor Sysoev <igor@sysoev.ru> parents: 3139 diff changeset	2859 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	2860 < 0) ? &temp->left : &temp->right;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2861 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2862
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2863 if (*p == sentinel) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2864 break;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2865 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2866
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2867 temp = *p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2868 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2869
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2870 *p = node;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2871 node->parent = temp;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2872 node->left = sentinel;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2873 node->right = sentinel;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2874 ngx_rbt_red(node);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2875 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2876
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2877
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2878 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2879
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2880 static void
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2881 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	2882 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	2883 {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2884 ngx_rbtree_node_t **p;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2885 ngx_resolver_node_t rn, rn_temp;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2886
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2887 for ( ;; ) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2888
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2889 if (node->key < temp->key) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2890
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2891 p = &temp->left;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2892
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2893 } else if (node->key > temp->key) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2894
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2895 p = &temp->right;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2896
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2897 } else { /* node->key == temp->key */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2898
5921 5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	2899 rn = ngx_resolver_node(node);
5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	2900 rn_temp = ngx_resolver_node(temp);
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2901
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2902 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	2903 < 0) ? &temp->left : &temp->right;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2904 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2905
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2906 if (*p == sentinel) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2907 break;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2908 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2909
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2910 temp = *p;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2911 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2912
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2913 *p = node;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2914 node->parent = temp;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2915 node->left = sentinel;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2916 node->right = sentinel;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2917 ngx_rbt_red(node);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2918 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2919
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2920 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2921
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	2922
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2923 static ngx_int_t
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	2924 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	2925 ngx_str_t *name)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2926 {
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2927 u_char p, s;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2928 size_t len, nlen;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2929 ngx_uint_t ident;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2930 ngx_resolver_qs_t *qs;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2931 ngx_resolver_hdr_t *query;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2932
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	2933 nlen = name->len ? (1 + name->len + 1) : 1;
3306 61bdaac6c668 fix resolving an empty name (".") Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	2934
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2935 len = sizeof(ngx_resolver_hdr_t) + nlen + sizeof(ngx_resolver_qs_t);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2936
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2937 #if (NGX_HAVE_INET6)
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	2938 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	2939 #else
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	2940 p = ngx_resolver_alloc(r, len);
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2941 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2942 if (p == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2943 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2944 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2945
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2946 rn->qlen = (u_short) len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2947 rn->query = p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2948
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2949 #if (NGX_HAVE_INET6)
5478 3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	2950 if (r->ipv6) {
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	2951 rn->query6 = p + len;
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	2952 }
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2953 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2954
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2955 query = (ngx_resolver_hdr_t *) p;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2956
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2957 ident = ngx_random();
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2958
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	2959 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	2960 "resolve: \"%V\" A %i", name, ident & 0xffff);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2961
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2962 query->ident_hi = (u_char) ((ident >> 8) & 0xff);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2963 query->ident_lo = (u_char) (ident & 0xff);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2964
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2965 /* recursion query */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2966 query->flags_hi = 1; query->flags_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2967
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2968 /* one question */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2969 query->nqs_hi = 0; query->nqs_lo = 1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2970 query->nan_hi = 0; query->nan_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2971 query->nns_hi = 0; query->nns_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2972 query->nar_hi = 0; query->nar_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2973
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2974 p += sizeof(ngx_resolver_hdr_t) + nlen;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2975
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2976 qs = (ngx_resolver_qs_t *) p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2977
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2978 /* query type */
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2979 qs->type_hi = 0; qs->type_lo = NGX_RESOLVE_A;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2980
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2981 /* IN query class */
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2982 qs->class_hi = 0; qs->class_lo = 1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2983
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2984 /* convert "www.example.com" to "\3www\7example\3com\0" */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2985
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2986 len = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2987 p--;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2988 *p-- = '\0';
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2989
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	2990 if (name->len == 0) {
4610 778d2cc03e22 Fixed segmentation fault in ngx_resolver_create_name_query(). Ruslan Ermilov <ru@nginx.com> parents: 4556 diff changeset	2991 return NGX_DECLINED;
778d2cc03e22 Fixed segmentation fault in ngx_resolver_create_name_query(). Ruslan Ermilov <ru@nginx.com> parents: 4556 diff changeset	2992 }
778d2cc03e22 Fixed segmentation fault in ngx_resolver_create_name_query(). Ruslan Ermilov <ru@nginx.com> parents: 4556 diff changeset	2993
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	2994 for (s = name->data + name->len - 1; s >= name->data; s--) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2995 if (*s != '.') {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2996 p = s;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2997 len++;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2998
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2999 } else {
4556 1bddc91e78d6 Resolver: added missing sanity checking when creating name queries. Maxim Dounin <mdounin@mdounin.ru> parents: 4497 diff changeset	3000 if (len == 0 \|\| len > 255) {
1961 99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	3001 return NGX_DECLINED;
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	3002 }
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	3003
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3004 *p = (u_char) len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3005 len = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3006 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3007
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3008 p--;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3009 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3010
4556 1bddc91e78d6 Resolver: added missing sanity checking when creating name queries. Maxim Dounin <mdounin@mdounin.ru> parents: 4497 diff changeset	3011 if (len == 0 \|\| len > 255) {
1bddc91e78d6 Resolver: added missing sanity checking when creating name queries. Maxim Dounin <mdounin@mdounin.ru> parents: 4497 diff changeset	3012 return NGX_DECLINED;
1bddc91e78d6 Resolver: added missing sanity checking when creating name queries. Maxim Dounin <mdounin@mdounin.ru> parents: 4497 diff changeset	3013 }
1bddc91e78d6 Resolver: added missing sanity checking when creating name queries. Maxim Dounin <mdounin@mdounin.ru> parents: 4497 diff changeset	3014
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3015 *p = (u_char) len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3016
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3017 #if (NGX_HAVE_INET6)
5478 3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	3018 if (!r->ipv6) {
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	3019 return NGX_OK;
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	3020 }
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	3021
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3022 p = rn->query6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3023
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3024 ngx_memcpy(p, rn->query, rn->qlen);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3025
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3026 query = (ngx_resolver_hdr_t *) p;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3027
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3028 ident = ngx_random();
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3029
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3030 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	3031 "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	3032
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3033 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	3034 query->ident_lo = (u_char) (ident & 0xff);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3035
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3036 p += sizeof(ngx_resolver_hdr_t) + nlen;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3037
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3038 qs = (ngx_resolver_qs_t *) p;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3039
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3040 qs->type_lo = NGX_RESOLVE_AAAA;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3041 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3042
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3043 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3044 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3045
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3046
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3047 static ngx_int_t
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3048 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	3049 ngx_addr_t *addr)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3050 {
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3051 u_char p, d;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3052 size_t len;
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3053 in_addr_t inaddr;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3054 ngx_int_t n;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3055 ngx_uint_t ident;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3056 ngx_resolver_hdr_t *query;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3057 struct sockaddr_in *sin;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3058 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3059 struct sockaddr_in6 *sin6;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3060 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3061
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3062 switch (addr->sockaddr->sa_family) {
5476 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 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3065 case AF_INET6:
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3066 len = sizeof(ngx_resolver_hdr_t)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3067 + 64 + sizeof(".ip6.arpa.") - 1
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3068 + sizeof(ngx_resolver_qs_t);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3069
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3070 break;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3071 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3072
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3073 default: /* AF_INET */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3074 len = sizeof(ngx_resolver_hdr_t)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3075 + 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	3076 + sizeof(ngx_resolver_qs_t);
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	3077 }
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3078
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3079 p = ngx_resolver_alloc(r, len);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3080 if (p == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3081 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3082 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3083
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3084 rn->query = p;
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3085 query = (ngx_resolver_hdr_t *) p;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3086
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3087 ident = ngx_random();
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3088
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3089 query->ident_hi = (u_char) ((ident >> 8) & 0xff);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3090 query->ident_lo = (u_char) (ident & 0xff);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3091
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3092 /* recursion query */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3093 query->flags_hi = 1; query->flags_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3094
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3095 /* one question */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3096 query->nqs_hi = 0; query->nqs_lo = 1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3097 query->nan_hi = 0; query->nan_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3098 query->nns_hi = 0; query->nns_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3099 query->nar_hi = 0; query->nar_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3100
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3101 p += sizeof(ngx_resolver_hdr_t);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3102
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3103 switch (addr->sockaddr->sa_family) {
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3104
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3105 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3106 case AF_INET6:
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3107 sin6 = (struct sockaddr_in6 *) addr->sockaddr;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3108
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3109 for (n = 15; n >= 0; n--) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3110 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	3111 sin6->sin6_addr.s6_addr[n] & 0xf,
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3112 (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	3113 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3114
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3115 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	3116
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3117 break;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3118 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3119
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3120 default: /* AF_INET */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3121
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3122 sin = (struct sockaddr_in *) addr->sockaddr;
a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3123 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	3124
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3125 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	3126 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	3127 *p = (u_char) (d - &p[1]);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3128 p = d;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3129 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3130
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3131 p = ngx_cpymem(p, "\7in-addr\4arpa\0", 14);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3132 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3133
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3134 /* query type "PTR", IN query class */
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3135 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	3136
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3137 rn->qlen = (u_short) (p - rn->query);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3138
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3139 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3140 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3141
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3142
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3143 static ngx_int_t
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3144 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	3145 u_char *last)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3146 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3147 char *err;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3148 u_char p, dst;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3149 ssize_t len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3150 ngx_uint_t i, n;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3151
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3152 p = src;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3153 len = -1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3154
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3155 /*
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3156 * compression pointers allow to create endless loop, so we set limit;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3157 * 128 pointers should be enough to store 255-byte name
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3158 */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3159
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3160 for (i = 0; i < 128; i++) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3161 n = *p++;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3162
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3163 if (n == 0) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3164 goto done;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3165 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3166
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3167 if (n & 0xc0) {
2314 52987a023486 fix compression pointer for big (>255) DNS responses Igor Sysoev <igor@sysoev.ru> parents: 2282 diff changeset	3168 n = ((n & 0x3f) << 8) + *p;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3169 p = &buf[n];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3170
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3171 } else {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3172 len += 1 + n;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3173 p = &p[n];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3174 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3175
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3176 if (p >= last) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3177 err = "name is out of response";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3178 goto invalid;
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
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3182 err = "compression pointers loop";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3183
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3184 invalid:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3185
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3186 ngx_log_error(r->log_level, r->log, 0, err);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3187
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3188 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3189
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3190 done:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3191
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3192 if (name == NULL) {
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3193 return NGX_OK;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3194 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3195
3298 847ab5a32307 fix "PTR ." case in address resolver Igor Sysoev <igor@sysoev.ru> parents: 3297 diff changeset	3196 if (len == -1) {
5764 f166c521b619 Style: use ngx_str_null(). Tatsuhiko Kubo <cubicdaiya@gmail.com> parents: 5600 diff changeset	3197 ngx_str_null(name);
3298 847ab5a32307 fix "PTR ." case in address resolver Igor Sysoev <igor@sysoev.ru> parents: 3297 diff changeset	3198 return NGX_OK;
847ab5a32307 fix "PTR ." case in address resolver Igor Sysoev <igor@sysoev.ru> parents: 3297 diff changeset	3199 }
847ab5a32307 fix "PTR ." case in address resolver Igor Sysoev <igor@sysoev.ru> parents: 3297 diff changeset	3200
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3201 dst = ngx_resolver_alloc(r, len);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3202 if (dst == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3203 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3204 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3205
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3206 name->data = dst;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3207
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3208 n = *src++;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3209
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3210 for ( ;; ) {
4267 768212ca0745 Fixed compression pointer processing in DNS response greater than 255 bytes. Igor Sysoev <igor@sysoev.ru> parents: 4225 diff changeset	3211 if (n & 0xc0) {
768212ca0745 Fixed compression pointer processing in DNS response greater than 255 bytes. Igor Sysoev <igor@sysoev.ru> parents: 4225 diff changeset	3212 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	3213 src = &buf[n];
768212ca0745 Fixed compression pointer processing in DNS response greater than 255 bytes. Igor Sysoev <igor@sysoev.ru> parents: 4225 diff changeset	3214
768212ca0745 Fixed compression pointer processing in DNS response greater than 255 bytes. Igor Sysoev <igor@sysoev.ru> parents: 4225 diff changeset	3215 n = *src++;
768212ca0745 Fixed compression pointer processing in DNS response greater than 255 bytes. Igor Sysoev <igor@sysoev.ru> parents: 4225 diff changeset	3216
768212ca0745 Fixed compression pointer processing in DNS response greater than 255 bytes. Igor Sysoev <igor@sysoev.ru> parents: 4225 diff changeset	3217 } else {
5479 c0d6eae5a1c5 Resolver: lookups are case-insensitive. Ruslan Ermilov <ru@nginx.com> parents: 5478 diff changeset	3218 ngx_strlow(dst, src, n);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3219 dst += n;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3220 src += n;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3221
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3222 n = *src++;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3223
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3224 if (n != 0) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3225 *dst++ = '.';
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3226 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3227 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3228
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3229 if (n == 0) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3230 name->len = dst - name->data;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3231 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3232 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3233 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3234 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3235
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3236
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3237 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3238 ngx_resolver_timeout_handler(ngx_event_t *ev)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3239 {
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	3240 ngx_resolver_ctx_t *ctx;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	3241
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	3242 ctx = ev->data;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	3243
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	3244 ctx->state = NGX_RESOLVE_TIMEDOUT;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	3245
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	3246 ctx->handler(ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3247 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3248
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3249
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3250 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3251 ngx_resolver_free_node(ngx_resolver_t r, ngx_resolver_node_t rn)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3252 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3253 /* lock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3254
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3255 if (rn->query) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3256 ngx_resolver_free_locked(r, rn->query);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3257 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3258
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3259 if (rn->name) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3260 ngx_resolver_free_locked(r, rn->name);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3261 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3262
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3263 if (rn->cnlen) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3264 ngx_resolver_free_locked(r, rn->u.cname);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3265 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3266
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3267 if (rn->naddrs > 1 && rn->naddrs != (u_short) -1) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3268 ngx_resolver_free_locked(r, rn->u.addrs);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3269 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3270
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3271 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3272 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	3273 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	3274 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3275 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3276
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3277 ngx_resolver_free_locked(r, rn);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3278
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3279 /* unlock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3280 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3281
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3282
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3283 static void *
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3284 ngx_resolver_alloc(ngx_resolver_t *r, size_t size)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3285 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3286 u_char *p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3287
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3288 /* lock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3289
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3290 p = ngx_alloc(size, r->log);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3291
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3292 /* unlock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3293
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3294 return p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3295 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3296
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3297
1903 1ea922585517 static ngx_resolver_calloc() Igor Sysoev <igor@sysoev.ru> parents: 1880 diff changeset	3298 static void *
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3299 ngx_resolver_calloc(ngx_resolver_t *r, size_t size)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3300 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3301 u_char *p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3302
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3303 p = ngx_resolver_alloc(r, size);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3304
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3305 if (p) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3306 ngx_memzero(p, size);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3307 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3308
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3309 return p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3310 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3311
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3312
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3313 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3314 ngx_resolver_free(ngx_resolver_t r, void p)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3315 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3316 /* lock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3317
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3318 ngx_free(p);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3319
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3320 /* unlock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3321 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3322
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3323
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3324 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3325 ngx_resolver_free_locked(ngx_resolver_t r, void p)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3326 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3327 ngx_free(p);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3328 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3329
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3330
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3331 static void *
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3332 ngx_resolver_dup(ngx_resolver_t r, void src, size_t size)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3333 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3334 void *dst;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3335
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3336 dst = ngx_resolver_alloc(r, size);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3337
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3338 if (dst == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3339 return dst;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3340 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3341
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3342 ngx_memcpy(dst, src, size);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3343
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3344 return dst;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3345 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3346
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3347
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	3348 static ngx_addr_t *
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3349 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	3350 ngx_uint_t rotate)
4871 c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	3351 {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3352 ngx_addr_t *dst;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3353 ngx_uint_t d, i, j, n;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3354 u_char (*sockaddr)[NGX_SOCKADDRLEN];
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3355 in_addr_t *addr;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3356 struct sockaddr_in *sin;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3357 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3358 struct in6_addr *addr6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3359 struct sockaddr_in6 *sin6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3360 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3361
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3362 n = rn->naddrs;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3363 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3364 n += rn->naddrs6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3365 #endif
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	3366
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	3367 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	3368 if (dst == NULL) {
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	3369 return NULL;
4892 063ac68d89dc Resolver: added missing memory allocation error handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4871 diff changeset	3370 }
063ac68d89dc Resolver: added missing memory allocation error handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4871 diff changeset	3371
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3372 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	3373 if (sockaddr == NULL) {
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	3374 ngx_resolver_free(r, dst);
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	3375 return NULL;
4871 c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	3376 }
c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	3377
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3378 i = 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3379 d = rotate ? ngx_random() % n : 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3380
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3381 if (rn->naddrs) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3382 j = rotate ? ngx_random() % rn->naddrs : 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3383
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3384 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	3385
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3386 do {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3387 sin = (struct sockaddr_in *) sockaddr[d];
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3388 sin->sin_family = AF_INET;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3389 sin->sin_addr.s_addr = addr[j++];
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3390 dst[d].sockaddr = (struct sockaddr *) sin;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3391 dst[d++].socklen = sizeof(struct sockaddr_in);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3392
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3393 if (d == n) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3394 d = 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3395 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3396
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3397 if (j == rn->naddrs) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3398 j = 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3399 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3400 } while (++i < rn->naddrs);
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	3401 }
4871 c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	3402
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3403 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3404 if (rn->naddrs6) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3405 j = rotate ? ngx_random() % rn->naddrs6 : 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3406
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3407 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	3408
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3409 do {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3410 sin6 = (struct sockaddr_in6 *) sockaddr[d];
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3411 sin6->sin6_family = AF_INET6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3412 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	3413 dst[d].sockaddr = (struct sockaddr *) sin6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3414 dst[d++].socklen = sizeof(struct sockaddr_in6);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3415
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3416 if (d == n) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3417 d = 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3418 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3419
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3420 if (j == rn->naddrs6) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3421 j = 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3422 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3423 } while (++i < n);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3424 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3425 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3426
4871 c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	3427 return dst;
c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	3428 }
c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	3429
c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	3430
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3431 char *
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3432 ngx_resolver_strerror(ngx_int_t err)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3433 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3434 static char *errors[] = {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3435 "Format error", /* FORMERR */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3436 "Server failure", /* SERVFAIL */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3437 "Host not found", /* NXDOMAIN */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3438 "Unimplemented", /* NOTIMP */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3439 "Operation refused" /* REFUSED */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3440 };
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3441
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3442 if (err > 0 && err < 6) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3443 return errors[err - 1];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3444 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3445
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3446 if (err == NGX_RESOLVE_TIMEDOUT) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3447 return "Operation timed out";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3448 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3449
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3450 return "Unknown error";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3451 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3452
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3453
3408 71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3454 static u_char *
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3455 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	3456 {
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3457 u_char *p;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3458 ngx_resolver_connection_t *rec;
3408 71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3459
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3460 p = buf;
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3461
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3462 if (log->action) {
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3463 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	3464 len -= p - buf;
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3465 }
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3466
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3467 rec = log->data;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3468
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3469 if (rec) {
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3470 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	3471 }
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3472
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3473 return p;
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3474 }
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3475
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	3476
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3477 ngx_int_t
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3478 ngx_udp_connect(ngx_resolver_connection_t *rec)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3479 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3480 int rc;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3481 ngx_int_t event;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3482 ngx_event_t rev, wev;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3483 ngx_socket_t s;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3484 ngx_connection_t *c;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3485
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3486 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	3487
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3488 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	3489
5360 3d2d3e1cf427 Win32: MinGW GCC compatibility. Maxim Dounin <mdounin@mdounin.ru> parents: 4892 diff changeset	3490 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	3491 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	3492 ngx_socket_n " failed");
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3493 return NGX_ERROR;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3494 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3495
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3496 c = ngx_get_connection(s, &rec->log);
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3497
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3498 if (c == NULL) {
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3499 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	3500 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	3501 ngx_close_socket_n "failed");
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3502 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3503
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3504 return NGX_ERROR;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3505 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3506
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3507 if (ngx_nonblocking(s) == -1) {
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3508 ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3509 ngx_nonblocking_n " failed");
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3510
5582 545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	3511 goto failed;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3512 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3513
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3514 rev = c->read;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3515 wev = c->write;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3516
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3517 rev->log = &rec->log;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3518 wev->log = &rec->log;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3519
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3520 rec->udp = c;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3521
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3522 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	3523
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3524 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	3525 "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	3526
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3527 rc = connect(s, rec->sockaddr, rec->socklen);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3528
6125 4dc8e7b62216 Removed the obsolete aio module. Ruslan Ermilov <ru@nginx.com> parents: 5921 diff changeset	3529 /* TODO: iocp */
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3530
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3531 if (rc == -1) {
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3532 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	3533 "connect() failed");
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3534
5582 545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	3535 goto failed;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3536 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3537
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3538 /* UDP sockets are always ready to write */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3539 wev->ready = 1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3540
6126 adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	3541 event = (ngx_event_flags & NGX_USE_CLEAR_EVENT) ?
adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	3542 /* kqueue, epoll */ NGX_CLEAR_EVENT:
adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	3543 /* select, poll, /dev/poll */ NGX_LEVEL_EVENT;
adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	3544 /* eventport event type has no meaning: oneshot only */
adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	3545
adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	3546 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	3547 goto failed;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3548 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3549
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3550 return NGX_OK;
5582 545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	3551
545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	3552 failed:
545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	3553
545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	3554 ngx_close_connection(c);
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	3555 rec->udp = NULL;
5582 545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	3556
545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	3557 return NGX_ERROR;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3558 }
6367 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
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3561 ngx_int_t
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3562 ngx_tcp_connect(ngx_resolver_connection_t *rec)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3563 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3564 int rc;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3565 ngx_int_t event;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3566 ngx_err_t err;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3567 ngx_uint_t level;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3568 ngx_socket_t s;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3569 ngx_event_t rev, wev;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3570 ngx_connection_t *c;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3571
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3572 s = ngx_socket(rec->sockaddr->sa_family, SOCK_STREAM, 0);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3573
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3574 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	3575
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3576 if (s == (ngx_socket_t) -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3577 ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3578 ngx_socket_n " failed");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3579 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3580 }
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 c = ngx_get_connection(s, &rec->log);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3583
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3584 if (c == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3585 if (ngx_close_socket(s) == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3586 ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3587 ngx_close_socket_n "failed");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3588 }
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 return NGX_ERROR;
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
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3593 if (ngx_nonblocking(s) == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3594 ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3595 ngx_nonblocking_n " failed");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3596
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3597 goto failed;
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
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3600 rev = c->read;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3601 wev = c->write;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3602
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3603 rev->log = &rec->log;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3604 wev->log = &rec->log;
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 rec->tcp = c;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3607
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3608 c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3609
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3610 if (ngx_add_conn) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3611 if (ngx_add_conn(c) == NGX_ERROR) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3612 goto failed;
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 }
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 ngx_log_debug3(NGX_LOG_DEBUG_EVENT, &rec->log, 0,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3617 "connect to %V, fd:%d #%uA", &rec->server, s, c->number);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3618
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3619 rc = connect(s, rec->sockaddr, rec->socklen);
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 (rc == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3622 err = ngx_socket_errno;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3623
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3624
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3625 if (err != NGX_EINPROGRESS
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3626 #if (NGX_WIN32)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3627 /* Winsock returns WSAEWOULDBLOCK (NGX_EAGAIN) */
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3628 && err != NGX_EAGAIN
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3629 #endif
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 if (err == NGX_ECONNREFUSED
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3633 #if (NGX_LINUX)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3634 /*
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3635 * Linux returns EAGAIN instead of ECONNREFUSED
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3636 * for unix sockets if listen queue is full
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 \|\| err == NGX_EAGAIN
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3639 #endif
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3640 \|\| err == NGX_ECONNRESET
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3641 \|\| err == NGX_ENETDOWN
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3642 \|\| err == NGX_ENETUNREACH
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3643 \|\| err == NGX_EHOSTDOWN
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3644 \|\| err == NGX_EHOSTUNREACH)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3645 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3646 level = NGX_LOG_ERR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3647
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3648 } else {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3649 level = NGX_LOG_CRIT;
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
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3652 ngx_log_error(level, c->log, err, "connect() to %V failed",
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3653 &rec->server);
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 ngx_close_connection(c);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3656 rec->tcp = NULL;
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 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3659 }
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 (ngx_add_conn) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3663 if (rc == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3664
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3665 /* NGX_EINPROGRESS */
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3666
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3667 return NGX_AGAIN;
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 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, &rec->log, 0, "connected");
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 wev->ready = 1;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3673
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3674 return NGX_OK;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3675 }
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 if (ngx_event_flags & NGX_USE_IOCP_EVENT) {
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 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	3680 "connect(): %d", rc);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3681
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3682 if (ngx_blocking(s) == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3683 ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3684 ngx_blocking_n " failed");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3685 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3686 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3687
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3688 /*
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3689 * 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	3690 * NT does not support it.
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3691 *
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3692 * 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	3693 */
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3694
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3695 rev->ready = 1;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3696 wev->ready = 1;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3697
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3698 return NGX_OK;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3699 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3700
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3701 if (ngx_event_flags & NGX_USE_CLEAR_EVENT) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3702
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3703 /* kqueue */
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3704
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3705 event = NGX_CLEAR_EVENT;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3706
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3707 } else {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3708
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3709 /* select, poll, /dev/poll */
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3710
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3711 event = NGX_LEVEL_EVENT;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3712 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3713
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3714 if (ngx_add_event(rev, NGX_READ_EVENT, event) != NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3715 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3716 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3717
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3718 if (rc == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3719
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3720 /* NGX_EINPROGRESS */
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3721
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3722 if (ngx_add_event(wev, NGX_WRITE_EVENT, event) != NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3723 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3724 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3725
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3726 return NGX_AGAIN;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3727 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3728
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3729 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, &rec->log, 0, "connected");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3730
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3731 wev->ready = 1;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3732
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3733 return NGX_OK;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3734
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3735 failed:
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3736
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3737 ngx_close_connection(c);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3738 rec->tcp = NULL;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3739
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3740 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	3741 }

Mercurial > hg > nginx

annotate src/core/ngx_resolver.c @ 6457:a6711b85da83