[svn] commit: r1342 - in /trunk/src/lib/dns: Makefile.am dnssectime.cc dnssectime.h dnstime.cc dnstime.h rdata/generic/rrsig_46.cc tests/Makefile.am tests/dnssectime_unittest.cc tests/dnstime_unittest.cc tests/rdata_rrsig_unittest.cc

[BIND 10 source code commits]

Author: each
Date: Thu Mar 11 23:48:33 2010
New Revision: 1342

Log:
- change dnstime.{cc,h} to dnssectime.{cc,h}
- change function names from DNSSECTime{To,From}Text to time{To,From}Text
- reject non-numeric characters in time text representations
- reject time values after December 31, 9999
- add unit tests

Added:
    trunk/src/lib/dns/dnssectime.cc
      - copied, changed from r1333, trunk/src/lib/dns/dnstime.cc
    trunk/src/lib/dns/dnssectime.h
      - copied, changed from r1333, trunk/src/lib/dns/dnstime.h
    trunk/src/lib/dns/tests/dnssectime_unittest.cc
      - copied, changed from r1333, trunk/src/lib/dns/tests/dnstime_unittest.cc
Removed:
    trunk/src/lib/dns/dnstime.cc
    trunk/src/lib/dns/dnstime.h
    trunk/src/lib/dns/tests/dnstime_unittest.cc
Modified:
    trunk/src/lib/dns/Makefile.am
    trunk/src/lib/dns/rdata/generic/rrsig_46.cc
    trunk/src/lib/dns/tests/Makefile.am
    trunk/src/lib/dns/tests/rdata_rrsig_unittest.cc

Modified: trunk/src/lib/dns/Makefile.am
==============================================================================
--- trunk/src/lib/dns/Makefile.am (original)
+++ trunk/src/lib/dns/Makefile.am Thu Mar 11 23:48:33 2010
@@ -23,7 +23,7 @@
 libdns_la_SOURCES += base64.h base64.cc
 libdns_la_SOURCES += sha1.h sha1.cc
 libdns_la_SOURCES += tsig.h tsig.cc
-libdns_la_SOURCES += dnstime.h dnstime.cc
+libdns_la_SOURCES += dnssectime.h dnssectime.cc
 libdns_la_SOURCES += hex.h hex.cc
 
 rrclass.h: rrclass-placeholder.h

Modified: trunk/src/lib/dns/rdata/generic/rrsig_46.cc
==============================================================================
--- trunk/src/lib/dns/rdata/generic/rrsig_46.cc (original)
+++ trunk/src/lib/dns/rdata/generic/rrsig_46.cc Thu Mar 11 23:48:33 2010
@@ -24,7 +24,7 @@
 
 #include "base64.h"
 #include "buffer.h"
-#include "dnstime.h"
+#include "dnssectime.h"
 #include "messagerenderer.h"
 #include "name.h"
 #include "rrtype.h"
@@ -96,8 +96,8 @@
         isc_throw(InvalidRdataText, "RRSIG labels out of range");
     }
 
-    uint32_t timeexpire = DNSSECTimeFromText(expire_txt);
-    uint32_t timeinception = DNSSECTimeFromText(inception_txt);
+    uint32_t timeexpire = timeFromText(expire_txt);
+    uint32_t timeinception = timeFromText(inception_txt);
 
     vector<uint8_t> signature;
     decodeBase64(signaturebuf.str(), signature);
@@ -164,8 +164,8 @@
 string
 RRSIG::toText() const
 {
-    string expire = DNSSECTimeToText(impl_->timeexpire_);
-    string inception = DNSSECTimeToText(impl_->timeinception_);
+    string expire = timeToText(impl_->timeexpire_);
+    string inception = timeToText(impl_->timeinception_);
 
     return (impl_->covered_.toText() +
             " " + boost::lexical_cast<string>(static_cast<int>(impl_->algorithm_))

Modified: trunk/src/lib/dns/tests/Makefile.am
==============================================================================
--- trunk/src/lib/dns/tests/Makefile.am (original)
+++ trunk/src/lib/dns/tests/Makefile.am Thu Mar 11 23:48:33 2010
@@ -10,7 +10,7 @@
 run_unittests_SOURCES += messagerenderer_unittest.cc
 run_unittests_SOURCES += rrclass_unittest.cc rrtype_unittest.cc
 run_unittests_SOURCES += rrttl_unittest.cc
-run_unittests_SOURCES += dnstime_unittest.cc
+run_unittests_SOURCES += dnssectime_unittest.cc
 run_unittests_SOURCES += rdata_unittest.h rdata_unittest.cc
 run_unittests_SOURCES += rdata_in_a_unittest.cc rdata_in_aaaa_unittest.cc
 run_unittests_SOURCES += rdata_ns_unittest.cc rdata_soa_unittest.cc

Modified: trunk/src/lib/dns/tests/rdata_rrsig_unittest.cc
==============================================================================
--- trunk/src/lib/dns/tests/rdata_rrsig_unittest.cc (original)
+++ trunk/src/lib/dns/tests/rdata_rrsig_unittest.cc Thu Mar 11 23:48:33 2010
@@ -16,7 +16,7 @@
 
 #include <dns/base64.h>
 #include <dns/buffer.h>
-#include <dns/dnstime.h>
+#include <dns/dnssectime.h>
 #include <dns/messagerenderer.h>
 #include <dns/rdata.h>
 #include <dns/rdataclass.h>