nginx: src/core/ngx_resolver.c annotate

annotate src/core/ngx_resolver.c @ 7312:54683f650cbd

Resolver: retry sending queries on errors (ticket #1511). Errors when sending UDP datagrams can happen, e.g., when local IP address changes (see fa0e093b64d7), or an unavailable DNS server on the LAN can cause send() to fail with EHOSTDOWN on BSD systems. If this happens during initial query, retry sending immediately, to a different DNS server when possible. If this is not enough, allow normal resend to happen by ignoring the return code of the second ngx_resolver_send_query() call, much like we do in ngx_resolver_resend().

author	Maxim Dounin <mdounin@mdounin.ru>
date	Thu, 05 Jul 2018 22:21:14 +0300
parents	faf14dc9ab4d
children	cbc5dee8d5d2

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
6922 a72886067bbb Added missing static specifiers. Eran Kornblau <erankor@gmail.com> parents: 6860 diff changeset	59 static ngx_int_t ngx_udp_connect(ngx_resolver_connection_t *rec);
a72886067bbb Added missing static specifiers. Eran Kornblau <erankor@gmail.com> parents: 6860 diff changeset	60 static 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);
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	77 static ngx_int_t ngx_resolver_create_srv_query(ngx_resolver_t *r,
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	78 ngx_resolver_node_t rn, ngx_str_t name);
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	79 static ngx_int_t ngx_resolver_create_addr_query(ngx_resolver_t *r,
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	80 ngx_resolver_node_t rn, ngx_resolver_addr_t addr);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	81 static void ngx_resolver_resend_handler(ngx_event_t *ev);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	82 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	83 ngx_queue_t *queue);
6196 c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	84 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	85 static void ngx_resolver_udp_read(ngx_event_t *rev);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	86 static void ngx_resolver_tcp_write(ngx_event_t *wev);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	87 static void ngx_resolver_tcp_read(ngx_event_t *rev);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	88 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	89 size_t n, ngx_uint_t tcp);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	90 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	91 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	92 ngx_uint_t nan, ngx_uint_t trunc, ngx_uint_t ans);
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	93 static void ngx_resolver_process_srv(ngx_resolver_t r, u_char buf, size_t n,
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	94 ngx_uint_t ident, ngx_uint_t code, ngx_uint_t nan,
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	95 ngx_uint_t trunc, ngx_uint_t ans);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	96 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	97 ngx_uint_t ident, ngx_uint_t code, ngx_uint_t nan);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	98 static ngx_resolver_node_t ngx_resolver_lookup_name(ngx_resolver_t r,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	99 ngx_str_t *name, uint32_t hash);
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	100 static ngx_resolver_node_t ngx_resolver_lookup_srv(ngx_resolver_t r,
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	101 ngx_str_t *name, uint32_t hash);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	102 static ngx_resolver_node_t ngx_resolver_lookup_addr(ngx_resolver_t r,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	103 in_addr_t addr);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	104 static void ngx_resolver_rbtree_insert_value(ngx_rbtree_node_t *temp,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	105 ngx_rbtree_node_t node, ngx_rbtree_node_t sentinel);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	106 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	107 u_char buf, u_char src, u_char *last);
7051 137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	108 static ngx_int_t ngx_resolver_set_timeout(ngx_resolver_t *r,
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	109 ngx_resolver_ctx_t *ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	110 static void ngx_resolver_timeout_handler(ngx_event_t *ev);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	111 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	112 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	113 static void ngx_resolver_calloc(ngx_resolver_t r, size_t size);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	114 static void ngx_resolver_free(ngx_resolver_t r, void p);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	115 static void ngx_resolver_free_locked(ngx_resolver_t r, void p);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	116 static void ngx_resolver_dup(ngx_resolver_t r, void *src, size_t size);
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	117 static ngx_resolver_addr_t ngx_resolver_export(ngx_resolver_t r,
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	118 ngx_resolver_node_t *rn, ngx_uint_t rotate);
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	119 static void ngx_resolver_report_srv(ngx_resolver_t r, ngx_resolver_ctx_t ctx);
3408 71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	120 static u_char ngx_resolver_log_error(ngx_log_t log, u_char *buf, size_t len);
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	121 static void ngx_resolver_resolve_srv_names(ngx_resolver_ctx_t *ctx,
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	122 ngx_resolver_node_t *rn);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	123 static void ngx_resolver_srv_names_handler(ngx_resolver_ctx_t *ctx);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	124 static ngx_int_t ngx_resolver_cmp_srvs(const void one, const void two);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	125
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	126 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	127 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	128 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	129 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	130 struct in6_addr *addr, uint32_t hash);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	131 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	132
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	133
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	134 ngx_resolver_t *
4225 016352c19049 Support of several servers in the "resolver" directive. Igor Sysoev <igor@sysoev.ru> parents: 3902 diff changeset	135 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	136 {
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	137 ngx_str_t s;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	138 ngx_url_t u;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	139 ngx_uint_t i, j;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	140 ngx_resolver_t *r;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	141 ngx_pool_cleanup_t *cln;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	142 ngx_resolver_connection_t *rec;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	143
7298 f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	144 r = ngx_pcalloc(cf->pool, sizeof(ngx_resolver_t));
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	145 if (r == NULL) {
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	146 return NULL;
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	147 }
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	148
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	149 r->event = ngx_pcalloc(cf->pool, sizeof(ngx_event_t));
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	150 if (r->event == NULL) {
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	151 return NULL;
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	152 }
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	153
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	154 cln = ngx_pool_cleanup_add(cf->pool, 0);
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	155 if (cln == NULL) {
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	156 return NULL;
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	157 }
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	158
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	159 cln->handler = ngx_resolver_cleanup;
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	160 cln->data = r;
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	161
1687 568d432effb9 use ngx_rbtree_init() Igor Sysoev <igor@sysoev.ru> parents: 1685 diff changeset	162 ngx_rbtree_init(&r->name_rbtree, &r->name_sentinel,
568d432effb9 use ngx_rbtree_init() Igor Sysoev <igor@sysoev.ru> parents: 1685 diff changeset	163 ngx_resolver_rbtree_insert_value);
568d432effb9 use ngx_rbtree_init() Igor Sysoev <igor@sysoev.ru> parents: 1685 diff changeset	164
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	165 ngx_rbtree_init(&r->srv_rbtree, &r->srv_sentinel,
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	166 ngx_resolver_rbtree_insert_value);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	167
1687 568d432effb9 use ngx_rbtree_init() Igor Sysoev <igor@sysoev.ru> parents: 1685 diff changeset	168 ngx_rbtree_init(&r->addr_rbtree, &r->addr_sentinel,
568d432effb9 use ngx_rbtree_init() Igor Sysoev <igor@sysoev.ru> parents: 1685 diff changeset	169 ngx_rbtree_insert_value);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	170
1685 a24c909ad879 use ngx_queue_init() Igor Sysoev <igor@sysoev.ru> parents: 1683 diff changeset	171 ngx_queue_init(&r->name_resend_queue);
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	172 ngx_queue_init(&r->srv_resend_queue);
1685 a24c909ad879 use ngx_queue_init() Igor Sysoev <igor@sysoev.ru> parents: 1683 diff changeset	173 ngx_queue_init(&r->addr_resend_queue);
a24c909ad879 use ngx_queue_init() Igor Sysoev <igor@sysoev.ru> parents: 1683 diff changeset	174
a24c909ad879 use ngx_queue_init() Igor Sysoev <igor@sysoev.ru> parents: 1683 diff changeset	175 ngx_queue_init(&r->name_expire_queue);
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	176 ngx_queue_init(&r->srv_expire_queue);
1685 a24c909ad879 use ngx_queue_init() Igor Sysoev <igor@sysoev.ru> parents: 1683 diff changeset	177 ngx_queue_init(&r->addr_expire_queue);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	178
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	179 #if (NGX_HAVE_INET6)
5478 3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	180 r->ipv6 = 1;
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	181
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	182 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	183 ngx_resolver_rbtree_insert_addr6_value);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	184
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	185 ngx_queue_init(&r->addr6_resend_queue);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	186
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	187 ngx_queue_init(&r->addr6_expire_queue);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	188 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	189
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	190 r->event->handler = ngx_resolver_resend_handler;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	191 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	192 r->event->log = &cf->cycle->new_log;
7052 70e65bf8dfd7 Resolver: cancelable resend timer event. Ruslan Ermilov <ru@nginx.com> parents: 7051 diff changeset	193 r->event->cancelable = 1;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	194 r->ident = -1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	195
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	196 r->resend_timeout = 5;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	197 r->tcp_timeout = 5;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	198 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	199 r->valid = 0;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	200
2785 d478379e51ac ) refactor error_log processing: listen socket log might inherit built-in Igor Sysoev <igor@sysoev.ru>* parents: 2490 diff changeset	201 r->log = &cf->cycle->new_log;
3763 beca53d6ab3c decrease resolver errors level to error Igor Sysoev <igor@sysoev.ru> parents: 3642 diff changeset	202 r->log_level = NGX_LOG_ERR;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	203
4784 dd63abf20ba7 Resolver: fixed possible memory leak in ngx_resolver_create(). Maxim Dounin <mdounin@mdounin.ru> parents: 4684 diff changeset	204 if (n) {
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	205 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	206 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	207 != NGX_OK)
dd63abf20ba7 Resolver: fixed possible memory leak in ngx_resolver_create(). Maxim Dounin <mdounin@mdounin.ru> parents: 4684 diff changeset	208 {
dd63abf20ba7 Resolver: fixed possible memory leak in ngx_resolver_create(). Maxim Dounin <mdounin@mdounin.ru> parents: 4684 diff changeset	209 return NULL;
dd63abf20ba7 Resolver: fixed possible memory leak in ngx_resolver_create(). Maxim Dounin <mdounin@mdounin.ru> parents: 4684 diff changeset	210 }
dd63abf20ba7 Resolver: fixed possible memory leak in ngx_resolver_create(). Maxim Dounin <mdounin@mdounin.ru> parents: 4684 diff changeset	211 }
dd63abf20ba7 Resolver: fixed possible memory leak in ngx_resolver_create(). Maxim Dounin <mdounin@mdounin.ru> parents: 4684 diff changeset	212
4225 016352c19049 Support of several servers in the "resolver" directive. Igor Sysoev <igor@sysoev.ru> parents: 3902 diff changeset	213 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	214 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	215 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	216 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	217
05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	218 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	219
4474 41f640a693de Time parsing cleanup. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	220 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	221 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	222 "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	223 return NULL;
05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	224 }
05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	225
05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	226 continue;
05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	227 }
05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	228
5478 3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	229 #if (NGX_HAVE_INET6)
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	230 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	231
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	232 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	233 r->ipv6 = 1;
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	234
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	235 } 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	236 r->ipv6 = 0;
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	237
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	238 } else {
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	239 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	240 "invalid parameter: %V", &names[i]);
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	241 return NULL;
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	242 }
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	243
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	244 continue;
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	245 }
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	246 #endif
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	247
4225 016352c19049 Support of several servers in the "resolver" directive. Igor Sysoev <igor@sysoev.ru> parents: 3902 diff changeset	248 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	249
4671 af9342747669 Support for IPv6 literals and an optional port in resolver. Ruslan Ermilov <ru@nginx.com> parents: 4653 diff changeset	250 u.url = names[i];
af9342747669 Support for IPv6 literals and an optional port in resolver. Ruslan Ermilov <ru@nginx.com> parents: 4653 diff changeset	251 u.default_port = 53;
af9342747669 Support for IPv6 literals and an optional port in resolver. Ruslan Ermilov <ru@nginx.com> parents: 4653 diff changeset	252
af9342747669 Support for IPv6 literals and an optional port in resolver. Ruslan Ermilov <ru@nginx.com> parents: 4653 diff changeset	253 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	254 if (u.err) {
bc5f881323b8 Fixed potential null pointer dereference in ngx_resolver_create(). Ruslan Ermilov <ru@nginx.com> parents: 4619 diff changeset	255 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	256 "%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	257 u.err, &u.url);
4643 bc5f881323b8 Fixed potential null pointer dereference in ngx_resolver_create(). Ruslan Ermilov <ru@nginx.com> parents: 4619 diff changeset	258 }
bc5f881323b8 Fixed potential null pointer dereference in ngx_resolver_create(). Ruslan Ermilov <ru@nginx.com> parents: 4619 diff changeset	259
4225 016352c19049 Support of several servers in the "resolver" directive. Igor Sysoev <igor@sysoev.ru> parents: 3902 diff changeset	260 return NULL;
016352c19049 Support of several servers in the "resolver" directive. Igor Sysoev <igor@sysoev.ru> parents: 3902 diff changeset	261 }
016352c19049 Support of several servers in the "resolver" directive. Igor Sysoev <igor@sysoev.ru> parents: 3902 diff changeset	262
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	263 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	264 if (rec == NULL) {
1683 1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1679 diff changeset	265 return NULL;
1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1679 diff changeset	266 }
1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1679 diff changeset	267
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	268 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	269
f5c2c9d656f9 When "resolver" is configured with a domain name, only the first Ruslan Ermilov <ru@nginx.com> parents: 4683 diff changeset	270 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	271 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	272 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	273 rec[j].server = u.addrs[j].name;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	274 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	275 }
1683 1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1679 diff changeset	276 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	277
7299 faf14dc9ab4d Resolver: require name servers. Ruslan Ermilov <ru@nginx.com> parents: 7298 diff changeset	278 if (n && r->connections.nelts == 0) {
faf14dc9ab4d Resolver: require name servers. Ruslan Ermilov <ru@nginx.com> parents: 7298 diff changeset	279 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "no name servers defined");
faf14dc9ab4d Resolver: require name servers. Ruslan Ermilov <ru@nginx.com> parents: 7298 diff changeset	280 return NULL;
faf14dc9ab4d Resolver: require name servers. Ruslan Ermilov <ru@nginx.com> parents: 7298 diff changeset	281 }
faf14dc9ab4d Resolver: require name servers. Ruslan Ermilov <ru@nginx.com> parents: 7298 diff changeset	282
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	283 return r;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	284 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	285
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	286
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	287 static void
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	288 ngx_resolver_cleanup(void *data)
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	289 {
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	290 ngx_resolver_t *r = data;
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	291
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	292 ngx_uint_t i;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	293 ngx_resolver_connection_t *rec;
4225 016352c19049 Support of several servers in the "resolver" directive. Igor Sysoev <igor@sysoev.ru> parents: 3902 diff changeset	294
7298 f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	295 ngx_log_debug0(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0, "cleanup resolver");
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	296
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	297 ngx_resolver_cleanup_tree(r, &r->name_rbtree);
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	298
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	299 ngx_resolver_cleanup_tree(r, &r->srv_rbtree);
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	300
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	301 ngx_resolver_cleanup_tree(r, &r->addr_rbtree);
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	302
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	303 #if (NGX_HAVE_INET6)
7298 f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	304 ngx_resolver_cleanup_tree(r, &r->addr6_rbtree);
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	305 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	306
7298 f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	307 if (r->event->timer_set) {
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	308 ngx_del_timer(r->event);
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	309 }
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	310
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	311 rec = r->connections.elts;
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	312
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	313 for (i = 0; i < r->connections.nelts; i++) {
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	314 if (rec[i].udp) {
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	315 ngx_close_connection(rec[i].udp);
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	316 }
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	317
7298 f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	318 if (rec[i].tcp) {
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	319 ngx_close_connection(rec[i].tcp);
1906 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
7298 f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	322 if (rec[i].read_buf) {
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	323 ngx_resolver_free(r, rec[i].read_buf->start);
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	324 ngx_resolver_free(r, rec[i].read_buf);
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	325 }
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	326
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	327 if (rec[i].write_buf) {
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	328 ngx_resolver_free(r, rec[i].write_buf->start);
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	329 ngx_resolver_free(r, rec[i].write_buf);
f37d8fb25de5 Resolver: allocate resolver from configuration pool. Ruslan Ermilov <ru@nginx.com> parents: 7290 diff changeset	330 }
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	331 }
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
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	335 static void
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	336 ngx_resolver_cleanup_tree(ngx_resolver_t r, ngx_rbtree_t tree)
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	337 {
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	338 ngx_resolver_ctx_t ctx, next;
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	339 ngx_resolver_node_t *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 while (tree->root != tree->sentinel) {
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	342
5921 5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	343 rn = ngx_resolver_node(ngx_rbtree_min(tree->root, tree->sentinel));
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	344
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	345 ngx_queue_remove(&rn->queue);
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	346
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	347 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	348 next = ctx->next;
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	349
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	350 if (ctx->event) {
6844 259e2a76e8fb Resolver: fixed possible use-after-free in worker on fast shutdown. Ruslan Ermilov <ru@nginx.com> parents: 6843 diff changeset	351 if (ctx->event->timer_set) {
259e2a76e8fb Resolver: fixed possible use-after-free in worker on fast shutdown. Ruslan Ermilov <ru@nginx.com> parents: 6843 diff changeset	352 ngx_del_timer(ctx->event);
259e2a76e8fb Resolver: fixed possible use-after-free in worker on fast shutdown. Ruslan Ermilov <ru@nginx.com> parents: 6843 diff changeset	353 }
259e2a76e8fb Resolver: fixed possible use-after-free in worker on fast shutdown. Ruslan Ermilov <ru@nginx.com> parents: 6843 diff changeset	354
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	355 ngx_resolver_free(r, ctx->event);
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	356 }
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	357
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	358 ngx_resolver_free(r, ctx);
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	359 }
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	360
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	361 ngx_rbtree_delete(tree, &rn->node);
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	362
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	363 ngx_resolver_free_node(r, rn);
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	364 }
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	365 }
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	366
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	367
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	368 ngx_resolver_ctx_t *
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	369 ngx_resolve_start(ngx_resolver_t r, ngx_resolver_ctx_t temp)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	370 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	371 in_addr_t addr;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	372 ngx_resolver_ctx_t *ctx;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	373
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	374 if (temp) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	375 addr = ngx_inet_addr(temp->name.data, temp->name.len);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	376
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	377 if (addr != INADDR_NONE) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	378 temp->resolver = r;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	379 temp->state = NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	380 temp->naddrs = 1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	381 temp->addrs = &temp->addr;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	382 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	383 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	384 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	385 temp->sin.sin_family = AF_INET;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	386 temp->sin.sin_addr.s_addr = addr;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	387 temp->quick = 1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	388
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	389 return temp;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	390 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	391 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	392
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	393 if (r->connections.nelts == 0) {
1683 1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1679 diff changeset	394 return NGX_NO_RESOLVER;
1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1679 diff changeset	395 }
1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1679 diff changeset	396
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	397 ctx = ngx_resolver_calloc(r, sizeof(ngx_resolver_ctx_t));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	398
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	399 if (ctx) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	400 ctx->resolver = r;
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 return ctx;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	404 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	405
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	406
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	407 ngx_int_t
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	408 ngx_resolve_name(ngx_resolver_ctx_t *ctx)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	409 {
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	410 size_t slen;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	411 ngx_int_t rc;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	412 ngx_str_t name;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	413 ngx_resolver_t *r;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	414
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	415 r = ctx->resolver;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	416
5505 d091d16ed398 Resolver: added support for domain names with a trailing dot. Yichun Zhang <agentzh@gmail.com> parents: 5485 diff changeset	417 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	418 ctx->name.len--;
d091d16ed398 Resolver: added support for domain names with a trailing dot. Yichun Zhang <agentzh@gmail.com> parents: 5485 diff changeset	419 }
d091d16ed398 Resolver: added support for domain names with a trailing dot. Yichun Zhang <agentzh@gmail.com> parents: 5485 diff changeset	420
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	421 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	422 "resolve: \"%V\"", &ctx->name);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	423
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	424 if (ctx->quick) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	425 ctx->handler(ctx);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	426 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	427 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	428
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	429 if (ctx->service.len) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	430 slen = ctx->service.len;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	431
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	432 if (ngx_strlchr(ctx->service.data,
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	433 ctx->service.data + ctx->service.len, '.')
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	434 == NULL)
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	435 {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	436 slen += sizeof("_._tcp") - 1;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	437 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	438
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	439 name.len = slen + 1 + ctx->name.len;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	440
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	441 name.data = ngx_resolver_alloc(r, name.len);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	442 if (name.data == NULL) {
7039 a39bc74873fa Resolver: fixed allocation error handling while resolving SRV. Bart Warmerdam <bartw@xs4all.nl> parents: 6922 diff changeset	443 goto failed;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	444 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	445
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	446 if (slen == ctx->service.len) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	447 ngx_sprintf(name.data, "%V.%V", &ctx->service, &ctx->name);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	448
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	449 } else {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	450 ngx_sprintf(name.data, "_%V._tcp.%V", &ctx->service, &ctx->name);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	451 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	452
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	453 /* lock name mutex */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	454
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	455 rc = ngx_resolve_name_locked(r, ctx, &name);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	456
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	457 ngx_resolver_free(r, name.data);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	458
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	459 } else {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	460 /* lock name mutex */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	461
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	462 rc = ngx_resolve_name_locked(r, ctx, &ctx->name);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	463 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	464
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	465 if (rc == NGX_OK) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	466 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	467 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	468
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	469 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	470
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	471 if (rc == NGX_AGAIN) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	472 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	473 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	474
1904 538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	475 /* NGX_ERROR */
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	476
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	477 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	478 ngx_resolver_free(r, ctx->event);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	479 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	480
7039 a39bc74873fa Resolver: fixed allocation error handling while resolving SRV. Bart Warmerdam <bartw@xs4all.nl> parents: 6922 diff changeset	481 failed:
a39bc74873fa Resolver: fixed allocation error handling while resolving SRV. Bart Warmerdam <bartw@xs4all.nl> parents: 6922 diff changeset	482
1904 538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	483 ngx_resolver_free(r, ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	484
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	485 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	486 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	487
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	488
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	489 void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	490 ngx_resolve_name_done(ngx_resolver_ctx_t *ctx)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	491 {
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	492 ngx_uint_t i;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	493 ngx_resolver_t *r;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	494 ngx_resolver_ctx_t w, *p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	495 ngx_resolver_node_t *rn;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	496
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	497 r = ctx->resolver;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	498
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	499 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	500 "resolve name done: %i", ctx->state);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	501
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	502 if (ctx->quick) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	503 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	504 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	505
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	506 if (ctx->event && ctx->event->timer_set) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	507 ngx_del_timer(ctx->event);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	508 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	509
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	510 /* lock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	511
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	512 if (ctx->nsrvs) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	513 for (i = 0; i < ctx->nsrvs; i++) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	514 if (ctx->srvs[i].ctx) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	515 ngx_resolve_name_done(ctx->srvs[i].ctx);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	516 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	517
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	518 if (ctx->srvs[i].addrs) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	519 ngx_resolver_free(r, ctx->srvs[i].addrs->sockaddr);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	520 ngx_resolver_free(r, ctx->srvs[i].addrs);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	521 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	522
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	523 ngx_resolver_free(r, ctx->srvs[i].name.data);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	524 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	525
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	526 ngx_resolver_free(r, ctx->srvs);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	527 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	528
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	529 if (ctx->state == NGX_AGAIN \|\| ctx->state == NGX_RESOLVE_TIMEDOUT) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	530
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	531 rn = ctx->node;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	532
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	533 if (rn) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	534 p = &rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	535 w = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	536
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	537 while (w) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	538 if (w == ctx) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	539 *p = w->next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	540
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	541 goto done;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	542 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	543
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	544 p = &w->next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	545 w = w->next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	546 }
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	547
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	548 ngx_log_error(NGX_LOG_ALERT, r->log, 0,
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	549 "could not cancel %V resolving", &ctx->name);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	550 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	551 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	552
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	553 done:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	554
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	555 if (ctx->service.len) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	556 ngx_resolver_expire(r, &r->srv_rbtree, &r->srv_expire_queue);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	557
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	558 } else {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	559 ngx_resolver_expire(r, &r->name_rbtree, &r->name_expire_queue);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	560 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	561
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	562 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	563
1904 538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	564 /* 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	565
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	566 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	567 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	568 }
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	569
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	570 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	571
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	572 /* unlock alloc mutex */
6196 c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	573
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	574 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	575 ngx_del_timer(r->event);
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	576 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	577 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	578
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	579
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	580 static ngx_int_t
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	581 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	582 ngx_str_t *name)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	583 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	584 uint32_t hash;
1961 99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	585 ngx_int_t rc;
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	586 ngx_str_t cname;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	587 ngx_uint_t i, naddrs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	588 ngx_queue_t resend_queue, expire_queue;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	589 ngx_rbtree_t *tree;
6349 978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	590 ngx_resolver_ctx_t next, last;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	591 ngx_resolver_addr_t *addrs;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	592 ngx_resolver_node_t *rn;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	593
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	594 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	595
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	596 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	597
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	598 if (ctx->service.len) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	599 rn = ngx_resolver_lookup_srv(r, name, hash);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	600
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	601 tree = &r->srv_rbtree;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	602 resend_queue = &r->srv_resend_queue;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	603 expire_queue = &r->srv_expire_queue;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	604
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	605 } else {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	606 rn = ngx_resolver_lookup_name(r, name, hash);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	607
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	608 tree = &r->name_rbtree;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	609 resend_queue = &r->name_resend_queue;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	610 expire_queue = &r->name_expire_queue;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	611 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	612
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	613 if (rn) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	614
6349 978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	615 /* 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	616 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	617
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	618 if (rn->valid >= ngx_time()) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	619
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	620 ngx_log_debug0(NGX_LOG_DEBUG_CORE, r->log, 0, "resolve cached");
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	621
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	622 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	623
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	624 rn->expire = ngx_time() + r->expire;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	625
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	626 ngx_queue_insert_head(expire_queue, &rn->queue);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	627
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	628 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	629 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	630 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	631 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	632
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	633 if (naddrs) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	634
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	635 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	636 addrs = NULL;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	637
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	638 } else {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	639 addrs = ngx_resolver_export(r, rn, 1);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	640 if (addrs == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	641 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	642 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	643 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	644
6349 978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	645 last->next = rn->waiting;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	646 rn->waiting = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	647
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	648 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	649
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	650 do {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	651 ctx->state = NGX_OK;
6456 c94aba230a5a Resolver: introduced valid field in resolver responses. Dmitry Volyntsev <xeioex@nginx.com> parents: 6372 diff changeset	652 ctx->valid = rn->valid;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	653 ctx->naddrs = naddrs;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	654
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	655 if (addrs == NULL) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	656 ctx->addrs = &ctx->addr;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	657 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	658 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	659 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	660 ctx->sin.sin_family = AF_INET;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	661 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	662
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	663 } else {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	664 ctx->addrs = addrs;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	665 }
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	666
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	667 next = ctx->next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	668
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	669 ctx->handler(ctx);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	670
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	671 ctx = next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	672 } while (ctx);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	673
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	674 if (addrs != NULL) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	675 ngx_resolver_free(r, addrs->sockaddr);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	676 ngx_resolver_free(r, addrs);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	677 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	678
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	679 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	680 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	681
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	682 if (rn->nsrvs) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	683 last->next = rn->waiting;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	684 rn->waiting = NULL;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	685
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	686 /* unlock name mutex */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	687
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	688 do {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	689 next = ctx->next;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	690
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	691 ngx_resolver_resolve_srv_names(ctx, rn);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	692
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	693 ctx = next;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	694 } while (ctx);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	695
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	696 return NGX_OK;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	697 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	698
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	699 /* NGX_RESOLVE_CNAME */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	700
1969 41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	701 if (ctx->recursion++ < NGX_RESOLVER_MAX_RECURSION) {
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	702
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	703 cname.len = rn->cnlen;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	704 cname.data = rn->u.cname;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	705
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	706 return ngx_resolve_name_locked(r, ctx, &cname);
1969 41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	707 }
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	708
6349 978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	709 last->next = rn->waiting;
1969 41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	710 rn->waiting = NULL;
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	711
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	712 /* unlock name mutex */
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	713
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	714 do {
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	715 ctx->state = NGX_RESOLVE_NXDOMAIN;
6456 c94aba230a5a Resolver: introduced valid field in resolver responses. Dmitry Volyntsev <xeioex@nginx.com> parents: 6372 diff changeset	716 ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
1969 41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	717 next = ctx->next;
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	718
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	719 ctx->handler(ctx);
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	720
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	721 ctx = next;
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	722 } while (ctx);
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	723
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	724 return NGX_OK;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	725 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	726
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	727 if (rn->waiting) {
7051 137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	728 if (ngx_resolver_set_timeout(r, ctx) != NGX_OK) {
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	729 return NGX_ERROR;
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	730 }
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	731
6349 978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	732 last->next = rn->waiting;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	733 rn->waiting = ctx;
3297 ebc5384479b4 fix segfault in resolver: Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	734 ctx->state = NGX_AGAIN;
7040 d49b74a683b1 Resolver: added the "async" flag to resolver context. Roman Arutyunyan <arut@nginx.com> parents: 7039 diff changeset	735 ctx->async = 1;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	736
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	737 do {
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	738 ctx->node = rn;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	739 ctx = ctx->next;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	740 } while (ctx);
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	741
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	742 return NGX_AGAIN;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	743 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	744
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	745 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	746
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	747 /* lock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	748
4619 3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	749 if (rn->query) {
3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	750 ngx_resolver_free_locked(r, rn->query);
3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	751 rn->query = NULL;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	752 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	753 rn->query6 = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	754 #endif
4619 3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	755 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	756
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	757 if (rn->cnlen) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	758 ngx_resolver_free_locked(r, rn->u.cname);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	759 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	760
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	761 if (rn->naddrs > 1 && rn->naddrs != (u_short) -1) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	762 ngx_resolver_free_locked(r, rn->u.addrs);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	763 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	764
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	765 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	766 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	767 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	768 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	769 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	770
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	771 if (rn->nsrvs) {
6860 f18c285c2e59 Win32: fixed some warnings reported by Borland C. Maxim Dounin <mdounin@mdounin.ru> parents: 6847 diff changeset	772 for (i = 0; i < (ngx_uint_t) rn->nsrvs; i++) {
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	773 if (rn->u.srvs[i].name.data) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	774 ngx_resolver_free_locked(r, rn->u.srvs[i].name.data);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	775 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	776 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	777
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	778 ngx_resolver_free_locked(r, rn->u.srvs);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	779 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	780
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	781 /* unlock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	782
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	783 } else {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	784
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	785 rn = ngx_resolver_alloc(r, sizeof(ngx_resolver_node_t));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	786 if (rn == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	787 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	788 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	789
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	790 rn->name = ngx_resolver_dup(r, name->data, name->len);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	791 if (rn->name == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	792 ngx_resolver_free(r, rn);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	793 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	794 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	795
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	796 rn->node.key = hash;
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	797 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	798 rn->query = NULL;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	799 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	800 rn->query6 = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	801 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	802
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	803 ngx_rbtree_insert(tree, &rn->node);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	804 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	805
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	806 if (ctx->service.len) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	807 rc = ngx_resolver_create_srv_query(r, rn, name);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	808
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	809 } else {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	810 rc = ngx_resolver_create_name_query(r, rn, name);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	811 }
1961 99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	812
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	813 if (rc == NGX_ERROR) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	814 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	815 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	816
1961 99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	817 if (rc == NGX_DECLINED) {
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	818 ngx_rbtree_delete(tree, &rn->node);
1961 99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	819
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	820 ngx_resolver_free(r, rn->query);
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	821 ngx_resolver_free(r, rn->name);
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	822 ngx_resolver_free(r, rn);
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	823
6349 978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	824 do {
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	825 ctx->state = NGX_RESOLVE_NXDOMAIN;
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	826 next = ctx->next;
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	827
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	828 ctx->handler(ctx);
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	829
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	830 ctx = next;
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	831 } while (ctx);
1961 99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	832
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	833 return NGX_OK;
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	834 }
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	835
6366 2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	836 rn->last_connection = r->last_connection++;
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	837 if (r->last_connection == r->connections.nelts) {
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	838 r->last_connection = 0;
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	839 }
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	840
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	841 rn->naddrs = (u_short) -1;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	842 rn->tcp = 0;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	843 #if (NGX_HAVE_INET6)
5478 3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	844 rn->naddrs6 = r->ipv6 ? (u_short) -1 : 0;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	845 rn->tcp6 = 0;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	846 #endif
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	847 rn->nsrvs = 0;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	848
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	849 if (ngx_resolver_send_query(r, rn) != NGX_OK) {
7312 54683f650cbd Resolver: retry sending queries on errors (ticket #1511). Maxim Dounin <mdounin@mdounin.ru> parents: 7299 diff changeset	850
54683f650cbd Resolver: retry sending queries on errors (ticket #1511). Maxim Dounin <mdounin@mdounin.ru> parents: 7299 diff changeset	851 /* immediately retry once on failure */
54683f650cbd Resolver: retry sending queries on errors (ticket #1511). Maxim Dounin <mdounin@mdounin.ru> parents: 7299 diff changeset	852
54683f650cbd Resolver: retry sending queries on errors (ticket #1511). Maxim Dounin <mdounin@mdounin.ru> parents: 7299 diff changeset	853 rn->last_connection++;
54683f650cbd Resolver: retry sending queries on errors (ticket #1511). Maxim Dounin <mdounin@mdounin.ru> parents: 7299 diff changeset	854 if (rn->last_connection == r->connections.nelts) {
54683f650cbd Resolver: retry sending queries on errors (ticket #1511). Maxim Dounin <mdounin@mdounin.ru> parents: 7299 diff changeset	855 rn->last_connection = 0;
54683f650cbd Resolver: retry sending queries on errors (ticket #1511). Maxim Dounin <mdounin@mdounin.ru> parents: 7299 diff changeset	856 }
54683f650cbd Resolver: retry sending queries on errors (ticket #1511). Maxim Dounin <mdounin@mdounin.ru> parents: 7299 diff changeset	857
54683f650cbd Resolver: retry sending queries on errors (ticket #1511). Maxim Dounin <mdounin@mdounin.ru> parents: 7299 diff changeset	858 (void) ngx_resolver_send_query(r, rn);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	859 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	860
7051 137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	861 if (ngx_resolver_set_timeout(r, ctx) != NGX_OK) {
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	862 goto failed;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	863 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	864
6846 c3a895b94d3f Resolver: fixed a race between parallel name and addr resolves. Dmitry Volyntsev <xeioex@nginx.com> parents: 6845 diff changeset	865 if (ngx_resolver_resend_empty(r)) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	866 ngx_add_timer(r->event, (ngx_msec_t) (r->resend_timeout * 1000));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	867 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	868
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	869 rn->expire = ngx_time() + r->resend_timeout;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	870
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	871 ngx_queue_insert_head(resend_queue, &rn->queue);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	872
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	873 rn->code = 0;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	874 rn->cnlen = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	875 rn->valid = 0;
5485 8958656a8060 Resolver: use minimum TTL for caching (ticket #329). Ruslan Ermilov <ru@nginx.com> parents: 5479 diff changeset	876 rn->ttl = NGX_MAX_UINT32_VALUE;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	877 rn->waiting = ctx;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	878
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	879 ctx->state = NGX_AGAIN;
7040 d49b74a683b1 Resolver: added the "async" flag to resolver context. Roman Arutyunyan <arut@nginx.com> parents: 7039 diff changeset	880 ctx->async = 1;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	881
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	882 do {
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	883 ctx->node = rn;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	884 ctx = ctx->next;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	885 } while (ctx);
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	886
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	887 return NGX_AGAIN;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	888
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	889 failed:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	890
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	891 ngx_rbtree_delete(tree, &rn->node);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	892
1960 1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	893 if (rn->query) {
1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	894 ngx_resolver_free(r, rn->query);
1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	895 }
1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	896
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	897 ngx_resolver_free(r, rn->name);
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_resolver_free(r, rn);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	900
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	901 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	902 }
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	903
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	904
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	905 ngx_int_t
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	906 ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	907 {
2484 cf3cd450049c store name pointer in variable allocated on stack Igor Sysoev <igor@sysoev.ru> parents: 2483 diff changeset	908 u_char *name;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	909 in_addr_t addr;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	910 ngx_queue_t resend_queue, expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	911 ngx_rbtree_t *tree;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	912 ngx_resolver_t *r;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	913 struct sockaddr_in *sin;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	914 ngx_resolver_node_t *rn;
5476 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 uint32_t hash;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	917 struct sockaddr_in6 *sin6;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	918 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	919
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	920 #if (NGX_SUPPRESS_WARN)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	921 addr = 0;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	922 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	923 hash = 0;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	924 sin6 = NULL;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	925 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	926 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	927
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	928 r = ctx->resolver;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	929
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	930 switch (ctx->addr.sockaddr->sa_family) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	931
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	932 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	933 case AF_INET6:
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	934 sin6 = (struct sockaddr_in6 *) ctx->addr.sockaddr;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	935 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	936
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	937 /* lock addr mutex */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	938
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	939 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	940
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	941 tree = &r->addr6_rbtree;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	942 resend_queue = &r->addr6_resend_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	943 expire_queue = &r->addr6_expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	944
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	945 break;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	946 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	947
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	948 default: /* AF_INET */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	949 sin = (struct sockaddr_in *) ctx->addr.sockaddr;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	950 addr = ntohl(sin->sin_addr.s_addr);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	951
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	952 /* lock addr mutex */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	953
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	954 rn = ngx_resolver_lookup_addr(r, addr);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	955
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	956 tree = &r->addr_rbtree;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	957 resend_queue = &r->addr_resend_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	958 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	959 }
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	960
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	961 if (rn) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	962
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	963 if (rn->valid >= ngx_time()) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	964
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	965 ngx_log_debug0(NGX_LOG_DEBUG_CORE, r->log, 0, "resolve cached");
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	966
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	967 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	968
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	969 rn->expire = ngx_time() + r->expire;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	970
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	971 ngx_queue_insert_head(expire_queue, &rn->queue);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	972
2484 cf3cd450049c store name pointer in variable allocated on stack Igor Sysoev <igor@sysoev.ru> parents: 2483 diff changeset	973 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	974 if (name == NULL) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	975 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	976 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	977
2484 cf3cd450049c store name pointer in variable allocated on stack Igor Sysoev <igor@sysoev.ru> parents: 2483 diff changeset	978 ctx->name.len = rn->nlen;
cf3cd450049c store name pointer in variable allocated on stack Igor Sysoev <igor@sysoev.ru> parents: 2483 diff changeset	979 ctx->name.data = name;
cf3cd450049c store name pointer in variable allocated on stack Igor Sysoev <igor@sysoev.ru> parents: 2483 diff changeset	980
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	981 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	982
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	983 ctx->state = NGX_OK;
6456 c94aba230a5a Resolver: introduced valid field in resolver responses. Dmitry Volyntsev <xeioex@nginx.com> parents: 6372 diff changeset	984 ctx->valid = rn->valid;
1649 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->handler(ctx);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	987
2484 cf3cd450049c store name pointer in variable allocated on stack Igor Sysoev <igor@sysoev.ru> parents: 2483 diff changeset	988 ngx_resolver_free(r, name);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	989
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	990 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	991 }
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->waiting) {
7051 137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	994 if (ngx_resolver_set_timeout(r, ctx) != NGX_OK) {
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	995 return NGX_ERROR;
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	996 }
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	997
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	998 ctx->next = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	999 rn->waiting = ctx;
3297 ebc5384479b4 fix segfault in resolver: Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	1000 ctx->state = NGX_AGAIN;
7040 d49b74a683b1 Resolver: added the "async" flag to resolver context. Roman Arutyunyan <arut@nginx.com> parents: 7039 diff changeset	1001 ctx->async = 1;
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	1002 ctx->node = rn;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1003
2487 9b4dce95c744 fix return code, this fixes segfault when two or more Igor Sysoev <igor@sysoev.ru> parents: 2486 diff changeset	1004 /* unlock addr mutex */
9b4dce95c744 fix return code, this fixes segfault when two or more Igor Sysoev <igor@sysoev.ru> parents: 2486 diff changeset	1005
9b4dce95c744 fix return code, this fixes segfault when two or more Igor Sysoev <igor@sysoev.ru> parents: 2486 diff changeset	1006 return NGX_OK;
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
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1009 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1010
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1011 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	1012 rn->query = NULL;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1013 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1014 rn->query6 = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1015 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1016
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1017 } else {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1018 rn = ngx_resolver_alloc(r, sizeof(ngx_resolver_node_t));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1019 if (rn == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1020 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1021 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1022
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1023 switch (ctx->addr.sockaddr->sa_family) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1024
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1025 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1026 case AF_INET6:
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1027 rn->addr6 = sin6->sin6_addr;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1028 rn->node.key = hash;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1029 break;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1030 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1031
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1032 default: /* AF_INET */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1033 rn->node.key = addr;
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
1960 1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	1036 rn->query = NULL;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1037 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1038 rn->query6 = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1039 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1040
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1041 ngx_rbtree_insert(tree, &rn->node);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1042 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1043
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	1044 if (ngx_resolver_create_addr_query(r, rn, &ctx->addr) != NGX_OK) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1045 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1046 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1047
6366 2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1048 rn->last_connection = r->last_connection++;
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1049 if (r->last_connection == r->connections.nelts) {
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1050 r->last_connection = 0;
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1051 }
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1052
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1053 rn->naddrs = (u_short) -1;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1054 rn->tcp = 0;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1055 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1056 rn->naddrs6 = (u_short) -1;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1057 rn->tcp6 = 0;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1058 #endif
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1059 rn->nsrvs = 0;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1060
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1061 if (ngx_resolver_send_query(r, rn) != NGX_OK) {
7312 54683f650cbd Resolver: retry sending queries on errors (ticket #1511). Maxim Dounin <mdounin@mdounin.ru> parents: 7299 diff changeset	1062
54683f650cbd Resolver: retry sending queries on errors (ticket #1511). Maxim Dounin <mdounin@mdounin.ru> parents: 7299 diff changeset	1063 /* immediately retry once on failure */
54683f650cbd Resolver: retry sending queries on errors (ticket #1511). Maxim Dounin <mdounin@mdounin.ru> parents: 7299 diff changeset	1064
54683f650cbd Resolver: retry sending queries on errors (ticket #1511). Maxim Dounin <mdounin@mdounin.ru> parents: 7299 diff changeset	1065 rn->last_connection++;
54683f650cbd Resolver: retry sending queries on errors (ticket #1511). Maxim Dounin <mdounin@mdounin.ru> parents: 7299 diff changeset	1066 if (rn->last_connection == r->connections.nelts) {
54683f650cbd Resolver: retry sending queries on errors (ticket #1511). Maxim Dounin <mdounin@mdounin.ru> parents: 7299 diff changeset	1067 rn->last_connection = 0;
54683f650cbd Resolver: retry sending queries on errors (ticket #1511). Maxim Dounin <mdounin@mdounin.ru> parents: 7299 diff changeset	1068 }
54683f650cbd Resolver: retry sending queries on errors (ticket #1511). Maxim Dounin <mdounin@mdounin.ru> parents: 7299 diff changeset	1069
54683f650cbd Resolver: retry sending queries on errors (ticket #1511). Maxim Dounin <mdounin@mdounin.ru> parents: 7299 diff changeset	1070 (void) ngx_resolver_send_query(r, rn);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1071 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1072
7051 137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	1073 if (ngx_resolver_set_timeout(r, ctx) != NGX_OK) {
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	1074 goto failed;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1075 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1076
6846 c3a895b94d3f Resolver: fixed a race between parallel name and addr resolves. Dmitry Volyntsev <xeioex@nginx.com> parents: 6845 diff changeset	1077 if (ngx_resolver_resend_empty(r)) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1078 ngx_add_timer(r->event, (ngx_msec_t) (r->resend_timeout * 1000));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1079 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1080
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1081 rn->expire = ngx_time() + r->resend_timeout;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1082
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1083 ngx_queue_insert_head(resend_queue, &rn->queue);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1084
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1085 rn->code = 0;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1086 rn->cnlen = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1087 rn->name = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1088 rn->nlen = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1089 rn->valid = 0;
5485 8958656a8060 Resolver: use minimum TTL for caching (ticket #329). Ruslan Ermilov <ru@nginx.com> parents: 5479 diff changeset	1090 rn->ttl = NGX_MAX_UINT32_VALUE;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1091 rn->waiting = ctx;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1092
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1093 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1094
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1095 ctx->state = NGX_AGAIN;
7040 d49b74a683b1 Resolver: added the "async" flag to resolver context. Roman Arutyunyan <arut@nginx.com> parents: 7039 diff changeset	1096 ctx->async = 1;
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	1097 ctx->node = rn;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1098
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1099 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1100
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1101 failed:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1102
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1103 if (rn) {
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1104 ngx_rbtree_delete(tree, &rn->node);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1105
1960 1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	1106 if (rn->query) {
1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	1107 ngx_resolver_free(r, rn->query);
1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	1108 }
1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	1109
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1110 ngx_resolver_free(r, 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
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1113 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1114
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1115 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	1116 ngx_resolver_free(r, ctx->event);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1117 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1118
1904 538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	1119 ngx_resolver_free(r, ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1120
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1121 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1122 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1123
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1124
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1125 void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1126 ngx_resolve_addr_done(ngx_resolver_ctx_t *ctx)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1127 {
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1128 ngx_queue_t *expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1129 ngx_rbtree_t *tree;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1130 ngx_resolver_t *r;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1131 ngx_resolver_ctx_t w, *p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1132 ngx_resolver_node_t *rn;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	1133
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1134 r = ctx->resolver;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1135
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1136 switch (ctx->addr.sockaddr->sa_family) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1137
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1138 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1139 case AF_INET6:
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1140 tree = &r->addr6_rbtree;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1141 expire_queue = &r->addr6_expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1142 break;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1143 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1144
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1145 default: /* AF_INET */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1146 tree = &r->addr_rbtree;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1147 expire_queue = &r->addr_expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1148 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1149
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1150 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1151 "resolve addr done: %i", ctx->state);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1152
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1153 if (ctx->event && ctx->event->timer_set) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1154 ngx_del_timer(ctx->event);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1155 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1156
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1157 /* lock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1158
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	1159 if (ctx->state == NGX_AGAIN \|\| ctx->state == NGX_RESOLVE_TIMEDOUT) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1160
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	1161 rn = ctx->node;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1162
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1163 if (rn) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1164 p = &rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1165 w = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1166
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1167 while (w) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1168 if (w == ctx) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1169 *p = w->next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1170
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1171 goto done;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1172 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1173
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1174 p = &w->next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1175 w = w->next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1176 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1177 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1178
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1179 {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1180 u_char text[NGX_SOCKADDR_STRLEN];
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1181 ngx_str_t addrtext;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1182
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1183 addrtext.data = text;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1184 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	1185 text, NGX_SOCKADDR_STRLEN, 0);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1186
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1187 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	1188 "could not cancel %V resolving", &addrtext);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1189 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1190 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1191
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1192 done:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1193
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1194 ngx_resolver_expire(r, tree, expire_queue);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1195
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1196 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1197
1904 538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	1198 /* 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	1199
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	1200 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	1201 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	1202 }
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	1203
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	1204 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	1205
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	1206 /* unlock alloc mutex */
6196 c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1207
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1208 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	1209 ngx_del_timer(r->event);
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1210 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1211 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1212
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1213
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1214 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1215 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	1216 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1217 time_t now;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1218 ngx_uint_t i;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1219 ngx_queue_t *q;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1220 ngx_resolver_node_t *rn;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1221
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1222 ngx_log_debug0(NGX_LOG_DEBUG_CORE, r->log, 0, "resolver expire");
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1223
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1224 now = ngx_time();
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1225
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1226 for (i = 0; i < 2; i++) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1227 if (ngx_queue_empty(queue)) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1228 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1229 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1230
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1231 q = ngx_queue_last(queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1232
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1233 rn = ngx_queue_data(q, ngx_resolver_node_t, queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1234
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1235 if (now <= rn->expire) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1236 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1237 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1238
1774 68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1742 diff changeset	1239 ngx_log_debug2(NGX_LOG_DEBUG_CORE, r->log, 0,
68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1742 diff changeset	1240 "resolver expire \"%*s\"", (size_t) rn->nlen, rn->name);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1241
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1242 ngx_queue_remove(q);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1243
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1244 ngx_rbtree_delete(tree, &rn->node);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1245
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1246 ngx_resolver_free_node(r, rn);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1247 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1248 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1249
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1250
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1251 static ngx_int_t
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1252 ngx_resolver_send_query(ngx_resolver_t r, ngx_resolver_node_t rn)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1253 {
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1254 ngx_int_t rc;
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1255 ngx_resolver_connection_t *rec;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1256
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1257 rec = r->connections.elts;
6366 2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1258 rec = &rec[rn->last_connection];
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1259
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1260 if (rec->log.handler == NULL) {
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1261 rec->log = *r->log;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1262 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	1263 rec->log.data = rec;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1264 rec->log.action = "resolving";
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1265 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1266
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1267 if (rn->naddrs == (u_short) -1) {
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1268 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	1269 : ngx_resolver_send_udp_query(r, rec, rn->query, rn->qlen);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1270
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1271 if (rc != NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1272 return rc;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1273 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1274 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1275
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1276 #if (NGX_HAVE_INET6)
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1277
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1278 if (rn->query6 && rn->naddrs6 == (u_short) -1) {
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1279 rc = rn->tcp6
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1280 ? ngx_resolver_send_tcp_query(r, rec, rn->query6, rn->qlen)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1281 : ngx_resolver_send_udp_query(r, rec, rn->query6, rn->qlen);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1282
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1283 if (rc != NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1284 return rc;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1285 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1286 }
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 #endif
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1289
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1290 return NGX_OK;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1291 }
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
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1294 static ngx_int_t
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1295 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	1296 u_char *query, u_short qlen)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1297 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1298 ssize_t n;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1299
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1300 if (rec->udp == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1301 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	1302 return NGX_ERROR;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1303 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1304
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1305 rec->udp->data = rec;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1306 rec->udp->read->handler = ngx_resolver_udp_read;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1307 rec->udp->read->resolver = 1;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1308 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1309
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1310 n = ngx_send(rec->udp, query, qlen);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1311
7275 e15bf978447e Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 7052 diff changeset	1312 if (n == NGX_ERROR) {
7276 a90f7812de35 Resolver: close UDP socket on error or incomplete send. Ruslan Ermilov <ru@nginx.com> parents: 7275 diff changeset	1313 goto failed;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1314 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1315
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1316 if ((size_t) n != (size_t) qlen) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1317 ngx_log_error(NGX_LOG_CRIT, &rec->log, 0, "send() incomplete");
7276 a90f7812de35 Resolver: close UDP socket on error or incomplete send. Ruslan Ermilov <ru@nginx.com> parents: 7275 diff changeset	1318 goto failed;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1319 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1320
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1321 return NGX_OK;
7276 a90f7812de35 Resolver: close UDP socket on error or incomplete send. Ruslan Ermilov <ru@nginx.com> parents: 7275 diff changeset	1322
a90f7812de35 Resolver: close UDP socket on error or incomplete send. Ruslan Ermilov <ru@nginx.com> parents: 7275 diff changeset	1323 failed:
a90f7812de35 Resolver: close UDP socket on error or incomplete send. Ruslan Ermilov <ru@nginx.com> parents: 7275 diff changeset	1324
a90f7812de35 Resolver: close UDP socket on error or incomplete send. Ruslan Ermilov <ru@nginx.com> parents: 7275 diff changeset	1325 ngx_close_connection(rec->udp);
a90f7812de35 Resolver: close UDP socket on error or incomplete send. Ruslan Ermilov <ru@nginx.com> parents: 7275 diff changeset	1326 rec->udp = NULL;
a90f7812de35 Resolver: close UDP socket on error or incomplete send. Ruslan Ermilov <ru@nginx.com> parents: 7275 diff changeset	1327
a90f7812de35 Resolver: close UDP socket on error or incomplete send. Ruslan Ermilov <ru@nginx.com> parents: 7275 diff changeset	1328 return NGX_ERROR;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1329 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1330
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1331
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1332 static ngx_int_t
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1333 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	1334 u_char *query, u_short qlen)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1335 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1336 ngx_buf_t *b;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1337 ngx_int_t rc;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1338
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1339 rc = NGX_OK;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1340
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1341 if (rec->tcp == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1342 b = rec->read_buf;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1343
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1344 if (b == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1345 b = ngx_resolver_calloc(r, sizeof(ngx_buf_t));
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1346 if (b == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1347 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1348 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1349
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1350 b->start = ngx_resolver_alloc(r, NGX_RESOLVER_TCP_RSIZE);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1351 if (b->start == NULL) {
6368 d73f77bb5caf Resolver: fixed possible resource leak introduced in 5a16d40c63de. Ruslan Ermilov <ru@nginx.com> parents: 6367 diff changeset	1352 ngx_resolver_free(r, b);
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1353 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1354 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1355
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1356 b->end = b->start + NGX_RESOLVER_TCP_RSIZE;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1357
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1358 rec->read_buf = b;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1359 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1360
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1361 b->pos = b->start;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1362 b->last = b->start;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1363
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1364 b = rec->write_buf;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1365
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1366 if (b == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1367 b = ngx_resolver_calloc(r, sizeof(ngx_buf_t));
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1368 if (b == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1369 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1370 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1371
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1372 b->start = ngx_resolver_alloc(r, NGX_RESOLVER_TCP_WSIZE);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1373 if (b->start == NULL) {
6368 d73f77bb5caf Resolver: fixed possible resource leak introduced in 5a16d40c63de. Ruslan Ermilov <ru@nginx.com> parents: 6367 diff changeset	1374 ngx_resolver_free(r, b);
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1375 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1376 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1377
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1378 b->end = b->start + NGX_RESOLVER_TCP_WSIZE;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1379
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1380 rec->write_buf = b;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1381 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1382
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1383 b->pos = b->start;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1384 b->last = b->start;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1385
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1386 rc = ngx_tcp_connect(rec);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1387 if (rc == NGX_ERROR) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1388 return NGX_ERROR;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1389 }
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1390
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1391 rec->tcp->data = rec;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1392 rec->tcp->write->handler = ngx_resolver_tcp_write;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1393 rec->tcp->read->handler = ngx_resolver_tcp_read;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1394 rec->tcp->read->resolver = 1;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1395
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1396 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	1397 }
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1398
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1399 b = rec->write_buf;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1400
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1401 if (b->end - b->last < 2 + qlen) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1402 ngx_log_error(NGX_LOG_CRIT, &rec->log, 0, "buffer overflow");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1403 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1404 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1405
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1406 *b->last++ = (u_char) (qlen >> 8);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1407 *b->last++ = (u_char) qlen;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1408 b->last = ngx_cpymem(b->last, query, qlen);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1409
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1410 if (rc == NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1411 ngx_resolver_tcp_write(rec->tcp->write);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1412 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1413
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1414 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1415 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1416
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1417
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1418 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1419 ngx_resolver_resend_handler(ngx_event_t *ev)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1420 {
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1421 time_t timer, atimer, stimer, ntimer;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1422 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1423 time_t a6timer;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1424 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1425 ngx_resolver_t *r;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1426
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1427 r = ev->data;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1428
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1429 ngx_log_debug0(NGX_LOG_DEBUG_CORE, r->log, 0,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1430 "resolver resend handler");
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1431
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1432 /* lock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1433
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1434 ntimer = ngx_resolver_resend(r, &r->name_rbtree, &r->name_resend_queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1435
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1436 stimer = ngx_resolver_resend(r, &r->srv_rbtree, &r->srv_resend_queue);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1437
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1438 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1439
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1440 /* lock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1441
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1442 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	1443
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1444 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1445
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1446 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1447
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1448 /* lock addr6 mutex */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1449
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1450 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	1451
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1452 /* unlock addr6 mutex */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1453
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1454 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1455
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1456 timer = ntimer;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1457
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1458 if (timer == 0) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1459 timer = atimer;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1460
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1461 } else if (atimer) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1462 timer = ngx_min(timer, atimer);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1463 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1464
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1465 if (timer == 0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1466 timer = stimer;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1467
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1468 } else if (stimer) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1469 timer = ngx_min(timer, stimer);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1470 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1471
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1472 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1473
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1474 if (timer == 0) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1475 timer = a6timer;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1476
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1477 } else if (a6timer) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1478 timer = ngx_min(timer, a6timer);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1479 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1480
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1481 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1482
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1483 if (timer) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1484 ngx_add_timer(r->event, (ngx_msec_t) (timer * 1000));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1485 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1486 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1487
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1488
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1489 static time_t
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1490 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	1491 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1492 time_t now;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1493 ngx_queue_t *q;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1494 ngx_resolver_node_t *rn;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1495
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1496 now = ngx_time();
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1497
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1498 for ( ;; ) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1499 if (ngx_queue_empty(queue)) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1500 return 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1501 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1502
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1503 q = ngx_queue_last(queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1504
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1505 rn = ngx_queue_data(q, ngx_resolver_node_t, queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1506
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1507 if (now < rn->expire) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1508 return rn->expire - now;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1509 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1510
1774 68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1742 diff changeset	1511 ngx_log_debug3(NGX_LOG_DEBUG_CORE, r->log, 0,
68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1742 diff changeset	1512 "resolver resend \"%*s\" %p",
68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1742 diff changeset	1513 (size_t) rn->nlen, rn->name, rn->waiting);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1514
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1515 ngx_queue_remove(q);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1516
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1517 if (rn->waiting) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1518
6366 2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1519 if (++rn->last_connection == r->connections.nelts) {
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1520 rn->last_connection = 0;
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1521 }
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1522
4683 84d8e60b65f0 Fixed crash in ngx_resolver_cleanup_tree(). Ruslan Ermilov <ru@nginx.com> parents: 4671 diff changeset	1523 (void) ngx_resolver_send_query(r, rn);
84d8e60b65f0 Fixed crash in ngx_resolver_cleanup_tree(). Ruslan Ermilov <ru@nginx.com> parents: 4671 diff changeset	1524
84d8e60b65f0 Fixed crash in ngx_resolver_cleanup_tree(). Ruslan Ermilov <ru@nginx.com> parents: 4671 diff changeset	1525 rn->expire = now + r->resend_timeout;
84d8e60b65f0 Fixed crash in ngx_resolver_cleanup_tree(). Ruslan Ermilov <ru@nginx.com> parents: 4671 diff changeset	1526
84d8e60b65f0 Fixed crash in ngx_resolver_cleanup_tree(). Ruslan Ermilov <ru@nginx.com> parents: 4671 diff changeset	1527 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	1528
cf4ee321d195 do not delete failed DNS request if there are waiting clients Igor Sysoev <igor@sysoev.ru> parents: 1878 diff changeset	1529 continue;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1530 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1531
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1532 ngx_rbtree_delete(tree, &rn->node);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1533
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1534 ngx_resolver_free_node(r, rn);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1535 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1536 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1537
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1538
6196 c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1539 static ngx_uint_t
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1540 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	1541 {
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1542 return ngx_queue_empty(&r->name_resend_queue)
6845 9abba5b70ea0 Resolver: fixed possible premature stop of the resend timer. Dmitry Volyntsev <xeioex@nginx.com> parents: 6844 diff changeset	1543 && ngx_queue_empty(&r->srv_resend_queue)
6196 c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1544 #if (NGX_HAVE_INET6)
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1545 && 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	1546 #endif
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1547 && 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	1548 }
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1549
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1550
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1551 static void
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1552 ngx_resolver_udp_read(ngx_event_t *rev)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1553 {
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1554 ssize_t n;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1555 ngx_connection_t *c;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1556 ngx_resolver_connection_t *rec;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1557 u_char buf[NGX_RESOLVER_UDP_SIZE];
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1558
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1559 c = rev->data;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1560 rec = c->data;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1561
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1562 do {
1689 0b592a68aade ngx_udp_recv() Igor Sysoev <igor@sysoev.ru> parents: 1687 diff changeset	1563 n = ngx_udp_recv(c, buf, NGX_RESOLVER_UDP_SIZE);
0b592a68aade ngx_udp_recv() Igor Sysoev <igor@sysoev.ru> parents: 1687 diff changeset	1564
0b592a68aade ngx_udp_recv() Igor Sysoev <igor@sysoev.ru> parents: 1687 diff changeset	1565 if (n < 0) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1566 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1567 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1568
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1569 ngx_resolver_process_response(rec->resolver, buf, n, 0);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1570
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1571 } while (rev->ready);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1572 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1573
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1574
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1575 static void
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1576 ngx_resolver_tcp_write(ngx_event_t *wev)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1577 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1578 off_t sent;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1579 ssize_t n;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1580 ngx_buf_t *b;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1581 ngx_resolver_t *r;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1582 ngx_connection_t *c;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1583 ngx_resolver_connection_t *rec;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1584
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1585 c = wev->data;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1586 rec = c->data;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1587 b = rec->write_buf;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1588 r = rec->resolver;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1589
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1590 if (wev->timedout) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1591 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1592 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1593
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1594 sent = c->sent;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1595
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1596 while (wev->ready && b->pos < b->last) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1597 n = ngx_send(c, b->pos, b->last - b->pos);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1598
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1599 if (n == NGX_AGAIN) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1600 break;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1601 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1602
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1603 if (n == NGX_ERROR) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1604 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1605 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1606
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1607 b->pos += n;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1608 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1609
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1610 if (b->pos != b->start) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1611 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	1612 b->pos = b->start;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1613 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1614
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1615 if (c->sent != sent) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1616 ngx_add_timer(wev, (ngx_msec_t) (r->tcp_timeout * 1000));
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1617 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1618
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1619 if (ngx_handle_write_event(wev, 0) != NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1620 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1621 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1622
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1623 return;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1624
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1625 failed:
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1626
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1627 ngx_close_connection(c);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1628 rec->tcp = NULL;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1629 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1630
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1631
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1632 static void
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1633 ngx_resolver_tcp_read(ngx_event_t *rev)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1634 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1635 u_char *p;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1636 size_t size;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1637 ssize_t n;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1638 u_short qlen;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1639 ngx_buf_t *b;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1640 ngx_resolver_t *r;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1641 ngx_connection_t *c;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1642 ngx_resolver_connection_t *rec;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1643
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1644 c = rev->data;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1645 rec = c->data;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1646 b = rec->read_buf;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1647 r = rec->resolver;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1648
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1649 while (rev->ready) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1650 n = ngx_recv(c, b->last, b->end - b->last);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1651
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1652 if (n == NGX_AGAIN) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1653 break;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1654 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1655
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1656 if (n == NGX_ERROR \|\| n == 0) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1657 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1658 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1659
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1660 b->last += n;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1661
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1662 for ( ;; ) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1663 p = b->pos;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1664 size = b->last - p;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1665
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1666 if (size < 2) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1667 break;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1668 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1669
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1670 qlen = (u_short) *p++ << 8;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1671 qlen += *p++;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1672
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1673 if (size < (size_t) (2 + qlen)) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1674 break;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1675 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1676
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1677 ngx_resolver_process_response(r, p, qlen, 1);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1678
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1679 b->pos += 2 + qlen;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1680 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1681
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1682 if (b->pos != b->start) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1683 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	1684 b->pos = b->start;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1685 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1686 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1687
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1688 if (ngx_handle_read_event(rev, 0) != NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1689 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1690 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1691
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1692 return;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1693
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1694 failed:
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1695
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1696 ngx_close_connection(c);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1697 rec->tcp = NULL;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1698 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1699
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1700
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1701 static void
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1702 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	1703 ngx_uint_t tcp)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1704 {
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1705 char *err;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1706 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	1707 qtype, qclass;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1708 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1709 ngx_uint_t qident6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1710 #endif
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1711 ngx_queue_t *q;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1712 ngx_resolver_qs_t *qs;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1713 ngx_resolver_hdr_t *response;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1714 ngx_resolver_node_t *rn;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1715
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1716 if (n < sizeof(ngx_resolver_hdr_t)) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1717 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1718 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1719
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1720 response = (ngx_resolver_hdr_t *) buf;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1721
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1722 ident = (response->ident_hi << 8) + response->ident_lo;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1723 flags = (response->flags_hi << 8) + response->flags_lo;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1724 nqs = (response->nqs_hi << 8) + response->nqs_lo;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1725 nan = (response->nan_hi << 8) + response->nan_lo;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1726 trunc = flags & 0x0200;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1727
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1728 ngx_log_debug6(NGX_LOG_DEBUG_CORE, r->log, 0,
6509 7640d6c213e1 Removed redundant "u" format specifier. Ruslan Ermilov <ru@nginx.com> parents: 6478 diff changeset	1729 "resolver DNS response %ui fl:%04Xi %ui/%ui/%ud/%ud",
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1730 ident, flags, nqs, nan,
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1731 (response->nns_hi << 8) + response->nns_lo,
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1732 (response->nar_hi << 8) + response->nar_lo);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1733
5470 aebdca7e8f8f Resolver: fixed response processing. Ruslan Ermilov <ru@nginx.com> parents: 5469 diff changeset	1734 /* response to a standard query */
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1735 if ((flags & 0xf870) != 0x8000 \|\| (trunc && tcp)) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1736 ngx_log_error(r->log_level, r->log, 0,
6509 7640d6c213e1 Removed redundant "u" format specifier. Ruslan Ermilov <ru@nginx.com> parents: 6478 diff changeset	1737 "invalid %s DNS response %ui fl:%04Xi",
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1738 tcp ? "TCP" : "UDP", ident, flags);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1739 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1740 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1741
5470 aebdca7e8f8f Resolver: fixed response processing. Ruslan Ermilov <ru@nginx.com> parents: 5469 diff changeset	1742 code = flags & 0xf;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1743
2282 ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1744 if (code == NGX_RESOLVE_FORMERR) {
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1745
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1746 times = 0;
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1747
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1748 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	1749 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	1750 q = ngx_queue_next(q))
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1751 {
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1752 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	1753 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	1754
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1755 if (qident == ident) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1756 goto dns_error_name;
2282 ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1757 }
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1758
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1759 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1760 if (rn->query6) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1761 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	1762
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1763 if (qident6 == ident) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1764 goto dns_error_name;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1765 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1766 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1767 #endif
2282 ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1768 }
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1769
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1770 goto dns_error;
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1771 }
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1772
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1773 if (code > NGX_RESOLVE_REFUSED) {
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1774 goto dns_error;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1775 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1776
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1777 if (nqs != 1) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1778 err = "invalid number of questions in DNS response";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1779 goto done;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1780 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1781
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1782 i = sizeof(ngx_resolver_hdr_t);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1783
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1784 while (i < (ngx_uint_t) n) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1785 if (buf[i] == '\0') {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1786 goto found;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1787 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1788
5470 aebdca7e8f8f Resolver: fixed response processing. Ruslan Ermilov <ru@nginx.com> parents: 5469 diff changeset	1789 i += 1 + buf[i];
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1790 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1791
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1792 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1793
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1794 found:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1795
5470 aebdca7e8f8f Resolver: fixed response processing. Ruslan Ermilov <ru@nginx.com> parents: 5469 diff changeset	1796 if (i++ == sizeof(ngx_resolver_hdr_t)) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1797 err = "zero-length domain name in DNS response";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1798 goto done;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1799 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1800
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1801 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	1802 > (ngx_uint_t) n)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1803 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1804 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1805 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1806
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1807 qs = (ngx_resolver_qs_t *) &buf[i];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1808
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1809 qtype = (qs->type_hi << 8) + qs->type_lo;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1810 qclass = (qs->class_hi << 8) + qs->class_lo;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1811
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1812 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	1813 "resolver DNS response qt:%ui cl:%ui", qtype, qclass);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1814
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1815 if (qclass != 1) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1816 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	1817 "unknown query class %ui in DNS response", qclass);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1818 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1819 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1820
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1821 switch (qtype) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1822
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1823 case NGX_RESOLVE_A:
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1824 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1825 case NGX_RESOLVE_AAAA:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1826 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1827
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1828 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	1829 i + sizeof(ngx_resolver_qs_t));
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1830
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1831 break;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1832
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1833 case NGX_RESOLVE_SRV:
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1834
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1835 ngx_resolver_process_srv(r, buf, n, ident, code, nan, trunc,
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1836 i + sizeof(ngx_resolver_qs_t));
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1837
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1838 break;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1839
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1840 case NGX_RESOLVE_PTR:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1841
1742 268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	1842 ngx_resolver_process_ptr(r, buf, n, ident, code, nan);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1843
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1844 break;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1845
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1846 default:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1847 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	1848 "unknown query type %ui in DNS response", qtype);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1849 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1850 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1851
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1852 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1853
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1854 short_response:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1855
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1856 err = "short DNS response";
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1857
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1858 done:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1859
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1860 ngx_log_error(r->log_level, r->log, 0, err);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1861
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1862 return;
2282 ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1863
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1864 dns_error_name:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1865
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1866 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	1867 "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	1868 code, ngx_resolver_strerror(code), ident,
6478 3ef7bb882ad4 Fixed logging with variable field width. Sergey Kandaurov <pluknet@nginx.com> parents: 6460 diff changeset	1869 (size_t) rn->nlen, rn->name);
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1870 return;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1871
2282 ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1872 dns_error:
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1873
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1874 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	1875 "DNS error (%ui: %s), query id:%ui",
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1876 code, ngx_resolver_strerror(code), ident);
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1877 return;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1878 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1879
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1880
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1881 static void
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	1882 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	1883 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	1884 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	1885 {
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1886 char *err;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1887 u_char *cname;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1888 size_t len;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1889 int32_t ttl;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1890 uint32_t hash;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1891 in_addr_t *addr;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1892 ngx_str_t name;
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	1893 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	1894 #if (NGX_HAVE_INET6)
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1895 struct in6_addr *addr6;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1896 #endif
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1897 ngx_resolver_an_t *an;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1898 ngx_resolver_ctx_t ctx, next;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1899 ngx_resolver_node_t *rn;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1900 ngx_resolver_addr_t *addrs;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1901 ngx_resolver_connection_t *rec;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1902
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1903 if (ngx_resolver_copy(r, &name, buf,
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	1904 buf + sizeof(ngx_resolver_hdr_t), buf + n)
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1905 != NGX_OK)
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1906 {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1907 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1908 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1909
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1910 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	1911
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1912 hash = ngx_crc32_short(name.data, name.len);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1913
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1914 /* lock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1915
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1916 rn = ngx_resolver_lookup_name(r, &name, hash);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1917
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1918 if (rn == NULL) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1919 ngx_log_error(r->log_level, r->log, 0,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1920 "unexpected response for %V", &name);
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	1921 ngx_resolver_free(r, name.data);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1922 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1923 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1924
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1925 switch (qtype) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1926
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1927 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1928 case NGX_RESOLVE_AAAA:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1929
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1930 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	1931 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	1932 "unexpected response for %V", &name);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1933 ngx_resolver_free(r, name.data);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1934 goto failed;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1935 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1936
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1937 if (trunc && rn->tcp6) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1938 ngx_resolver_free(r, name.data);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1939 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1940 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1941
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1942 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	1943
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1944 break;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1945 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1946
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1947 default: /* NGX_RESOLVE_A */
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1948
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1949 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	1950 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	1951 "unexpected response for %V", &name);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1952 ngx_resolver_free(r, name.data);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1953 goto failed;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1954 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1955
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1956 if (trunc && rn->tcp) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1957 ngx_resolver_free(r, name.data);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1958 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1959 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1960
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1961 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	1962 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1963
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1964 if (ident != qident) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1965 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	1966 "wrong ident %ui response for %V, expect %ui",
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1967 ident, &name, qident);
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	1968 ngx_resolver_free(r, name.data);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1969 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1970 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1971
3139 5f6144fc674d fix memory leak in resolver Igor Sysoev <igor@sysoev.ru> parents: 2785 diff changeset	1972 ngx_resolver_free(r, name.data);
5f6144fc674d fix memory leak in resolver Igor Sysoev <igor@sysoev.ru> parents: 2785 diff changeset	1973
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1974 if (trunc) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1975
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1976 ngx_queue_remove(&rn->queue);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1977
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1978 if (rn->waiting == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1979 ngx_rbtree_delete(&r->name_rbtree, &rn->node);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1980 ngx_resolver_free_node(r, rn);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1981 goto next;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1982 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1983
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1984 rec = r->connections.elts;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1985 rec = &rec[rn->last_connection];
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1986
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1987 switch (qtype) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1988
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1989 #if (NGX_HAVE_INET6)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1990 case NGX_RESOLVE_AAAA:
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1991
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1992 rn->tcp6 = 1;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1993
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1994 (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	1995
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1996 break;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1997 #endif
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1998
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1999 default: /* NGX_RESOLVE_A */
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	2000
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	2001 rn->tcp = 1;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	2002
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	2003 (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	2004 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	2005
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	2006 rn->expire = ngx_time() + r->resend_timeout;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	2007
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	2008 ngx_queue_insert_head(&r->name_resend_queue, &rn->queue);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	2009
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	2010 goto next;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	2011 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	2012
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2013 if (code == 0 && rn->code) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2014 code = rn->code;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2015 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2016
1742 268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	2017 if (code == 0 && nan == 0) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2018
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2019 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2020 switch (qtype) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2021
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2022 case NGX_RESOLVE_AAAA:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2023
5768 70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2024 rn->naddrs6 = 0;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2025
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2026 if (rn->naddrs == (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2027 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2028 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2029
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2030 if (rn->naddrs) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2031 goto export;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2032 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2033
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2034 break;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2035
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2036 default: /* NGX_RESOLVE_A */
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2037
5768 70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2038 rn->naddrs = 0;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2039
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2040 if (rn->naddrs6 == (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2041 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2042 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2043
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2044 if (rn->naddrs6) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2045 goto export;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2046 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2047 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2048 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2049
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2050 code = NGX_RESOLVE_NXDOMAIN;
1742 268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	2051 }
268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	2052
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2053 if (code) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2054
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2055 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2056 switch (qtype) {
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 case NGX_RESOLVE_AAAA:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2059
5768 70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2060 rn->naddrs6 = 0;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2061
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2062 if (rn->naddrs == (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2063 rn->code = (u_char) code;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2064 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2065 }
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 break;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2068
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2069 default: /* NGX_RESOLVE_A */
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2070
5768 70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2071 rn->naddrs = 0;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2072
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2073 if (rn->naddrs6 == (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2074 rn->code = (u_char) code;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2075 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2076 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2077 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2078 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2079
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2080 next = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2081 rn->waiting = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2082
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2083 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2084
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2085 ngx_rbtree_delete(&r->name_rbtree, &rn->node);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2086
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2087 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2088
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2089 while (next) {
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2090 ctx = next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2091 ctx->state = code;
6456 c94aba230a5a Resolver: introduced valid field in resolver responses. Dmitry Volyntsev <xeioex@nginx.com> parents: 6372 diff changeset	2092 ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2093 next = ctx->next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2094
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2095 ctx->handler(ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2096 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2097
5920 7420068c4d4b Resolver: fixed use-after-free memory access. Ruslan Ermilov <ru@nginx.com> parents: 5820 diff changeset	2098 ngx_resolver_free_node(r, rn);
7420068c4d4b Resolver: fixed use-after-free memory access. Ruslan Ermilov <ru@nginx.com> parents: 5820 diff changeset	2099
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2100 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2101 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2102
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2103 i = ans;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2104 naddrs = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2105 cname = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2106
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2107 for (a = 0; a < nan; a++) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2108
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2109 start = i;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2110
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2111 while (i < n) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2112
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2113 if (buf[i] & 0xc0) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2114 i += 2;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2115 goto found;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2116 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2117
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2118 if (buf[i] == 0) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2119 i++;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2120 goto test_length;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2121 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2122
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2123 i += 1 + buf[i];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2124 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2125
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2126 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2127
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2128 test_length:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2129
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2130 if (i - start < 2) {
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2131 err = "invalid name in DNS response";
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2132 goto invalid;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2133 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2134
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2135 found:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2136
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2137 if (i + sizeof(ngx_resolver_an_t) >= n) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2138 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2139 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2140
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2141 an = (ngx_resolver_an_t *) &buf[i];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2142
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2143 type = (an->type_hi << 8) + an->type_lo;
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2144 class = (an->class_hi << 8) + an->class_lo;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2145 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	2146 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	2147 + (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	2148
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2149 if (class != 1) {
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2150 ngx_log_error(r->log_level, r->log, 0,
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2151 "unexpected RR class %ui", class);
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2152 goto failed;
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2153 }
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2154
4295 05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	2155 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	2156 ttl = 0;
05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	2157 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2158
5485 8958656a8060 Resolver: use minimum TTL for caching (ticket #329). Ruslan Ermilov <ru@nginx.com> parents: 5479 diff changeset	2159 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	2160
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2161 i += sizeof(ngx_resolver_an_t);
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2162
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2163 switch (type) {
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2164
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2165 case NGX_RESOLVE_A:
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2166
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2167 if (qtype != NGX_RESOLVE_A) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2168 err = "unexpected A record in DNS response";
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2169 goto invalid;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2170 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2171
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2172 if (len != 4) {
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2173 err = "invalid A record in DNS response";
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2174 goto invalid;
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2175 }
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2176
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2177 if (i + 4 > n) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2178 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2179 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2180
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2181 naddrs++;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2182
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2183 break;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2184
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2185 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2186 case NGX_RESOLVE_AAAA:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2187
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2188 if (qtype != NGX_RESOLVE_AAAA) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2189 err = "unexpected AAAA record in DNS response";
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2190 goto invalid;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2191 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2192
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2193 if (len != 16) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2194 err = "invalid AAAA record in DNS response";
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2195 goto invalid;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2196 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2197
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2198 if (i + 16 > n) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2199 goto short_response;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2200 }
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 naddrs++;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2203
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2204 break;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2205 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2206
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2207 case NGX_RESOLVE_CNAME:
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2208
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2209 cname = &buf[i];
1965 14463ae77723 take into account DNAME Igor Sysoev <igor@sysoev.ru> parents: 1961 diff changeset	2210
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2211 break;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2212
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2213 case NGX_RESOLVE_DNAME:
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2214
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2215 break;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2216
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2217 default:
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2218
1966 fb02f63eafd6 log unexpected qtype Igor Sysoev <igor@sysoev.ru> parents: 1965 diff changeset	2219 ngx_log_error(r->log_level, r->log, 0,
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2220 "unexpected RR type %ui", type);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2221 }
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2222
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2223 i += len;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2224 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2225
4295 05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	2226 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	2227 "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	2228 naddrs, cname, rn->ttl);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2229
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2230 if (naddrs) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2231
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2232 switch (qtype) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2233
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2234 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2235 case NGX_RESOLVE_AAAA:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2236
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2237 if (naddrs == 1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2238 addr6 = &rn->u6.addr6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2239 rn->naddrs6 = 1;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2240
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2241 } else {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2242 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	2243 if (addr6 == NULL) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2244 goto failed;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2245 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2246
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2247 rn->u6.addrs6 = addr6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2248 rn->naddrs6 = (u_short) naddrs;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2249 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2250
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2251 #if (NGX_SUPPRESS_WARN)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2252 addr = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2253 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2254
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2255 break;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2256 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2257
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2258 default: /* NGX_RESOLVE_A */
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2259
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2260 if (naddrs == 1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2261 addr = &rn->u.addr;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2262 rn->naddrs = 1;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2263
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2264 } else {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2265 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	2266 if (addr == NULL) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2267 goto failed;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2268 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2269
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2270 rn->u.addrs = addr;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2271 rn->naddrs = (u_short) naddrs;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2272 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2273
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2274 #if (NGX_HAVE_INET6 && NGX_SUPPRESS_WARN)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2275 addr6 = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2276 #endif
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2277 }
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2278
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2279 j = 0;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2280 i = ans;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2281
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2282 for (a = 0; a < nan; a++) {
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 for ( ;; ) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2285
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2286 if (buf[i] & 0xc0) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2287 i += 2;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2288 break;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2289 }
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2290
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2291 if (buf[i] == 0) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2292 i++;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2293 break;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2294 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2295
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2296 i += 1 + buf[i];
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2297 }
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2298
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2299 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	2300
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2301 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	2302 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	2303
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2304 i += sizeof(ngx_resolver_an_t);
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2305
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2306 if (type == NGX_RESOLVE_A) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2307
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2308 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	2309 + (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	2310
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2311 if (++j == naddrs) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2312
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2313 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2314 if (rn->naddrs6 == (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2315 goto next;
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 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2318
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2319 break;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2320 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2321 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2322
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2323 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2324 else if (type == NGX_RESOLVE_AAAA) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2325
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2326 ngx_memcpy(addr6[j].s6_addr, &buf[i], 16);
8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2327
8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2328 if (++j == naddrs) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2329
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2330 if (rn->naddrs == (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2331 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2332 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2333
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2334 break;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2335 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2336 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2337 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2338
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2339 i += len;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2340 }
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2341 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2342
5768 70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2343 switch (qtype) {
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2344
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2345 #if (NGX_HAVE_INET6)
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2346 case NGX_RESOLVE_AAAA:
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2347
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2348 if (rn->naddrs6 == (u_short) -1) {
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2349 rn->naddrs6 = 0;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2350 }
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2351
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2352 break;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2353 #endif
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2354
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2355 default: /* NGX_RESOLVE_A */
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2356
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2357 if (rn->naddrs == (u_short) -1) {
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2358 rn->naddrs = 0;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2359 }
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2360 }
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2361
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2362 if (rn->naddrs != (u_short) -1
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2363 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2364 && rn->naddrs6 != (u_short) -1
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2365 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2366 && rn->naddrs
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2367 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2368 + rn->naddrs6
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2369 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2370 > 0)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2371 {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2372
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2373 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2374 export:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2375 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2376
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2377 naddrs = rn->naddrs;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2378 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2379 naddrs += rn->naddrs6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2380 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2381
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2382 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	2383 addrs = NULL;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2384
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2385 } else {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2386 addrs = ngx_resolver_export(r, rn, 0);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2387 if (addrs == NULL) {
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2388 goto failed;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2389 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2390 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2391
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2392 ngx_queue_remove(&rn->queue);
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 rn->valid = ngx_time() + (r->valid ? r->valid : (time_t) rn->ttl);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2395 rn->expire = ngx_time() + r->expire;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2396
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2397 ngx_queue_insert_head(&r->name_expire_queue, &rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2398
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2399 next = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2400 rn->waiting = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2401
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2402 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2403
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2404 while (next) {
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2405 ctx = next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2406 ctx->state = NGX_OK;
6456 c94aba230a5a Resolver: introduced valid field in resolver responses. Dmitry Volyntsev <xeioex@nginx.com> parents: 6372 diff changeset	2407 ctx->valid = rn->valid;
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2408 ctx->naddrs = naddrs;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2409
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2410 if (addrs == NULL) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2411 ctx->addrs = &ctx->addr;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2412 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	2413 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	2414 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	2415 ctx->sin.sin_family = AF_INET;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2416 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	2417
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2418 } else {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2419 ctx->addrs = addrs;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2420 }
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2421
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2422 next = ctx->next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2423
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2424 ctx->handler(ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2425 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2426
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2427 if (addrs != NULL) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2428 ngx_resolver_free(r, addrs->sockaddr);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2429 ngx_resolver_free(r, addrs);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2430 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2431
4619 3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	2432 ngx_resolver_free(r, rn->query);
3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	2433 rn->query = NULL;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2434 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2435 rn->query6 = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2436 #endif
4619 3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	2437
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2438 return;
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2439 }
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2440
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2441 if (cname) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2442
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2443 /* CNAME only */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2444
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2445 if (rn->naddrs == (u_short) -1
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2446 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2447 \|\| rn->naddrs6 == (u_short) -1
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2448 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2449 )
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2450 {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2451 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2452 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2453
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2454 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	2455 goto failed;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2456 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2457
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2458 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2459 "resolver cname:\"%V\"", &name);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2460
1741 0829024c924d fix segfault if response will have CNAME only Igor Sysoev <igor@sysoev.ru> parents: 1689 diff changeset	2461 ngx_queue_remove(&rn->queue);
0829024c924d fix segfault if response will have CNAME only Igor Sysoev <igor@sysoev.ru> parents: 1689 diff changeset	2462
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2463 rn->cnlen = (u_short) name.len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2464 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	2465
5485 8958656a8060 Resolver: use minimum TTL for caching (ticket #329). Ruslan Ermilov <ru@nginx.com> parents: 5479 diff changeset	2466 rn->valid = ngx_time() + (r->valid ? r->valid : (time_t) rn->ttl);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2467 rn->expire = ngx_time() + r->expire;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2468
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2469 ngx_queue_insert_head(&r->name_expire_queue, &rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2470
6352 ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2471 ngx_resolver_free(r, rn->query);
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2472 rn->query = NULL;
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2473 #if (NGX_HAVE_INET6)
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2474 rn->query6 = NULL;
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2475 #endif
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2476
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2477 ctx = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2478 rn->waiting = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2479
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2480 if (ctx) {
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	2481
6352 ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2482 if (ctx->recursion++ >= NGX_RESOLVER_MAX_RECURSION) {
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2483
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2484 /* unlock name mutex */
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2485
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2486 do {
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2487 ctx->state = NGX_RESOLVE_NXDOMAIN;
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2488 next = ctx->next;
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2489
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2490 ctx->handler(ctx);
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2491
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2492 ctx = next;
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2493 } while (ctx);
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2494
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2495 return;
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2496 }
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2497
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	2498 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	2499 next->node = NULL;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	2500 }
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	2501
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	2502 (void) ngx_resolve_name_locked(r, ctx, &name);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2503 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2504
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2505 /* unlock name mutex */
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2506
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2507 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2508 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2509
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2510 ngx_log_error(r->log_level, r->log, 0,
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2511 "no A or CNAME types in DNS response");
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2512 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2513
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2514 short_response:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2515
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2516 err = "short DNS response";
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2517
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2518 invalid:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2519
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2520 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2521
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2522 ngx_log_error(r->log_level, r->log, 0, err);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2523
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2524 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2525
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2526 failed:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2527
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2528 next:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2529
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2530 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2531
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2532 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2533 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2534
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2535
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2536 static void
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2537 ngx_resolver_process_srv(ngx_resolver_t r, u_char buf, size_t n,
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2538 ngx_uint_t ident, ngx_uint_t code, ngx_uint_t nan,
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2539 ngx_uint_t trunc, ngx_uint_t ans)
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2540 {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2541 char *err;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2542 u_char *cname;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2543 size_t len;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2544 int32_t ttl;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2545 uint32_t hash;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2546 ngx_str_t name;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2547 ngx_uint_t type, qident, class, start, nsrvs, a, i, j;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2548 ngx_resolver_an_t *an;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2549 ngx_resolver_ctx_t ctx, next;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2550 ngx_resolver_srv_t *srvs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2551 ngx_resolver_node_t *rn;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2552 ngx_resolver_connection_t *rec;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2553
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2554 if (ngx_resolver_copy(r, &name, buf,
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2555 buf + sizeof(ngx_resolver_hdr_t), buf + n)
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2556 != NGX_OK)
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2557 {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2558 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2559 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2560
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2561 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0, "resolver qs:%V", &name);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2562
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2563 hash = ngx_crc32_short(name.data, name.len);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2564
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2565 rn = ngx_resolver_lookup_srv(r, &name, hash);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2566
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2567 if (rn == NULL \|\| rn->query == NULL) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2568 ngx_log_error(r->log_level, r->log, 0,
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2569 "unexpected response for %V", &name);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2570 ngx_resolver_free(r, name.data);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2571 goto failed;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2572 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2573
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2574 if (trunc && rn->tcp) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2575 ngx_resolver_free(r, name.data);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2576 goto failed;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2577 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2578
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2579 qident = (rn->query[0] << 8) + rn->query[1];
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2580
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2581 if (ident != qident) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2582 ngx_log_error(r->log_level, r->log, 0,
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2583 "wrong ident %ui response for %V, expect %ui",
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2584 ident, &name, qident);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2585 ngx_resolver_free(r, name.data);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2586 goto failed;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2587 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2588
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2589 ngx_resolver_free(r, name.data);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2590
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2591 if (trunc) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2592
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2593 ngx_queue_remove(&rn->queue);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2594
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2595 if (rn->waiting == NULL) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2596 ngx_rbtree_delete(&r->srv_rbtree, &rn->node);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2597 ngx_resolver_free_node(r, rn);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2598 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2599 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2600
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2601 rec = r->connections.elts;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2602 rec = &rec[rn->last_connection];
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2603
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2604 rn->tcp = 1;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2605
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2606 (void) ngx_resolver_send_tcp_query(r, rec, rn->query, rn->qlen);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2607
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2608 rn->expire = ngx_time() + r->resend_timeout;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2609
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2610 ngx_queue_insert_head(&r->srv_resend_queue, &rn->queue);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2611
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2612 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2613 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2614
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2615 if (code == 0 && rn->code) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2616 code = rn->code;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2617 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2618
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2619 if (code == 0 && nan == 0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2620 code = NGX_RESOLVE_NXDOMAIN;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2621 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2622
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2623 if (code) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2624 next = rn->waiting;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2625 rn->waiting = NULL;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2626
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2627 ngx_queue_remove(&rn->queue);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2628
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2629 ngx_rbtree_delete(&r->srv_rbtree, &rn->node);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2630
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2631 while (next) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2632 ctx = next;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2633 ctx->state = code;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2634 ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2635 next = ctx->next;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2636
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2637 ctx->handler(ctx);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2638 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2639
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2640 ngx_resolver_free_node(r, rn);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2641
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2642 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2643 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2644
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2645 i = ans;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2646 nsrvs = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2647 cname = NULL;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2648
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2649 for (a = 0; a < nan; a++) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2650
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2651 start = i;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2652
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2653 while (i < n) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2654
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2655 if (buf[i] & 0xc0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2656 i += 2;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2657 goto found;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2658 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2659
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2660 if (buf[i] == 0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2661 i++;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2662 goto test_length;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2663 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2664
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2665 i += 1 + buf[i];
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2666 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2667
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2668 goto short_response;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2669
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2670 test_length:
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2671
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2672 if (i - start < 2) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2673 err = "invalid name DNS response";
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2674 goto invalid;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2675 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2676
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2677 found:
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2678
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2679 if (i + sizeof(ngx_resolver_an_t) >= n) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2680 goto short_response;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2681 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2682
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2683 an = (ngx_resolver_an_t *) &buf[i];
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2684
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2685 type = (an->type_hi << 8) + an->type_lo;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2686 class = (an->class_hi << 8) + an->class_lo;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2687 len = (an->len_hi << 8) + an->len_lo;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2688 ttl = (an->ttl[0] << 24) + (an->ttl[1] << 16)
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2689 + (an->ttl[2] << 8) + (an->ttl[3]);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2690
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2691 if (class != 1) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2692 ngx_log_error(r->log_level, r->log, 0,
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2693 "unexpected RR class %ui", class);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2694 goto failed;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2695 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2696
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2697 if (ttl < 0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2698 ttl = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2699 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2700
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2701 rn->ttl = ngx_min(rn->ttl, (uint32_t) ttl);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2702
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2703 i += sizeof(ngx_resolver_an_t);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2704
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2705 switch (type) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2706
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2707 case NGX_RESOLVE_SRV:
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2708
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2709 if (i + 6 > n) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2710 goto short_response;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2711 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2712
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2713 if (ngx_resolver_copy(r, NULL, buf, &buf[i + 6], buf + n)
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2714 != NGX_OK)
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2715 {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2716 goto failed;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2717 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2718
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2719 nsrvs++;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2720
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2721 break;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2722
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2723 case NGX_RESOLVE_CNAME:
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2724
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2725 cname = &buf[i];
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2726
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2727 break;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2728
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2729 case NGX_RESOLVE_DNAME:
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2730
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2731 break;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2732
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2733 default:
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2734
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2735 ngx_log_error(r->log_level, r->log, 0,
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2736 "unexpected RR type %ui", type);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2737 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2738
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2739 i += len;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2740 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2741
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2742 ngx_log_debug3(NGX_LOG_DEBUG_CORE, r->log, 0,
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2743 "resolver nsrvs:%ui cname:%p ttl:%uD",
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2744 nsrvs, cname, rn->ttl);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2745
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2746 if (nsrvs) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2747
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2748 srvs = ngx_resolver_calloc(r, nsrvs * sizeof(ngx_resolver_srv_t));
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2749 if (srvs == NULL) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2750 goto failed;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2751 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2752
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2753 rn->u.srvs = srvs;
6460 034329824dd3 Win32: fixed build after 384154fc634f. Dmitry Volyntsev <xeioex@nginx.com> parents: 6458 diff changeset	2754 rn->nsrvs = (u_short) nsrvs;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2755
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2756 j = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2757 i = ans;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2758
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2759 for (a = 0; a < nan; a++) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2760
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2761 for ( ;; ) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2762
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2763 if (buf[i] & 0xc0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2764 i += 2;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2765 break;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2766 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2767
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2768 if (buf[i] == 0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2769 i++;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2770 break;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2771 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2772
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2773 i += 1 + buf[i];
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2774 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2775
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2776 an = (ngx_resolver_an_t *) &buf[i];
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2777
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2778 type = (an->type_hi << 8) + an->type_lo;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2779 len = (an->len_hi << 8) + an->len_lo;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2780
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2781 i += sizeof(ngx_resolver_an_t);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2782
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2783 if (type == NGX_RESOLVE_SRV) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2784
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2785 srvs[j].priority = (buf[i] << 8) + buf[i + 1];
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2786 srvs[j].weight = (buf[i + 2] << 8) + buf[i + 3];
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2787
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2788 if (srvs[j].weight == 0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2789 srvs[j].weight = 1;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2790 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2791
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2792 srvs[j].port = (buf[i + 4] << 8) + buf[i + 5];
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2793
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2794 if (ngx_resolver_copy(r, &srvs[j].name, buf, &buf[i + 6],
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2795 buf + n)
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2796 != NGX_OK)
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2797 {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2798 goto failed;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2799 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2800
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2801 j++;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2802 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2803
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2804 i += len;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2805 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2806
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2807 ngx_sort(srvs, nsrvs, sizeof(ngx_resolver_srv_t),
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2808 ngx_resolver_cmp_srvs);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2809
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2810 ngx_resolver_free(r, rn->query);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2811 rn->query = NULL;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2812
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2813 ngx_queue_remove(&rn->queue);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2814
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2815 rn->valid = ngx_time() + (r->valid ? r->valid : (time_t) rn->ttl);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2816 rn->expire = ngx_time() + r->expire;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2817
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2818 ngx_queue_insert_head(&r->srv_expire_queue, &rn->queue);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2819
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2820 next = rn->waiting;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2821 rn->waiting = NULL;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2822
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2823 while (next) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2824 ctx = next;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2825 next = ctx->next;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2826
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2827 ngx_resolver_resolve_srv_names(ctx, rn);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2828 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2829
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2830 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2831 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2832
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2833 rn->nsrvs = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2834
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2835 if (cname) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2836
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2837 /* CNAME only */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2838
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2839 if (ngx_resolver_copy(r, &name, buf, cname, buf + n) != NGX_OK) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2840 goto failed;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2841 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2842
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2843 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0,
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2844 "resolver cname:\"%V\"", &name);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2845
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2846 ngx_queue_remove(&rn->queue);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2847
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2848 rn->cnlen = (u_short) name.len;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2849 rn->u.cname = name.data;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2850
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2851 rn->valid = ngx_time() + (r->valid ? r->valid : (time_t) rn->ttl);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2852 rn->expire = ngx_time() + r->expire;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2853
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2854 ngx_queue_insert_head(&r->srv_expire_queue, &rn->queue);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2855
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2856 ngx_resolver_free(r, rn->query);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2857 rn->query = NULL;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2858 #if (NGX_HAVE_INET6)
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2859 rn->query6 = NULL;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2860 #endif
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2861
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2862 ctx = rn->waiting;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2863 rn->waiting = NULL;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2864
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2865 if (ctx) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2866
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2867 if (ctx->recursion++ >= NGX_RESOLVER_MAX_RECURSION) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2868
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2869 /* unlock name mutex */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2870
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2871 do {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2872 ctx->state = NGX_RESOLVE_NXDOMAIN;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2873 next = ctx->next;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2874
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2875 ctx->handler(ctx);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2876
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2877 ctx = next;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2878 } while (ctx);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2879
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2880 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2881 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2882
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2883 for (next = ctx; next; next = next->next) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2884 next->node = NULL;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2885 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2886
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2887 (void) ngx_resolve_name_locked(r, ctx, &name);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2888 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2889
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2890 /* unlock name mutex */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2891
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2892 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2893 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2894
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2895 ngx_log_error(r->log_level, r->log, 0, "no SRV type in DNS response");
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2896
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2897 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2898
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2899 short_response:
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2900
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2901 err = "short DNS response";
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2902
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2903 invalid:
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2904
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2905 /* unlock name mutex */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2906
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2907 ngx_log_error(r->log_level, r->log, 0, err);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2908
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2909 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2910
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2911 failed:
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2912
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2913 /* unlock name mutex */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2914
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2915 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2916 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2917
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2918
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2919 static void
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2920 ngx_resolver_resolve_srv_names(ngx_resolver_ctx_t ctx, ngx_resolver_node_t rn)
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2921 {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2922 ngx_uint_t i;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2923 ngx_resolver_t *r;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2924 ngx_resolver_ctx_t *cctx;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2925 ngx_resolver_srv_name_t *srvs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2926
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2927 r = ctx->resolver;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2928
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2929 ctx->node = NULL;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2930 ctx->state = NGX_OK;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2931 ctx->valid = rn->valid;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2932 ctx->count = rn->nsrvs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2933
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2934 srvs = ngx_resolver_calloc(r, rn->nsrvs * sizeof(ngx_resolver_srv_name_t));
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2935 if (srvs == NULL) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2936 goto failed;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2937 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2938
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2939 ctx->srvs = srvs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2940 ctx->nsrvs = rn->nsrvs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2941
6847 d72b38376092 Resolver: fixed handling of partially resolved SRV. Dmitry Volyntsev <xeioex@nginx.com> parents: 6846 diff changeset	2942 if (ctx->event && ctx->event->timer_set) {
d72b38376092 Resolver: fixed handling of partially resolved SRV. Dmitry Volyntsev <xeioex@nginx.com> parents: 6846 diff changeset	2943 ngx_del_timer(ctx->event);
d72b38376092 Resolver: fixed handling of partially resolved SRV. Dmitry Volyntsev <xeioex@nginx.com> parents: 6846 diff changeset	2944 }
d72b38376092 Resolver: fixed handling of partially resolved SRV. Dmitry Volyntsev <xeioex@nginx.com> parents: 6846 diff changeset	2945
6860 f18c285c2e59 Win32: fixed some warnings reported by Borland C. Maxim Dounin <mdounin@mdounin.ru> parents: 6847 diff changeset	2946 for (i = 0; i < (ngx_uint_t) rn->nsrvs; i++) {
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2947 srvs[i].name.data = ngx_resolver_alloc(r, rn->u.srvs[i].name.len);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2948 if (srvs[i].name.data == NULL) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2949 goto failed;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2950 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2951
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2952 srvs[i].name.len = rn->u.srvs[i].name.len;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2953 ngx_memcpy(srvs[i].name.data, rn->u.srvs[i].name.data,
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2954 srvs[i].name.len);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2955
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2956 cctx = ngx_resolve_start(r, NULL);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2957 if (cctx == NULL) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2958 goto failed;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2959 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2960
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2961 cctx->name = srvs[i].name;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2962 cctx->handler = ngx_resolver_srv_names_handler;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2963 cctx->data = ctx;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2964 cctx->srvs = &srvs[i];
6847 d72b38376092 Resolver: fixed handling of partially resolved SRV. Dmitry Volyntsev <xeioex@nginx.com> parents: 6846 diff changeset	2965 cctx->timeout = ctx->timeout;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2966
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2967 srvs[i].priority = rn->u.srvs[i].priority;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2968 srvs[i].weight = rn->u.srvs[i].weight;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2969 srvs[i].port = rn->u.srvs[i].port;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2970 srvs[i].ctx = cctx;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2971
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2972 if (ngx_resolve_name(cctx) == NGX_ERROR) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2973 srvs[i].ctx = NULL;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2974 goto failed;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2975 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2976 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2977
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2978 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2979
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2980 failed:
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2981
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2982 ctx->state = NGX_ERROR;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2983 ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2984
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2985 ctx->handler(ctx);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2986 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2987
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2988
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2989 static void
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2990 ngx_resolver_srv_names_handler(ngx_resolver_ctx_t *cctx)
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2991 {
6559 adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	2992 ngx_uint_t i;
adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	2993 ngx_addr_t *addrs;
adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	2994 ngx_resolver_t *r;
adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	2995 ngx_sockaddr_t *sockaddr;
adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	2996 ngx_resolver_ctx_t *ctx;
adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	2997 ngx_resolver_srv_name_t *srv;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2998
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2999 r = cctx->resolver;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3000 ctx = cctx->data;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3001 srv = cctx->srvs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3002
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3003 ctx->count--;
7040 d49b74a683b1 Resolver: added the "async" flag to resolver context. Roman Arutyunyan <arut@nginx.com> parents: 7039 diff changeset	3004 ctx->async \|= cctx->async;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3005
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3006 srv->ctx = NULL;
6714 c3e3de6d2672 Resolver: introduced state field in ngx_resolver_srv_name_t. Dmitry Volyntsev <xeioex@nginx.com> parents: 6593 diff changeset	3007 srv->state = cctx->state;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3008
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3009 if (cctx->naddrs) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3010
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3011 ctx->valid = ngx_min(ctx->valid, cctx->valid);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3012
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3013 addrs = ngx_resolver_calloc(r, cctx->naddrs * sizeof(ngx_addr_t));
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3014 if (addrs == NULL) {
7048 80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	3015 srv->state = NGX_ERROR;
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	3016 goto done;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3017 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3018
6559 adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	3019 sockaddr = ngx_resolver_alloc(r, cctx->naddrs * sizeof(ngx_sockaddr_t));
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3020 if (sockaddr == NULL) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3021 ngx_resolver_free(r, addrs);
7048 80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	3022 srv->state = NGX_ERROR;
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	3023 goto done;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3024 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3025
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3026 for (i = 0; i < cctx->naddrs; i++) {
6559 adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	3027 addrs[i].sockaddr = &sockaddr[i].sockaddr;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3028 addrs[i].socklen = cctx->addrs[i].socklen;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3029
6559 adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	3030 ngx_memcpy(&sockaddr[i], cctx->addrs[i].sockaddr,
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3031 addrs[i].socklen);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3032
6593 b3b7e33083ac Introduced ngx_inet_get_port() and ngx_inet_set_port() functions. Roman Arutyunyan <arut@nginx.com> parents: 6559 diff changeset	3033 ngx_inet_set_port(addrs[i].sockaddr, srv->port);
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3034 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3035
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3036 srv->addrs = addrs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3037 srv->naddrs = cctx->naddrs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3038 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3039
7048 80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	3040 done:
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	3041
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3042 ngx_resolve_name_done(cctx);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3043
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3044 if (ctx->count == 0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3045 ngx_resolver_report_srv(r, ctx);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3046 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3047 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3048
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3049
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3050 static void
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3051 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	3052 ngx_uint_t ident, ngx_uint_t code, ngx_uint_t nan)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3053 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3054 char *err;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3055 size_t len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3056 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	3057 int32_t ttl;
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3058 ngx_int_t octet;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3059 ngx_str_t name;
6371 33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3060 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	3061 ngx_queue_t *expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3062 ngx_rbtree_t *tree;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3063 ngx_resolver_an_t *an;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3064 ngx_resolver_ctx_t ctx, next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3065 ngx_resolver_node_t *rn;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3066 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3067 uint32_t hash;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3068 ngx_int_t digit;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3069 struct in6_addr addr6;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3070 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3071
6372 a6a5bacf6b74 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6371 diff changeset	3072 if (ngx_resolver_copy(r, &name, buf,
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3073 buf + sizeof(ngx_resolver_hdr_t), buf + n)
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3074 != NGX_OK)
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3075 {
5472 ab493c60d9ff Resolver: fixes in PTR processing. Ruslan Ermilov <ru@nginx.com> parents: 5471 diff changeset	3076 return;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3077 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3078
6372 a6a5bacf6b74 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6371 diff changeset	3079 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	3080
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3081 /* AF_INET */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3082
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3083 addr = 0;
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3084 i = sizeof(ngx_resolver_hdr_t);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3085
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3086 for (mask = 0; mask < 32; mask += 8) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3087 len = buf[i++];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3088
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3089 octet = ngx_atoi(&buf[i], len);
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3090 if (octet == NGX_ERROR \|\| octet > 255) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3091 goto invalid_in_addr_arpa;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3092 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3093
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3094 addr += octet << mask;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3095 i += len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3096 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3097
5479 c0d6eae5a1c5 Resolver: lookups are case-insensitive. Ruslan Ermilov <ru@nginx.com> parents: 5478 diff changeset	3098 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	3099 i += sizeof("\7in-addr\4arpa");
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3100
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3101 /* lock addr mutex */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3102
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3103 rn = ngx_resolver_lookup_addr(r, addr);
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 tree = &r->addr_rbtree;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3106 expire_queue = &r->addr_expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3107
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3108 goto valid;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3109 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3110
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3111 invalid_in_addr_arpa:
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3112
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3113 #if (NGX_HAVE_INET6)
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 i = sizeof(ngx_resolver_hdr_t);
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 for (octet = 15; octet >= 0; octet--) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3118 if (buf[i++] != '\1') {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3119 goto invalid_ip6_arpa;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3120 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3121
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3122 digit = ngx_hextoi(&buf[i++], 1);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3123 if (digit == NGX_ERROR) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3124 goto invalid_ip6_arpa;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3125 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3126
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3127 addr6.s6_addr[octet] = (u_char) digit;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3128
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3129 if (buf[i++] != '\1') {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3130 goto invalid_ip6_arpa;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3131 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3132
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3133 digit = ngx_hextoi(&buf[i++], 1);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3134 if (digit == NGX_ERROR) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3135 goto invalid_ip6_arpa;
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
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3138 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	3139 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3140
5479 c0d6eae5a1c5 Resolver: lookups are case-insensitive. Ruslan Ermilov <ru@nginx.com> parents: 5478 diff changeset	3141 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	3142 i += sizeof("\3ip6\4arpa");
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3143
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3144 /* lock addr mutex */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3145
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3146 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	3147 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	3148
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3149 tree = &r->addr6_rbtree;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3150 expire_queue = &r->addr6_expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3151
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3152 goto valid;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3153 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3154
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3155 invalid_ip6_arpa:
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3156 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3157
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3158 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	3159 "invalid in-addr.arpa or ip6.arpa name in DNS response");
6372 a6a5bacf6b74 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6371 diff changeset	3160 ngx_resolver_free(r, name.data);
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3161 return;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3162
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3163 valid:
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3164
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3165 if (rn == NULL \|\| rn->query == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3166 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	3167 "unexpected response for %V", &name);
6372 a6a5bacf6b74 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6371 diff changeset	3168 ngx_resolver_free(r, name.data);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3169 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3170 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3171
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3172 qident = (rn->query[0] << 8) + rn->query[1];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3173
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3174 if (ident != qident) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3175 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	3176 "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	3177 ident, &name, qident);
6372 a6a5bacf6b74 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6371 diff changeset	3178 ngx_resolver_free(r, name.data);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3179 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3180 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3181
6372 a6a5bacf6b74 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6371 diff changeset	3182 ngx_resolver_free(r, name.data);
a6a5bacf6b74 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6371 diff changeset	3183
1742 268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	3184 if (code == 0 && nan == 0) {
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3185 code = NGX_RESOLVE_NXDOMAIN;
1742 268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	3186 }
268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	3187
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3188 if (code) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3189 next = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3190 rn->waiting = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3191
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3192 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3193
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3194 ngx_rbtree_delete(tree, &rn->node);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3195
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3196 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3197
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3198 while (next) {
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	3199 ctx = next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	3200 ctx->state = code;
6456 c94aba230a5a Resolver: introduced valid field in resolver responses. Dmitry Volyntsev <xeioex@nginx.com> parents: 6372 diff changeset	3201 ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	3202 next = ctx->next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	3203
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	3204 ctx->handler(ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3205 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3206
5920 7420068c4d4b Resolver: fixed use-after-free memory access. Ruslan Ermilov <ru@nginx.com> parents: 5820 diff changeset	3207 ngx_resolver_free_node(r, rn);
7420068c4d4b Resolver: fixed use-after-free memory access. Ruslan Ermilov <ru@nginx.com> parents: 5820 diff changeset	3208
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3209 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3210 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3211
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3212 i += sizeof(ngx_resolver_qs_t);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3213
6371 33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3214 for (a = 0; a < nan; a++) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3215
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3216 start = i;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3217
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3218 while (i < n) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3219
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3220 if (buf[i] & 0xc0) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3221 i += 2;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3222 goto found;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3223 }
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3224
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3225 if (buf[i] == 0) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3226 i++;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3227 goto test_length;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3228 }
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3229
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3230 i += 1 + buf[i];
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3231 }
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3232
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3233 goto short_response;
6371 33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3234
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3235 test_length:
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3236
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3237 if (i - start < 2) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3238 err = "invalid name in DNS response";
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3239 goto invalid;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3240 }
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3241
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3242 found:
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3243
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3244 if (i + sizeof(ngx_resolver_an_t) >= n) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3245 goto short_response;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3246 }
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3247
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3248 an = (ngx_resolver_an_t *) &buf[i];
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3249
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3250 type = (an->type_hi << 8) + an->type_lo;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3251 class = (an->class_hi << 8) + an->class_lo;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3252 len = (an->len_hi << 8) + an->len_lo;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3253 ttl = (an->ttl[0] << 24) + (an->ttl[1] << 16)
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3254 + (an->ttl[2] << 8) + (an->ttl[3]);
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3255
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3256 if (class != 1) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3257 ngx_log_error(r->log_level, r->log, 0,
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3258 "unexpected RR class %ui", class);
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3259 goto failed;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3260 }
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3261
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3262 if (ttl < 0) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3263 ttl = 0;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3264 }
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3265
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3266 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	3267 "resolver qt:%ui cl:%ui len:%uz",
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3268 type, class, len);
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3269
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3270 i += sizeof(ngx_resolver_an_t);
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3271
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3272 switch (type) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3273
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3274 case NGX_RESOLVE_PTR:
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3275
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3276 goto ptr;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3277
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3278 case NGX_RESOLVE_CNAME:
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3279
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3280 break;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3281
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3282 default:
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3283
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3284 ngx_log_error(r->log_level, r->log, 0,
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3285 "unexpected RR type %ui", type);
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3286 }
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3287
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3288 i += len;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3289 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3290
6371 33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3291 /* unlock addr mutex */
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3292
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3293 ngx_log_error(r->log_level, r->log, 0,
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3294 "no PTR type in DNS response");
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3295 return;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3296
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3297 ptr:
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3298
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3299 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	3300 goto failed;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3301 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3302
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3303 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	3304
2486 8de5dc3e7001 use length of uncompressed name Igor Sysoev <igor@sysoev.ru> parents: 2484 diff changeset	3305 if (name.len != (size_t) rn->nlen
8de5dc3e7001 use length of uncompressed name Igor Sysoev <igor@sysoev.ru> parents: 2484 diff changeset	3306 \|\| ngx_strncmp(name.data, rn->name, name.len) != 0)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3307 {
2482 30ec8c5ac75b fix reverse resolving cache: it stored zero length names Igor Sysoev <igor@sysoev.ru> parents: 2314 diff changeset	3308 if (rn->nlen) {
30ec8c5ac75b fix reverse resolving cache: it stored zero length names Igor Sysoev <igor@sysoev.ru> parents: 2314 diff changeset	3309 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	3310 }
30ec8c5ac75b fix reverse resolving cache: it stored zero length names Igor Sysoev <igor@sysoev.ru> parents: 2314 diff changeset	3311
2490 1c87647b7ca5 fix building by msvc, introduced in r2487 Igor Sysoev <igor@sysoev.ru> parents: 2487 diff changeset	3312 rn->nlen = (u_short) name.len;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3313 rn->name = name.data;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3314
2486 8de5dc3e7001 use length of uncompressed name Igor Sysoev <igor@sysoev.ru> parents: 2484 diff changeset	3315 name.data = ngx_resolver_dup(r, rn->name, name.len);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3316 if (name.data == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3317 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3318 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3319 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3320
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3321 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3322
4295 05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	3323 rn->valid = ngx_time() + (r->valid ? r->valid : ttl);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3324 rn->expire = ngx_time() + r->expire;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3325
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3326 ngx_queue_insert_head(expire_queue, &rn->queue);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3327
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3328 next = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3329 rn->waiting = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3330
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3331 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3332
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3333 while (next) {
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	3334 ctx = next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	3335 ctx->state = NGX_OK;
6456 c94aba230a5a Resolver: introduced valid field in resolver responses. Dmitry Volyntsev <xeioex@nginx.com> parents: 6372 diff changeset	3336 ctx->valid = rn->valid;
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	3337 ctx->name = name;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	3338 next = ctx->next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	3339
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	3340 ctx->handler(ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3341 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3342
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3343 ngx_resolver_free(r, name.data);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3344
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3345 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3346
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3347 short_response:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3348
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3349 err = "short DNS response";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3350
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3351 invalid:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3352
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3353 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3354
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3355 ngx_log_error(r->log_level, r->log, 0, err);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3356
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3357 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3358
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3359 failed:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3360
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3361 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3362
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3363 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3364 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3365
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3366
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3367 static ngx_resolver_node_t *
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3368 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	3369 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3370 ngx_int_t rc;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3371 ngx_rbtree_node_t node, sentinel;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3372 ngx_resolver_node_t *rn;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3373
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3374 node = r->name_rbtree.root;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3375 sentinel = r->name_rbtree.sentinel;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3376
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3377 while (node != sentinel) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3378
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3379 if (hash < node->key) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3380 node = node->left;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3381 continue;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3382 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3383
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3384 if (hash > node->key) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3385 node = node->right;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3386 continue;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3387 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3388
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3389 /* hash == node->key */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3390
5921 5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	3391 rn = ngx_resolver_node(node);
4497 95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	3392
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	3393 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	3394
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	3395 if (rc == 0) {
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	3396 return rn;
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	3397 }
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	3398
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	3399 node = (rc < 0) ? node->left : node->right;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3400 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3401
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3402 /* not found */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3403
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3404 return NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3405 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3406
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3407
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3408 static ngx_resolver_node_t *
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3409 ngx_resolver_lookup_srv(ngx_resolver_t r, ngx_str_t name, uint32_t hash)
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3410 {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3411 ngx_int_t rc;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3412 ngx_rbtree_node_t node, sentinel;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3413 ngx_resolver_node_t *rn;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3414
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3415 node = r->srv_rbtree.root;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3416 sentinel = r->srv_rbtree.sentinel;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3417
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3418 while (node != sentinel) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3419
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3420 if (hash < node->key) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3421 node = node->left;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3422 continue;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3423 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3424
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3425 if (hash > node->key) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3426 node = node->right;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3427 continue;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3428 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3429
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3430 /* hash == node->key */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3431
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3432 rn = ngx_resolver_node(node);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3433
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3434 rc = ngx_memn2cmp(name->data, rn->name, name->len, rn->nlen);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3435
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3436 if (rc == 0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3437 return rn;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3438 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3439
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3440 node = (rc < 0) ? node->left : node->right;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3441 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3442
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3443 /* not found */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3444
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3445 return NULL;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3446 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3447
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3448
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3449 static ngx_resolver_node_t *
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3450 ngx_resolver_lookup_addr(ngx_resolver_t *r, in_addr_t addr)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3451 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3452 ngx_rbtree_node_t node, sentinel;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3453
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3454 node = r->addr_rbtree.root;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3455 sentinel = r->addr_rbtree.sentinel;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3456
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3457 while (node != sentinel) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3458
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3459 if (addr < node->key) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3460 node = node->left;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3461 continue;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3462 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3463
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3464 if (addr > node->key) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3465 node = node->right;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3466 continue;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3467 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3468
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3469 /* addr == node->key */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3470
5921 5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	3471 return ngx_resolver_node(node);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3472 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3473
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3474 /* not found */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3475
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3476 return NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3477 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3478
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3479
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3480 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3481
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3482 static ngx_resolver_node_t *
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3483 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	3484 uint32_t hash)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3485 {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3486 ngx_int_t rc;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3487 ngx_rbtree_node_t node, sentinel;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3488 ngx_resolver_node_t *rn;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3489
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3490 node = r->addr6_rbtree.root;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3491 sentinel = r->addr6_rbtree.sentinel;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3492
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3493 while (node != sentinel) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3494
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3495 if (hash < node->key) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3496 node = node->left;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3497 continue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3498 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3499
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3500 if (hash > node->key) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3501 node = node->right;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3502 continue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3503 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3504
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3505 /* hash == node->key */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3506
5921 5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	3507 rn = ngx_resolver_node(node);
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3508
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3509 rc = ngx_memcmp(addr, &rn->addr6, 16);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3510
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3511 if (rc == 0) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3512 return rn;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3513 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3514
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3515 node = (rc < 0) ? node->left : node->right;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3516 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3517
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3518 /* not found */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3519
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3520 return NULL;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3521 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3522
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3523 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3524
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3525
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3526 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3527 ngx_resolver_rbtree_insert_value(ngx_rbtree_node_t *temp,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3528 ngx_rbtree_node_t node, ngx_rbtree_node_t sentinel)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3529 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3530 ngx_rbtree_node_t **p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3531 ngx_resolver_node_t rn, rn_temp;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3532
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3533 for ( ;; ) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3534
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3535 if (node->key < temp->key) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3536
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3537 p = &temp->left;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3538
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3539 } else if (node->key > temp->key) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3540
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3541 p = &temp->right;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3542
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3543 } else { /* node->key == temp->key */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3544
5921 5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	3545 rn = ngx_resolver_node(node);
5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	3546 rn_temp = ngx_resolver_node(temp);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3547
3143 ab6258e18099 fix resolver cache rbtree comparison Igor Sysoev <igor@sysoev.ru> parents: 3139 diff changeset	3548 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	3549 < 0) ? &temp->left : &temp->right;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3550 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3551
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3552 if (*p == sentinel) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3553 break;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3554 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3555
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3556 temp = *p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3557 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3558
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3559 *p = node;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3560 node->parent = temp;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3561 node->left = sentinel;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3562 node->right = sentinel;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3563 ngx_rbt_red(node);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3564 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3565
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3566
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3567 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3568
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3569 static void
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3570 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	3571 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	3572 {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3573 ngx_rbtree_node_t **p;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3574 ngx_resolver_node_t rn, rn_temp;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3575
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3576 for ( ;; ) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3577
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3578 if (node->key < temp->key) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3579
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3580 p = &temp->left;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3581
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3582 } else if (node->key > temp->key) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3583
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3584 p = &temp->right;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3585
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3586 } else { /* node->key == temp->key */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3587
5921 5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	3588 rn = ngx_resolver_node(node);
5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	3589 rn_temp = ngx_resolver_node(temp);
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3590
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3591 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	3592 < 0) ? &temp->left : &temp->right;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3593 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3594
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3595 if (*p == sentinel) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3596 break;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3597 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3598
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3599 temp = *p;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3600 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3601
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3602 *p = node;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3603 node->parent = temp;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3604 node->left = sentinel;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3605 node->right = sentinel;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3606 ngx_rbt_red(node);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3607 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3608
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3609 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3610
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3611
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3612 static ngx_int_t
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3613 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	3614 ngx_str_t *name)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3615 {
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3616 u_char p, s;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3617 size_t len, nlen;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3618 ngx_uint_t ident;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3619 ngx_resolver_qs_t *qs;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3620 ngx_resolver_hdr_t *query;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3621
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3622 nlen = name->len ? (1 + name->len + 1) : 1;
3306 61bdaac6c668 fix resolving an empty name (".") Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	3623
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3624 len = sizeof(ngx_resolver_hdr_t) + nlen + sizeof(ngx_resolver_qs_t);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3625
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3626 #if (NGX_HAVE_INET6)
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3627 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	3628 #else
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3629 p = ngx_resolver_alloc(r, len);
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3630 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3631 if (p == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3632 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3633 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3634
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3635 rn->qlen = (u_short) len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3636 rn->query = p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3637
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3638 #if (NGX_HAVE_INET6)
5478 3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	3639 if (r->ipv6) {
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	3640 rn->query6 = p + len;
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	3641 }
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3642 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3643
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3644 query = (ngx_resolver_hdr_t *) p;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3645
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3646 ident = ngx_random();
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3647
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3648 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	3649 "resolve: \"%V\" A %i", name, ident & 0xffff);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3650
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3651 query->ident_hi = (u_char) ((ident >> 8) & 0xff);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3652 query->ident_lo = (u_char) (ident & 0xff);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3653
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3654 /* recursion query */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3655 query->flags_hi = 1; query->flags_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3656
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3657 /* one question */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3658 query->nqs_hi = 0; query->nqs_lo = 1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3659 query->nan_hi = 0; query->nan_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3660 query->nns_hi = 0; query->nns_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3661 query->nar_hi = 0; query->nar_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3662
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3663 p += sizeof(ngx_resolver_hdr_t) + nlen;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3664
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3665 qs = (ngx_resolver_qs_t *) p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3666
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3667 /* query type */
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3668 qs->type_hi = 0; qs->type_lo = NGX_RESOLVE_A;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3669
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3670 /* IN query class */
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3671 qs->class_hi = 0; qs->class_lo = 1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3672
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3673 /* convert "www.example.com" to "\3www\7example\3com\0" */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3674
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3675 len = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3676 p--;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3677 *p-- = '\0';
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3678
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3679 if (name->len == 0) {
4610 778d2cc03e22 Fixed segmentation fault in ngx_resolver_create_name_query(). Ruslan Ermilov <ru@nginx.com> parents: 4556 diff changeset	3680 return NGX_DECLINED;
778d2cc03e22 Fixed segmentation fault in ngx_resolver_create_name_query(). Ruslan Ermilov <ru@nginx.com> parents: 4556 diff changeset	3681 }
778d2cc03e22 Fixed segmentation fault in ngx_resolver_create_name_query(). Ruslan Ermilov <ru@nginx.com> parents: 4556 diff changeset	3682
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3683 for (s = name->data + name->len - 1; s >= name->data; s--) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3684 if (*s != '.') {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3685 p = s;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3686 len++;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3687
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3688 } else {
4556 1bddc91e78d6 Resolver: added missing sanity checking when creating name queries. Maxim Dounin <mdounin@mdounin.ru> parents: 4497 diff changeset	3689 if (len == 0 \|\| len > 255) {
1961 99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	3690 return NGX_DECLINED;
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	3691 }
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	3692
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3693 *p = (u_char) len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3694 len = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3695 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3696
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3697 p--;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3698 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3699
4556 1bddc91e78d6 Resolver: added missing sanity checking when creating name queries. Maxim Dounin <mdounin@mdounin.ru> parents: 4497 diff changeset	3700 if (len == 0 \|\| len > 255) {
1bddc91e78d6 Resolver: added missing sanity checking when creating name queries. Maxim Dounin <mdounin@mdounin.ru> parents: 4497 diff changeset	3701 return NGX_DECLINED;
1bddc91e78d6 Resolver: added missing sanity checking when creating name queries. Maxim Dounin <mdounin@mdounin.ru> parents: 4497 diff changeset	3702 }
1bddc91e78d6 Resolver: added missing sanity checking when creating name queries. Maxim Dounin <mdounin@mdounin.ru> parents: 4497 diff changeset	3703
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3704 *p = (u_char) len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3705
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3706 #if (NGX_HAVE_INET6)
5478 3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	3707 if (!r->ipv6) {
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	3708 return NGX_OK;
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	3709 }
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	3710
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3711 p = rn->query6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3712
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3713 ngx_memcpy(p, rn->query, rn->qlen);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3714
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3715 query = (ngx_resolver_hdr_t *) p;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3716
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3717 ident = ngx_random();
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3718
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3719 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	3720 "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	3721
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3722 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	3723 query->ident_lo = (u_char) (ident & 0xff);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3724
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3725 p += sizeof(ngx_resolver_hdr_t) + nlen;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3726
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3727 qs = (ngx_resolver_qs_t *) p;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3728
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3729 qs->type_lo = NGX_RESOLVE_AAAA;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3730 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3731
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3732 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3733 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3734
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3735
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3736 static ngx_int_t
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3737 ngx_resolver_create_srv_query(ngx_resolver_t r, ngx_resolver_node_t rn,
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3738 ngx_str_t *name)
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3739 {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3740 u_char p, s;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3741 size_t len, nlen;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3742 ngx_uint_t ident;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3743 ngx_resolver_qs_t *qs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3744 ngx_resolver_hdr_t *query;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3745
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3746 nlen = name->len ? (1 + name->len + 1) : 1;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3747
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3748 len = sizeof(ngx_resolver_hdr_t) + nlen + sizeof(ngx_resolver_qs_t);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3749
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3750 p = ngx_resolver_alloc(r, len);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3751 if (p == NULL) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3752 return NGX_ERROR;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3753 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3754
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3755 rn->qlen = (u_short) len;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3756 rn->query = p;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3757
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3758 query = (ngx_resolver_hdr_t *) p;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3759
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3760 ident = ngx_random();
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3761
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3762 ngx_log_debug2(NGX_LOG_DEBUG_CORE, r->log, 0,
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3763 "resolve: \"%V\" SRV %i", name, ident & 0xffff);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3764
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3765 query->ident_hi = (u_char) ((ident >> 8) & 0xff);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3766 query->ident_lo = (u_char) (ident & 0xff);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3767
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3768 /* recursion query */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3769 query->flags_hi = 1; query->flags_lo = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3770
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3771 /* one question */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3772 query->nqs_hi = 0; query->nqs_lo = 1;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3773 query->nan_hi = 0; query->nan_lo = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3774 query->nns_hi = 0; query->nns_lo = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3775 query->nar_hi = 0; query->nar_lo = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3776
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3777 p += sizeof(ngx_resolver_hdr_t) + nlen;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3778
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3779 qs = (ngx_resolver_qs_t *) p;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3780
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3781 /* query type */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3782 qs->type_hi = 0; qs->type_lo = NGX_RESOLVE_SRV;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3783
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3784 /* IN query class */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3785 qs->class_hi = 0; qs->class_lo = 1;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3786
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3787 /* converts "www.example.com" to "\3www\7example\3com\0" */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3788
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3789 len = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3790 p--;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3791 *p-- = '\0';
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3792
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3793 if (name->len == 0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3794 return NGX_DECLINED;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3795 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3796
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3797 for (s = name->data + name->len - 1; s >= name->data; s--) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3798 if (*s != '.') {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3799 p = s;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3800 len++;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3801
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3802 } else {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3803 if (len == 0 \|\| len > 255) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3804 return NGX_DECLINED;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3805 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3806
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3807 *p = (u_char) len;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3808 len = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3809 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3810
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3811 p--;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3812 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3813
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3814 if (len == 0 \|\| len > 255) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3815 return NGX_DECLINED;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3816 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3817
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3818 *p = (u_char) len;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3819
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3820 return NGX_OK;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3821 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3822
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3823
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3824 static ngx_int_t
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3825 ngx_resolver_create_addr_query(ngx_resolver_t r, ngx_resolver_node_t rn,
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3826 ngx_resolver_addr_t *addr)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3827 {
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3828 u_char p, d;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3829 size_t len;
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3830 in_addr_t inaddr;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3831 ngx_int_t n;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3832 ngx_uint_t ident;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3833 ngx_resolver_hdr_t *query;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3834 struct sockaddr_in *sin;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3835 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3836 struct sockaddr_in6 *sin6;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3837 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3838
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3839 switch (addr->sockaddr->sa_family) {
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3840
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3841 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3842 case AF_INET6:
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3843 len = sizeof(ngx_resolver_hdr_t)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3844 + 64 + sizeof(".ip6.arpa.") - 1
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3845 + sizeof(ngx_resolver_qs_t);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3846
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3847 break;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3848 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3849
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3850 default: /* AF_INET */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3851 len = sizeof(ngx_resolver_hdr_t)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3852 + 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	3853 + sizeof(ngx_resolver_qs_t);
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	3854 }
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3855
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3856 p = ngx_resolver_alloc(r, len);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3857 if (p == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3858 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3859 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3860
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3861 rn->query = p;
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3862 query = (ngx_resolver_hdr_t *) p;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3863
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3864 ident = ngx_random();
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3865
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3866 query->ident_hi = (u_char) ((ident >> 8) & 0xff);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3867 query->ident_lo = (u_char) (ident & 0xff);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3868
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3869 /* recursion query */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3870 query->flags_hi = 1; query->flags_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3871
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3872 /* one question */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3873 query->nqs_hi = 0; query->nqs_lo = 1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3874 query->nan_hi = 0; query->nan_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3875 query->nns_hi = 0; query->nns_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3876 query->nar_hi = 0; query->nar_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3877
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3878 p += sizeof(ngx_resolver_hdr_t);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3879
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3880 switch (addr->sockaddr->sa_family) {
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3881
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3882 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3883 case AF_INET6:
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3884 sin6 = (struct sockaddr_in6 *) addr->sockaddr;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3885
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3886 for (n = 15; n >= 0; n--) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3887 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	3888 sin6->sin6_addr.s6_addr[n] & 0xf,
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3889 (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	3890 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3891
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3892 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	3893
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3894 break;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3895 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3896
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3897 default: /* AF_INET */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3898
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3899 sin = (struct sockaddr_in *) addr->sockaddr;
a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3900 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	3901
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3902 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	3903 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	3904 *p = (u_char) (d - &p[1]);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3905 p = d;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3906 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3907
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3908 p = ngx_cpymem(p, "\7in-addr\4arpa\0", 14);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3909 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3910
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3911 /* query type "PTR", IN query class */
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3912 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	3913
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3914 rn->qlen = (u_short) (p - rn->query);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3915
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3916 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3917 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3918
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3919
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3920 static ngx_int_t
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3921 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	3922 u_char *last)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3923 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3924 char *err;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3925 u_char p, dst;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3926 ssize_t len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3927 ngx_uint_t i, n;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3928
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3929 p = src;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3930 len = -1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3931
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3932 /*
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3933 * compression pointers allow to create endless loop, so we set limit;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3934 * 128 pointers should be enough to store 255-byte name
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3935 */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3936
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3937 for (i = 0; i < 128; i++) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3938 n = *p++;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3939
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3940 if (n == 0) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3941 goto done;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3942 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3943
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3944 if (n & 0xc0) {
2314 52987a023486 fix compression pointer for big (>255) DNS responses Igor Sysoev <igor@sysoev.ru> parents: 2282 diff changeset	3945 n = ((n & 0x3f) << 8) + *p;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3946 p = &buf[n];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3947
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3948 } else {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3949 len += 1 + n;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3950 p = &p[n];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3951 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3952
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3953 if (p >= last) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3954 err = "name is out of response";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3955 goto invalid;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3956 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3957 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3958
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3959 err = "compression pointers loop";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3960
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3961 invalid:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3962
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3963 ngx_log_error(r->log_level, r->log, 0, err);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3964
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3965 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3966
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3967 done:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3968
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3969 if (name == NULL) {
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3970 return NGX_OK;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3971 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3972
3298 847ab5a32307 fix "PTR ." case in address resolver Igor Sysoev <igor@sysoev.ru> parents: 3297 diff changeset	3973 if (len == -1) {
5764 f166c521b619 Style: use ngx_str_null(). Tatsuhiko Kubo <cubicdaiya@gmail.com> parents: 5600 diff changeset	3974 ngx_str_null(name);
3298 847ab5a32307 fix "PTR ." case in address resolver Igor Sysoev <igor@sysoev.ru> parents: 3297 diff changeset	3975 return NGX_OK;
847ab5a32307 fix "PTR ." case in address resolver Igor Sysoev <igor@sysoev.ru> parents: 3297 diff changeset	3976 }
847ab5a32307 fix "PTR ." case in address resolver Igor Sysoev <igor@sysoev.ru> parents: 3297 diff changeset	3977
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3978 dst = ngx_resolver_alloc(r, len);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3979 if (dst == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3980 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3981 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3982
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3983 name->data = dst;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3984
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3985 n = *src++;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3986
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3987 for ( ;; ) {
4267 768212ca0745 Fixed compression pointer processing in DNS response greater than 255 bytes. Igor Sysoev <igor@sysoev.ru> parents: 4225 diff changeset	3988 if (n & 0xc0) {
768212ca0745 Fixed compression pointer processing in DNS response greater than 255 bytes. Igor Sysoev <igor@sysoev.ru> parents: 4225 diff changeset	3989 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	3990 src = &buf[n];
768212ca0745 Fixed compression pointer processing in DNS response greater than 255 bytes. Igor Sysoev <igor@sysoev.ru> parents: 4225 diff changeset	3991
768212ca0745 Fixed compression pointer processing in DNS response greater than 255 bytes. Igor Sysoev <igor@sysoev.ru> parents: 4225 diff changeset	3992 n = *src++;
768212ca0745 Fixed compression pointer processing in DNS response greater than 255 bytes. Igor Sysoev <igor@sysoev.ru> parents: 4225 diff changeset	3993
768212ca0745 Fixed compression pointer processing in DNS response greater than 255 bytes. Igor Sysoev <igor@sysoev.ru> parents: 4225 diff changeset	3994 } else {
5479 c0d6eae5a1c5 Resolver: lookups are case-insensitive. Ruslan Ermilov <ru@nginx.com> parents: 5478 diff changeset	3995 ngx_strlow(dst, src, n);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3996 dst += n;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3997 src += n;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3998
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3999 n = *src++;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4000
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4001 if (n != 0) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4002 *dst++ = '.';
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4003 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4004 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4005
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4006 if (n == 0) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4007 name->len = dst - name->data;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4008 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4009 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4010 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4011 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4012
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4013
7051 137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4014 static ngx_int_t
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4015 ngx_resolver_set_timeout(ngx_resolver_t r, ngx_resolver_ctx_t ctx)
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4016 {
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4017 if (ctx->event \|\| ctx->timeout == 0) {
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4018 return NGX_OK;
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4019 }
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4020
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4021 ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t));
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4022 if (ctx->event == NULL) {
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4023 return NGX_ERROR;
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4024 }
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4025
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4026 ctx->event->handler = ngx_resolver_timeout_handler;
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4027 ctx->event->data = ctx;
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4028 ctx->event->log = r->log;
7052 70e65bf8dfd7 Resolver: cancelable resend timer event. Ruslan Ermilov <ru@nginx.com> parents: 7051 diff changeset	4029 ctx->event->cancelable = ctx->cancelable;
7051 137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4030 ctx->ident = -1;
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4031
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4032 ngx_add_timer(ctx->event, ctx->timeout);
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4033
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4034 return NGX_OK;
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4035 }
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4036
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4037
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4038 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4039 ngx_resolver_timeout_handler(ngx_event_t *ev)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4040 {
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	4041 ngx_resolver_ctx_t *ctx;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	4042
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	4043 ctx = ev->data;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	4044
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	4045 ctx->state = NGX_RESOLVE_TIMEDOUT;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	4046
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	4047 ctx->handler(ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4048 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4049
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4050
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4051 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4052 ngx_resolver_free_node(ngx_resolver_t r, ngx_resolver_node_t rn)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4053 {
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4054 ngx_uint_t i;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4055
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4056 /* lock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4057
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4058 if (rn->query) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4059 ngx_resolver_free_locked(r, rn->query);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4060 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4061
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4062 if (rn->name) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4063 ngx_resolver_free_locked(r, rn->name);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4064 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4065
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4066 if (rn->cnlen) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4067 ngx_resolver_free_locked(r, rn->u.cname);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4068 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4069
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4070 if (rn->naddrs > 1 && rn->naddrs != (u_short) -1) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4071 ngx_resolver_free_locked(r, rn->u.addrs);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4072 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4073
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4074 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4075 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	4076 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	4077 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4078 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4079
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4080 if (rn->nsrvs) {
6860 f18c285c2e59 Win32: fixed some warnings reported by Borland C. Maxim Dounin <mdounin@mdounin.ru> parents: 6847 diff changeset	4081 for (i = 0; i < (ngx_uint_t) rn->nsrvs; i++) {
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4082 if (rn->u.srvs[i].name.data) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4083 ngx_resolver_free_locked(r, rn->u.srvs[i].name.data);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4084 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4085 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4086
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4087 ngx_resolver_free_locked(r, rn->u.srvs);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4088 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4089
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4090 ngx_resolver_free_locked(r, rn);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4091
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4092 /* unlock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4093 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4094
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4095
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4096 static void *
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4097 ngx_resolver_alloc(ngx_resolver_t *r, size_t size)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4098 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4099 u_char *p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4100
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4101 /* lock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4102
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4103 p = ngx_alloc(size, r->log);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4104
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4105 /* unlock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4106
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4107 return p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4108 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4109
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4110
1903 1ea922585517 static ngx_resolver_calloc() Igor Sysoev <igor@sysoev.ru> parents: 1880 diff changeset	4111 static void *
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4112 ngx_resolver_calloc(ngx_resolver_t *r, size_t size)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4113 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4114 u_char *p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4115
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4116 p = ngx_resolver_alloc(r, size);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4117
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4118 if (p) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4119 ngx_memzero(p, size);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4120 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4121
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4122 return p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4123 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4124
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4125
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4126 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4127 ngx_resolver_free(ngx_resolver_t r, void p)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4128 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4129 /* lock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4130
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4131 ngx_free(p);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4132
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4133 /* unlock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4134 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4135
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4136
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4137 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4138 ngx_resolver_free_locked(ngx_resolver_t r, void p)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4139 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4140 ngx_free(p);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4141 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4142
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4143
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4144 static void *
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4145 ngx_resolver_dup(ngx_resolver_t r, void src, size_t size)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4146 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4147 void *dst;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4148
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4149 dst = ngx_resolver_alloc(r, size);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4150
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4151 if (dst == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4152 return dst;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4153 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4154
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4155 ngx_memcpy(dst, src, size);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4156
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4157 return dst;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4158 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4159
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4160
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4161 static ngx_resolver_addr_t *
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4162 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	4163 ngx_uint_t rotate)
4871 c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	4164 {
6559 adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	4165 ngx_uint_t d, i, j, n;
adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	4166 in_addr_t *addr;
adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	4167 ngx_sockaddr_t *sockaddr;
adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	4168 struct sockaddr_in *sin;
adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	4169 ngx_resolver_addr_t *dst;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4170 #if (NGX_HAVE_INET6)
6559 adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	4171 struct in6_addr *addr6;
adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	4172 struct sockaddr_in6 *sin6;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4173 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4174
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4175 n = rn->naddrs;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4176 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4177 n += rn->naddrs6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4178 #endif
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	4179
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4180 dst = ngx_resolver_calloc(r, n * sizeof(ngx_resolver_addr_t));
4892 063ac68d89dc Resolver: added missing memory allocation error handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4871 diff changeset	4181 if (dst == NULL) {
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	4182 return NULL;
4892 063ac68d89dc Resolver: added missing memory allocation error handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4871 diff changeset	4183 }
063ac68d89dc Resolver: added missing memory allocation error handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4871 diff changeset	4184
6559 adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	4185 sockaddr = ngx_resolver_calloc(r, n * sizeof(ngx_sockaddr_t));
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4186 if (sockaddr == NULL) {
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	4187 ngx_resolver_free(r, dst);
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	4188 return NULL;
4871 c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	4189 }
c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	4190
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4191 i = 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4192 d = rotate ? ngx_random() % n : 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4193
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4194 if (rn->naddrs) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4195 j = rotate ? ngx_random() % rn->naddrs : 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4196
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4197 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	4198
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4199 do {
6559 adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	4200 sin = &sockaddr[d].sockaddr_in;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4201 sin->sin_family = AF_INET;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4202 sin->sin_addr.s_addr = addr[j++];
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4203 dst[d].sockaddr = (struct sockaddr *) sin;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4204 dst[d++].socklen = sizeof(struct sockaddr_in);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4205
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4206 if (d == n) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4207 d = 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4208 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4209
6860 f18c285c2e59 Win32: fixed some warnings reported by Borland C. Maxim Dounin <mdounin@mdounin.ru> parents: 6847 diff changeset	4210 if (j == (ngx_uint_t) rn->naddrs) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4211 j = 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4212 }
6860 f18c285c2e59 Win32: fixed some warnings reported by Borland C. Maxim Dounin <mdounin@mdounin.ru> parents: 6847 diff changeset	4213 } while (++i < (ngx_uint_t) rn->naddrs);
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	4214 }
4871 c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	4215
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4216 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4217 if (rn->naddrs6) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4218 j = rotate ? ngx_random() % rn->naddrs6 : 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4219
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4220 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	4221
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4222 do {
6559 adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	4223 sin6 = &sockaddr[d].sockaddr_in6;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4224 sin6->sin6_family = AF_INET6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4225 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	4226 dst[d].sockaddr = (struct sockaddr *) sin6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4227 dst[d++].socklen = sizeof(struct sockaddr_in6);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4228
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4229 if (d == n) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4230 d = 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4231 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4232
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4233 if (j == rn->naddrs6) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4234 j = 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4235 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4236 } while (++i < n);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4237 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4238 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4239
4871 c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	4240 return dst;
c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	4241 }
c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	4242
c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	4243
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4244 static void
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4245 ngx_resolver_report_srv(ngx_resolver_t r, ngx_resolver_ctx_t ctx)
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4246 {
6460 034329824dd3 Win32: fixed build after 384154fc634f. Dmitry Volyntsev <xeioex@nginx.com> parents: 6458 diff changeset	4247 ngx_uint_t naddrs, nsrvs, nw, i, j, k, l, m, n, w;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4248 ngx_resolver_addr_t *addrs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4249 ngx_resolver_srv_name_t *srvs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4250
7048 80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	4251 srvs = ctx->srvs;
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	4252 nsrvs = ctx->nsrvs;
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	4253
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4254 naddrs = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4255
7048 80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	4256 for (i = 0; i < nsrvs; i++) {
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	4257 if (srvs[i].state == NGX_ERROR) {
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	4258 ctx->state = NGX_ERROR;
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	4259 ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	4260
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	4261 ctx->handler(ctx);
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	4262 return;
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	4263 }
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	4264
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	4265 naddrs += srvs[i].naddrs;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4266 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4267
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4268 if (naddrs == 0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4269 ctx->state = NGX_RESOLVE_NXDOMAIN;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4270 ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4271
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4272 ctx->handler(ctx);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4273 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4274 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4275
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4276 addrs = ngx_resolver_calloc(r, naddrs * sizeof(ngx_resolver_addr_t));
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4277 if (addrs == NULL) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4278 ctx->state = NGX_ERROR;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4279 ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4280
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4281 ctx->handler(ctx);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4282 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4283 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4284
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4285 i = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4286 n = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4287
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4288 do {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4289 nw = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4290
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4291 for (j = i; j < nsrvs; j++) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4292 if (srvs[j].priority != srvs[i].priority) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4293 break;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4294 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4295
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4296 nw += srvs[j].naddrs * srvs[j].weight;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4297 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4298
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4299 if (nw == 0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4300 goto next_srv;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4301 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4302
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4303 w = ngx_random() % nw;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4304
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4305 for (k = i; k < j; k++) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4306 if (w < srvs[k].naddrs * srvs[k].weight) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4307 break;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4308 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4309
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4310 w -= srvs[k].naddrs * srvs[k].weight;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4311 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4312
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4313 for (l = i; l < j; l++) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4314
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4315 for (m = 0; m < srvs[k].naddrs; m++) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4316 addrs[n].socklen = srvs[k].addrs[m].socklen;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4317 addrs[n].sockaddr = srvs[k].addrs[m].sockaddr;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4318 addrs[n].name = srvs[k].name;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4319 addrs[n].priority = srvs[k].priority;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4320 addrs[n].weight = srvs[k].weight;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4321 n++;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4322 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4323
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4324 if (++k == j) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4325 k = i;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4326 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4327 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4328
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4329 next_srv:
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4330
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4331 i = j;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4332
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4333 } while (i < ctx->nsrvs);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4334
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4335 ctx->state = NGX_OK;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4336 ctx->addrs = addrs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4337 ctx->naddrs = naddrs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4338
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4339 ctx->handler(ctx);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4340
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4341 ngx_resolver_free(r, addrs);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4342 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4343
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4344
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4345 char *
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4346 ngx_resolver_strerror(ngx_int_t err)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4347 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4348 static char *errors[] = {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4349 "Format error", /* FORMERR */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4350 "Server failure", /* SERVFAIL */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4351 "Host not found", /* NXDOMAIN */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4352 "Unimplemented", /* NOTIMP */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4353 "Operation refused" /* REFUSED */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4354 };
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4355
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4356 if (err > 0 && err < 6) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4357 return errors[err - 1];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4358 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4359
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4360 if (err == NGX_RESOLVE_TIMEDOUT) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4361 return "Operation timed out";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4362 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4363
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4364 return "Unknown error";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4365 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4366
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4367
3408 71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4368 static u_char *
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4369 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	4370 {
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4371 u_char *p;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4372 ngx_resolver_connection_t *rec;
3408 71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4373
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4374 p = buf;
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4375
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4376 if (log->action) {
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4377 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	4378 len -= p - buf;
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4379 }
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4380
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4381 rec = log->data;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4382
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4383 if (rec) {
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4384 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	4385 }
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4386
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4387 return p;
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4388 }
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4389
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4390
6922 a72886067bbb Added missing static specifiers. Eran Kornblau <erankor@gmail.com> parents: 6860 diff changeset	4391 static ngx_int_t
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4392 ngx_udp_connect(ngx_resolver_connection_t *rec)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4393 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4394 int rc;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4395 ngx_int_t event;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4396 ngx_event_t rev, wev;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4397 ngx_socket_t s;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4398 ngx_connection_t *c;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4399
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4400 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	4401
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4402 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	4403
5360 3d2d3e1cf427 Win32: MinGW GCC compatibility. Maxim Dounin <mdounin@mdounin.ru> parents: 4892 diff changeset	4404 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	4405 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	4406 ngx_socket_n " failed");
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4407 return NGX_ERROR;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4408 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4409
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4410 c = ngx_get_connection(s, &rec->log);
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4411
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4412 if (c == NULL) {
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4413 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	4414 ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
7290 91ea68dd1501 Added missing space after ngx_close_socket_n. Maxim Dounin <mdounin@mdounin.ru> parents: 7276 diff changeset	4415 ngx_close_socket_n " failed");
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4416 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4417
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4418 return NGX_ERROR;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4419 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4420
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4421 if (ngx_nonblocking(s) == -1) {
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4422 ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4423 ngx_nonblocking_n " failed");
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4424
5582 545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	4425 goto failed;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4426 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4427
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4428 rev = c->read;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4429 wev = c->write;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4430
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4431 rev->log = &rec->log;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4432 wev->log = &rec->log;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4433
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4434 rec->udp = c;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4435
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4436 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	4437
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4438 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	4439 "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	4440
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4441 rc = connect(s, rec->sockaddr, rec->socklen);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4442
6125 4dc8e7b62216 Removed the obsolete aio module. Ruslan Ermilov <ru@nginx.com> parents: 5921 diff changeset	4443 /* TODO: iocp */
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4444
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4445 if (rc == -1) {
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4446 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	4447 "connect() failed");
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4448
5582 545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	4449 goto failed;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4450 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4451
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4452 /* UDP sockets are always ready to write */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4453 wev->ready = 1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4454
6126 adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	4455 event = (ngx_event_flags & NGX_USE_CLEAR_EVENT) ?
adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	4456 /* kqueue, epoll */ NGX_CLEAR_EVENT:
adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	4457 /* select, poll, /dev/poll */ NGX_LEVEL_EVENT;
adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	4458 /* eventport event type has no meaning: oneshot only */
adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	4459
adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	4460 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	4461 goto failed;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4462 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4463
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4464 return NGX_OK;
5582 545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	4465
545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	4466 failed:
545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	4467
545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	4468 ngx_close_connection(c);
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4469 rec->udp = NULL;
5582 545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	4470
545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	4471 return NGX_ERROR;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4472 }
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4473
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4474
6922 a72886067bbb Added missing static specifiers. Eran Kornblau <erankor@gmail.com> parents: 6860 diff changeset	4475 static ngx_int_t
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4476 ngx_tcp_connect(ngx_resolver_connection_t *rec)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4477 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4478 int rc;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4479 ngx_int_t event;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4480 ngx_err_t err;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4481 ngx_uint_t level;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4482 ngx_socket_t s;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4483 ngx_event_t rev, wev;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4484 ngx_connection_t *c;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4485
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4486 s = ngx_socket(rec->sockaddr->sa_family, SOCK_STREAM, 0);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4487
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4488 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	4489
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4490 if (s == (ngx_socket_t) -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4491 ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4492 ngx_socket_n " failed");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4493 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4494 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4495
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4496 c = ngx_get_connection(s, &rec->log);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4497
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4498 if (c == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4499 if (ngx_close_socket(s) == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4500 ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
7290 91ea68dd1501 Added missing space after ngx_close_socket_n. Maxim Dounin <mdounin@mdounin.ru> parents: 7276 diff changeset	4501 ngx_close_socket_n " failed");
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4502 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4503
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4504 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4505 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4506
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4507 if (ngx_nonblocking(s) == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4508 ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4509 ngx_nonblocking_n " failed");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4510
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4511 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4512 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4513
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4514 rev = c->read;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4515 wev = c->write;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4516
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4517 rev->log = &rec->log;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4518 wev->log = &rec->log;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4519
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4520 rec->tcp = c;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4521
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4522 c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4523
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4524 if (ngx_add_conn) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4525 if (ngx_add_conn(c) == NGX_ERROR) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4526 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4527 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4528 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4529
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4530 ngx_log_debug3(NGX_LOG_DEBUG_EVENT, &rec->log, 0,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4531 "connect to %V, fd:%d #%uA", &rec->server, s, c->number);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4532
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4533 rc = connect(s, rec->sockaddr, rec->socklen);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4534
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4535 if (rc == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4536 err = ngx_socket_errno;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4537
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4538
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4539 if (err != NGX_EINPROGRESS
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4540 #if (NGX_WIN32)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4541 /* Winsock returns WSAEWOULDBLOCK (NGX_EAGAIN) */
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4542 && err != NGX_EAGAIN
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4543 #endif
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4544 )
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4545 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4546 if (err == NGX_ECONNREFUSED
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4547 #if (NGX_LINUX)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4548 /*
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4549 * Linux returns EAGAIN instead of ECONNREFUSED
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4550 * for unix sockets if listen queue is full
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4551 */
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4552 \|\| err == NGX_EAGAIN
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4553 #endif
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4554 \|\| err == NGX_ECONNRESET
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4555 \|\| err == NGX_ENETDOWN
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4556 \|\| err == NGX_ENETUNREACH
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4557 \|\| err == NGX_EHOSTDOWN
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4558 \|\| err == NGX_EHOSTUNREACH)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4559 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4560 level = NGX_LOG_ERR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4561
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4562 } else {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4563 level = NGX_LOG_CRIT;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4564 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4565
7275 e15bf978447e Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 7052 diff changeset	4566 ngx_log_error(level, &rec->log, err, "connect() to %V failed",
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4567 &rec->server);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4568
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4569 ngx_close_connection(c);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4570 rec->tcp = NULL;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4571
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4572 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4573 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4574 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4575
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4576 if (ngx_add_conn) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4577 if (rc == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4578
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4579 /* NGX_EINPROGRESS */
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4580
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4581 return NGX_AGAIN;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4582 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4583
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4584 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, &rec->log, 0, "connected");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4585
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4586 wev->ready = 1;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4587
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4588 return NGX_OK;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4589 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4590
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4591 if (ngx_event_flags & NGX_USE_IOCP_EVENT) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4592
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4593 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	4594 "connect(): %d", rc);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4595
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4596 if (ngx_blocking(s) == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4597 ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4598 ngx_blocking_n " failed");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4599 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4600 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4601
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4602 /*
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4603 * 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	4604 * NT does not support it.
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4605 *
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4606 * 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	4607 */
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4608
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4609 rev->ready = 1;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4610 wev->ready = 1;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4611
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4612 return NGX_OK;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4613 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4614
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4615 if (ngx_event_flags & NGX_USE_CLEAR_EVENT) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4616
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4617 /* kqueue */
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4618
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4619 event = NGX_CLEAR_EVENT;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4620
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4621 } else {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4622
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4623 /* select, poll, /dev/poll */
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4624
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4625 event = NGX_LEVEL_EVENT;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4626 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4627
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4628 if (ngx_add_event(rev, NGX_READ_EVENT, event) != NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4629 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4630 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4631
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4632 if (rc == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4633
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4634 /* NGX_EINPROGRESS */
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4635
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4636 if (ngx_add_event(wev, NGX_WRITE_EVENT, event) != NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4637 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4638 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4639
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4640 return NGX_AGAIN;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4641 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4642
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4643 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, &rec->log, 0, "connected");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4644
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4645 wev->ready = 1;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4646
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4647 return NGX_OK;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4648
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4649 failed:
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4650
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4651 ngx_close_connection(c);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4652 rec->tcp = NULL;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4653
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4654 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4655 }
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4656
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4657
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4658 static ngx_int_t
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4659 ngx_resolver_cmp_srvs(const void one, const void two)
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4660 {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4661 ngx_int_t p1, p2;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4662 ngx_resolver_srv_t first, second;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4663
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4664 first = (ngx_resolver_srv_t *) one;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4665 second = (ngx_resolver_srv_t *) two;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4666
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4667 p1 = first->priority;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4668 p2 = second->priority;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4669
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4670 return p1 - p2;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4671 }

Mercurial > hg > nginx

annotate src/core/ngx_resolver.c @ 7312:54683f650cbd