nginx: src/core/ngx_resolver.c annotate

annotate src/core/ngx_resolver.c @ 7051:137c5be7df09

Resolver: factored out setting a timer for resolver timeout. No functional changes.

author	Sergey Kandaurov <pluknet@nginx.com>
date	Tue, 04 Jul 2017 18:46:30 +0300
parents	80224192163c
children	70e65bf8dfd7

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
1913 c0f873458e2b use cf->cycle->new_log because at merge stage cf->pool->log is old log Igor Sysoev <igor@sysoev.ru> parents: 1906 diff changeset	144 cln = ngx_pool_cleanup_add(cf->pool, 0);
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	145 if (cln == NULL) {
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	146 return NULL;
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	147 }
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	148
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	149 cln->handler = ngx_resolver_cleanup;
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	150
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	151 r = ngx_calloc(sizeof(ngx_resolver_t), cf->log);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	152 if (r == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	153 return NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	154 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	155
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	156 cln->data = r;
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	157
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	158 r->event = ngx_calloc(sizeof(ngx_event_t), cf->log);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	159 if (r->event == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	160 return NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	161 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	162
1687 568d432effb9 use ngx_rbtree_init() Igor Sysoev <igor@sysoev.ru> parents: 1685 diff changeset	163 ngx_rbtree_init(&r->name_rbtree, &r->name_sentinel,
568d432effb9 use ngx_rbtree_init() Igor Sysoev <igor@sysoev.ru> parents: 1685 diff changeset	164 ngx_resolver_rbtree_insert_value);
568d432effb9 use ngx_rbtree_init() Igor Sysoev <igor@sysoev.ru> parents: 1685 diff changeset	165
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	166 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	167 ngx_resolver_rbtree_insert_value);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	168
1687 568d432effb9 use ngx_rbtree_init() Igor Sysoev <igor@sysoev.ru> parents: 1685 diff changeset	169 ngx_rbtree_init(&r->addr_rbtree, &r->addr_sentinel,
568d432effb9 use ngx_rbtree_init() Igor Sysoev <igor@sysoev.ru> parents: 1685 diff changeset	170 ngx_rbtree_insert_value);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	171
1685 a24c909ad879 use ngx_queue_init() Igor Sysoev <igor@sysoev.ru> parents: 1683 diff changeset	172 ngx_queue_init(&r->name_resend_queue);
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	173 ngx_queue_init(&r->srv_resend_queue);
1685 a24c909ad879 use ngx_queue_init() Igor Sysoev <igor@sysoev.ru> parents: 1683 diff changeset	174 ngx_queue_init(&r->addr_resend_queue);
a24c909ad879 use ngx_queue_init() Igor Sysoev <igor@sysoev.ru> parents: 1683 diff changeset	175
a24c909ad879 use ngx_queue_init() Igor Sysoev <igor@sysoev.ru> parents: 1683 diff changeset	176 ngx_queue_init(&r->name_expire_queue);
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	177 ngx_queue_init(&r->srv_expire_queue);
1685 a24c909ad879 use ngx_queue_init() Igor Sysoev <igor@sysoev.ru> parents: 1683 diff changeset	178 ngx_queue_init(&r->addr_expire_queue);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	179
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	180 #if (NGX_HAVE_INET6)
5478 3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	181 r->ipv6 = 1;
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	182
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	183 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	184 ngx_resolver_rbtree_insert_addr6_value);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	185
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	186 ngx_queue_init(&r->addr6_resend_queue);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	187
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	188 ngx_queue_init(&r->addr6_expire_queue);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	189 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	190
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	191 r->event->handler = ngx_resolver_resend_handler;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	192 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	193 r->event->log = &cf->cycle->new_log;
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
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	278 return r;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	279 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	280
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	281
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	282 static void
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	283 ngx_resolver_cleanup(void *data)
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	284 {
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	285 ngx_resolver_t *r = data;
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	286
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	287 ngx_uint_t i;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	288 ngx_resolver_connection_t *rec;
4225 016352c19049 Support of several servers in the "resolver" directive. Igor Sysoev <igor@sysoev.ru> parents: 3902 diff changeset	289
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	290 if (r) {
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	291 ngx_log_debug0(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0,
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	292 "cleanup resolver");
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	293
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	294 ngx_resolver_cleanup_tree(r, &r->name_rbtree);
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	295
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	296 ngx_resolver_cleanup_tree(r, &r->srv_rbtree);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	297
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	298 ngx_resolver_cleanup_tree(r, &r->addr_rbtree);
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	299
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	300 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	301 ngx_resolver_cleanup_tree(r, &r->addr6_rbtree);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	302 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	303
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	304 if (r->event) {
6843 a3dc657f4e95 Resolver: fixed possible use-after-free in worker on fast shutdown. Ruslan Ermilov <ru@nginx.com> parents: 6714 diff changeset	305 if (r->event->timer_set) {
a3dc657f4e95 Resolver: fixed possible use-after-free in worker on fast shutdown. Ruslan Ermilov <ru@nginx.com> parents: 6714 diff changeset	306 ngx_del_timer(r->event);
a3dc657f4e95 Resolver: fixed possible use-after-free in worker on fast shutdown. Ruslan Ermilov <ru@nginx.com> parents: 6714 diff changeset	307 }
a3dc657f4e95 Resolver: fixed possible use-after-free in worker on fast shutdown. Ruslan Ermilov <ru@nginx.com> parents: 6714 diff changeset	308
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	309 ngx_free(r->event);
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	310 }
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	311
4225 016352c19049 Support of several servers in the "resolver" directive. Igor Sysoev <igor@sysoev.ru> parents: 3902 diff changeset	312
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	313 rec = r->connections.elts;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	314
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	315 for (i = 0; i < r->connections.nelts; i++) {
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	316 if (rec[i].udp) {
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	317 ngx_close_connection(rec[i].udp);
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	318 }
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	319
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	320 if (rec[i].tcp) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	321 ngx_close_connection(rec[i].tcp);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	322 }
6369 06459bc8b92f Resolver: free TCP buffers on resolver cleanup. Roman Arutyunyan <arut@nginx.com> parents: 6368 diff changeset	323
06459bc8b92f Resolver: free TCP buffers on resolver cleanup. Roman Arutyunyan <arut@nginx.com> parents: 6368 diff changeset	324 if (rec[i].read_buf) {
06459bc8b92f Resolver: free TCP buffers on resolver cleanup. Roman Arutyunyan <arut@nginx.com> parents: 6368 diff changeset	325 ngx_resolver_free(r, rec[i].read_buf->start);
06459bc8b92f Resolver: free TCP buffers on resolver cleanup. Roman Arutyunyan <arut@nginx.com> parents: 6368 diff changeset	326 ngx_resolver_free(r, rec[i].read_buf);
06459bc8b92f Resolver: free TCP buffers on resolver cleanup. Roman Arutyunyan <arut@nginx.com> parents: 6368 diff changeset	327 }
06459bc8b92f Resolver: free TCP buffers on resolver cleanup. Roman Arutyunyan <arut@nginx.com> parents: 6368 diff changeset	328
06459bc8b92f Resolver: free TCP buffers on resolver cleanup. Roman Arutyunyan <arut@nginx.com> parents: 6368 diff changeset	329 if (rec[i].write_buf) {
06459bc8b92f Resolver: free TCP buffers on resolver cleanup. Roman Arutyunyan <arut@nginx.com> parents: 6368 diff changeset	330 ngx_resolver_free(r, rec[i].write_buf->start);
06459bc8b92f Resolver: free TCP buffers on resolver cleanup. Roman Arutyunyan <arut@nginx.com> parents: 6368 diff changeset	331 ngx_resolver_free(r, rec[i].write_buf);
06459bc8b92f Resolver: free TCP buffers on resolver cleanup. Roman Arutyunyan <arut@nginx.com> parents: 6368 diff changeset	332 }
1906 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 ngx_free(r);
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	336 }
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	337 }
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	338
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	339
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	340 static void
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	341 ngx_resolver_cleanup_tree(ngx_resolver_t r, ngx_rbtree_t tree)
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	342 {
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	343 ngx_resolver_ctx_t ctx, next;
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	344 ngx_resolver_node_t *rn;
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	345
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	346 while (tree->root != tree->sentinel) {
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	347
5921 5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	348 rn = ngx_resolver_node(ngx_rbtree_min(tree->root, tree->sentinel));
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 ngx_queue_remove(&rn->queue);
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	351
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	352 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	353 next = ctx->next;
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	354
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	355 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	356 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	357 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	358 }
259e2a76e8fb Resolver: fixed possible use-after-free in worker on fast shutdown. Ruslan Ermilov <ru@nginx.com> parents: 6843 diff changeset	359
1906 4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	360 ngx_resolver_free(r, ctx->event);
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	361 }
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(r, ctx);
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 ngx_rbtree_delete(tree, &rn->node);
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	367
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	368 ngx_resolver_free_node(r, rn);
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	369 }
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	370 }
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	371
4a8c9139e579 cleanup resolver Igor Sysoev <igor@sysoev.ru> parents: 1904 diff changeset	372
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	373 ngx_resolver_ctx_t *
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	374 ngx_resolve_start(ngx_resolver_t r, ngx_resolver_ctx_t temp)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	375 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	376 in_addr_t addr;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	377 ngx_resolver_ctx_t *ctx;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	378
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	379 if (temp) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	380 addr = ngx_inet_addr(temp->name.data, temp->name.len);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	381
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	382 if (addr != INADDR_NONE) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	383 temp->resolver = r;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	384 temp->state = NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	385 temp->naddrs = 1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	386 temp->addrs = &temp->addr;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	387 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	388 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	389 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	390 temp->sin.sin_family = AF_INET;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	391 temp->sin.sin_addr.s_addr = addr;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	392 temp->quick = 1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	393
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	394 return temp;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	395 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	396 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	397
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	398 if (r->connections.nelts == 0) {
1683 1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1679 diff changeset	399 return NGX_NO_RESOLVER;
1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1679 diff changeset	400 }
1e0b028055ec allow to use IP addresses without defined resolver Igor Sysoev <igor@sysoev.ru> parents: 1679 diff changeset	401
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	402 ctx = ngx_resolver_calloc(r, sizeof(ngx_resolver_ctx_t));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	403
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	404 if (ctx) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	405 ctx->resolver = r;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	406 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	407
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	408 return ctx;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	409 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	410
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	411
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	412 ngx_int_t
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	413 ngx_resolve_name(ngx_resolver_ctx_t *ctx)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	414 {
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	415 size_t slen;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	416 ngx_int_t rc;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	417 ngx_str_t name;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	418 ngx_resolver_t *r;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	419
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	420 r = ctx->resolver;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	421
5505 d091d16ed398 Resolver: added support for domain names with a trailing dot. Yichun Zhang <agentzh@gmail.com> parents: 5485 diff changeset	422 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	423 ctx->name.len--;
d091d16ed398 Resolver: added support for domain names with a trailing dot. Yichun Zhang <agentzh@gmail.com> parents: 5485 diff changeset	424 }
d091d16ed398 Resolver: added support for domain names with a trailing dot. Yichun Zhang <agentzh@gmail.com> parents: 5485 diff changeset	425
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	426 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	427 "resolve: \"%V\"", &ctx->name);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	428
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	429 if (ctx->quick) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	430 ctx->handler(ctx);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	431 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	432 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	433
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	434 if (ctx->service.len) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	435 slen = ctx->service.len;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	436
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	437 if (ngx_strlchr(ctx->service.data,
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	438 ctx->service.data + ctx->service.len, '.')
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	439 == NULL)
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 slen += sizeof("_._tcp") - 1;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	442 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	443
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	444 name.len = slen + 1 + ctx->name.len;
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 name.data = ngx_resolver_alloc(r, name.len);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	447 if (name.data == NULL) {
7039 a39bc74873fa Resolver: fixed allocation error handling while resolving SRV. Bart Warmerdam <bartw@xs4all.nl> parents: 6922 diff changeset	448 goto failed;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	449 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	450
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	451 if (slen == ctx->service.len) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	452 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	453
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	454 } else {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	455 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	456 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	457
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	458 /* lock name mutex */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	459
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	460 rc = ngx_resolve_name_locked(r, ctx, &name);
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 ngx_resolver_free(r, name.data);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	463
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	464 } else {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	465 /* lock name mutex */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	466
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	467 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	468 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	469
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	470 if (rc == NGX_OK) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	471 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	472 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	473
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	474 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	475
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	476 if (rc == NGX_AGAIN) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	477 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	478 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	479
1904 538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	480 /* NGX_ERROR */
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	481
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	482 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	483 ngx_resolver_free(r, ctx->event);
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
7039 a39bc74873fa Resolver: fixed allocation error handling while resolving SRV. Bart Warmerdam <bartw@xs4all.nl> parents: 6922 diff changeset	486 failed:
a39bc74873fa Resolver: fixed allocation error handling while resolving SRV. Bart Warmerdam <bartw@xs4all.nl> parents: 6922 diff changeset	487
1904 538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	488 ngx_resolver_free(r, ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	489
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	490 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	491 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	492
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	493
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	494 void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	495 ngx_resolve_name_done(ngx_resolver_ctx_t *ctx)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	496 {
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	497 ngx_uint_t i;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	498 ngx_resolver_t *r;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	499 ngx_resolver_ctx_t w, *p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	500 ngx_resolver_node_t *rn;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	501
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	502 r = ctx->resolver;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	503
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	504 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	505 "resolve name done: %i", ctx->state);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	506
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	507 if (ctx->quick) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	508 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	509 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	510
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	511 if (ctx->event && ctx->event->timer_set) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	512 ngx_del_timer(ctx->event);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	513 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	514
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	515 /* lock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	516
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	517 if (ctx->nsrvs) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	518 for (i = 0; i < ctx->nsrvs; i++) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	519 if (ctx->srvs[i].ctx) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	520 ngx_resolve_name_done(ctx->srvs[i].ctx);
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 if (ctx->srvs[i].addrs) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	524 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	525 ngx_resolver_free(r, ctx->srvs[i].addrs);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	526 }
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 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	529 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	530
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	531 ngx_resolver_free(r, ctx->srvs);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	532 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	533
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	534 if (ctx->state == NGX_AGAIN \|\| ctx->state == NGX_RESOLVE_TIMEDOUT) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	535
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	536 rn = ctx->node;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	537
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	538 if (rn) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	539 p = &rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	540 w = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	541
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	542 while (w) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	543 if (w == ctx) {
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
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	546 goto done;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	547 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	548
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	549 p = &w->next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	550 w = w->next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	551 }
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	552
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	553 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	554 "could not cancel %V resolving", &ctx->name);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	555 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	556 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	557
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	558 done:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	559
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	560 if (ctx->service.len) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	561 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	562
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	563 } else {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	564 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	565 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	566
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	567 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	568
1904 538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	569 /* 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	570
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	571 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	572 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	573 }
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	574
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	575 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	576
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	577 /* unlock alloc mutex */
6196 c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	578
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	579 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	580 ngx_del_timer(r->event);
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	581 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	582 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	583
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	584
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	585 static ngx_int_t
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	586 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	587 ngx_str_t *name)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	588 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	589 uint32_t hash;
1961 99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	590 ngx_int_t rc;
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	591 ngx_str_t cname;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	592 ngx_uint_t i, naddrs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	593 ngx_queue_t resend_queue, expire_queue;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	594 ngx_rbtree_t *tree;
6349 978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	595 ngx_resolver_ctx_t next, last;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	596 ngx_resolver_addr_t *addrs;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	597 ngx_resolver_node_t *rn;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	598
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	599 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	600
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	601 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	602
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	603 if (ctx->service.len) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	604 rn = ngx_resolver_lookup_srv(r, name, hash);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	605
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	606 tree = &r->srv_rbtree;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	607 resend_queue = &r->srv_resend_queue;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	608 expire_queue = &r->srv_expire_queue;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	609
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	610 } else {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	611 rn = ngx_resolver_lookup_name(r, name, hash);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	612
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	613 tree = &r->name_rbtree;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	614 resend_queue = &r->name_resend_queue;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	615 expire_queue = &r->name_expire_queue;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	616 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	617
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	618 if (rn) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	619
6349 978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	620 /* 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	621 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	622
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	623 if (rn->valid >= ngx_time()) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	624
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	625 ngx_log_debug0(NGX_LOG_DEBUG_CORE, r->log, 0, "resolve cached");
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	626
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	627 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	628
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	629 rn->expire = ngx_time() + r->expire;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	630
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	631 ngx_queue_insert_head(expire_queue, &rn->queue);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	632
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	633 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	634 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	635 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	636 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	637
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	638 if (naddrs) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	639
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	640 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	641 addrs = NULL;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	642
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	643 } else {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	644 addrs = ngx_resolver_export(r, rn, 1);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	645 if (addrs == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	646 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	647 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	648 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	649
6349 978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	650 last->next = rn->waiting;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	651 rn->waiting = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	652
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	653 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	654
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	655 do {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	656 ctx->state = NGX_OK;
6456 c94aba230a5a Resolver: introduced valid field in resolver responses. Dmitry Volyntsev <xeioex@nginx.com> parents: 6372 diff changeset	657 ctx->valid = rn->valid;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	658 ctx->naddrs = naddrs;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	659
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	660 if (addrs == NULL) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	661 ctx->addrs = &ctx->addr;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	662 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	663 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	664 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	665 ctx->sin.sin_family = AF_INET;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	666 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	667
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	668 } else {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	669 ctx->addrs = addrs;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	670 }
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	671
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	672 next = ctx->next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	673
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	674 ctx->handler(ctx);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	675
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	676 ctx = next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	677 } while (ctx);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	678
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	679 if (addrs != NULL) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	680 ngx_resolver_free(r, addrs->sockaddr);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	681 ngx_resolver_free(r, addrs);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	682 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	683
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	684 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	685 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	686
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	687 if (rn->nsrvs) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	688 last->next = rn->waiting;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	689 rn->waiting = NULL;
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 /* unlock name mutex */
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 do {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	694 next = ctx->next;
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 ngx_resolver_resolve_srv_names(ctx, rn);
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 ctx = next;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	699 } while (ctx);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	700
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	701 return NGX_OK;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	702 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	703
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	704 /* NGX_RESOLVE_CNAME */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	705
1969 41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	706 if (ctx->recursion++ < NGX_RESOLVER_MAX_RECURSION) {
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	707
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	708 cname.len = rn->cnlen;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	709 cname.data = rn->u.cname;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	710
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	711 return ngx_resolve_name_locked(r, ctx, &cname);
1969 41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	712 }
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	713
6349 978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	714 last->next = rn->waiting;
1969 41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	715 rn->waiting = NULL;
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	716
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	717 /* unlock name mutex */
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 do {
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	720 ctx->state = NGX_RESOLVE_NXDOMAIN;
6456 c94aba230a5a Resolver: introduced valid field in resolver responses. Dmitry Volyntsev <xeioex@nginx.com> parents: 6372 diff changeset	721 ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
1969 41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	722 next = ctx->next;
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 ctx->handler(ctx);
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	725
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	726 ctx = next;
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	727 } while (ctx);
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	728
41fd9a2e0755 limit CNAME recursion Igor Sysoev <igor@sysoev.ru> parents: 1967 diff changeset	729 return NGX_OK;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	730 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	731
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	732 if (rn->waiting) {
7051 137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	733 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	734 return NGX_ERROR;
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	735 }
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	736
6349 978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	737 last->next = rn->waiting;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	738 rn->waiting = ctx;
3297 ebc5384479b4 fix segfault in resolver: Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	739 ctx->state = NGX_AGAIN;
7040 d49b74a683b1 Resolver: added the "async" flag to resolver context. Roman Arutyunyan <arut@nginx.com> parents: 7039 diff changeset	740 ctx->async = 1;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	741
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	742 do {
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	743 ctx->node = rn;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	744 ctx = ctx->next;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	745 } while (ctx);
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	746
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	747 return NGX_AGAIN;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	748 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	749
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	750 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	751
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	752 /* lock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	753
4619 3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	754 if (rn->query) {
3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	755 ngx_resolver_free_locked(r, rn->query);
3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	756 rn->query = NULL;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	757 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	758 rn->query6 = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	759 #endif
4619 3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	760 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	761
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	762 if (rn->cnlen) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	763 ngx_resolver_free_locked(r, rn->u.cname);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	764 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	765
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	766 if (rn->naddrs > 1 && rn->naddrs != (u_short) -1) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	767 ngx_resolver_free_locked(r, rn->u.addrs);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	768 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	769
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	770 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	771 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	772 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	773 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	774 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	775
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	776 if (rn->nsrvs) {
6860 f18c285c2e59 Win32: fixed some warnings reported by Borland C. Maxim Dounin <mdounin@mdounin.ru> parents: 6847 diff changeset	777 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	778 if (rn->u.srvs[i].name.data) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	779 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	780 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	781 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	782
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	783 ngx_resolver_free_locked(r, rn->u.srvs);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	784 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	785
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	786 /* unlock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	787
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	788 } else {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	789
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	790 rn = ngx_resolver_alloc(r, sizeof(ngx_resolver_node_t));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	791 if (rn == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	792 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	793 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	794
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	795 rn->name = ngx_resolver_dup(r, name->data, name->len);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	796 if (rn->name == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	797 ngx_resolver_free(r, rn);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	798 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	799 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	800
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	801 rn->node.key = hash;
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	802 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	803 rn->query = NULL;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	804 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	805 rn->query6 = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	806 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	807
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	808 ngx_rbtree_insert(tree, &rn->node);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	809 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	810
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	811 if (ctx->service.len) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	812 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	813
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	814 } else {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	815 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	816 }
1961 99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	817
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	818 if (rc == NGX_ERROR) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	819 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	820 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	821
1961 99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	822 if (rc == NGX_DECLINED) {
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	823 ngx_rbtree_delete(tree, &rn->node);
1961 99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	824
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	825 ngx_resolver_free(r, rn->query);
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	826 ngx_resolver_free(r, rn->name);
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	827 ngx_resolver_free(r, rn);
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	828
6349 978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	829 do {
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	830 ctx->state = NGX_RESOLVE_NXDOMAIN;
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	831 next = ctx->next;
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	832
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	833 ctx->handler(ctx);
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	834
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	835 ctx = next;
978e79b95c9f Resolver: fixed CNAME processing for several requests. Ruslan Ermilov <ru@nginx.com> parents: 6348 diff changeset	836 } while (ctx);
1961 99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	837
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	838 return NGX_OK;
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	839 }
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	840
6366 2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	841 rn->last_connection = r->last_connection++;
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	842 if (r->last_connection == r->connections.nelts) {
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	843 r->last_connection = 0;
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	844 }
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	845
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	846 rn->naddrs = (u_short) -1;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	847 rn->tcp = 0;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	848 #if (NGX_HAVE_INET6)
5478 3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	849 rn->naddrs6 = r->ipv6 ? (u_short) -1 : 0;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	850 rn->tcp6 = 0;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	851 #endif
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	852 rn->nsrvs = 0;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	853
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	854 if (ngx_resolver_send_query(r, rn) != NGX_OK) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	855 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	856 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	857
7051 137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	858 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	859 goto failed;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	860 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	861
6846 c3a895b94d3f Resolver: fixed a race between parallel name and addr resolves. Dmitry Volyntsev <xeioex@nginx.com> parents: 6845 diff changeset	862 if (ngx_resolver_resend_empty(r)) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	863 ngx_add_timer(r->event, (ngx_msec_t) (r->resend_timeout * 1000));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	864 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	865
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	866 rn->expire = ngx_time() + r->resend_timeout;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	867
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	868 ngx_queue_insert_head(resend_queue, &rn->queue);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	869
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	870 rn->code = 0;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	871 rn->cnlen = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	872 rn->valid = 0;
5485 8958656a8060 Resolver: use minimum TTL for caching (ticket #329). Ruslan Ermilov <ru@nginx.com> parents: 5479 diff changeset	873 rn->ttl = NGX_MAX_UINT32_VALUE;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	874 rn->waiting = ctx;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	875
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	876 ctx->state = NGX_AGAIN;
7040 d49b74a683b1 Resolver: added the "async" flag to resolver context. Roman Arutyunyan <arut@nginx.com> parents: 7039 diff changeset	877 ctx->async = 1;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	878
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	879 do {
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	880 ctx->node = rn;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	881 ctx = ctx->next;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	882 } while (ctx);
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	883
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	884 return NGX_AGAIN;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	885
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	886 failed:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	887
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	888 ngx_rbtree_delete(tree, &rn->node);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	889
1960 1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	890 if (rn->query) {
1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	891 ngx_resolver_free(r, rn->query);
1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	892 }
1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	893
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	894 ngx_resolver_free(r, rn->name);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	895
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	896 ngx_resolver_free(r, rn);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	897
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	898 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	899 }
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	900
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	901
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	902 ngx_int_t
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	903 ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	904 {
2484 cf3cd450049c store name pointer in variable allocated on stack Igor Sysoev <igor@sysoev.ru> parents: 2483 diff changeset	905 u_char *name;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	906 in_addr_t addr;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	907 ngx_queue_t resend_queue, expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	908 ngx_rbtree_t *tree;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	909 ngx_resolver_t *r;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	910 struct sockaddr_in *sin;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	911 ngx_resolver_node_t *rn;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	912 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	913 uint32_t hash;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	914 struct sockaddr_in6 *sin6;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	915 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	916
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	917 #if (NGX_SUPPRESS_WARN)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	918 addr = 0;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	919 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	920 hash = 0;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	921 sin6 = NULL;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	922 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	923 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	924
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	925 r = ctx->resolver;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	926
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	927 switch (ctx->addr.sockaddr->sa_family) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	928
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	929 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	930 case AF_INET6:
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	931 sin6 = (struct sockaddr_in6 *) ctx->addr.sockaddr;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	932 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	933
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	934 /* lock addr mutex */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	935
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	936 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	937
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	938 tree = &r->addr6_rbtree;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	939 resend_queue = &r->addr6_resend_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	940 expire_queue = &r->addr6_expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	941
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	942 break;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	943 #endif
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 default: /* AF_INET */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	946 sin = (struct sockaddr_in *) ctx->addr.sockaddr;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	947 addr = ntohl(sin->sin_addr.s_addr);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	948
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	949 /* lock addr mutex */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	950
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	951 rn = ngx_resolver_lookup_addr(r, addr);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	952
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	953 tree = &r->addr_rbtree;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	954 resend_queue = &r->addr_resend_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	955 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	956 }
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	957
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	958 if (rn) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	959
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	960 if (rn->valid >= ngx_time()) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	961
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	962 ngx_log_debug0(NGX_LOG_DEBUG_CORE, r->log, 0, "resolve cached");
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	963
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	964 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	965
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	966 rn->expire = ngx_time() + r->expire;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	967
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	968 ngx_queue_insert_head(expire_queue, &rn->queue);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	969
2484 cf3cd450049c store name pointer in variable allocated on stack Igor Sysoev <igor@sysoev.ru> parents: 2483 diff changeset	970 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	971 if (name == NULL) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	972 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	973 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	974
2484 cf3cd450049c store name pointer in variable allocated on stack Igor Sysoev <igor@sysoev.ru> parents: 2483 diff changeset	975 ctx->name.len = rn->nlen;
cf3cd450049c store name pointer in variable allocated on stack Igor Sysoev <igor@sysoev.ru> parents: 2483 diff changeset	976 ctx->name.data = name;
cf3cd450049c store name pointer in variable allocated on stack Igor Sysoev <igor@sysoev.ru> parents: 2483 diff changeset	977
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	978 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	979
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	980 ctx->state = NGX_OK;
6456 c94aba230a5a Resolver: introduced valid field in resolver responses. Dmitry Volyntsev <xeioex@nginx.com> parents: 6372 diff changeset	981 ctx->valid = rn->valid;
1649 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->handler(ctx);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	984
2484 cf3cd450049c store name pointer in variable allocated on stack Igor Sysoev <igor@sysoev.ru> parents: 2483 diff changeset	985 ngx_resolver_free(r, name);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	986
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	987 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	988 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	989
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	990 if (rn->waiting) {
7051 137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	991 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	992 return NGX_ERROR;
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	993 }
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	994
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	995 ctx->next = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	996 rn->waiting = ctx;
3297 ebc5384479b4 fix segfault in resolver: Igor Sysoev <igor@sysoev.ru> parents: 3269 diff changeset	997 ctx->state = NGX_AGAIN;
7040 d49b74a683b1 Resolver: added the "async" flag to resolver context. Roman Arutyunyan <arut@nginx.com> parents: 7039 diff changeset	998 ctx->async = 1;
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	999 ctx->node = rn;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1000
2487 9b4dce95c744 fix return code, this fixes segfault when two or more Igor Sysoev <igor@sysoev.ru> parents: 2486 diff changeset	1001 /* unlock addr mutex */
9b4dce95c744 fix return code, this fixes segfault when two or more Igor Sysoev <igor@sysoev.ru> parents: 2486 diff changeset	1002
9b4dce95c744 fix return code, this fixes segfault when two or more Igor Sysoev <igor@sysoev.ru> parents: 2486 diff changeset	1003 return NGX_OK;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1004 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1005
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1006 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1007
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1008 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	1009 rn->query = NULL;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1010 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1011 rn->query6 = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1012 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1013
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1014 } else {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1015 rn = ngx_resolver_alloc(r, sizeof(ngx_resolver_node_t));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1016 if (rn == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1017 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1018 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1019
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1020 switch (ctx->addr.sockaddr->sa_family) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1021
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1022 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1023 case AF_INET6:
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1024 rn->addr6 = sin6->sin6_addr;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1025 rn->node.key = hash;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1026 break;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1027 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1028
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1029 default: /* AF_INET */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1030 rn->node.key = addr;
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
1960 1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	1033 rn->query = NULL;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1034 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1035 rn->query6 = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1036 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1037
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1038 ngx_rbtree_insert(tree, &rn->node);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1039 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1040
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	1041 if (ngx_resolver_create_addr_query(r, rn, &ctx->addr) != NGX_OK) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1042 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1043 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1044
6366 2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1045 rn->last_connection = r->last_connection++;
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1046 if (r->last_connection == r->connections.nelts) {
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1047 r->last_connection = 0;
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1048 }
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1049
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1050 rn->naddrs = (u_short) -1;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1051 rn->tcp = 0;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1052 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1053 rn->naddrs6 = (u_short) -1;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1054 rn->tcp6 = 0;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1055 #endif
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1056 rn->nsrvs = 0;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1057
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1058 if (ngx_resolver_send_query(r, rn) != NGX_OK) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1059 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1060 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1061
7051 137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	1062 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	1063 goto failed;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1064 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1065
6846 c3a895b94d3f Resolver: fixed a race between parallel name and addr resolves. Dmitry Volyntsev <xeioex@nginx.com> parents: 6845 diff changeset	1066 if (ngx_resolver_resend_empty(r)) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1067 ngx_add_timer(r->event, (ngx_msec_t) (r->resend_timeout * 1000));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1068 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1069
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1070 rn->expire = ngx_time() + r->resend_timeout;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1071
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1072 ngx_queue_insert_head(resend_queue, &rn->queue);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1073
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1074 rn->code = 0;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1075 rn->cnlen = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1076 rn->name = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1077 rn->nlen = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1078 rn->valid = 0;
5485 8958656a8060 Resolver: use minimum TTL for caching (ticket #329). Ruslan Ermilov <ru@nginx.com> parents: 5479 diff changeset	1079 rn->ttl = NGX_MAX_UINT32_VALUE;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1080 rn->waiting = ctx;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1081
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1082 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1083
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1084 ctx->state = NGX_AGAIN;
7040 d49b74a683b1 Resolver: added the "async" flag to resolver context. Roman Arutyunyan <arut@nginx.com> parents: 7039 diff changeset	1085 ctx->async = 1;
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	1086 ctx->node = rn;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1087
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1088 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1089
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1090 failed:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1091
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1092 if (rn) {
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1093 ngx_rbtree_delete(tree, &rn->node);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1094
1960 1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	1095 if (rn->query) {
1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	1096 ngx_resolver_free(r, rn->query);
1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	1097 }
1609b3c3d604 fix memory leak on resolver query send failure Igor Sysoev <igor@sysoev.ru> parents: 1914 diff changeset	1098
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1099 ngx_resolver_free(r, rn);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1100 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1101
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1102 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1103
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1104 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	1105 ngx_resolver_free(r, ctx->event);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1106 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1107
1904 538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	1108 ngx_resolver_free(r, ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1109
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1110 return NGX_ERROR;
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
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1114 void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1115 ngx_resolve_addr_done(ngx_resolver_ctx_t *ctx)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1116 {
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1117 ngx_queue_t *expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1118 ngx_rbtree_t *tree;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1119 ngx_resolver_t *r;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1120 ngx_resolver_ctx_t w, *p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1121 ngx_resolver_node_t *rn;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	1122
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1123 r = ctx->resolver;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1124
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1125 switch (ctx->addr.sockaddr->sa_family) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1126
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1127 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1128 case AF_INET6:
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1129 tree = &r->addr6_rbtree;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1130 expire_queue = &r->addr6_expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1131 break;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1132 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1133
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1134 default: /* AF_INET */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1135 tree = &r->addr_rbtree;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1136 expire_queue = &r->addr_expire_queue;
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
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1139 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1140 "resolve addr done: %i", ctx->state);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1141
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1142 if (ctx->event && ctx->event->timer_set) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1143 ngx_del_timer(ctx->event);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1144 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1145
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1146 /* lock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1147
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	1148 if (ctx->state == NGX_AGAIN \|\| ctx->state == NGX_RESOLVE_TIMEDOUT) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1149
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	1150 rn = ctx->node;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1151
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1152 if (rn) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1153 p = &rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1154 w = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1155
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1156 while (w) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1157 if (w == ctx) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1158 *p = w->next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1159
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1160 goto done;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1161 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1162
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1163 p = &w->next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1164 w = w->next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1165 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1166 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1167
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1168 {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1169 u_char text[NGX_SOCKADDR_STRLEN];
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1170 ngx_str_t addrtext;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1171
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1172 addrtext.data = text;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1173 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	1174 text, NGX_SOCKADDR_STRLEN, 0);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1175
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1176 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	1177 "could not cancel %V resolving", &addrtext);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1178 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1179 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1180
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1181 done:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1182
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1183 ngx_resolver_expire(r, tree, expire_queue);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1184
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1185 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1186
1904 538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	1187 /* 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	1188
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	1189 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	1190 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	1191 }
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	1192
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	1193 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	1194
538f06aa8118 fix memory leaks, use unlocked ngx_resolver_free() for seldom failed cases Igor Sysoev <igor@sysoev.ru> parents: 1903 diff changeset	1195 /* unlock alloc mutex */
6196 c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1196
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1197 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	1198 ngx_del_timer(r->event);
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1199 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1200 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1201
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1202
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1203 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1204 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	1205 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1206 time_t now;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1207 ngx_uint_t i;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1208 ngx_queue_t *q;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1209 ngx_resolver_node_t *rn;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1210
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1211 ngx_log_debug0(NGX_LOG_DEBUG_CORE, r->log, 0, "resolver expire");
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1212
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1213 now = ngx_time();
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1214
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1215 for (i = 0; i < 2; i++) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1216 if (ngx_queue_empty(queue)) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1217 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1218 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1219
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1220 q = ngx_queue_last(queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1221
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1222 rn = ngx_queue_data(q, ngx_resolver_node_t, queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1223
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1224 if (now <= rn->expire) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1225 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1226 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1227
1774 68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1742 diff changeset	1228 ngx_log_debug2(NGX_LOG_DEBUG_CORE, r->log, 0,
68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1742 diff changeset	1229 "resolver expire \"%*s\"", (size_t) rn->nlen, rn->name);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1230
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1231 ngx_queue_remove(q);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1232
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1233 ngx_rbtree_delete(tree, &rn->node);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1234
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1235 ngx_resolver_free_node(r, rn);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1236 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1237 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1238
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1239
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1240 static ngx_int_t
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1241 ngx_resolver_send_query(ngx_resolver_t r, ngx_resolver_node_t rn)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1242 {
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1243 ngx_int_t rc;
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1244 ngx_resolver_connection_t *rec;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1245
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1246 rec = r->connections.elts;
6366 2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1247 rec = &rec[rn->last_connection];
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1248
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1249 if (rec->log.handler == NULL) {
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1250 rec->log = *r->log;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1251 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	1252 rec->log.data = rec;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	1253 rec->log.action = "resolving";
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1254 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1255
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1256 if (rn->naddrs == (u_short) -1) {
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1257 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	1258 : ngx_resolver_send_udp_query(r, rec, rn->query, rn->qlen);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1259
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1260 if (rc != NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1261 return rc;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1262 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1263 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1264
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1265 #if (NGX_HAVE_INET6)
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1266
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1267 if (rn->query6 && rn->naddrs6 == (u_short) -1) {
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1268 rc = rn->tcp6
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1269 ? ngx_resolver_send_tcp_query(r, rec, rn->query6, rn->qlen)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1270 : ngx_resolver_send_udp_query(r, rec, rn->query6, rn->qlen);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1271
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1272 if (rc != NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1273 return rc;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1274 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1275 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1276
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1277 #endif
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1278
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1279 return NGX_OK;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1280 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1281
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1282
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1283 static ngx_int_t
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1284 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	1285 u_char *query, u_short qlen)
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 ssize_t n;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1288
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1289 if (rec->udp == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1290 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	1291 return NGX_ERROR;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1292 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1293
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1294 rec->udp->data = rec;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1295 rec->udp->read->handler = ngx_resolver_udp_read;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1296 rec->udp->read->resolver = 1;
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
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1299 n = ngx_send(rec->udp, query, qlen);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1300
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1301 if (n == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1302 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1303 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1304
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1305 if ((size_t) n != (size_t) qlen) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1306 ngx_log_error(NGX_LOG_CRIT, &rec->log, 0, "send() incomplete");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1307 return NGX_ERROR;
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 return NGX_OK;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1311 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1312
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1313
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1314 static ngx_int_t
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1315 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	1316 u_char *query, u_short qlen)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1317 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1318 ngx_buf_t *b;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1319 ngx_int_t rc;
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 rc = NGX_OK;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1322
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1323 if (rec->tcp == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1324 b = rec->read_buf;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1325
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1326 if (b == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1327 b = ngx_resolver_calloc(r, sizeof(ngx_buf_t));
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1328 if (b == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1329 return NGX_ERROR;
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 b->start = ngx_resolver_alloc(r, NGX_RESOLVER_TCP_RSIZE);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1333 if (b->start == NULL) {
6368 d73f77bb5caf Resolver: fixed possible resource leak introduced in 5a16d40c63de. Ruslan Ermilov <ru@nginx.com> parents: 6367 diff changeset	1334 ngx_resolver_free(r, b);
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1335 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1336 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1337
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1338 b->end = b->start + NGX_RESOLVER_TCP_RSIZE;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1339
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1340 rec->read_buf = b;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1341 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1342
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1343 b->pos = b->start;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1344 b->last = b->start;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1345
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1346 b = rec->write_buf;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1347
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1348 if (b == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1349 b = ngx_resolver_calloc(r, sizeof(ngx_buf_t));
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1350 if (b == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1351 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1352 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1353
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1354 b->start = ngx_resolver_alloc(r, NGX_RESOLVER_TCP_WSIZE);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1355 if (b->start == NULL) {
6368 d73f77bb5caf Resolver: fixed possible resource leak introduced in 5a16d40c63de. Ruslan Ermilov <ru@nginx.com> parents: 6367 diff changeset	1356 ngx_resolver_free(r, b);
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1357 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1358 }
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 b->end = b->start + NGX_RESOLVER_TCP_WSIZE;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1361
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1362 rec->write_buf = b;
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
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1365 b->pos = b->start;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1366 b->last = b->start;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1367
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1368 rc = ngx_tcp_connect(rec);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1369 if (rc == NGX_ERROR) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1370 return NGX_ERROR;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1371 }
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1372
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1373 rec->tcp->data = rec;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1374 rec->tcp->write->handler = ngx_resolver_tcp_write;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1375 rec->tcp->read->handler = ngx_resolver_tcp_read;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1376 rec->tcp->read->resolver = 1;
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 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	1379 }
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1380
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1381 b = rec->write_buf;
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 if (b->end - b->last < 2 + qlen) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1384 ngx_log_error(NGX_LOG_CRIT, &rec->log, 0, "buffer overflow");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1385 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1386 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1387
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1388 *b->last++ = (u_char) (qlen >> 8);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1389 *b->last++ = (u_char) qlen;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1390 b->last = ngx_cpymem(b->last, query, qlen);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1391
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1392 if (rc == NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1393 ngx_resolver_tcp_write(rec->tcp->write);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1394 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1395
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1396 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1397 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1398
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1399
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1400 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1401 ngx_resolver_resend_handler(ngx_event_t *ev)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1402 {
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1403 time_t timer, atimer, stimer, ntimer;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1404 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1405 time_t a6timer;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1406 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1407 ngx_resolver_t *r;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1408
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1409 r = ev->data;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1410
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1411 ngx_log_debug0(NGX_LOG_DEBUG_CORE, r->log, 0,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1412 "resolver resend handler");
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1413
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1414 /* lock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1415
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1416 ntimer = ngx_resolver_resend(r, &r->name_rbtree, &r->name_resend_queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1417
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1418 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	1419
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1420 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1421
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1422 /* lock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1423
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1424 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	1425
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1426 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1427
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1428 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1429
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1430 /* lock addr6 mutex */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1431
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1432 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	1433
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1434 /* unlock addr6 mutex */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1435
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1436 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1437
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1438 timer = ntimer;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1439
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1440 if (timer == 0) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1441 timer = atimer;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1442
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1443 } else if (atimer) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1444 timer = ngx_min(timer, atimer);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1445 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1446
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1447 if (timer == 0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1448 timer = stimer;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1449
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1450 } else if (stimer) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1451 timer = ngx_min(timer, stimer);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1452 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1453
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1454 #if (NGX_HAVE_INET6)
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 if (timer == 0) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1457 timer = a6timer;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1458
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1459 } else if (a6timer) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1460 timer = ngx_min(timer, a6timer);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1461 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1462
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1463 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	1464
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1465 if (timer) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1466 ngx_add_timer(r->event, (ngx_msec_t) (timer * 1000));
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1467 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1468 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1469
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1470
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1471 static time_t
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1472 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	1473 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1474 time_t now;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1475 ngx_queue_t *q;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1476 ngx_resolver_node_t *rn;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1477
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1478 now = ngx_time();
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1479
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1480 for ( ;; ) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1481 if (ngx_queue_empty(queue)) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1482 return 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1483 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1484
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1485 q = ngx_queue_last(queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1486
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1487 rn = ngx_queue_data(q, ngx_resolver_node_t, queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1488
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1489 if (now < rn->expire) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1490 return rn->expire - now;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1491 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1492
1774 68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1742 diff changeset	1493 ngx_log_debug3(NGX_LOG_DEBUG_CORE, r->log, 0,
68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1742 diff changeset	1494 "resolver resend \"%*s\" %p",
68d21fd1dc64 use %s format Igor Sysoev <igor@sysoev.ru>* parents: 1742 diff changeset	1495 (size_t) rn->nlen, rn->name, rn->waiting);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1496
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1497 ngx_queue_remove(q);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1498
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1499 if (rn->waiting) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1500
6366 2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1501 if (++rn->last_connection == r->connections.nelts) {
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1502 rn->last_connection = 0;
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1503 }
2e5c027f2a98 Resolver: per-request DNS server balancer. Roman Arutyunyan <arut@nginx.com> parents: 6365 diff changeset	1504
4683 84d8e60b65f0 Fixed crash in ngx_resolver_cleanup_tree(). Ruslan Ermilov <ru@nginx.com> parents: 4671 diff changeset	1505 (void) ngx_resolver_send_query(r, rn);
84d8e60b65f0 Fixed crash in ngx_resolver_cleanup_tree(). Ruslan Ermilov <ru@nginx.com> parents: 4671 diff changeset	1506
84d8e60b65f0 Fixed crash in ngx_resolver_cleanup_tree(). Ruslan Ermilov <ru@nginx.com> parents: 4671 diff changeset	1507 rn->expire = now + r->resend_timeout;
84d8e60b65f0 Fixed crash in ngx_resolver_cleanup_tree(). Ruslan Ermilov <ru@nginx.com> parents: 4671 diff changeset	1508
84d8e60b65f0 Fixed crash in ngx_resolver_cleanup_tree(). Ruslan Ermilov <ru@nginx.com> parents: 4671 diff changeset	1509 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	1510
cf4ee321d195 do not delete failed DNS request if there are waiting clients Igor Sysoev <igor@sysoev.ru> parents: 1878 diff changeset	1511 continue;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1512 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1513
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1514 ngx_rbtree_delete(tree, &rn->node);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1515
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1516 ngx_resolver_free_node(r, rn);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1517 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1518 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1519
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1520
6196 c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1521 static ngx_uint_t
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1522 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	1523 {
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1524 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	1525 && 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	1526 #if (NGX_HAVE_INET6)
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1527 && 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	1528 #endif
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1529 && 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	1530 }
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1531
c3ec43580a48 Resolver: canceled resend timer on empty resend queues. Sergey Kandaurov <pluknet@nginx.com> parents: 6126 diff changeset	1532
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1533 static void
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1534 ngx_resolver_udp_read(ngx_event_t *rev)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1535 {
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1536 ssize_t n;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1537 ngx_connection_t *c;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1538 ngx_resolver_connection_t *rec;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1539 u_char buf[NGX_RESOLVER_UDP_SIZE];
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1540
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1541 c = rev->data;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1542 rec = c->data;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1543
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1544 do {
1689 0b592a68aade ngx_udp_recv() Igor Sysoev <igor@sysoev.ru> parents: 1687 diff changeset	1545 n = ngx_udp_recv(c, buf, NGX_RESOLVER_UDP_SIZE);
0b592a68aade ngx_udp_recv() Igor Sysoev <igor@sysoev.ru> parents: 1687 diff changeset	1546
0b592a68aade ngx_udp_recv() Igor Sysoev <igor@sysoev.ru> parents: 1687 diff changeset	1547 if (n < 0) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1548 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1549 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1550
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1551 ngx_resolver_process_response(rec->resolver, buf, n, 0);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1552
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1553 } while (rev->ready);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1554 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1555
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1556
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1557 static void
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1558 ngx_resolver_tcp_write(ngx_event_t *wev)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1559 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1560 off_t sent;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1561 ssize_t n;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1562 ngx_buf_t *b;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1563 ngx_resolver_t *r;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1564 ngx_connection_t *c;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1565 ngx_resolver_connection_t *rec;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1566
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1567 c = wev->data;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1568 rec = c->data;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1569 b = rec->write_buf;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1570 r = rec->resolver;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1571
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1572 if (wev->timedout) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1573 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1574 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1575
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1576 sent = c->sent;
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 while (wev->ready && b->pos < b->last) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1579 n = ngx_send(c, b->pos, b->last - b->pos);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1580
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1581 if (n == NGX_AGAIN) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1582 break;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1583 }
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 if (n == NGX_ERROR) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1586 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1587 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1588
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1589 b->pos += n;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1590 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1591
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1592 if (b->pos != b->start) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1593 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	1594 b->pos = b->start;
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
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1597 if (c->sent != sent) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1598 ngx_add_timer(wev, (ngx_msec_t) (r->tcp_timeout * 1000));
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1599 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1600
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1601 if (ngx_handle_write_event(wev, 0) != NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1602 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1603 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1604
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1605 return;
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 failed:
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 ngx_close_connection(c);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1610 rec->tcp = NULL;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1611 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1612
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 static void
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1615 ngx_resolver_tcp_read(ngx_event_t *rev)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1616 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1617 u_char *p;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1618 size_t size;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1619 ssize_t n;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1620 u_short qlen;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1621 ngx_buf_t *b;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1622 ngx_resolver_t *r;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1623 ngx_connection_t *c;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1624 ngx_resolver_connection_t *rec;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1625
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1626 c = rev->data;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1627 rec = c->data;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1628 b = rec->read_buf;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1629 r = rec->resolver;
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 while (rev->ready) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1632 n = ngx_recv(c, b->last, b->end - b->last);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1633
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1634 if (n == NGX_AGAIN) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1635 break;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1636 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1637
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1638 if (n == NGX_ERROR \|\| n == 0) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1639 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1640 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1641
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1642 b->last += n;
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 for ( ;; ) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1645 p = b->pos;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1646 size = b->last - p;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1647
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1648 if (size < 2) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1649 break;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1650 }
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 qlen = (u_short) *p++ << 8;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1653 qlen += *p++;
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 if (size < (size_t) (2 + qlen)) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1656 break;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1657 }
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 ngx_resolver_process_response(r, p, qlen, 1);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1660
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1661 b->pos += 2 + qlen;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1662 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1663
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1664 if (b->pos != b->start) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1665 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	1666 b->pos = b->start;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1667 }
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 if (ngx_handle_read_event(rev, 0) != NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1671 goto failed;
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
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1674 return;
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 failed:
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1677
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1678 ngx_close_connection(c);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1679 rec->tcp = NULL;
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
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1683 static void
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1684 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	1685 ngx_uint_t tcp)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1686 {
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1687 char *err;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1688 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	1689 qtype, qclass;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1690 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1691 ngx_uint_t qident6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1692 #endif
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1693 ngx_queue_t *q;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1694 ngx_resolver_qs_t *qs;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1695 ngx_resolver_hdr_t *response;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1696 ngx_resolver_node_t *rn;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1697
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1698 if (n < sizeof(ngx_resolver_hdr_t)) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1699 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1700 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1701
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1702 response = (ngx_resolver_hdr_t *) buf;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1703
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1704 ident = (response->ident_hi << 8) + response->ident_lo;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1705 flags = (response->flags_hi << 8) + response->flags_lo;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1706 nqs = (response->nqs_hi << 8) + response->nqs_lo;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1707 nan = (response->nan_hi << 8) + response->nan_lo;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1708 trunc = flags & 0x0200;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1709
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1710 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	1711 "resolver DNS response %ui fl:%04Xi %ui/%ui/%ud/%ud",
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1712 ident, flags, nqs, nan,
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1713 (response->nns_hi << 8) + response->nns_lo,
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1714 (response->nar_hi << 8) + response->nar_lo);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1715
5470 aebdca7e8f8f Resolver: fixed response processing. Ruslan Ermilov <ru@nginx.com> parents: 5469 diff changeset	1716 /* response to a standard query */
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1717 if ((flags & 0xf870) != 0x8000 \|\| (trunc && tcp)) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1718 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	1719 "invalid %s DNS response %ui fl:%04Xi",
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1720 tcp ? "TCP" : "UDP", ident, flags);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1721 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1722 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1723
5470 aebdca7e8f8f Resolver: fixed response processing. Ruslan Ermilov <ru@nginx.com> parents: 5469 diff changeset	1724 code = flags & 0xf;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1725
2282 ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1726 if (code == NGX_RESOLVE_FORMERR) {
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1727
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1728 times = 0;
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1729
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1730 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	1731 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	1732 q = ngx_queue_next(q))
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1733 {
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1734 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	1735 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	1736
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1737 if (qident == ident) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1738 goto dns_error_name;
2282 ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1739 }
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1740
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1741 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1742 if (rn->query6) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1743 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	1744
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1745 if (qident6 == ident) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1746 goto dns_error_name;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1747 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1748 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1749 #endif
2282 ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1750 }
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 goto dns_error;
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1753 }
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 (code > NGX_RESOLVE_REFUSED) {
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1756 goto dns_error;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1757 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1758
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1759 if (nqs != 1) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1760 err = "invalid number of questions in DNS response";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1761 goto done;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1762 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1763
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1764 i = sizeof(ngx_resolver_hdr_t);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1765
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1766 while (i < (ngx_uint_t) n) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1767 if (buf[i] == '\0') {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1768 goto found;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1769 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1770
5470 aebdca7e8f8f Resolver: fixed response processing. Ruslan Ermilov <ru@nginx.com> parents: 5469 diff changeset	1771 i += 1 + buf[i];
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1772 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1773
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1774 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1775
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1776 found:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1777
5470 aebdca7e8f8f Resolver: fixed response processing. Ruslan Ermilov <ru@nginx.com> parents: 5469 diff changeset	1778 if (i++ == sizeof(ngx_resolver_hdr_t)) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1779 err = "zero-length domain name in DNS response";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1780 goto done;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1781 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1782
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1783 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	1784 > (ngx_uint_t) n)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1785 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1786 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1787 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1788
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1789 qs = (ngx_resolver_qs_t *) &buf[i];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1790
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1791 qtype = (qs->type_hi << 8) + qs->type_lo;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1792 qclass = (qs->class_hi << 8) + qs->class_lo;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1793
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1794 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	1795 "resolver DNS response qt:%ui cl:%ui", qtype, qclass);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1796
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1797 if (qclass != 1) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1798 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	1799 "unknown query class %ui in DNS response", qclass);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1800 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1801 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1802
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1803 switch (qtype) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1804
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1805 case NGX_RESOLVE_A:
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1806 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1807 case NGX_RESOLVE_AAAA:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1808 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1809
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1810 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	1811 i + sizeof(ngx_resolver_qs_t));
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1812
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1813 break;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1814
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1815 case NGX_RESOLVE_SRV:
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1816
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1817 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	1818 i + sizeof(ngx_resolver_qs_t));
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1819
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1820 break;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1821
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1822 case NGX_RESOLVE_PTR:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1823
1742 268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	1824 ngx_resolver_process_ptr(r, buf, n, ident, code, nan);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1825
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1826 break;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1827
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1828 default:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1829 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	1830 "unknown query type %ui in DNS response", qtype);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1831 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1832 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1833
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1834 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1835
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1836 short_response:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1837
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1838 err = "short DNS response";
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1839
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1840 done:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1841
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1842 ngx_log_error(r->log_level, r->log, 0, err);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1843
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1844 return;
2282 ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1845
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1846 dns_error_name:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1847
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1848 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	1849 "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	1850 code, ngx_resolver_strerror(code), ident,
6478 3ef7bb882ad4 Fixed logging with variable field width. Sergey Kandaurov <pluknet@nginx.com> parents: 6460 diff changeset	1851 (size_t) rn->nlen, rn->name);
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1852 return;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1853
2282 ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1854 dns_error:
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1855
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1856 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	1857 "DNS error (%ui: %s), query id:%ui",
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1858 code, ngx_resolver_strerror(code), ident);
ec97eb9a8038 show name for a FORMERR DNS response Igor Sysoev <igor@sysoev.ru> parents: 2281 diff changeset	1859 return;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1860 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1861
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1862
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1863 static void
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	1864 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	1865 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	1866 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	1867 {
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1868 char *err;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1869 u_char *cname;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1870 size_t len;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1871 int32_t ttl;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1872 uint32_t hash;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1873 in_addr_t *addr;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1874 ngx_str_t name;
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	1875 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	1876 #if (NGX_HAVE_INET6)
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1877 struct in6_addr *addr6;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1878 #endif
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1879 ngx_resolver_an_t *an;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1880 ngx_resolver_ctx_t ctx, next;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1881 ngx_resolver_node_t *rn;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	1882 ngx_resolver_addr_t *addrs;
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1883 ngx_resolver_connection_t *rec;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1884
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1885 if (ngx_resolver_copy(r, &name, buf,
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	1886 buf + sizeof(ngx_resolver_hdr_t), buf + n)
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1887 != NGX_OK)
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	1888 {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1889 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1890 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1891
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1892 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	1893
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1894 hash = ngx_crc32_short(name.data, name.len);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1895
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1896 /* lock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1897
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1898 rn = ngx_resolver_lookup_name(r, &name, hash);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1899
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1900 if (rn == NULL) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1901 ngx_log_error(r->log_level, r->log, 0,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1902 "unexpected response for %V", &name);
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	1903 ngx_resolver_free(r, name.data);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1904 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1905 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1906
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1907 switch (qtype) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1908
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1909 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1910 case NGX_RESOLVE_AAAA:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1911
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1912 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	1913 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	1914 "unexpected response for %V", &name);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1915 ngx_resolver_free(r, name.data);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1916 goto failed;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1917 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1918
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1919 if (trunc && rn->tcp6) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1920 ngx_resolver_free(r, name.data);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1921 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1922 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1923
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1924 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	1925
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1926 break;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1927 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1928
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1929 default: /* NGX_RESOLVE_A */
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1930
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1931 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	1932 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	1933 "unexpected response for %V", &name);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1934 ngx_resolver_free(r, name.data);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1935 goto failed;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1936 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1937
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1938 if (trunc && rn->tcp) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1939 ngx_resolver_free(r, name.data);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1940 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1941 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1942
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1943 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	1944 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1945
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1946 if (ident != qident) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1947 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	1948 "wrong ident %ui response for %V, expect %ui",
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1949 ident, &name, qident);
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	1950 ngx_resolver_free(r, name.data);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1951 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1952 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	1953
3139 5f6144fc674d fix memory leak in resolver Igor Sysoev <igor@sysoev.ru> parents: 2785 diff changeset	1954 ngx_resolver_free(r, name.data);
5f6144fc674d fix memory leak in resolver Igor Sysoev <igor@sysoev.ru> parents: 2785 diff changeset	1955
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1956 if (trunc) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1957
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1958 ngx_queue_remove(&rn->queue);
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 if (rn->waiting == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1961 ngx_rbtree_delete(&r->name_rbtree, &rn->node);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1962 ngx_resolver_free_node(r, rn);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1963 goto next;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1964 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1965
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1966 rec = r->connections.elts;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1967 rec = &rec[rn->last_connection];
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1968
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1969 switch (qtype) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1970
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1971 #if (NGX_HAVE_INET6)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1972 case NGX_RESOLVE_AAAA:
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1973
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1974 rn->tcp6 = 1;
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 (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	1977
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1978 break;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1979 #endif
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1980
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1981 default: /* NGX_RESOLVE_A */
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 rn->tcp = 1;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1984
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1985 (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	1986 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1987
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1988 rn->expire = ngx_time() + r->resend_timeout;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1989
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	1990 ngx_queue_insert_head(&r->name_resend_queue, &rn->queue);
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 goto next;
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
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1995 if (code == 0 && rn->code) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1996 code = rn->code;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1997 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	1998
1742 268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	1999 if (code == 0 && nan == 0) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2000
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2001 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2002 switch (qtype) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2003
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2004 case NGX_RESOLVE_AAAA:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2005
5768 70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2006 rn->naddrs6 = 0;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2007
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2008 if (rn->naddrs == (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2009 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2010 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2011
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2012 if (rn->naddrs) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2013 goto export;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2014 }
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 break;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2017
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2018 default: /* NGX_RESOLVE_A */
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2019
5768 70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2020 rn->naddrs = 0;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2021
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2022 if (rn->naddrs6 == (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2023 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2024 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2025
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2026 if (rn->naddrs6) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2027 goto export;
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 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2031
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2032 code = NGX_RESOLVE_NXDOMAIN;
1742 268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	2033 }
268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	2034
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2035 if (code) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2036
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2037 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2038 switch (qtype) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2039
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2040 case NGX_RESOLVE_AAAA:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2041
5768 70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2042 rn->naddrs6 = 0;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2043
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2044 if (rn->naddrs == (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2045 rn->code = (u_char) code;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2046 goto next;
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
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2049 break;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2050
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2051 default: /* NGX_RESOLVE_A */
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2052
5768 70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2053 rn->naddrs = 0;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2054
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2055 if (rn->naddrs6 == (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2056 rn->code = (u_char) code;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2057 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2058 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2059 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2060 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2061
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2062 next = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2063 rn->waiting = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2064
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2065 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2066
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2067 ngx_rbtree_delete(&r->name_rbtree, &rn->node);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2068
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2069 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2070
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2071 while (next) {
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2072 ctx = next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2073 ctx->state = code;
6456 c94aba230a5a Resolver: introduced valid field in resolver responses. Dmitry Volyntsev <xeioex@nginx.com> parents: 6372 diff changeset	2074 ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2075 next = ctx->next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2076
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2077 ctx->handler(ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2078 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2079
5920 7420068c4d4b Resolver: fixed use-after-free memory access. Ruslan Ermilov <ru@nginx.com> parents: 5820 diff changeset	2080 ngx_resolver_free_node(r, rn);
7420068c4d4b Resolver: fixed use-after-free memory access. Ruslan Ermilov <ru@nginx.com> parents: 5820 diff changeset	2081
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2082 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2083 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2084
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2085 i = ans;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2086 naddrs = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2087 cname = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2088
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2089 for (a = 0; a < nan; a++) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2090
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2091 start = i;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2092
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2093 while (i < n) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2094
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2095 if (buf[i] & 0xc0) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2096 i += 2;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2097 goto found;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2098 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2099
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2100 if (buf[i] == 0) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2101 i++;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2102 goto test_length;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2103 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2104
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2105 i += 1 + buf[i];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2106 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2107
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2108 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2109
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2110 test_length:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2111
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2112 if (i - start < 2) {
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2113 err = "invalid name in DNS response";
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2114 goto invalid;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2115 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2116
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2117 found:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2118
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2119 if (i + sizeof(ngx_resolver_an_t) >= n) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2120 goto short_response;
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 an = (ngx_resolver_an_t *) &buf[i];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2124
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2125 type = (an->type_hi << 8) + an->type_lo;
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2126 class = (an->class_hi << 8) + an->class_lo;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2127 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	2128 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	2129 + (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	2130
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2131 if (class != 1) {
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2132 ngx_log_error(r->log_level, r->log, 0,
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2133 "unexpected RR class %ui", class);
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2134 goto failed;
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2135 }
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2136
4295 05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	2137 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	2138 ttl = 0;
05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	2139 }
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2140
5485 8958656a8060 Resolver: use minimum TTL for caching (ticket #329). Ruslan Ermilov <ru@nginx.com> parents: 5479 diff changeset	2141 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	2142
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2143 i += sizeof(ngx_resolver_an_t);
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2144
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2145 switch (type) {
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2146
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2147 case NGX_RESOLVE_A:
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2148
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2149 if (qtype != NGX_RESOLVE_A) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2150 err = "unexpected A record in DNS response";
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2151 goto invalid;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2152 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2153
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2154 if (len != 4) {
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2155 err = "invalid A record in DNS response";
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2156 goto invalid;
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2157 }
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2158
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2159 if (i + 4 > n) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2160 goto short_response;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2161 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2162
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2163 naddrs++;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2164
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2165 break;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2166
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2167 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2168 case NGX_RESOLVE_AAAA:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2169
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2170 if (qtype != NGX_RESOLVE_AAAA) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2171 err = "unexpected AAAA record in DNS response";
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2172 goto invalid;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2173 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2174
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2175 if (len != 16) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2176 err = "invalid AAAA record in DNS response";
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2177 goto invalid;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2178 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2179
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2180 if (i + 16 > n) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2181 goto short_response;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2182 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2183
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2184 naddrs++;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2185
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2186 break;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2187 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2188
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2189 case NGX_RESOLVE_CNAME:
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2190
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2191 cname = &buf[i];
1965 14463ae77723 take into account DNAME Igor Sysoev <igor@sysoev.ru> parents: 1961 diff changeset	2192
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2193 break;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2194
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2195 case NGX_RESOLVE_DNAME:
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2196
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2197 break;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2198
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2199 default:
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2200
1966 fb02f63eafd6 log unexpected qtype Igor Sysoev <igor@sysoev.ru> parents: 1965 diff changeset	2201 ngx_log_error(r->log_level, r->log, 0,
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2202 "unexpected RR type %ui", type);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2203 }
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2204
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2205 i += len;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2206 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2207
4295 05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	2208 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	2209 "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	2210 naddrs, cname, rn->ttl);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2211
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2212 if (naddrs) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2213
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2214 switch (qtype) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2215
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2216 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2217 case NGX_RESOLVE_AAAA:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2218
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2219 if (naddrs == 1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2220 addr6 = &rn->u6.addr6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2221 rn->naddrs6 = 1;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2222
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2223 } else {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2224 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	2225 if (addr6 == NULL) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2226 goto failed;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2227 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2228
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2229 rn->u6.addrs6 = addr6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2230 rn->naddrs6 = (u_short) naddrs;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2231 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2232
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2233 #if (NGX_SUPPRESS_WARN)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2234 addr = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2235 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2236
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2237 break;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2238 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2239
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2240 default: /* NGX_RESOLVE_A */
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2241
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2242 if (naddrs == 1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2243 addr = &rn->u.addr;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2244 rn->naddrs = 1;
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 } else {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2247 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	2248 if (addr == NULL) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2249 goto failed;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2250 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2251
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2252 rn->u.addrs = addr;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2253 rn->naddrs = (u_short) naddrs;
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
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2256 #if (NGX_HAVE_INET6 && NGX_SUPPRESS_WARN)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2257 addr6 = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2258 #endif
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2259 }
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2260
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2261 j = 0;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2262 i = ans;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2263
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2264 for (a = 0; a < nan; a++) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2265
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2266 for ( ;; ) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2267
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2268 if (buf[i] & 0xc0) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2269 i += 2;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2270 break;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2271 }
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2272
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2273 if (buf[i] == 0) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2274 i++;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2275 break;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2276 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2277
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2278 i += 1 + buf[i];
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2279 }
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2280
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2281 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	2282
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2283 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	2284 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	2285
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2286 i += sizeof(ngx_resolver_an_t);
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2287
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2288 if (type == NGX_RESOLVE_A) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2289
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2290 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	2291 + (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	2292
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2293 if (++j == naddrs) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2294
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2295 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2296 if (rn->naddrs6 == (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2297 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2298 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2299 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2300
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2301 break;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2302 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2303 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2304
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2305 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2306 else if (type == NGX_RESOLVE_AAAA) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2307
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2308 ngx_memcpy(addr6[j].s6_addr, &buf[i], 16);
8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2309
8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2310 if (++j == naddrs) {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2311
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2312 if (rn->naddrs == (u_short) -1) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2313 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2314 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2315
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2316 break;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2317 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2318 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2319 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2320
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2321 i += len;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2322 }
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2323 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2324
5768 70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2325 switch (qtype) {
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2326
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2327 #if (NGX_HAVE_INET6)
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2328 case NGX_RESOLVE_AAAA:
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2329
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2330 if (rn->naddrs6 == (u_short) -1) {
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2331 rn->naddrs6 = 0;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2332 }
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2333
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2334 break;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2335 #endif
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2336
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2337 default: /* NGX_RESOLVE_A */
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2338
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2339 if (rn->naddrs == (u_short) -1) {
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2340 rn->naddrs = 0;
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2341 }
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2342 }
70a0408cca7b Resolver: fixed resend on malformed responses. Ruslan Ermilov <ru@nginx.com> parents: 5764 diff changeset	2343
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2344 if (rn->naddrs != (u_short) -1
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2345 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2346 && rn->naddrs6 != (u_short) -1
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2347 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2348 && rn->naddrs
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2349 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2350 + rn->naddrs6
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2351 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2352 > 0)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2353 {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2354
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2355 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2356 export:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2357 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2358
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2359 naddrs = rn->naddrs;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2360 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2361 naddrs += rn->naddrs6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2362 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2363
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2364 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	2365 addrs = NULL;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2366
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2367 } else {
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2368 addrs = ngx_resolver_export(r, rn, 0);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2369 if (addrs == NULL) {
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2370 goto failed;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2371 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2372 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2373
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2374 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2375
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2376 rn->valid = ngx_time() + (r->valid ? r->valid : (time_t) rn->ttl);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2377 rn->expire = ngx_time() + r->expire;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2378
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2379 ngx_queue_insert_head(&r->name_expire_queue, &rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2380
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2381 next = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2382 rn->waiting = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2383
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2384 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2385
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2386 while (next) {
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2387 ctx = next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2388 ctx->state = NGX_OK;
6456 c94aba230a5a Resolver: introduced valid field in resolver responses. Dmitry Volyntsev <xeioex@nginx.com> parents: 6372 diff changeset	2389 ctx->valid = rn->valid;
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2390 ctx->naddrs = naddrs;
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2391
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2392 if (addrs == NULL) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2393 ctx->addrs = &ctx->addr;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2394 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	2395 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	2396 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	2397 ctx->sin.sin_family = AF_INET;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2398 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	2399
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2400 } else {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2401 ctx->addrs = addrs;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2402 }
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2403
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2404 next = ctx->next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2405
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	2406 ctx->handler(ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2407 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2408
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2409 if (addrs != NULL) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	2410 ngx_resolver_free(r, addrs->sockaddr);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2411 ngx_resolver_free(r, addrs);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2412 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2413
4619 3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	2414 ngx_resolver_free(r, rn->query);
3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	2415 rn->query = NULL;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2416 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2417 rn->query6 = NULL;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2418 #endif
4619 3171ec7d0d05 Resolver: protection from duplicate responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4610 diff changeset	2419
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2420 return;
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2421 }
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2422
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2423 if (cname) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2424
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2425 /* CNAME only */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2426
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2427 if (rn->naddrs == (u_short) -1
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2428 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2429 \|\| rn->naddrs6 == (u_short) -1
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2430 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2431 )
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2432 {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2433 goto next;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2434 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2435
6370 8c8739bdd3f1 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6369 diff changeset	2436 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	2437 goto failed;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2438 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2439
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2440 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2441 "resolver cname:\"%V\"", &name);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2442
1741 0829024c924d fix segfault if response will have CNAME only Igor Sysoev <igor@sysoev.ru> parents: 1689 diff changeset	2443 ngx_queue_remove(&rn->queue);
0829024c924d fix segfault if response will have CNAME only Igor Sysoev <igor@sysoev.ru> parents: 1689 diff changeset	2444
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2445 rn->cnlen = (u_short) name.len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2446 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	2447
5485 8958656a8060 Resolver: use minimum TTL for caching (ticket #329). Ruslan Ermilov <ru@nginx.com> parents: 5479 diff changeset	2448 rn->valid = ngx_time() + (r->valid ? r->valid : (time_t) rn->ttl);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2449 rn->expire = ngx_time() + r->expire;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2450
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2451 ngx_queue_insert_head(&r->name_expire_queue, &rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2452
6352 ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2453 ngx_resolver_free(r, rn->query);
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2454 rn->query = NULL;
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2455 #if (NGX_HAVE_INET6)
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2456 rn->query6 = NULL;
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2457 #endif
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2458
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2459 ctx = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2460 rn->waiting = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2461
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2462 if (ctx) {
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	2463
6352 ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2464 if (ctx->recursion++ >= NGX_RESOLVER_MAX_RECURSION) {
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2465
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2466 /* unlock name mutex */
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2467
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2468 do {
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2469 ctx->state = NGX_RESOLVE_NXDOMAIN;
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2470 next = ctx->next;
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2471
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2472 ctx->handler(ctx);
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2473
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2474 ctx = next;
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2475 } while (ctx);
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2476
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2477 return;
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2478 }
ff9b32c0e141 Resolver: limited CNAME recursion. Ruslan Ermilov <ru@nginx.com> parents: 6351 diff changeset	2479
6351 497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	2480 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	2481 next->node = NULL;
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	2482 }
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	2483
497d0cff8ace Resolver: fixed use-after-free memory accesses with CNAME. Roman Arutyunyan <arut@nginx.com> parents: 6350 diff changeset	2484 (void) ngx_resolve_name_locked(r, ctx, &name);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2485 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2486
5471 9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2487 /* unlock name mutex */
9c96782d9d05 Resolver: fixes in A processing. Ruslan Ermilov <ru@nginx.com> parents: 5470 diff changeset	2488
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2489 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2490 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2491
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2492 ngx_log_error(r->log_level, r->log, 0,
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2493 "no A or CNAME types in DNS response");
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2494 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2495
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2496 short_response:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2497
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	2498 err = "short DNS response";
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2499
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2500 invalid:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2501
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2502 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2503
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2504 ngx_log_error(r->log_level, r->log, 0, err);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2505
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2506 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2507
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2508 failed:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2509
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2510 next:
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	2511
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2512 /* unlock name mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2513
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2514 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2515 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2516
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2517
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	2518 static void
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2519 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	2520 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	2521 ngx_uint_t trunc, ngx_uint_t ans)
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2522 {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2523 char *err;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2524 u_char *cname;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2525 size_t len;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2526 int32_t ttl;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2527 uint32_t hash;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2528 ngx_str_t name;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2529 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	2530 ngx_resolver_an_t *an;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2531 ngx_resolver_ctx_t ctx, next;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2532 ngx_resolver_srv_t *srvs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2533 ngx_resolver_node_t *rn;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2534 ngx_resolver_connection_t *rec;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2535
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2536 if (ngx_resolver_copy(r, &name, buf,
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2537 buf + sizeof(ngx_resolver_hdr_t), buf + n)
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2538 != NGX_OK)
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2539 {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2540 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2541 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2542
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2543 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	2544
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2545 hash = ngx_crc32_short(name.data, name.len);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2546
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2547 rn = ngx_resolver_lookup_srv(r, &name, hash);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2548
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2549 if (rn == NULL \|\| rn->query == NULL) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2550 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	2551 "unexpected response for %V", &name);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2552 ngx_resolver_free(r, name.data);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2553 goto failed;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2554 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2555
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2556 if (trunc && rn->tcp) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2557 ngx_resolver_free(r, name.data);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2558 goto failed;
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 qident = (rn->query[0] << 8) + rn->query[1];
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 if (ident != qident) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2564 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	2565 "wrong ident %ui response for %V, expect %ui",
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2566 ident, &name, qident);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2567 ngx_resolver_free(r, name.data);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2568 goto failed;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2569 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2570
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2571 ngx_resolver_free(r, name.data);
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 if (trunc) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2574
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2575 ngx_queue_remove(&rn->queue);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2576
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2577 if (rn->waiting == NULL) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2578 ngx_rbtree_delete(&r->srv_rbtree, &rn->node);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2579 ngx_resolver_free_node(r, rn);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2580 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2581 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2582
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2583 rec = r->connections.elts;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2584 rec = &rec[rn->last_connection];
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2585
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2586 rn->tcp = 1;
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 (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	2589
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2590 rn->expire = ngx_time() + r->resend_timeout;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2591
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2592 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	2593
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2594 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2595 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2596
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2597 if (code == 0 && rn->code) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2598 code = rn->code;
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 if (code == 0 && nan == 0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2602 code = NGX_RESOLVE_NXDOMAIN;
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
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2605 if (code) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2606 next = rn->waiting;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2607 rn->waiting = NULL;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2608
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2609 ngx_queue_remove(&rn->queue);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2610
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2611 ngx_rbtree_delete(&r->srv_rbtree, &rn->node);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2612
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2613 while (next) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2614 ctx = next;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2615 ctx->state = code;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2616 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	2617 next = ctx->next;
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 ctx->handler(ctx);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2620 }
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 ngx_resolver_free_node(r, rn);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2623
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2624 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2625 }
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 i = ans;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2628 nsrvs = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2629 cname = NULL;
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 for (a = 0; a < nan; a++) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2632
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2633 start = i;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2634
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2635 while (i < n) {
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 if (buf[i] & 0xc0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2638 i += 2;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2639 goto found;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2640 }
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 if (buf[i] == 0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2643 i++;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2644 goto test_length;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2645 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2646
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2647 i += 1 + buf[i];
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
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2650 goto short_response;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2651
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2652 test_length:
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2653
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2654 if (i - start < 2) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2655 err = "invalid name DNS response";
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2656 goto invalid;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2657 }
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 found:
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2660
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2661 if (i + sizeof(ngx_resolver_an_t) >= n) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2662 goto short_response;
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 an = (ngx_resolver_an_t *) &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 type = (an->type_hi << 8) + an->type_lo;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2668 class = (an->class_hi << 8) + an->class_lo;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2669 len = (an->len_hi << 8) + an->len_lo;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2670 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	2671 + (an->ttl[2] << 8) + (an->ttl[3]);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2672
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2673 if (class != 1) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2674 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	2675 "unexpected RR class %ui", class);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2676 goto failed;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2677 }
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 (ttl < 0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2680 ttl = 0;
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 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	2684
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2685 i += sizeof(ngx_resolver_an_t);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2686
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2687 switch (type) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2688
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2689 case NGX_RESOLVE_SRV:
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 (i + 6 > n) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2692 goto short_response;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2693 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2694
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2695 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	2696 != NGX_OK)
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2697 {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2698 goto failed;
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 nsrvs++;
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 break;
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 case NGX_RESOLVE_CNAME:
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 cname = &buf[i];
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 break;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2710
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2711 case NGX_RESOLVE_DNAME:
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 break;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2714
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2715 default:
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2716
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2717 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	2718 "unexpected RR type %ui", type);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2719 }
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 i += len;
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
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2724 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	2725 "resolver nsrvs:%ui cname:%p ttl:%uD",
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2726 nsrvs, cname, rn->ttl);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2727
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2728 if (nsrvs) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2729
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2730 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	2731 if (srvs == NULL) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2732 goto failed;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2733 }
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 rn->u.srvs = srvs;
6460 034329824dd3 Win32: fixed build after 384154fc634f. Dmitry Volyntsev <xeioex@nginx.com> parents: 6458 diff changeset	2736 rn->nsrvs = (u_short) nsrvs;
6458 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 j = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2739 i = ans;
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 for (a = 0; a < nan; a++) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2742
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2743 for ( ;; ) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2744
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2745 if (buf[i] & 0xc0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2746 i += 2;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2747 break;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2748 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2749
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2750 if (buf[i] == 0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2751 i++;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2752 break;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2753 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2754
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2755 i += 1 + buf[i];
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2756 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2757
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2758 an = (ngx_resolver_an_t *) &buf[i];
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2759
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2760 type = (an->type_hi << 8) + an->type_lo;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2761 len = (an->len_hi << 8) + an->len_lo;
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 i += sizeof(ngx_resolver_an_t);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2764
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2765 if (type == NGX_RESOLVE_SRV) {
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 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	2768 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	2769
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2770 if (srvs[j].weight == 0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2771 srvs[j].weight = 1;
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
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2774 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	2775
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2776 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	2777 buf + n)
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2778 != NGX_OK)
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2779 {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2780 goto failed;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2781 }
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 j++;
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
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2786 i += len;
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
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2789 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	2790 ngx_resolver_cmp_srvs);
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 ngx_resolver_free(r, rn->query);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2793 rn->query = NULL;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2794
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2795 ngx_queue_remove(&rn->queue);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2796
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2797 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	2798 rn->expire = ngx_time() + r->expire;
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 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	2801
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2802 next = rn->waiting;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2803 rn->waiting = NULL;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2804
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2805 while (next) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2806 ctx = next;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2807 next = ctx->next;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2808
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2809 ngx_resolver_resolve_srv_names(ctx, rn);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2810 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2811
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2812 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2813 }
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->nsrvs = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2816
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2817 if (cname) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2818
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2819 /* CNAME only */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2820
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2821 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	2822 goto failed;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2823 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2824
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2825 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	2826 "resolver cname:\"%V\"", &name);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2827
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2828 ngx_queue_remove(&rn->queue);
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 rn->cnlen = (u_short) name.len;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2831 rn->u.cname = name.data;
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->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	2834 rn->expire = ngx_time() + r->expire;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2835
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2836 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	2837
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2838 ngx_resolver_free(r, rn->query);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2839 rn->query = NULL;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2840 #if (NGX_HAVE_INET6)
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2841 rn->query6 = NULL;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2842 #endif
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2843
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2844 ctx = rn->waiting;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2845 rn->waiting = NULL;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2846
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2847 if (ctx) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2848
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2849 if (ctx->recursion++ >= NGX_RESOLVER_MAX_RECURSION) {
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 /* unlock name mutex */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2852
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2853 do {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2854 ctx->state = NGX_RESOLVE_NXDOMAIN;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2855 next = ctx->next;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2856
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2857 ctx->handler(ctx);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2858
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2859 ctx = next;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2860 } while (ctx);
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 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2863 }
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 for (next = ctx; next; next = next->next) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2866 next->node = NULL;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2867 }
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 (void) ngx_resolve_name_locked(r, ctx, &name);
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
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2872 /* unlock name mutex */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2873
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2874 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2875 }
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 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	2878
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2879 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2880
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2881 short_response:
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 err = "short DNS response";
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2884
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2885 invalid:
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 /* unlock name mutex */
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 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	2890
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2891 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2892
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2893 failed:
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 /* unlock name mutex */
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
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 static void
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2902 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	2903 {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2904 ngx_uint_t i;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2905 ngx_resolver_t *r;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2906 ngx_resolver_ctx_t *cctx;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2907 ngx_resolver_srv_name_t *srvs;
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 r = ctx->resolver;
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 ctx->node = NULL;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2912 ctx->state = NGX_OK;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2913 ctx->valid = rn->valid;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2914 ctx->count = rn->nsrvs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2915
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2916 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	2917 if (srvs == NULL) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2918 goto failed;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2919 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2920
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2921 ctx->srvs = srvs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2922 ctx->nsrvs = rn->nsrvs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2923
6847 d72b38376092 Resolver: fixed handling of partially resolved SRV. Dmitry Volyntsev <xeioex@nginx.com> parents: 6846 diff changeset	2924 if (ctx->event && ctx->event->timer_set) {
d72b38376092 Resolver: fixed handling of partially resolved SRV. Dmitry Volyntsev <xeioex@nginx.com> parents: 6846 diff changeset	2925 ngx_del_timer(ctx->event);
d72b38376092 Resolver: fixed handling of partially resolved SRV. Dmitry Volyntsev <xeioex@nginx.com> parents: 6846 diff changeset	2926 }
d72b38376092 Resolver: fixed handling of partially resolved SRV. Dmitry Volyntsev <xeioex@nginx.com> parents: 6846 diff changeset	2927
6860 f18c285c2e59 Win32: fixed some warnings reported by Borland C. Maxim Dounin <mdounin@mdounin.ru> parents: 6847 diff changeset	2928 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	2929 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	2930 if (srvs[i].name.data == NULL) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2931 goto failed;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2932 }
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[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	2935 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	2936 srvs[i].name.len);
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 cctx = ngx_resolve_start(r, NULL);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2939 if (cctx == NULL) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2940 goto failed;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2941 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2942
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2943 cctx->name = srvs[i].name;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2944 cctx->handler = ngx_resolver_srv_names_handler;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2945 cctx->data = ctx;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2946 cctx->srvs = &srvs[i];
6847 d72b38376092 Resolver: fixed handling of partially resolved SRV. Dmitry Volyntsev <xeioex@nginx.com> parents: 6846 diff changeset	2947 cctx->timeout = ctx->timeout;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2948
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2949 srvs[i].priority = rn->u.srvs[i].priority;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2950 srvs[i].weight = rn->u.srvs[i].weight;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2951 srvs[i].port = rn->u.srvs[i].port;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2952 srvs[i].ctx = cctx;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2953
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2954 if (ngx_resolve_name(cctx) == NGX_ERROR) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2955 srvs[i].ctx = NULL;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2956 goto failed;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2957 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2958 }
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 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2961
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2962 failed:
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2963
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2964 ctx->state = NGX_ERROR;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2965 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	2966
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2967 ctx->handler(ctx);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2968 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2969
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2970
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2971 static void
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2972 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	2973 {
6559 adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	2974 ngx_uint_t i;
adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	2975 ngx_addr_t *addrs;
adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	2976 ngx_resolver_t *r;
adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	2977 ngx_sockaddr_t *sockaddr;
adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	2978 ngx_resolver_ctx_t *ctx;
adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	2979 ngx_resolver_srv_name_t *srv;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2980
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2981 r = cctx->resolver;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2982 ctx = cctx->data;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2983 srv = cctx->srvs;
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->count--;
7040 d49b74a683b1 Resolver: added the "async" flag to resolver context. Roman Arutyunyan <arut@nginx.com> parents: 7039 diff changeset	2986 ctx->async \|= cctx->async;
6458 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 srv->ctx = NULL;
6714 c3e3de6d2672 Resolver: introduced state field in ngx_resolver_srv_name_t. Dmitry Volyntsev <xeioex@nginx.com> parents: 6593 diff changeset	2989 srv->state = cctx->state;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2990
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2991 if (cctx->naddrs) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2992
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2993 ctx->valid = ngx_min(ctx->valid, cctx->valid);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2994
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2995 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	2996 if (addrs == NULL) {
7048 80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	2997 srv->state = NGX_ERROR;
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	2998 goto done;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	2999 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3000
6559 adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	3001 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	3002 if (sockaddr == NULL) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3003 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	3004 srv->state = NGX_ERROR;
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	3005 goto done;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3006 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3007
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3008 for (i = 0; i < cctx->naddrs; i++) {
6559 adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	3009 addrs[i].sockaddr = &sockaddr[i].sockaddr;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3010 addrs[i].socklen = cctx->addrs[i].socklen;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3011
6559 adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	3012 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	3013 addrs[i].socklen);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3014
6593 b3b7e33083ac Introduced ngx_inet_get_port() and ngx_inet_set_port() functions. Roman Arutyunyan <arut@nginx.com> parents: 6559 diff changeset	3015 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	3016 }
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 srv->addrs = addrs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3019 srv->naddrs = cctx->naddrs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3020 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3021
7048 80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	3022 done:
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	3023
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3024 ngx_resolve_name_done(cctx);
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 if (ctx->count == 0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3027 ngx_resolver_report_srv(r, ctx);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3028 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3029 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3030
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3031
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3032 static void
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3033 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	3034 ngx_uint_t ident, ngx_uint_t code, ngx_uint_t nan)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3035 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3036 char *err;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3037 size_t len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3038 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	3039 int32_t ttl;
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3040 ngx_int_t octet;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3041 ngx_str_t name;
6371 33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3042 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	3043 ngx_queue_t *expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3044 ngx_rbtree_t *tree;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3045 ngx_resolver_an_t *an;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3046 ngx_resolver_ctx_t ctx, next;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3047 ngx_resolver_node_t *rn;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3048 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3049 uint32_t hash;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3050 ngx_int_t digit;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3051 struct in6_addr addr6;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3052 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3053
6372 a6a5bacf6b74 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6371 diff changeset	3054 if (ngx_resolver_copy(r, &name, buf,
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3055 buf + sizeof(ngx_resolver_hdr_t), buf + n)
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3056 != NGX_OK)
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3057 {
5472 ab493c60d9ff Resolver: fixes in PTR processing. Ruslan Ermilov <ru@nginx.com> parents: 5471 diff changeset	3058 return;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3059 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3060
6372 a6a5bacf6b74 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6371 diff changeset	3061 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	3062
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3063 /* AF_INET */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3064
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3065 addr = 0;
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3066 i = sizeof(ngx_resolver_hdr_t);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3067
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3068 for (mask = 0; mask < 32; mask += 8) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3069 len = buf[i++];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3070
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3071 octet = ngx_atoi(&buf[i], len);
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3072 if (octet == NGX_ERROR \|\| octet > 255) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3073 goto invalid_in_addr_arpa;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3074 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3075
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3076 addr += octet << mask;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3077 i += len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3078 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3079
5479 c0d6eae5a1c5 Resolver: lookups are case-insensitive. Ruslan Ermilov <ru@nginx.com> parents: 5478 diff changeset	3080 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	3081 i += sizeof("\7in-addr\4arpa");
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3082
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3083 /* lock addr mutex */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3084
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3085 rn = ngx_resolver_lookup_addr(r, addr);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3086
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3087 tree = &r->addr_rbtree;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3088 expire_queue = &r->addr_expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3089
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3090 goto valid;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3091 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3092
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3093 invalid_in_addr_arpa:
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3094
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3095 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3096
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3097 i = sizeof(ngx_resolver_hdr_t);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3098
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3099 for (octet = 15; octet >= 0; octet--) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3100 if (buf[i++] != '\1') {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3101 goto invalid_ip6_arpa;
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
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3104 digit = ngx_hextoi(&buf[i++], 1);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3105 if (digit == NGX_ERROR) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3106 goto invalid_ip6_arpa;
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
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3109 addr6.s6_addr[octet] = (u_char) digit;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3110
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3111 if (buf[i++] != '\1') {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3112 goto invalid_ip6_arpa;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3113 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3114
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3115 digit = ngx_hextoi(&buf[i++], 1);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3116 if (digit == NGX_ERROR) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3117 goto invalid_ip6_arpa;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3118 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3119
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3120 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	3121 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3122
5479 c0d6eae5a1c5 Resolver: lookups are case-insensitive. Ruslan Ermilov <ru@nginx.com> parents: 5478 diff changeset	3123 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	3124 i += sizeof("\3ip6\4arpa");
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 /* lock addr mutex */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3127
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3128 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	3129 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	3130
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3131 tree = &r->addr6_rbtree;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3132 expire_queue = &r->addr6_expire_queue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3133
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3134 goto valid;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3135 }
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 invalid_ip6_arpa:
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3138 #endif
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 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	3141 "invalid in-addr.arpa or ip6.arpa name in DNS response");
6372 a6a5bacf6b74 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6371 diff changeset	3142 ngx_resolver_free(r, name.data);
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3143 return;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3144
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3145 valid:
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3146
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3147 if (rn == NULL \|\| rn->query == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3148 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	3149 "unexpected response for %V", &name);
6372 a6a5bacf6b74 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6371 diff changeset	3150 ngx_resolver_free(r, name.data);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3151 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3152 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3153
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3154 qident = (rn->query[0] << 8) + rn->query[1];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3155
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3156 if (ident != qident) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3157 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	3158 "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	3159 ident, &name, qident);
6372 a6a5bacf6b74 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6371 diff changeset	3160 ngx_resolver_free(r, name.data);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3161 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3162 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3163
6372 a6a5bacf6b74 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6371 diff changeset	3164 ngx_resolver_free(r, name.data);
a6a5bacf6b74 Resolver: style. Ruslan Ermilov <ru@nginx.com> parents: 6371 diff changeset	3165
1742 268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	3166 if (code == 0 && nan == 0) {
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3167 code = NGX_RESOLVE_NXDOMAIN;
1742 268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	3168 }
268b81386fe4 no answers in DNS response should be NXDOMAIN Igor Sysoev <igor@sysoev.ru> parents: 1741 diff changeset	3169
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3170 if (code) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3171 next = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3172 rn->waiting = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3173
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3174 ngx_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3175
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3176 ngx_rbtree_delete(tree, &rn->node);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3177
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3178 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3179
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3180 while (next) {
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	3181 ctx = next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	3182 ctx->state = code;
6456 c94aba230a5a Resolver: introduced valid field in resolver responses. Dmitry Volyntsev <xeioex@nginx.com> parents: 6372 diff changeset	3183 ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	3184 next = ctx->next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	3185
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	3186 ctx->handler(ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3187 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3188
5920 7420068c4d4b Resolver: fixed use-after-free memory access. Ruslan Ermilov <ru@nginx.com> parents: 5820 diff changeset	3189 ngx_resolver_free_node(r, rn);
7420068c4d4b Resolver: fixed use-after-free memory access. Ruslan Ermilov <ru@nginx.com> parents: 5820 diff changeset	3190
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3191 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3192 }
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 i += sizeof(ngx_resolver_qs_t);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3195
6371 33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3196 for (a = 0; a < nan; a++) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3197
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3198 start = i;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3199
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3200 while (i < n) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3201
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3202 if (buf[i] & 0xc0) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3203 i += 2;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3204 goto found;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3205 }
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3206
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3207 if (buf[i] == 0) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3208 i++;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3209 goto test_length;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3210 }
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3211
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3212 i += 1 + buf[i];
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3213 }
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3214
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3215 goto short_response;
6371 33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3216
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3217 test_length:
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3218
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3219 if (i - start < 2) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3220 err = "invalid name in DNS response";
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3221 goto invalid;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3222 }
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 found:
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3225
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3226 if (i + sizeof(ngx_resolver_an_t) >= n) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3227 goto short_response;
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 an = (ngx_resolver_an_t *) &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 type = (an->type_hi << 8) + an->type_lo;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3233 class = (an->class_hi << 8) + an->class_lo;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3234 len = (an->len_hi << 8) + an->len_lo;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3235 ttl = (an->ttl[0] << 24) + (an->ttl[1] << 16)
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3236 + (an->ttl[2] << 8) + (an->ttl[3]);
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3237
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3238 if (class != 1) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3239 ngx_log_error(r->log_level, r->log, 0,
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3240 "unexpected RR class %ui", class);
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3241 goto failed;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3242 }
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 (ttl < 0) {
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3245 ttl = 0;
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 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	3249 "resolver qt:%ui cl:%ui len:%uz",
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3250 type, class, len);
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3251
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3252 i += sizeof(ngx_resolver_an_t);
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3253
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3254 switch (type) {
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 case NGX_RESOLVE_PTR:
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3257
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3258 goto ptr;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3259
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3260 case NGX_RESOLVE_CNAME:
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 break;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3263
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3264 default:
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_error(r->log_level, r->log, 0,
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3267 "unexpected RR type %ui", type);
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3268 }
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 += len;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3271 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3272
6371 33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3273 /* unlock addr mutex */
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3274
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3275 ngx_log_error(r->log_level, r->log, 0,
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3276 "no PTR type in DNS response");
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3277 return;
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3278
33c4d319f08f Resolver: improved PTR response processing. Ruslan Ermilov <ru@nginx.com> parents: 6370 diff changeset	3279 ptr:
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3280
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3281 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	3282 goto failed;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3283 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3284
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3285 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	3286
2486 8de5dc3e7001 use length of uncompressed name Igor Sysoev <igor@sysoev.ru> parents: 2484 diff changeset	3287 if (name.len != (size_t) rn->nlen
8de5dc3e7001 use length of uncompressed name Igor Sysoev <igor@sysoev.ru> parents: 2484 diff changeset	3288 \|\| ngx_strncmp(name.data, rn->name, name.len) != 0)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3289 {
2482 30ec8c5ac75b fix reverse resolving cache: it stored zero length names Igor Sysoev <igor@sysoev.ru> parents: 2314 diff changeset	3290 if (rn->nlen) {
30ec8c5ac75b fix reverse resolving cache: it stored zero length names Igor Sysoev <igor@sysoev.ru> parents: 2314 diff changeset	3291 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	3292 }
30ec8c5ac75b fix reverse resolving cache: it stored zero length names Igor Sysoev <igor@sysoev.ru> parents: 2314 diff changeset	3293
2490 1c87647b7ca5 fix building by msvc, introduced in r2487 Igor Sysoev <igor@sysoev.ru> parents: 2487 diff changeset	3294 rn->nlen = (u_short) name.len;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3295 rn->name = name.data;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3296
2486 8de5dc3e7001 use length of uncompressed name Igor Sysoev <igor@sysoev.ru> parents: 2484 diff changeset	3297 name.data = ngx_resolver_dup(r, rn->name, name.len);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3298 if (name.data == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3299 goto failed;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3300 }
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_queue_remove(&rn->queue);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3304
4295 05031fce7ce8 Now nginx uses TTL of a DNS response when calculating cache validity. Ruslan Ermilov <ru@nginx.com> parents: 4267 diff changeset	3305 rn->valid = ngx_time() + (r->valid ? r->valid : ttl);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3306 rn->expire = ngx_time() + r->expire;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3307
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3308 ngx_queue_insert_head(expire_queue, &rn->queue);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3309
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3310 next = rn->waiting;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3311 rn->waiting = NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3312
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3313 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3314
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3315 while (next) {
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	3316 ctx = next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	3317 ctx->state = NGX_OK;
6456 c94aba230a5a Resolver: introduced valid field in resolver responses. Dmitry Volyntsev <xeioex@nginx.com> parents: 6372 diff changeset	3318 ctx->valid = rn->valid;
5474 b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	3319 ctx->name = name;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	3320 next = ctx->next;
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	3321
b43b02bb54db Resolver: fixed indentation. Ruslan Ermilov <ru@nginx.com> parents: 5472 diff changeset	3322 ctx->handler(ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3323 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3324
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3325 ngx_resolver_free(r, name.data);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3326
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3327 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3328
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3329 short_response:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3330
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3331 err = "short DNS response";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3332
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3333 invalid:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3334
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3335 /* unlock addr mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3336
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3337 ngx_log_error(r->log_level, r->log, 0, err);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3338
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3339 return;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3340
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3341 failed:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3342
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3343 /* unlock addr mutex */
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
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3348
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3349 static ngx_resolver_node_t *
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3350 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	3351 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3352 ngx_int_t rc;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3353 ngx_rbtree_node_t node, sentinel;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3354 ngx_resolver_node_t *rn;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3355
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3356 node = r->name_rbtree.root;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3357 sentinel = r->name_rbtree.sentinel;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3358
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3359 while (node != sentinel) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3360
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3361 if (hash < node->key) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3362 node = node->left;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3363 continue;
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 if (hash > node->key) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3367 node = node->right;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3368 continue;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3369 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3370
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3371 /* hash == node->key */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3372
5921 5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	3373 rn = ngx_resolver_node(node);
4497 95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	3374
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	3375 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	3376
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	3377 if (rc == 0) {
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	3378 return rn;
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	3379 }
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	3380
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4496 diff changeset	3381 node = (rc < 0) ? node->left : node->right;
1649 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 /* not found */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3385
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3386 return NULL;
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
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3390 static ngx_resolver_node_t *
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3391 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	3392 {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3393 ngx_int_t rc;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3394 ngx_rbtree_node_t node, sentinel;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3395 ngx_resolver_node_t *rn;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3396
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3397 node = r->srv_rbtree.root;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3398 sentinel = r->srv_rbtree.sentinel;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3399
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3400 while (node != sentinel) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3401
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3402 if (hash < node->key) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3403 node = node->left;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3404 continue;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3405 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3406
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3407 if (hash > node->key) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3408 node = node->right;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3409 continue;
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
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3412 /* hash == node->key */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3413
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3414 rn = ngx_resolver_node(node);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3415
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3416 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	3417
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3418 if (rc == 0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3419 return rn;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3420 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3421
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3422 node = (rc < 0) ? node->left : node->right;
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 /* not found */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3426
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3427 return NULL;
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
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3431 static ngx_resolver_node_t *
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3432 ngx_resolver_lookup_addr(ngx_resolver_t *r, in_addr_t addr)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3433 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3434 ngx_rbtree_node_t node, sentinel;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3435
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3436 node = r->addr_rbtree.root;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3437 sentinel = r->addr_rbtree.sentinel;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3438
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3439 while (node != sentinel) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3440
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3441 if (addr < node->key) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3442 node = node->left;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3443 continue;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3444 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3445
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3446 if (addr > node->key) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3447 node = node->right;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3448 continue;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3449 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3450
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3451 /* addr == node->key */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3452
5921 5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	3453 return ngx_resolver_node(node);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3454 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3455
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3456 /* not found */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3457
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3458 return NULL;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3459 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3460
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3461
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3462 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3463
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3464 static ngx_resolver_node_t *
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3465 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	3466 uint32_t hash)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3467 {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3468 ngx_int_t rc;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3469 ngx_rbtree_node_t node, sentinel;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3470 ngx_resolver_node_t *rn;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3471
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3472 node = r->addr6_rbtree.root;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3473 sentinel = r->addr6_rbtree.sentinel;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3474
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3475 while (node != sentinel) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3476
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3477 if (hash < node->key) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3478 node = node->left;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3479 continue;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3480 }
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 if (hash > node->key) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3483 node = node->right;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3484 continue;
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
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3487 /* hash == node->key */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3488
5921 5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	3489 rn = ngx_resolver_node(node);
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3490
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3491 rc = ngx_memcmp(addr, &rn->addr6, 16);
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 if (rc == 0) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3494 return rn;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3495 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3496
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3497 node = (rc < 0) ? node->left : node->right;
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 /* not found */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3501
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3502 return NULL;
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 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3506
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3507
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3508 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3509 ngx_resolver_rbtree_insert_value(ngx_rbtree_node_t *temp,
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3510 ngx_rbtree_node_t node, ngx_rbtree_node_t sentinel)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3511 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3512 ngx_rbtree_node_t **p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3513 ngx_resolver_node_t rn, rn_temp;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3514
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3515 for ( ;; ) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3516
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3517 if (node->key < temp->key) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3518
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3519 p = &temp->left;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3520
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3521 } else if (node->key > temp->key) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3522
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3523 p = &temp->right;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3524
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3525 } else { /* node->key == temp->key */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3526
5921 5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	3527 rn = ngx_resolver_node(node);
5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	3528 rn_temp = ngx_resolver_node(temp);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3529
3143 ab6258e18099 fix resolver cache rbtree comparison Igor Sysoev <igor@sysoev.ru> parents: 3139 diff changeset	3530 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	3531 < 0) ? &temp->left : &temp->right;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3532 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3533
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3534 if (*p == sentinel) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3535 break;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3536 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3537
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3538 temp = *p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3539 }
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 = node;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3542 node->parent = temp;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3543 node->left = sentinel;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3544 node->right = sentinel;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3545 ngx_rbt_red(node);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3546 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3547
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3548
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3549 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3550
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3551 static void
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3552 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	3553 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	3554 {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3555 ngx_rbtree_node_t **p;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3556 ngx_resolver_node_t rn, rn_temp;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3557
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3558 for ( ;; ) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3559
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3560 if (node->key < temp->key) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3561
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3562 p = &temp->left;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3563
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3564 } else if (node->key > temp->key) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3565
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3566 p = &temp->right;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3567
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3568 } else { /* node->key == temp->key */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3569
5921 5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	3570 rn = ngx_resolver_node(node);
5004210e8c78 Resolver: fixed debug event logging. Ruslan Ermilov <ru@nginx.com> parents: 5920 diff changeset	3571 rn_temp = ngx_resolver_node(temp);
5476 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 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	3574 < 0) ? &temp->left : &temp->right;
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
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3577 if (*p == sentinel) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3578 break;
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
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3581 temp = *p;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3582 }
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 = node;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3585 node->parent = temp;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3586 node->left = sentinel;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3587 node->right = sentinel;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3588 ngx_rbt_red(node);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3589 }
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 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3592
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3593
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3594 static ngx_int_t
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3595 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	3596 ngx_str_t *name)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3597 {
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3598 u_char p, s;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3599 size_t len, nlen;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3600 ngx_uint_t ident;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3601 ngx_resolver_qs_t *qs;
5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3602 ngx_resolver_hdr_t *query;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3603
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3604 nlen = name->len ? (1 + name->len + 1) : 1;
3306 61bdaac6c668 fix resolving an empty name (".") Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	3605
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3606 len = sizeof(ngx_resolver_hdr_t) + nlen + sizeof(ngx_resolver_qs_t);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3607
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3608 #if (NGX_HAVE_INET6)
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3609 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	3610 #else
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3611 p = ngx_resolver_alloc(r, len);
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3612 #endif
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3613 if (p == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3614 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3615 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3616
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3617 rn->qlen = (u_short) len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3618 rn->query = p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3619
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3620 #if (NGX_HAVE_INET6)
5478 3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	3621 if (r->ipv6) {
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	3622 rn->query6 = p + len;
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	3623 }
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3624 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3625
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3626 query = (ngx_resolver_hdr_t *) p;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3627
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3628 ident = ngx_random();
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3629
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3630 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	3631 "resolve: \"%V\" A %i", name, ident & 0xffff);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3632
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3633 query->ident_hi = (u_char) ((ident >> 8) & 0xff);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3634 query->ident_lo = (u_char) (ident & 0xff);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3635
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3636 /* recursion query */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3637 query->flags_hi = 1; query->flags_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3638
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3639 /* one question */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3640 query->nqs_hi = 0; query->nqs_lo = 1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3641 query->nan_hi = 0; query->nan_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3642 query->nns_hi = 0; query->nns_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3643 query->nar_hi = 0; query->nar_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3644
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3645 p += sizeof(ngx_resolver_hdr_t) + nlen;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3646
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3647 qs = (ngx_resolver_qs_t *) p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3648
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3649 /* query type */
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3650 qs->type_hi = 0; qs->type_lo = NGX_RESOLVE_A;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3651
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3652 /* IN query class */
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3653 qs->class_hi = 0; qs->class_lo = 1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3654
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3655 /* convert "www.example.com" to "\3www\7example\3com\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 len = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3658 p--;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3659 *p-- = '\0';
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3660
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3661 if (name->len == 0) {
4610 778d2cc03e22 Fixed segmentation fault in ngx_resolver_create_name_query(). Ruslan Ermilov <ru@nginx.com> parents: 4556 diff changeset	3662 return NGX_DECLINED;
778d2cc03e22 Fixed segmentation fault in ngx_resolver_create_name_query(). Ruslan Ermilov <ru@nginx.com> parents: 4556 diff changeset	3663 }
778d2cc03e22 Fixed segmentation fault in ngx_resolver_create_name_query(). Ruslan Ermilov <ru@nginx.com> parents: 4556 diff changeset	3664
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3665 for (s = name->data + name->len - 1; s >= name->data; s--) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3666 if (*s != '.') {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3667 p = s;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3668 len++;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3669
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3670 } else {
4556 1bddc91e78d6 Resolver: added missing sanity checking when creating name queries. Maxim Dounin <mdounin@mdounin.ru> parents: 4497 diff changeset	3671 if (len == 0 \|\| len > 255) {
1961 99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	3672 return NGX_DECLINED;
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	3673 }
99b9feacccb4 return NXDOMAIN for ".." in host name Igor Sysoev <igor@sysoev.ru> parents: 1960 diff changeset	3674
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3675 *p = (u_char) len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3676 len = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3677 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3678
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3679 p--;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3680 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3681
4556 1bddc91e78d6 Resolver: added missing sanity checking when creating name queries. Maxim Dounin <mdounin@mdounin.ru> parents: 4497 diff changeset	3682 if (len == 0 \|\| len > 255) {
1bddc91e78d6 Resolver: added missing sanity checking when creating name queries. Maxim Dounin <mdounin@mdounin.ru> parents: 4497 diff changeset	3683 return NGX_DECLINED;
1bddc91e78d6 Resolver: added missing sanity checking when creating name queries. Maxim Dounin <mdounin@mdounin.ru> parents: 4497 diff changeset	3684 }
1bddc91e78d6 Resolver: added missing sanity checking when creating name queries. Maxim Dounin <mdounin@mdounin.ru> parents: 4497 diff changeset	3685
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3686 *p = (u_char) len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3687
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3688 #if (NGX_HAVE_INET6)
5478 3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	3689 if (!r->ipv6) {
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	3690 return NGX_OK;
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	3691 }
3cb3175a6fef The "ipv6=" boolean parameter of the "resolver" directive. Ruslan Ermilov <ru@nginx.com> parents: 5477 diff changeset	3692
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3693 p = rn->query6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3694
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3695 ngx_memcpy(p, rn->query, rn->qlen);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3696
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3697 query = (ngx_resolver_hdr_t *) p;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3698
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3699 ident = ngx_random();
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3700
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3701 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	3702 "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	3703
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3704 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	3705 query->ident_lo = (u_char) (ident & 0xff);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3706
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3707 p += sizeof(ngx_resolver_hdr_t) + nlen;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3708
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3709 qs = (ngx_resolver_qs_t *) p;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3710
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3711 qs->type_lo = NGX_RESOLVE_AAAA;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3712 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	3713
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3714 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3715 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3716
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3717
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3718 static ngx_int_t
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3719 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	3720 ngx_str_t *name)
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3721 {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3722 u_char p, s;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3723 size_t len, nlen;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3724 ngx_uint_t ident;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3725 ngx_resolver_qs_t *qs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3726 ngx_resolver_hdr_t *query;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3727
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3728 nlen = name->len ? (1 + name->len + 1) : 1;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3729
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3730 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	3731
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3732 p = ngx_resolver_alloc(r, len);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3733 if (p == NULL) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3734 return NGX_ERROR;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3735 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3736
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3737 rn->qlen = (u_short) len;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3738 rn->query = p;
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 query = (ngx_resolver_hdr_t *) p;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3741
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3742 ident = ngx_random();
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3743
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3744 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	3745 "resolve: \"%V\" SRV %i", name, ident & 0xffff);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3746
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3747 query->ident_hi = (u_char) ((ident >> 8) & 0xff);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3748 query->ident_lo = (u_char) (ident & 0xff);
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 /* recursion query */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3751 query->flags_hi = 1; query->flags_lo = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3752
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3753 /* one question */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3754 query->nqs_hi = 0; query->nqs_lo = 1;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3755 query->nan_hi = 0; query->nan_lo = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3756 query->nns_hi = 0; query->nns_lo = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3757 query->nar_hi = 0; query->nar_lo = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3758
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3759 p += sizeof(ngx_resolver_hdr_t) + nlen;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3760
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3761 qs = (ngx_resolver_qs_t *) p;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3762
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3763 /* query type */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3764 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	3765
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3766 /* IN query class */
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3767 qs->class_hi = 0; qs->class_lo = 1;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3768
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3769 /* 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	3770
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3771 len = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3772 p--;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3773 *p-- = '\0';
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3774
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3775 if (name->len == 0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3776 return NGX_DECLINED;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3777 }
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 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	3780 if (*s != '.') {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3781 p = s;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3782 len++;
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 } else {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3785 if (len == 0 \|\| len > 255) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3786 return NGX_DECLINED;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3787 }
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 *p = (u_char) len;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3790 len = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3791 }
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 p--;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3794 }
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 if (len == 0 \|\| len > 255) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3797 return NGX_DECLINED;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3798 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3799
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3800 *p = (u_char) 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 return NGX_OK;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3803 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	3804
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 static ngx_int_t
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3807 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	3808 ngx_resolver_addr_t *addr)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3809 {
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3810 u_char p, d;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3811 size_t len;
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3812 in_addr_t inaddr;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3813 ngx_int_t n;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3814 ngx_uint_t ident;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3815 ngx_resolver_hdr_t *query;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3816 struct sockaddr_in *sin;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3817 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3818 struct sockaddr_in6 *sin6;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3819 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3820
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3821 switch (addr->sockaddr->sa_family) {
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3822
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3823 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3824 case AF_INET6:
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3825 len = sizeof(ngx_resolver_hdr_t)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3826 + 64 + sizeof(".ip6.arpa.") - 1
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3827 + sizeof(ngx_resolver_qs_t);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3828
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3829 break;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3830 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3831
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3832 default: /* AF_INET */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3833 len = sizeof(ngx_resolver_hdr_t)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3834 + 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	3835 + sizeof(ngx_resolver_qs_t);
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	3836 }
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3837
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3838 p = ngx_resolver_alloc(r, len);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3839 if (p == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3840 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3841 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3842
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3843 rn->query = p;
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3844 query = (ngx_resolver_hdr_t *) p;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3845
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3846 ident = ngx_random();
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3847
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3848 query->ident_hi = (u_char) ((ident >> 8) & 0xff);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3849 query->ident_lo = (u_char) (ident & 0xff);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3850
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3851 /* recursion query */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3852 query->flags_hi = 1; query->flags_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3853
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3854 /* one question */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3855 query->nqs_hi = 0; query->nqs_lo = 1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3856 query->nan_hi = 0; query->nan_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3857 query->nns_hi = 0; query->nns_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3858 query->nar_hi = 0; query->nar_lo = 0;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3859
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3860 p += sizeof(ngx_resolver_hdr_t);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3861
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3862 switch (addr->sockaddr->sa_family) {
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3863
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3864 #if (NGX_HAVE_INET6)
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3865 case AF_INET6:
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3866 sin6 = (struct sockaddr_in6 *) addr->sockaddr;
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3867
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3868 for (n = 15; n >= 0; n--) {
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3869 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	3870 sin6->sin6_addr.s6_addr[n] & 0xf,
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3871 (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	3872 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3873
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3874 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	3875
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3876 break;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3877 #endif
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3878
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3879 default: /* AF_INET */
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3880
6350 a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3881 sin = (struct sockaddr_in *) addr->sockaddr;
a5767988c022 Resolver: changed the ngx_resolver_create__query() arguments. Roman Arutyunyan <arut@nginx.com>* parents: 6349 diff changeset	3882 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	3883
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3884 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	3885 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	3886 *p = (u_char) (d - &p[1]);
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3887 p = d;
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3888 }
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3889
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3890 p = ngx_cpymem(p, "\7in-addr\4arpa\0", 14);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3891 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3892
5468 5c410d6ca7dd Resolver: improved code readability. Ruslan Ermilov <ru@nginx.com> parents: 5360 diff changeset	3893 /* query type "PTR", IN query class */
5476 950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3894 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	3895
950c9ed3e66f Resolver: implemented IPv6 address to name resolving. Ruslan Ermilov <ru@nginx.com> parents: 5475 diff changeset	3896 rn->qlen = (u_short) (p - rn->query);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3897
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3898 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3899 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3900
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3901
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3902 static ngx_int_t
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3903 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	3904 u_char *last)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3905 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3906 char *err;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3907 u_char p, dst;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3908 ssize_t len;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3909 ngx_uint_t i, n;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3910
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3911 p = src;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3912 len = -1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3913
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3914 /*
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3915 * compression pointers allow to create endless loop, so we set limit;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3916 * 128 pointers should be enough to store 255-byte name
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 for (i = 0; i < 128; i++) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3920 n = *p++;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3921
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3922 if (n == 0) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3923 goto done;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3924 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3925
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3926 if (n & 0xc0) {
2314 52987a023486 fix compression pointer for big (>255) DNS responses Igor Sysoev <igor@sysoev.ru> parents: 2282 diff changeset	3927 n = ((n & 0x3f) << 8) + *p;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3928 p = &buf[n];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3929
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3930 } else {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3931 len += 1 + n;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3932 p = &p[n];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3933 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3934
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3935 if (p >= last) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3936 err = "name is out of response";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3937 goto invalid;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3938 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3939 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3940
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3941 err = "compression pointers loop";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3942
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3943 invalid:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3944
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3945 ngx_log_error(r->log_level, r->log, 0, err);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3946
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3947 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3948
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3949 done:
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3950
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3951 if (name == NULL) {
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3952 return NGX_OK;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3953 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3954
3298 847ab5a32307 fix "PTR ." case in address resolver Igor Sysoev <igor@sysoev.ru> parents: 3297 diff changeset	3955 if (len == -1) {
5764 f166c521b619 Style: use ngx_str_null(). Tatsuhiko Kubo <cubicdaiya@gmail.com> parents: 5600 diff changeset	3956 ngx_str_null(name);
3298 847ab5a32307 fix "PTR ." case in address resolver Igor Sysoev <igor@sysoev.ru> parents: 3297 diff changeset	3957 return NGX_OK;
847ab5a32307 fix "PTR ." case in address resolver Igor Sysoev <igor@sysoev.ru> parents: 3297 diff changeset	3958 }
847ab5a32307 fix "PTR ." case in address resolver Igor Sysoev <igor@sysoev.ru> parents: 3297 diff changeset	3959
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3960 dst = ngx_resolver_alloc(r, len);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3961 if (dst == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3962 return NGX_ERROR;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3963 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3964
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3965 name->data = dst;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3966
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3967 n = *src++;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3968
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3969 for ( ;; ) {
4267 768212ca0745 Fixed compression pointer processing in DNS response greater than 255 bytes. Igor Sysoev <igor@sysoev.ru> parents: 4225 diff changeset	3970 if (n & 0xc0) {
768212ca0745 Fixed compression pointer processing in DNS response greater than 255 bytes. Igor Sysoev <igor@sysoev.ru> parents: 4225 diff changeset	3971 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	3972 src = &buf[n];
768212ca0745 Fixed compression pointer processing in DNS response greater than 255 bytes. Igor Sysoev <igor@sysoev.ru> parents: 4225 diff changeset	3973
768212ca0745 Fixed compression pointer processing in DNS response greater than 255 bytes. Igor Sysoev <igor@sysoev.ru> parents: 4225 diff changeset	3974 n = *src++;
768212ca0745 Fixed compression pointer processing in DNS response greater than 255 bytes. Igor Sysoev <igor@sysoev.ru> parents: 4225 diff changeset	3975
768212ca0745 Fixed compression pointer processing in DNS response greater than 255 bytes. Igor Sysoev <igor@sysoev.ru> parents: 4225 diff changeset	3976 } else {
5479 c0d6eae5a1c5 Resolver: lookups are case-insensitive. Ruslan Ermilov <ru@nginx.com> parents: 5478 diff changeset	3977 ngx_strlow(dst, src, n);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3978 dst += n;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3979 src += n;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3980
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3981 n = *src++;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3982
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3983 if (n != 0) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3984 *dst++ = '.';
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3985 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3986 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3987
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3988 if (n == 0) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3989 name->len = dst - name->data;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3990 return NGX_OK;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3991 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3992 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3993 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3994
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	3995
7051 137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	3996 static ngx_int_t
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	3997 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	3998 {
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	3999 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	4000 return NGX_OK;
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4001 }
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4002
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4003 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	4004 if (ctx->event == NULL) {
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4005 return NGX_ERROR;
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4006 }
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4007
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4008 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	4009 ctx->event->data = ctx;
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4010 ctx->event->log = r->log;
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4011 ctx->ident = -1;
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4012
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4013 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	4014
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4015 return NGX_OK;
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
137c5be7df09 Resolver: factored out setting a timer for resolver timeout. Sergey Kandaurov <pluknet@nginx.com> parents: 7048 diff changeset	4018
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4019 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4020 ngx_resolver_timeout_handler(ngx_event_t *ev)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4021 {
6348 7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	4022 ngx_resolver_ctx_t *ctx;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	4023
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	4024 ctx = ev->data;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	4025
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	4026 ctx->state = NGX_RESOLVE_TIMEDOUT;
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	4027
7316c57e4fe7 Resolver: fixed crashes in timeout handler. Ruslan Ermilov <ru@nginx.com> parents: 6347 diff changeset	4028 ctx->handler(ctx);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4029 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4030
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4031
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4032 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4033 ngx_resolver_free_node(ngx_resolver_t r, ngx_resolver_node_t rn)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4034 {
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4035 ngx_uint_t i;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4036
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4037 /* lock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4038
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4039 if (rn->query) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4040 ngx_resolver_free_locked(r, rn->query);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4041 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4042
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4043 if (rn->name) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4044 ngx_resolver_free_locked(r, rn->name);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4045 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4046
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4047 if (rn->cnlen) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4048 ngx_resolver_free_locked(r, rn->u.cname);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4049 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4050
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4051 if (rn->naddrs > 1 && rn->naddrs != (u_short) -1) {
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4052 ngx_resolver_free_locked(r, rn->u.addrs);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4053 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4054
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4055 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4056 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	4057 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	4058 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4059 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4060
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4061 if (rn->nsrvs) {
6860 f18c285c2e59 Win32: fixed some warnings reported by Borland C. Maxim Dounin <mdounin@mdounin.ru> parents: 6847 diff changeset	4062 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	4063 if (rn->u.srvs[i].name.data) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4064 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	4065 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4066 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4067
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4068 ngx_resolver_free_locked(r, rn->u.srvs);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4069 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4070
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4071 ngx_resolver_free_locked(r, rn);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4072
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4073 /* unlock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4074 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4075
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4076
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4077 static void *
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4078 ngx_resolver_alloc(ngx_resolver_t *r, size_t size)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4079 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4080 u_char *p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4081
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4082 /* lock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4083
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4084 p = ngx_alloc(size, r->log);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4085
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4086 /* unlock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4087
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4088 return p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4089 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4090
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4091
1903 1ea922585517 static ngx_resolver_calloc() Igor Sysoev <igor@sysoev.ru> parents: 1880 diff changeset	4092 static void *
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4093 ngx_resolver_calloc(ngx_resolver_t *r, size_t size)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4094 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4095 u_char *p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4096
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4097 p = ngx_resolver_alloc(r, 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 if (p) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4100 ngx_memzero(p, size);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4101 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4102
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4103 return p;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4104 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4105
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4106
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4107 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4108 ngx_resolver_free(ngx_resolver_t r, void p)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4109 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4110 /* lock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4111
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4112 ngx_free(p);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4113
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4114 /* unlock alloc mutex */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4115 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4116
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4117
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4118 static void
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4119 ngx_resolver_free_locked(ngx_resolver_t r, void p)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4120 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4121 ngx_free(p);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4122 }
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 static void *
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4126 ngx_resolver_dup(ngx_resolver_t r, void src, size_t size)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4127 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4128 void *dst;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4129
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4130 dst = ngx_resolver_alloc(r, size);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4131
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4132 if (dst == NULL) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4133 return dst;
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 ngx_memcpy(dst, src, size);
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4137
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4138 return dst;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4139 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4140
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4141
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4142 static ngx_resolver_addr_t *
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4143 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	4144 ngx_uint_t rotate)
4871 c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	4145 {
6559 adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	4146 ngx_uint_t d, i, j, n;
adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	4147 in_addr_t *addr;
adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	4148 ngx_sockaddr_t *sockaddr;
adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	4149 struct sockaddr_in *sin;
adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	4150 ngx_resolver_addr_t *dst;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4151 #if (NGX_HAVE_INET6)
6559 adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	4152 struct in6_addr *addr6;
adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	4153 struct sockaddr_in6 *sin6;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4154 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4155
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4156 n = rn->naddrs;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4157 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4158 n += rn->naddrs6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4159 #endif
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	4160
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4161 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	4162 if (dst == NULL) {
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	4163 return NULL;
4892 063ac68d89dc Resolver: added missing memory allocation error handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4871 diff changeset	4164 }
063ac68d89dc Resolver: added missing memory allocation error handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4871 diff changeset	4165
6559 adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	4166 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	4167 if (sockaddr == NULL) {
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	4168 ngx_resolver_free(r, dst);
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5474 diff changeset	4169 return NULL;
4871 c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	4170 }
c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	4171
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4172 i = 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4173 d = rotate ? ngx_random() % n : 0;
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 if (rn->naddrs) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4176 j = rotate ? ngx_random() % rn->naddrs : 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4177
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4178 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	4179
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4180 do {
6559 adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	4181 sin = &sockaddr[d].sockaddr_in;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4182 sin->sin_family = AF_INET;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4183 sin->sin_addr.s_addr = addr[j++];
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4184 dst[d].sockaddr = (struct sockaddr *) sin;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4185 dst[d++].socklen = sizeof(struct sockaddr_in);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4186
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4187 if (d == n) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4188 d = 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4189 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4190
6860 f18c285c2e59 Win32: fixed some warnings reported by Borland C. Maxim Dounin <mdounin@mdounin.ru> parents: 6847 diff changeset	4191 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	4192 j = 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4193 }
6860 f18c285c2e59 Win32: fixed some warnings reported by Borland C. Maxim Dounin <mdounin@mdounin.ru> parents: 6847 diff changeset	4194 } 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	4195 }
4871 c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	4196
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4197 #if (NGX_HAVE_INET6)
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4198 if (rn->naddrs6) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4199 j = rotate ? ngx_random() % rn->naddrs6 : 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4200
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4201 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	4202
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4203 do {
6559 adf25b8d0431 Introduced the ngx_sockaddr_t type. Ruslan Ermilov <ru@nginx.com> parents: 6509 diff changeset	4204 sin6 = &sockaddr[d].sockaddr_in6;
5477 98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4205 sin6->sin6_family = AF_INET6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4206 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	4207 dst[d].sockaddr = (struct sockaddr *) sin6;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4208 dst[d++].socklen = sizeof(struct sockaddr_in6);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4209
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4210 if (d == n) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4211 d = 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4212 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4213
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4214 if (j == rn->naddrs6) {
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4215 j = 0;
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4216 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4217 } while (++i < n);
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4218 }
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4219 #endif
98876ce2a7fd Resolver: implemented IPv6 name to address resolving. Ruslan Ermilov <ru@nginx.com> parents: 5476 diff changeset	4220
4871 c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	4221 return dst;
c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	4222 }
c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	4223
c85cefbdaafe Resolver: cached addresses are returned with random rotation now. Maxim Dounin <mdounin@mdounin.ru> parents: 4784 diff changeset	4224
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4225 static void
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4226 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	4227 {
6460 034329824dd3 Win32: fixed build after 384154fc634f. Dmitry Volyntsev <xeioex@nginx.com> parents: 6458 diff changeset	4228 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	4229 ngx_resolver_addr_t *addrs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4230 ngx_resolver_srv_name_t *srvs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4231
7048 80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	4232 srvs = ctx->srvs;
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	4233 nsrvs = ctx->nsrvs;
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	4234
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4235 naddrs = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4236
7048 80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	4237 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	4238 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	4239 ctx->state = NGX_ERROR;
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	4240 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	4241
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	4242 ctx->handler(ctx);
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	4243 return;
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	4244 }
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	4245
80224192163c Resolver: fixed possible use-after-free while resolving SRV. Roman Arutyunyan <arut@nginx.com> parents: 7040 diff changeset	4246 naddrs += srvs[i].naddrs;
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4247 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4248
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4249 if (naddrs == 0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4250 ctx->state = NGX_RESOLVE_NXDOMAIN;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4251 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	4252
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4253 ctx->handler(ctx);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4254 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4255 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4256
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4257 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	4258 if (addrs == NULL) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4259 ctx->state = NGX_ERROR;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4260 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	4261
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4262 ctx->handler(ctx);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4263 return;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4264 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4265
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4266 i = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4267 n = 0;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4268
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4269 do {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4270 nw = 0;
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 for (j = i; j < nsrvs; j++) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4273 if (srvs[j].priority != srvs[i].priority) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4274 break;
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
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4277 nw += srvs[j].naddrs * srvs[j].weight;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4278 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4279
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4280 if (nw == 0) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4281 goto next_srv;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4282 }
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 w = ngx_random() % nw;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4285
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4286 for (k = i; k < j; k++) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4287 if (w < srvs[k].naddrs * srvs[k].weight) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4288 break;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4289 }
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 w -= srvs[k].naddrs * srvs[k].weight;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4292 }
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4293
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4294 for (l = i; l < j; l++) {
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 for (m = 0; m < srvs[k].naddrs; m++) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4297 addrs[n].socklen = srvs[k].addrs[m].socklen;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4298 addrs[n].sockaddr = srvs[k].addrs[m].sockaddr;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4299 addrs[n].name = srvs[k].name;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4300 addrs[n].priority = srvs[k].priority;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4301 addrs[n].weight = srvs[k].weight;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4302 n++;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4303 }
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 if (++k == j) {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4306 k = i;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4307 }
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 next_srv:
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 i = j;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4313
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4314 } while (i < ctx->nsrvs);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4315
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4316 ctx->state = NGX_OK;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4317 ctx->addrs = addrs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4318 ctx->naddrs = naddrs;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4319
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4320 ctx->handler(ctx);
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4321
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4322 ngx_resolver_free(r, addrs);
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
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4325
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4326 char *
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4327 ngx_resolver_strerror(ngx_int_t err)
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4328 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4329 static char *errors[] = {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4330 "Format error", /* FORMERR */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4331 "Server failure", /* SERVFAIL */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4332 "Host not found", /* NXDOMAIN */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4333 "Unimplemented", /* NOTIMP */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4334 "Operation refused" /* REFUSED */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4335 };
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4336
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4337 if (err > 0 && err < 6) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4338 return errors[err - 1];
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4339 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4340
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4341 if (err == NGX_RESOLVE_TIMEDOUT) {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4342 return "Operation timed out";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4343 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4344
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4345 return "Unknown error";
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4346 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4347
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4348
3408 71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4349 static u_char *
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4350 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	4351 {
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4352 u_char *p;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4353 ngx_resolver_connection_t *rec;
3408 71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4354
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4355 p = buf;
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4356
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4357 if (log->action) {
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4358 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	4359 len -= p - buf;
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4360 }
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4361
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4362 rec = log->data;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4363
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4364 if (rec) {
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4365 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	4366 }
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4367
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4368 return p;
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4369 }
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4370
71193a456616 add context to a resolver log Igor Sysoev <igor@sysoev.ru> parents: 3376 diff changeset	4371
6922 a72886067bbb Added missing static specifiers. Eran Kornblau <erankor@gmail.com> parents: 6860 diff changeset	4372 static ngx_int_t
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4373 ngx_udp_connect(ngx_resolver_connection_t *rec)
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4374 {
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4375 int rc;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4376 ngx_int_t event;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4377 ngx_event_t rev, wev;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4378 ngx_socket_t s;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4379 ngx_connection_t *c;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4380
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4381 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	4382
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4383 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	4384
5360 3d2d3e1cf427 Win32: MinGW GCC compatibility. Maxim Dounin <mdounin@mdounin.ru> parents: 4892 diff changeset	4385 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	4386 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	4387 ngx_socket_n " failed");
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4388 return NGX_ERROR;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4389 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4390
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4391 c = ngx_get_connection(s, &rec->log);
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4392
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4393 if (c == NULL) {
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4394 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	4395 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	4396 ngx_close_socket_n "failed");
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4397 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4398
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4399 return NGX_ERROR;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4400 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4401
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4402 if (ngx_nonblocking(s) == -1) {
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4403 ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4404 ngx_nonblocking_n " failed");
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4405
5582 545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	4406 goto failed;
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4407 }
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4408
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4409 rev = c->read;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4410 wev = c->write;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4411
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4412 rev->log = &rec->log;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4413 wev->log = &rec->log;
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4414
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4415 rec->udp = c;
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 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	4418
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4419 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	4420 "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	4421
d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4422 rc = connect(s, rec->sockaddr, rec->socklen);
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4423
6125 4dc8e7b62216 Removed the obsolete aio module. Ruslan Ermilov <ru@nginx.com> parents: 5921 diff changeset	4424 /* TODO: iocp */
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4425
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4426 if (rc == -1) {
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4427 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	4428 "connect() failed");
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4429
5582 545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	4430 goto failed;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4431 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4432
1649 80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4433 /* UDP sockets are always ready to write */
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4434 wev->ready = 1;
80901499140d resolver Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	4435
6126 adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	4436 event = (ngx_event_flags & NGX_USE_CLEAR_EVENT) ?
adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	4437 /* kqueue, epoll */ NGX_CLEAR_EVENT:
adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	4438 /* select, poll, /dev/poll */ NGX_LEVEL_EVENT;
adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	4439 /* eventport event type has no meaning: oneshot only */
adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	4440
adba26ff70b5 Removed the obsolete rtsig module. Ruslan Ermilov <ru@nginx.com> parents: 6125 diff changeset	4441 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	4442 goto failed;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4443 }
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 return NGX_OK;
5582 545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	4446
545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	4447 failed:
545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	4448
545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	4449 ngx_close_connection(c);
6365 d35b4d590b2d Resolver: renamed UDP-specific structures, fields and variables. Roman Arutyunyan <arut@nginx.com> parents: 6352 diff changeset	4450 rec->udp = NULL;
5582 545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	4451
545a4d393e2f Resolver: properly handle connect() failures. Ruslan Ermilov <ru@nginx.com> parents: 5505 diff changeset	4452 return NGX_ERROR;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	4453 }
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4454
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4455
6922 a72886067bbb Added missing static specifiers. Eran Kornblau <erankor@gmail.com> parents: 6860 diff changeset	4456 static ngx_int_t
6367 5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4457 ngx_tcp_connect(ngx_resolver_connection_t *rec)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4458 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4459 int rc;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4460 ngx_int_t event;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4461 ngx_err_t err;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4462 ngx_uint_t level;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4463 ngx_socket_t s;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4464 ngx_event_t rev, wev;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4465 ngx_connection_t *c;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4466
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4467 s = ngx_socket(rec->sockaddr->sa_family, SOCK_STREAM, 0);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4468
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4469 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	4470
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4471 if (s == (ngx_socket_t) -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4472 ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4473 ngx_socket_n " failed");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4474 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4475 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4476
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4477 c = ngx_get_connection(s, &rec->log);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4478
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4479 if (c == NULL) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4480 if (ngx_close_socket(s) == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4481 ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4482 ngx_close_socket_n "failed");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4483 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4484
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4485 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4486 }
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 if (ngx_nonblocking(s) == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4489 ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4490 ngx_nonblocking_n " failed");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4491
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4492 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4493 }
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 rev = c->read;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4496 wev = c->write;
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 rev->log = &rec->log;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4499 wev->log = &rec->log;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4500
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4501 rec->tcp = c;
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 c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4504
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4505 if (ngx_add_conn) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4506 if (ngx_add_conn(c) == NGX_ERROR) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4507 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4508 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4509 }
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 ngx_log_debug3(NGX_LOG_DEBUG_EVENT, &rec->log, 0,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4512 "connect to %V, fd:%d #%uA", &rec->server, s, c->number);
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 rc = connect(s, rec->sockaddr, rec->socklen);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4515
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4516 if (rc == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4517 err = ngx_socket_errno;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4518
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 if (err != NGX_EINPROGRESS
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4521 #if (NGX_WIN32)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4522 /* Winsock returns WSAEWOULDBLOCK (NGX_EAGAIN) */
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4523 && err != NGX_EAGAIN
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4524 #endif
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4525 )
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4526 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4527 if (err == NGX_ECONNREFUSED
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4528 #if (NGX_LINUX)
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 * Linux returns EAGAIN instead of ECONNREFUSED
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4531 * for unix sockets if listen queue is full
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 \|\| err == NGX_EAGAIN
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4534 #endif
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4535 \|\| err == NGX_ECONNRESET
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4536 \|\| err == NGX_ENETDOWN
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4537 \|\| err == NGX_ENETUNREACH
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4538 \|\| err == NGX_EHOSTDOWN
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4539 \|\| err == NGX_EHOSTUNREACH)
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4540 {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4541 level = NGX_LOG_ERR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4542
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4543 } else {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4544 level = NGX_LOG_CRIT;
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
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4547 ngx_log_error(level, c->log, err, "connect() to %V failed",
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4548 &rec->server);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4549
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4550 ngx_close_connection(c);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4551 rec->tcp = NULL;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4552
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4553 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4554 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4555 }
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4556
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4557 if (ngx_add_conn) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4558 if (rc == -1) {
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 /* NGX_EINPROGRESS */
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 return NGX_AGAIN;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4563 }
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 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, &rec->log, 0, "connected");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4566
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4567 wev->ready = 1;
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 return NGX_OK;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4570 }
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 if (ngx_event_flags & NGX_USE_IOCP_EVENT) {
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 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	4575 "connect(): %d", rc);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4576
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4577 if (ngx_blocking(s) == -1) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4578 ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4579 ngx_blocking_n " failed");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4580 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4581 }
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 * 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	4585 * NT does not support it.
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4586 *
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4587 * 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	4588 */
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 rev->ready = 1;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4591 wev->ready = 1;
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 return NGX_OK;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4594 }
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_event_flags & NGX_USE_CLEAR_EVENT) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4597
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4598 /* kqueue */
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4599
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4600 event = NGX_CLEAR_EVENT;
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 } else {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4603
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4604 /* select, poll, /dev/poll */
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 event = NGX_LEVEL_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 if (ngx_add_event(rev, NGX_READ_EVENT, event) != NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4610 goto failed;
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
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4613 if (rc == -1) {
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 /* NGX_EINPROGRESS */
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 if (ngx_add_event(wev, NGX_WRITE_EVENT, event) != NGX_OK) {
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4618 goto failed;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4619 }
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 return NGX_AGAIN;
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
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4624 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, &rec->log, 0, "connected");
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4625
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4626 wev->ready = 1;
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 return NGX_OK;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4629
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4630 failed:
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 ngx_close_connection(c);
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4633 rec->tcp = NULL;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4634
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4635 return NGX_ERROR;
5a16d40c63de Resolver: TCP support. Roman Arutyunyan <arut@nginx.com> parents: 6366 diff changeset	4636 }
6458 384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4637
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4638
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4639 static ngx_int_t
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4640 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	4641 {
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4642 ngx_int_t p1, p2;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4643 ngx_resolver_srv_t first, second;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4644
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4645 first = (ngx_resolver_srv_t *) one;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4646 second = (ngx_resolver_srv_t *) two;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4647
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4648 p1 = first->priority;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4649 p2 = second->priority;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4650
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4651 return p1 - p2;
384154fc634f Resolver: added support for SRV records. Dmitry Volyntsev <xeioex@nginx.com> parents: 6457 diff changeset	4652 }

Mercurial > hg > nginx

annotate src/core/ngx_resolver.c @ 7051:137c5be7df09