Skip to content

Commit

Permalink
Merge branch '4736-isc_r_hostdown-was-not-being-handled-by-resolver-c…
Browse files Browse the repository at this point in the history
…' into 'main'

Resolve "ISC_R_HOSTDOWN was not being handled by resolver.c"

Closes #4736

See merge request isc-projects/bind9!9055
  • Loading branch information
marka63 committed Jun 4, 2024
2 parents e7971f6 + 71cfa8d commit 67b9510
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
6395. [bug] Handle ISC_R_HOSTDOWN and ISC_R_NETDOWN in resolver.c.
[GL #4736]

6394. [bug] Named's -4 and -6 options now apply to zone primaries,
also-notify and parental-agents. Report when a zone
has these options configured but does not have an IPv4
Expand Down
10 changes: 9 additions & 1 deletion lib/dns/resolver.c
Original file line number Diff line number Diff line change
Expand Up @@ -1752,11 +1752,15 @@ resquery_senddone(isc_result_t eresult, isc_region_t *region, void *arg) {
case ISC_R_SHUTTINGDOWN:
break;

case ISC_R_HOSTDOWN:
case ISC_R_HOSTUNREACH:
case ISC_R_NETDOWN:
case ISC_R_NETUNREACH:
case ISC_R_NOPERM:
case ISC_R_ADDRNOTAVAIL:
case ISC_R_CONNREFUSED:
case ISC_R_CONNECTIONRESET:
case ISC_R_TIMEDOUT:
/* No route to remote. */
FCTXTRACE3("query canceled in resquery_senddone(): "
"no route to host; no response",
Expand Down Expand Up @@ -2829,8 +2833,10 @@ resquery_connected(isc_result_t eresult, isc_region_t *region, void *arg) {
fctx_done_detach(&fctx, eresult);
break;

case ISC_R_NETUNREACH:
case ISC_R_HOSTDOWN:
case ISC_R_HOSTUNREACH:
case ISC_R_NETDOWN:
case ISC_R_NETUNREACH:
case ISC_R_CONNREFUSED:
case ISC_R_NOPERM:
case ISC_R_ADDRNOTAVAIL:
Expand Down Expand Up @@ -7756,7 +7762,9 @@ rctx_dispfail(respctx_t *rctx) {
*/
switch (rctx->result) {
case ISC_R_EOF:
case ISC_R_HOSTDOWN:
case ISC_R_HOSTUNREACH:
case ISC_R_NETDOWN:
case ISC_R_NETUNREACH:
case ISC_R_CONNREFUSED:
case ISC_R_CONNECTIONRESET:
Expand Down

0 comments on commit 67b9510

Please sign in to comment.