[svn] commit: r643 - in /experiments/each-query/src/lib: auth/cpp/Makefile.am auth/cpp/data_source_static.cc auth/cpp/data_source_static.h auth/cpp/query.h dns/cpp/message.h dns/cpp/rrclass.h

[BIND 10 source code commits]

Author: each
Date: Fri Jan 29 18:49:15 2010
New Revision: 643

Log:
checkpoint

Modified:
    experiments/each-query/src/lib/auth/cpp/Makefile.am
    experiments/each-query/src/lib/auth/cpp/data_source_static.cc
    experiments/each-query/src/lib/auth/cpp/data_source_static.h
    experiments/each-query/src/lib/auth/cpp/query.h
    experiments/each-query/src/lib/dns/cpp/message.h
    experiments/each-query/src/lib/dns/cpp/rrclass.h

Modified: experiments/each-query/src/lib/auth/cpp/Makefile.am
==============================================================================
--- experiments/each-query/src/lib/auth/cpp/Makefile.am (original)
+++ experiments/each-query/src/lib/auth/cpp/Makefile.am Fri Jan 29 18:49:15 2010
@@ -4,6 +4,7 @@
 
 lib_LTLIBRARIES = libauth.la
 libauth_la_SOURCES = data_source.h data_source.cc
+libauth_la_SOURCES = data_source_static.h data_source_static.cc
 #libauth_la_SOURCES += data_source_static.h data_source_static.cc
 #libauth_la_SOURCES += data_source_plot.h data_source_plot.cc
 libauth_la_SOURCES += query.h query.cc

Modified: experiments/each-query/src/lib/auth/cpp/data_source_static.cc
==============================================================================
--- experiments/each-query/src/lib/auth/cpp/data_source_static.cc (original)
+++ experiments/each-query/src/lib/auth/cpp/data_source_static.cc Fri Jan 29 18:49:15 2010
@@ -29,10 +29,8 @@
     version->addRdata(rdata::generic::TXT("BIND10 0.0.0 (pre-alpha)"));
 }
 
-DataSrc
-StaticDataSrc::findClosestEnclosure(const Name& qname,
-                                       Name& container)
-{
+DataSrcPtr
+StaticDataSrc::findClosestEnclosure(const Name& qname, Name& container) {
     NameComparisonResult::NameRelation version_cmp = qname.compare(version_name).getRelation();
     if (version_cmp == NameComparisonResult::EQUAL ||
         version_cmp == NameComparisonResult::SUBDOMAIN) {

Modified: experiments/each-query/src/lib/auth/cpp/data_source_static.h
==============================================================================
--- experiments/each-query/src/lib/auth/cpp/data_source_static.h (original)
+++ experiments/each-query/src/lib/auth/cpp/data_source_static.h Fri Jan 29 18:49:15 2010
@@ -35,8 +35,8 @@
     StaticDataSrc();
     ~StaticDataSrc() {};
 
-    DataSrc* findClosestEnclosure(const Name& qname,
-                                  Name& container);
+    DataSrcPtr findClosestEnclosure(const Name& qname,
+                                    Name& container);
 
     DSResult findRRset(const Name& qname,
                        const RRClass& qclass,

Modified: experiments/each-query/src/lib/auth/cpp/query.h
==============================================================================
--- experiments/each-query/src/lib/auth/cpp/query.h (original)
+++ experiments/each-query/src/lib/auth/cpp/query.h Fri Jan 29 18:49:15 2010
@@ -21,6 +21,7 @@
 
 #include <dns/cpp/exceptions.h>
 #include <dns/cpp/name.h>
+#include <dns/cpp/message.h>
 #include <dns/cpp/rrset.h>
 #include <dns/cpp/rrclass.h>
 #include <dns/cpp/rrtype.h>

Modified: experiments/each-query/src/lib/dns/cpp/message.h
==============================================================================
--- experiments/each-query/src/lib/dns/cpp/message.h (original)
+++ experiments/each-query/src/lib/dns/cpp/message.h Fri Jan 29 18:49:15 2010
@@ -398,10 +398,10 @@
 }
 
 enum SectionCode {
-    question = 0U,
-    answer = 1U,
-    authority = 2U,
-    additional = 3U
+    QUESTION_SECTION = 0U,
+    ANSWER_SECTION = 1U,
+    AUTHORITY_SECTION = 2U,
+    ADDITIONAL_SECTION = 3U
 };
 
 class Section {
@@ -421,28 +421,28 @@
 inline const Section&
 Section::QUESTION()
 {
-    static Section s(question);
+    static Section s(QUESTION_SECTION);
     return (s);
 }
 
 inline const Section&
 Section::ANSWER()
 {
-    static Section s(answer);
+    static Section s(ANSWER_SECTION);
     return (s);
 }
 
 inline const Section&
 Section::AUTHORITY()
 {
-    static Section s(authority);
+    static Section s(AUTHORITY_SECTION);
     return (s);
 }
 
 inline const Section&
 Section::ADDITIONAL()
 {
-    static Section s(additional);
+    static Section s(ADDITIONAL_SECTION);
     return (s);
 }
 

Modified: experiments/each-query/src/lib/dns/cpp/rrclass.h
==============================================================================
--- experiments/each-query/src/lib/dns/cpp/rrclass.h (original)
+++ experiments/each-query/src/lib/dns/cpp/rrclass.h Fri Jan 29 18:49:15 2010
@@ -83,6 +83,17 @@
 /// Note to developers: same note as \c RRType applies.
 class RRClass {
 public:
+    /// \name Standard class codes
+    enum {
+        RRCLASS_RESERVED0 = 0,
+        RRCLASS_IN = 1,
+        RRCLASS_CH = 3,
+        RRCLASS_CHAOS = 3,
+        RRCLASS_HS = 4,
+        RRCLASS_NONE = 254,
+        RRCLASS_ANY = 255
+    };
+
     ///
     /// \name Constructors and Destructor
     ///
@@ -240,6 +251,9 @@
     // hard-coded for a proof of concept.
     static const RRClass& IN();
     static const RRClass& CH();
+    static const RRClass& HS();
+    static const RRClass& NONE();
+    static const RRClass& ANY();
 
 private:
     uint16_t classcode_;
@@ -251,7 +265,7 @@
 inline const RRClass&
 RRClass::IN()
 {
-    static RRClass rrclass(1);
+    static RRClass rrclass(RRCLASS_IN);
 
     return (rrclass);
 }
@@ -259,7 +273,31 @@
 inline const RRClass&
 RRClass::CH()
 {
-    static RRClass rrclass(3);
+    static RRClass rrclass(RRCLASS_CH);
+
+    return (rrclass);
+}
+
+inline const RRClass&
+RRClass::HS()
+{
+    static RRClass rrclass(RRCLASS_HS);
+
+    return (rrclass);
+}
+
+inline const RRClass&
+RRClass::NONE()
+{
+    static RRClass rrclass(RRCLASS_NONE);
+
+    return (rrclass);
+}
+
+inline const RRClass&
+RRClass::ANY()
+{
+    static RRClass rrclass(RRCLASS_ANY);
 
     return (rrclass);
 }