[Opendnssec-commits] [keihatsu.kirei.se/svn/dnssec] r4049 - trunk/OpenDNSSEC/signer/src/signer

Matthijs Mekking matthijs at nlnetlabs.nl
Tue Oct 5 11:46:31 CEST 2010


Author: matthijs
Date: 2010-10-05 11:46:31 +0200 (Tue, 05 Oct 2010)
New Revision: 4049

Modified:
   trunk/OpenDNSSEC/signer/src/signer/rrset.c
Log:
debug messages tweaked



Modified: trunk/OpenDNSSEC/signer/src/signer/rrset.c
===================================================================
--- trunk/OpenDNSSEC/signer/src/signer/rrset.c	2010-10-05 08:45:56 UTC (rev 4048)
+++ trunk/OpenDNSSEC/signer/src/signer/rrset.c	2010-10-05 09:46:31 UTC (rev 4049)
@@ -448,11 +448,14 @@
         expiration = ldns_rdf2native_int32(ldns_rr_rrsig_expiration(rrs->rr));
         inception = ldns_rdf2native_int32(ldns_rr_rrsig_inception(rrs->rr));
 
-        if (!refresh || expiration < refresh ||
-            inception > (uint32_t) signtime) {
-            /* this is it */
-            se_log_debug("refresh signature for RRset[%i] (refresh=%u, "
-                "expiration=%u)", rrset->rr_type, refresh, expiration);
+        if (/* Refresh is 0 */ !refresh ||
+            /* Expiration - Refresh has passed */ expiration < refresh ||
+            /* Inception has not passed */ inception > (uint32_t) signtime) {
+
+            se_log_deeebug("refresh signature for RRset[%i] (refresh=%u, "
+                "signtime=%u, inception=%u, expiration=%u)", rrset->rr_type,
+                refresh, (uint32_t) signtime, inception, expiration);
+
             if (prev_rrs) {
                 prev_rrs->next = rrs->next;
             } else {
@@ -463,8 +466,9 @@
             ldns_rr_free(rrs->rr);
             se_free((void*)rrs);
         } else {
-            se_log_debug("keep signature for RRset[%i] (refresh=%u, "
-                "expiration=%u)", rrset->rr_type, refresh, expiration);
+            se_log_deeebug("recycle signature for RRset[%i] (refresh=%u, "
+                "signtime=%u, inception=%u, expiration=%u)", rrset->rr_type,
+                refresh, (uint32_t) signtime, inception, expiration);
             rrset_log_rr(rrs->rr, "*RRSIG", 6);
             *reusedsigs += 1;
             prev_rrs = rrs;
@@ -588,7 +592,6 @@
             rrset->rrsigs = ldns_dnssec_rrs_new();
         }
         if (!rrset->rrsigs->rr) {
-            se_log_debug("new signatures for RRset[%i]", rrset->rr_type);
             rr_list = rrset2rrlist(rrset);
             if (!rr_list) {
                 se_log_error("error signing rrset[%i], cannot convert to rr "
@@ -642,7 +645,7 @@
             }
             ldns_rr_list_free(rr_list);
         } else {
-            se_log_debug("reuse signatures for RRset[%i]", rrset->rr_type);
+            se_log_debug("recycle signatures RRset[%i]", rrset->rr_type);
         }
         rrset->outbound_serial = serial;
     } else {




More information about the Opendnssec-commits mailing list