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

Resolver: fixed resend on malformed responses.

Browse Source 
DNS request resend on malformed responses was broken in 98876ce2a7fd (1.5.8).

Reported by Pramod Korathota.
This commit is contained in:
Ruslan Ermilov 2014-07-16 10:21:28 +04:00
parent 79c55b2cca
commit 7e52432a05
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/core/ngx_resolver.c
View File

@ -1467,7 +1467,6 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
goto failed; goto failed;
} }
rn->naddrs6 = 0;
qident = (rn->query6[0] << 8) + rn->query6[1]; qident = (rn->query6[0] << 8) + rn->query6[1];
break; break;
@ -1482,7 +1481,6 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
goto failed; goto failed;
} }
rn->naddrs = 0;
qident = (rn->query[0] << 8) + rn->query[1]; qident = (rn->query[0] << 8) + rn->query[1];
} }
@ -1507,6 +1505,8 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
case NGX_RESOLVE_AAAA: case NGX_RESOLVE_AAAA:
rn->naddrs6 = 0;
if (rn->naddrs == (u_short) -1) { if (rn->naddrs == (u_short) -1) {
goto next; goto next;
} }
@ -1519,6 +1519,8 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
default: /* NGX_RESOLVE_A */ default: /* NGX_RESOLVE_A */
rn->naddrs = 0;
if (rn->naddrs6 == (u_short) -1) { if (rn->naddrs6 == (u_short) -1) {
goto next; goto next;
} }
@ -1539,6 +1541,8 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
case NGX_RESOLVE_AAAA: case NGX_RESOLVE_AAAA:
rn->naddrs6 = 0;
if (rn->naddrs == (u_short) -1) { if (rn->naddrs == (u_short) -1) {
rn->code = (u_char) code; rn->code = (u_char) code;
goto next; goto next;
@ -1548,6 +1552,8 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
default: /* NGX_RESOLVE_A */ default: /* NGX_RESOLVE_A */
rn->naddrs = 0;
if (rn->naddrs6 == (u_short) -1) { if (rn->naddrs6 == (u_short) -1) {
rn->code = (u_char) code; rn->code = (u_char) code;
goto next; goto next;
@ -1817,6 +1823,25 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
} }
} }
switch (qtype) {
#if (NGX_HAVE_INET6)
case NGX_RESOLVE_AAAA:
if (rn->naddrs6 == (u_short) -1) {
rn->naddrs6 = 0;
}
break;
#endif
default: /* NGX_RESOLVE_A */
if (rn->naddrs == (u_short) -1) {
rn->naddrs = 0;
}
}
if (rn->naddrs != (u_short) -1 if (rn->naddrs != (u_short) -1
#if (NGX_HAVE_INET6) #if (NGX_HAVE_INET6)
&& rn->naddrs6 != (u_short) -1 && rn->naddrs6 != (u_short) -1