fixup test, less logging.

git-svn-id: file:///svn/unbound/trunk@687 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index f4c252c6035fd047b1e409816e6af955ebfba5d6..05d0cef7a991395177c7426f8654bb8b3276840a 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -10,6 +10,9 @@
          entropy from the system.
        - fix crash where failure to prime DNSKEY tried to print null pointer
          in the log message.
+       - removed some debug prints, only verb_algo (4) enables them.
+       - fixup test; new random generator took new paths; such as one 
+         where no scripted answer was available.
 
 16 October 2007: Wouter
        - no malloc in log_hex.

diff --git a/iterator/iterator.c b/iterator/iterator.c
index d5feee1ccc90f0703f4e5ebfa231189650e8e884..5feb63fb942458be7bf64e695052f77755ce3a26 100644 (file)
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -665,7 +665,9 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
                /* handle positive cache response */
                enum response_type type = response_type_from_cache(msg, 
                        &iq->qchase);
-               log_dns_msg("msg from cache lookup", &msg->qinfo, msg->rep);
+               if(verbosity >= VERB_ALGO)
+                       log_dns_msg("msg from cache lookup", &msg->qinfo, 
+                               msg->rep);
 
                if(type == RESPONSE_TYPE_CNAME) {
                        uint8_t* sname = 0;
@@ -1241,7 +1243,9 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
                 * reset of the query state and go back to INIT_REQUEST_STATE).
                 */
                verbose(VERB_DETAIL, "query response was CNAME");
-               log_dns_msg("cname msg", &iq->response->qinfo, iq->response->rep);
+               if(verbosity >= VERB_ALGO)
+                       log_dns_msg("cname msg", &iq->response->qinfo, 
+                               iq->response->rep);
                /* Process the CNAME response. */
                if(!handle_cname_response(qstate, iq, iq->response, 
                        &sname, &snamelen))

diff --git a/testdata/val_referglue.rpl b/testdata/val_referglue.rpl
index 3f2fbf72d2564067af7dc092a678a66815105852..f7e496ddae0fa9e44af38cc94b186b3dca6e940a 100644 (file)
--- a/testdata/val_referglue.rpl
+++ b/testdata/val_referglue.rpl
@@ -3,6 +3,7 @@
 server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
+       directory: ""
 
 stub-zone:
        name: "."
@@ -109,6 +110,61 @@ sub.example.com.        3600    IN      RRSIG   NSEC 3 3 3600 20070926134150 200
 ENTRY_END
 RANGE_END
 
+; ns2.sub.example.com.
+RANGE_BEGIN 0 100
+       ADDRESS 100.200.30.40
+
+; response to DNSKEY priming query
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+example.com. IN DNSKEY
+SECTION ANSWER
+example.com.    3600    IN      DNSKEY  256 3 3 ALXLUsWqUrY3JYER3T4TBJII s70j+sDS/UT2QRp61SE7S3E EXopNXoFE73JLRmvpi/UrOO/Vz4Se 6wXv/CYCKjGw06U4WRgR YXcpEhJROyNapmdIKSx hOzfLVE1gqA0PweZR8d tY3aNQSRn3sPpwJr6Mi /PqQKAMMrZ9ckJpf1+b QMOOvxgzz2U1GS18b3y ZKcgTMEaJzd/GZYzi/B N2DzQ0MsrSwYXfsNLFO Bbs8PJMW4LYIxeeOe6rUgkWOF 7CC9Dh/dduQ1QrsJhmZAEFfd6ByYV+ ;{id = 2854 (zsk), size = 1688b}
+example.com.    3600    IN      RRSIG   DNSKEY 3 2 3600 20070926134802 20070829134802 2854 example.com. MCwCFG1yhRNtTEa3Eno2zhVVuy2EJX3wAhQeLyUp6+UXcpC5qGNu9tkrTEgPUg== ;{id = 2854}
+SECTION AUTHORITY
+example.com.   IN NS   ns.example.com.
+example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
+SECTION ADDITIONAL
+ns.example.com.                IN      A       1.2.3.4
+ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+www.example.com. IN A
+SECTION ANSWER
+www.example.com. IN A  10.20.30.40
+www.example.com.        3600    IN      RRSIG   A 3 3 3600 20070926134150 20070829134150 2854 example.com. MC0CFC99iE9K5y2WNgI0gFvBWaTi9wm6AhUAoUqOpDtG5Zct+Qr9F3mSdnbc6V4= ;{id = 2854}
+SECTION AUTHORITY
+example.com.   IN NS   ns.example.com.
+example.com.   IN NS   ns2.sub.example.com.
+example.com.    3600    IN      RRSIG   NS DSA 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCiyp/3hxwKS5QZPnjk36t16s4QTwIUI0m+MBVOAPacANrXXFKieyZd39o= ;{id = 2854}
+SECTION ADDITIONAL
+ns.example.com.                IN      A       1.2.3.4
+ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCQMyTjn7WWwpwAR1LlVeLpRgZGuQIUCcJDEkwAuzytTDRlYK7nIMwH1CM= ;{id = 2854}
+; This is from an unsigned subzone
+ns2.sub.example.com.   IN      A       100.200.30.40
+ENTRY_END
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+sub.example.com. IN DS
+SECTION ANSWER
+SECTION AUTHORITY
+sub.example.com. IN NSEC       www.example.com. NS RRSIG NSEC
+sub.example.com.        3600    IN      RRSIG   NSEC 3 3 3600 20070926134150 20070829134150 2854 example.com. MCwCFEG4WWIYBDknWlr2d8S42UZHRuByAhRgnDELUAccGZTCVzG+xl/locivpA== ;{id = 2854}
+ENTRY_END
+RANGE_END
+
+
 ; first ask for +CD and get the data in the cache.
 STEP 1 QUERY
 ENTRY_BEGIN

diff --git a/validator/val_utils.c b/validator/val_utils.c
index 975ea9c8a570ca640071fdd6370d5068b494b3ac..40a470e1f48c2c0c5752825ecd9c19e57ec21691 100644 (file)
--- a/validator/val_utils.c
+++ b/validator/val_utils.c
@@ -96,7 +96,7 @@ val_classify_response(uint16_t query_flags, struct query_info* qinf,
                if(ntohs(rep->rrsets[i]->rk.type) == LDNS_RR_TYPE_CNAME)
                        return VAL_CLASS_CNAME;
        }
-       log_dns_msg("validator: failed to classify response message: ",
+       log_dns_msg("validator: error. failed to classify response message: ",
                qinf, rep);
        return VAL_CLASS_UNKNOWN;
 }

diff --git a/validator/validator.c b/validator/validator.c
index ac83781fd93ac0c95e24f02cb7732c119eda2ed8..55a69c5dcbfd20441546efc8a16c15829777654b 100644 (file)
--- a/validator/validator.c
+++ b/validator/validator.c
@@ -1165,7 +1165,9 @@ processInit(struct module_qstate* qstate, struct val_qstate* vq,
                 * the eventual VALIDATE stage */
                val_fill_reply(vq->chase_reply, vq->orig_msg->rep, 
                        vq->rrset_skip, lookup_name, lookup_len);
-               log_dns_msg("chased extract", &vq->qchase, vq->chase_reply);
+               if(verbosity >= VERB_ALGO)
+                       log_dns_msg("chased extract", &vq->qchase, 
+                               vq->chase_reply);
        }
 
        vq->key_entry = key_cache_obtain(ve->kcache, lookup_name, lookup_len,