mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-08 02:02:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolver: changed the ngx_resolver_create_*_query() arguments.

Browse Source 
No functional changes.

This is needed by the following change.
This commit is contained in:
Roman Arutyunyan 2016-01-26 16:46:48 +03:00
parent 4016e6b1da
commit b1a110e3a4
1 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/core/ngx_resolver.c
View File

@ -64,10 +64,10 @@ static void ngx_resolver_expire(ngx_resolver_t *r, ngx_rbtree_t *tree,
ngx_queue_t *queue); ngx_queue_t *queue);
static ngx_int_t ngx_resolver_send_query(ngx_resolver_t *r, static ngx_int_t ngx_resolver_send_query(ngx_resolver_t *r,
ngx_resolver_node_t *rn); ngx_resolver_node_t *rn);
static ngx_int_t ngx_resolver_create_name_query(ngx_resolver_node_t *rn, static ngx_int_t ngx_resolver_create_name_query(ngx_resolver_t *r,
ngx_resolver_ctx_t *ctx); ngx_resolver_node_t *rn, ngx_str_t *name);
static ngx_int_t ngx_resolver_create_addr_query(ngx_resolver_node_t *rn, static ngx_int_t ngx_resolver_create_addr_query(ngx_resolver_t *r,
ngx_resolver_ctx_t *ctx); ngx_resolver_node_t *rn, ngx_addr_t *addr);
static void ngx_resolver_resend_handler(ngx_event_t *ev); static void ngx_resolver_resend_handler(ngx_event_t *ev);
static time_t ngx_resolver_resend(ngx_resolver_t *r, ngx_rbtree_t *tree, static time_t ngx_resolver_resend(ngx_resolver_t *r, ngx_rbtree_t *tree,
ngx_queue_t *queue); ngx_queue_t *queue);
@ -656,7 +656,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
ngx_rbtree_insert(&r->name_rbtree, &rn->node); ngx_rbtree_insert(&r->name_rbtree, &rn->node);
} }
rc = ngx_resolver_create_name_query(rn, ctx); rc = ngx_resolver_create_name_query(r, rn, &ctx->name);
if (rc == NGX_ERROR) { if (rc == NGX_ERROR) {
goto failed; goto failed;
@ -883,7 +883,7 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
ngx_rbtree_insert(tree, &rn->node); ngx_rbtree_insert(tree, &rn->node);
} }
if (ngx_resolver_create_addr_query(rn, ctx) != NGX_OK) { if (ngx_resolver_create_addr_query(r, rn, &ctx->addr) != NGX_OK) {
goto failed; goto failed;
} }
@ -2531,27 +2531,23 @@ ngx_resolver_rbtree_insert_addr6_value(ngx_rbtree_node_t *temp,
static ngx_int_t static ngx_int_t
ngx_resolver_create_name_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx) ngx_resolver_create_name_query(ngx_resolver_t *r, ngx_resolver_node_t *rn,
ngx_str_t *name)
{ {
u_char *p, *s; u_char *p, *s;
size_t len, nlen; size_t len, nlen;
ngx_uint_t ident; ngx_uint_t ident;
#if (NGX_HAVE_INET6)
ngx_resolver_t *r;
#endif
ngx_resolver_qs_t *qs; ngx_resolver_qs_t *qs;
ngx_resolver_hdr_t *query; ngx_resolver_hdr_t *query;
nlen = ctx->name.len ? (1 + ctx->name.len + 1) : 1; nlen = name->len ? (1 + name->len + 1) : 1;
len = sizeof(ngx_resolver_hdr_t) + nlen + sizeof(ngx_resolver_qs_t); len = sizeof(ngx_resolver_hdr_t) + nlen + sizeof(ngx_resolver_qs_t);
#if (NGX_HAVE_INET6) #if (NGX_HAVE_INET6)
r = ctx->resolver; p = ngx_resolver_alloc(r, r->ipv6 ? len * 2 : len);
p = ngx_resolver_alloc(ctx->resolver, r->ipv6 ? len * 2 : len);
#else #else
p = ngx_resolver_alloc(ctx->resolver, len); p = ngx_resolver_alloc(r, len);
#endif #endif
if (p == NULL) { if (p == NULL) {
return NGX_ERROR; return NGX_ERROR;
@ -2570,8 +2566,8 @@ ngx_resolver_create_name_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx)
ident = ngx_random(); ident = ngx_random();
ngx_log_debug2(NGX_LOG_DEBUG_CORE, ctx->resolver->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_CORE, r->log, 0,
"resolve: \"%V\" A %i", &ctx->name, ident & 0xffff); "resolve: \"%V\" A %i", name, ident & 0xffff);
query->ident_hi = (u_char) ((ident >> 8) & 0xff); query->ident_hi = (u_char) ((ident >> 8) & 0xff);
query->ident_lo = (u_char) (ident & 0xff); query->ident_lo = (u_char) (ident & 0xff);
@ -2601,11 +2597,11 @@ ngx_resolver_create_name_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx)
p--; p--;
*p-- = '\0'; *p-- = '\0';
if (ctx->name.len == 0) { if (name->len == 0) {
return NGX_DECLINED; return NGX_DECLINED;
} }
for (s = ctx->name.data + ctx->name.len - 1; s >= ctx->name.data; s--) { for (s = name->data + name->len - 1; s >= name->data; s--) {
if (*s != '.') { if (*s != '.') {
*p = *s; *p = *s;
len++; len++;
@ -2641,8 +2637,8 @@ ngx_resolver_create_name_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx)
ident = ngx_random(); ident = ngx_random();
ngx_log_debug2(NGX_LOG_DEBUG_CORE, ctx->resolver->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_CORE, r->log, 0,
"resolve: \"%V\" AAAA %i", &ctx->name, ident & 0xffff); "resolve: \"%V\" AAAA %i", name, ident & 0xffff);
query->ident_hi = (u_char) ((ident >> 8) & 0xff); query->ident_hi = (u_char) ((ident >> 8) & 0xff);
query->ident_lo = (u_char) (ident & 0xff); query->ident_lo = (u_char) (ident & 0xff);
@ -2659,11 +2655,12 @@ ngx_resolver_create_name_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx)
static ngx_int_t static ngx_int_t
ngx_resolver_create_addr_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx) ngx_resolver_create_addr_query(ngx_resolver_t *r, ngx_resolver_node_t *rn,
ngx_addr_t *addr)
{ {
u_char *p, *d; u_char *p, *d;
size_t len; size_t len;
in_addr_t addr; in_addr_t inaddr;
ngx_int_t n; ngx_int_t n;
ngx_uint_t ident; ngx_uint_t ident;
ngx_resolver_hdr_t *query; ngx_resolver_hdr_t *query;
@ -2672,7 +2669,7 @@ ngx_resolver_create_addr_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx)
struct sockaddr_in6 *sin6; struct sockaddr_in6 *sin6;
#endif #endif
switch (ctx->addr.sockaddr->sa_family) { switch (addr->sockaddr->sa_family) {
#if (NGX_HAVE_INET6) #if (NGX_HAVE_INET6)
case AF_INET6: case AF_INET6:
@ -2689,7 +2686,7 @@ ngx_resolver_create_addr_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx)
+ sizeof(ngx_resolver_qs_t); + sizeof(ngx_resolver_qs_t);
} }
p = ngx_resolver_alloc(ctx->resolver, len); p = ngx_resolver_alloc(r, len);
if (p == NULL) { if (p == NULL) {
return NGX_ERROR; return NGX_ERROR;
} }
@ -2713,11 +2710,11 @@ ngx_resolver_create_addr_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx)
p += sizeof(ngx_resolver_hdr_t); p += sizeof(ngx_resolver_hdr_t);
switch (ctx->addr.sockaddr->sa_family) { switch (addr->sockaddr->sa_family) {
#if (NGX_HAVE_INET6) #if (NGX_HAVE_INET6)
case AF_INET6: case AF_INET6:
sin6 = (struct sockaddr_in6 *) ctx->addr.sockaddr; sin6 = (struct sockaddr_in6 *) addr->sockaddr;
for (n = 15; n >= 0; n--) { for (n = 15; n >= 0; n--) {
p = ngx_sprintf(p, "\1%xd\1%xd", p = ngx_sprintf(p, "\1%xd\1%xd",
@ -2732,11 +2729,11 @@ ngx_resolver_create_addr_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx)
default: /* AF_INET */ default: /* AF_INET */
sin = (struct sockaddr_in *) ctx->addr.sockaddr; sin = (struct sockaddr_in *) addr->sockaddr;
addr = ntohl(sin->sin_addr.s_addr); inaddr = ntohl(sin->sin_addr.s_addr);
for (n = 0; n < 32; n += 8) { for (n = 0; n < 32; n += 8) {
d = ngx_sprintf(&p[1], "%ud", (addr >> n) & 0xff); d = ngx_sprintf(&p[1], "%ud", (inaddr >> n) & 0xff);
*p = (u_char) (d - &p[1]); *p = (u_char) (d - &p[1]);
p = d; p = d;
} }