1358. [func] log the reason for rejecting a server when resolving

                        queries.

diff --git a/CHANGES b/CHANGES
index b7ad7d2793bdcf199f5876e006368334420869f9..e492ce5171b7c8fd426f0493b64d19de672469ae 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1358.  [func]          log the reason for rejecting a server when resolving
+                       queries.
+
 1357.  [bug]           --enable-libbind would fail when not built in the
                        source tree for certain OS's.
 

diff --git a/lib/dns/include/dns/opcode.h b/lib/dns/include/dns/opcode.h
new file mode 100644 (file)
index 0000000..4ff5fd5
--- /dev/null
+++ b/lib/dns/include/dns/opcode.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 1999-2001  Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* $Id: opcode.h,v 1.1 2002/08/09 06:12:50 marka Exp $ */
+
+#ifndef DNS_OPCODE_H
+#define DNS_OPCODE_H 1
+
+#include <isc/lang.h>
+
+#include <dns/types.h>
+
+ISC_LANG_BEGINDECLS
+
+isc_result_t dns_opcode_totext(dns_opcode_t opcode, isc_buffer_t *target);
+/*
+ * Put a textual representation of error 'opcode' into 'target'.
+ *
+ * Requires:
+ *     'opcode' is a valid opcode.
+ *
+ *     'target' is a valid text buffer.
+ *
+ * Ensures:
+ *     If the result is success:
+ *             The used space in 'target' is updated.
+ *
+ * Returns:
+ *     ISC_R_SUCCESS                   on success
+ *     ISC_R_NOSPACE                   target buffer is too small
+ */
+
+ISC_LANG_ENDDECLS
+
+#endif /* DNS_OPCODE_H */

diff --git a/lib/dns/include/dns/result.h b/lib/dns/include/dns/result.h
index 4cbbcadebae53a4b00ce60a08b9fd71695ba4a68..e3dd1de6546f69404a13987ac623c1dd73e45b75 100644 (file)
--- a/lib/dns/include/dns/result.h
+++ b/lib/dns/include/dns/result.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.h,v 1.92 2002/08/06 01:50:28 marka Exp $ */
+/* $Id: result.h,v 1.93 2002/08/09 06:12:50 marka Exp $ */
 
 #ifndef DNS_RESULT_H
 #define DNS_RESULT_H 1
@@ -122,8 +122,13 @@
 #define DNS_R_EXPECTEDRESPONSE         (ISC_RESULTCLASS_DNS + 83)
 #define DNS_R_NOVALIDDS                        (ISC_RESULTCLASS_DNS + 84)
 #define DNS_R_NSISADDRESS              (ISC_RESULTCLASS_DNS + 85)
+#define DNS_R_REMOTEFORMERR            (ISC_RESULTCLASS_DNS + 86)
+#define DNS_R_TRUNCATEDTCP             (ISC_RESULTCLASS_DNS + 87)
+#define DNS_R_LAME                     (ISC_RESULTCLASS_DNS + 88)
+#define DNS_R_UNEXPECTEDRCODE          (ISC_RESULTCLASS_DNS + 89)
+#define DNS_R_UNEXPECTEDOPCODE         (ISC_RESULTCLASS_DNS + 90)
 
-#define DNS_R_NRESULTS                 86      /* Number of results */
+#define DNS_R_NRESULTS                 91      /* Number of results */
 
 /*
  * DNS wire format rcodes.

diff --git a/lib/dns/message.c b/lib/dns/message.c
index e208a8c2abe25a0ba1f6b94bff221cd21c1e574e..db2573156187b67906e86075b96e761a6bab4691 100644 (file)
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: message.c,v 1.212 2002/04/26 00:40:30 marka Exp $ */
+/* $Id: message.c,v 1.213 2002/08/09 06:12:50 marka Exp $ */
 
 /***
  *** Imports
@@ -34,6 +34,7 @@
 #include <dns/log.h>
 #include <dns/masterdump.h>
 #include <dns/message.h>
+#include <dns/opcode.h>
 #include <dns/rdata.h>
 #include <dns/rdatalist.h>
 #include <dns/rdataset.h>
@@ -3131,3 +3132,14 @@ dns_message_gettimeadjust(dns_message_t *msg) {
        REQUIRE(DNS_MESSAGE_VALID(msg));
        return (msg->timeadjust);
 }
+
+isc_result_t
+dns_opcode_totext(dns_opcode_t opcode, isc_buffer_t *target) {
+
+       REQUIRE(opcode < 16);
+
+       if (isc_buffer_availablelength(target) < strlen(opcodetext[opcode]))
+               return (ISC_R_NOSPACE);
+       isc_buffer_putstr(target, opcodetext[opcode]);
+       return (ISC_R_SUCCESS);
+}

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 1edbb91827cddf840103b7bb2727ea90a6026a33..0588b73002a93b4e0a45e17d41302cac5406338b 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.245 2002/07/23 03:41:44 marka Exp $ */
+/* $Id: resolver.c,v 1.246 2002/08/09 06:12:50 marka Exp $ */
 
 #include <config.h>
 
@@ -33,7 +33,9 @@
 #include <dns/log.h>
 #include <dns/message.h>
 #include <dns/ncache.h>
+#include <dns/opcode.h>
 #include <dns/peer.h>
+#include <dns/rcode.h>
 #include <dns/rdata.h>
 #include <dns/rdatalist.h>
 #include <dns/rdataset.h>
@@ -1319,8 +1321,13 @@ mark_bad(fetchctx_t *fctx) {
 }
 
 static void
-add_bad(fetchctx_t *fctx, isc_sockaddr_t *address) {
+add_bad(fetchctx_t *fctx, isc_sockaddr_t *address, isc_result_t reason) {
+       char namebuf[DNS_NAME_FORMATSIZE];
+       char addrbuf[ISC_SOCKADDR_FORMATSIZE];
+       char code[64];
+       isc_buffer_t b;
        isc_sockaddr_t *sa;
+       const char *sep1, *sep2;
 
        if (bad_server(fctx, address)) {
                /*
@@ -1336,6 +1343,32 @@ add_bad(fetchctx_t *fctx, isc_sockaddr_t *address) {
                return;
        *sa = *address;
        ISC_LIST_INITANDAPPEND(fctx->bad, sa, link);
+
+       if (reason == DNS_R_LAME)       /* already logged */
+               return;
+
+       if (reason == DNS_R_UNEXPECTEDRCODE) {
+               isc_buffer_init(&b, code, sizeof(code));
+               dns_rcode_totext(fctx->rmessage->rcode, &b);
+               sep1 = "(";
+               sep2 = ") ";
+       } else if (reason == DNS_R_UNEXPECTEDOPCODE) {
+               isc_buffer_init(&b, code, sizeof(code));
+               dns_opcode_totext(fctx->rmessage->opcode, &b);
+               sep1 = "(";
+               sep2 = ") ";
+       } else {
+               code[0] = '\0';
+               sep1 = "";
+               sep2 = "";
+       }
+       dns_name_format(&fctx->name, namebuf, sizeof(namebuf));
+       isc_sockaddr_format(address, addrbuf, sizeof(addrbuf));
+       isc_log_write(dns_lctx, DNS_LOGCATEGORY_RESOLVER,
+                     DNS_LOGMODULE_RESOLVER, ISC_LOG_INFO,
+                     "%s %s%s%sresolving '%s': %s",
+                     dns_result_totext(reason), sep1, code, sep2,
+                     namebuf, addrbuf);
 }
 
 static void
@@ -4159,7 +4192,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
        isc_result_t result = ISC_R_SUCCESS;
        resquery_t *query = event->ev_arg;
        dns_dispatchevent_t *devent = (dns_dispatchevent_t *)event;
-       isc_boolean_t keep_trying, broken_server, get_nameservers, resend;
+       isc_boolean_t keep_trying, get_nameservers, resend;
        isc_boolean_t truncated;
        dns_message_t *message;
        fetchctx_t *fctx;
@@ -4170,6 +4203,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
        dns_adbaddrinfo_t *addrinfo;
        unsigned int options;
        unsigned int findoptions;
+       isc_result_t broken_server;
 
        REQUIRE(VALID_QUERY(query));
        fctx = query->fctx;
@@ -4183,7 +4217,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
        (void)isc_timer_touch(fctx->timer);
 
        keep_trying = ISC_FALSE;
-       broken_server = ISC_FALSE;
+       broken_server = ISC_R_SUCCESS;
        get_nameservers = ISC_FALSE;
        resend = ISC_FALSE;
        truncated = ISC_FALSE;
@@ -4282,7 +4316,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
                                                        DNS_FETCHOPT_NOEDNS0,
                                                        DNS_FETCHOPT_NOEDNS0);
                                } else {
-                                       broken_server = ISC_TRUE;
+                                       broken_server = result;
                                        keep_trying = ISC_TRUE;
                                }
                                goto done;
@@ -4310,7 +4344,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
                                                    DNS_FETCHOPT_NOEDNS0,
                                                    DNS_FETCHOPT_NOEDNS0);
                        } else {
-                               broken_server = ISC_TRUE;
+                               broken_server = DNS_R_UNEXPECTEDRCODE;
                                keep_trying = ISC_TRUE;
                        }
                        goto done;
@@ -4351,7 +4385,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
 
        if (truncated) {
                if ((options & DNS_FETCHOPT_TCP) != 0) {
-                       broken_server = ISC_TRUE;
+                       broken_server = DNS_R_TRUNCATEDTCP;
                        keep_trying = ISC_TRUE;
                } else {
                        options |= DNS_FETCHOPT_TCP;
@@ -4365,7 +4399,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
         */
        if (message->opcode != dns_opcode_query) {
                /* XXXRTH Log */
-               broken_server = ISC_TRUE;
+               broken_server = DNS_R_UNEXPECTEDOPCODE;
                keep_trying = ISC_TRUE;
                goto done;
        }
@@ -4401,7 +4435,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
                                 * This forwarder doesn't understand us,
                                 * but other forwarders might.  Keep trying.
                                 */
-                               broken_server = ISC_TRUE;
+                               broken_server = DNS_R_REMOTEFORMERR;
                                keep_trying = ISC_TRUE;
                        } else {
                                /*
@@ -4425,7 +4459,8 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
                        /*
                         * XXXRTH log.
                         */
-                       broken_server = ISC_TRUE;
+                       broken_server = DNS_R_UNEXPECTEDRCODE;
+                       INSIST(broken_server != ISC_R_SUCCESS);
                        keep_trying = ISC_TRUE;
                }
                goto done;
@@ -4456,7 +4491,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
                                      DNS_LOGMODULE_RESOLVER, ISC_LOG_ERROR,
                                      "could not mark server as lame: %s",
                                      isc_result_totext(result));
-               broken_server = ISC_TRUE;
+               broken_server = DNS_R_LAME;
                keep_trying = ISC_TRUE;
                goto done;
        }
@@ -4491,7 +4526,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
                                 * to treat it as such than to figure out
                                 * some more elaborate course of action.
                                 */
-                               broken_server = ISC_TRUE;
+                               broken_server = DNS_R_LAME;
                                keep_trying = ISC_TRUE;
                                goto done;
                        }
@@ -4537,7 +4572,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
                 * The server is insane.
                 */
                /* XXXRTH Log */
-               broken_server = ISC_TRUE;
+               broken_server = DNS_R_UNEXPECTEDRCODE;
                keep_trying = ISC_TRUE;
                goto done;
        }
@@ -4590,13 +4625,13 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
 
        if (keep_trying) {
                if (result == DNS_R_FORMERR)
-                       broken_server = ISC_TRUE;
-               if (broken_server) {
+                       broken_server = DNS_R_FORMERR;
+               if (broken_server != ISC_R_SUCCESS) {
                        /*
                         * Add this server to the list of bad servers for
                         * this fctx.
                         */
-                       add_bad(fctx, &addrinfo->sockaddr);
+                       add_bad(fctx, &addrinfo->sockaddr, broken_server);
                }
 
                if (get_nameservers) {

diff --git a/lib/dns/result.c b/lib/dns/result.c
index 358576604cb839347369a592b83dfcd5e0de2980..217f55aa794754137fc61f320adf7de9e48c4c4b 100644 (file)
--- a/lib/dns/result.c
+++ b/lib/dns/result.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.c,v 1.102 2002/08/06 01:50:28 marka Exp $ */
+/* $Id: result.c,v 1.103 2002/08/09 06:12:50 marka Exp $ */
 
 #include <config.h>
 
@@ -128,7 +128,12 @@ static const char *text[DNS_R_NRESULTS] = {
        "expected a response",                 /* 83 DNS_R_EXPECTEDRESPONSE  */
        "no valid DS",                         /* 84 DNS_R_NOVALIDDS         */
        
-       "NS is an address"                     /* 85 DNS_R_NSISADDRESS       */
+       "NS is an address",                    /* 85 DNS_R_NSISADDRESS       */
+       "received FORMERR",                    /* 86 DNS_R_REMOTEFORMERR     */
+       "truncated TCP response",              /* 87 DNS_R_TRUNCATEDTCP      */
+       "lame server detected",                /* 88 DNS_R_LAME              */
+       "unexpected RCODE",                    /* 89 DNS_R_UNEXPECTEDRCODE   */
+       "unexpected OPCODE"                    /* 90 DNS_R_UNEXPECTEDOPCODE  */
 };
 
 static const char *rcode_text[DNS_R_NRCODERESULTS] = {