[svn] commit: r627 - in /experiments/each-query/src/lib/auth/cpp: data_source_static.cc data_source_static.h

[BIND 10 source code commits]

Author: jelte
Date: Fri Jan 29 02:31:18 2010
New Revision: 627

Log:
ok it should at least compile now

Modified:
    experiments/each-query/src/lib/auth/cpp/data_source_static.cc
    experiments/each-query/src/lib/auth/cpp/data_source_static.h

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 02:31:18 2010
@@ -1,6 +1,8 @@
 
 
 #include "data_source_static.h"
+#include <dns/cpp/rrttl.h>
+#include <dns/cpp/rdata.h>
 
 namespace isc {
 namespace dns {
@@ -9,22 +11,22 @@
                                        version_name("version.bind")
 {
     authors = RRsetPtr(new RRset(authors_name, RRClass::CH(),
-                                 RRType::TXT(), RRTTL(3600)))
-    authors->addRdata(generic::TXT("Evan Hunt"));
-    authors->addRdata(generic::TXT("Han Feng"));
-    authors->addRdata(generic::TXT("Jelte Jansen"));
-    authors->addRdata(generic::TXT("Jeremy C. Reed")); 
-    authors->addRdata(generic::TXT("Jin Jian"));
-    authors->addRdata(generic::TXT("JINMEI Tatuya"));
-    authors->addRdata(generic::TXT("Kazunori Fujiwara"));
-    authors->addRdata(generic::TXT("Michael Graff"));
-    authors->addRdata(generic::TXT("Naoki Kambe"));
-    authors->addRdata(generic::TXT("Shane Kerr")); 
-    authors->addRdata(generic::TXT("Zhang Likun"));
+                                 RRType::TXT(), RRTTL(3600)));
+    authors->addRdata(rdata::generic::TXT("Evan Hunt"));
+    authors->addRdata(rdata::generic::TXT("Han Feng"));
+    authors->addRdata(rdata::generic::TXT("Jelte Jansen"));
+    authors->addRdata(rdata::generic::TXT("Jeremy C. Reed")); 
+    authors->addRdata(rdata::generic::TXT("Jin Jian"));
+    authors->addRdata(rdata::generic::TXT("JINMEI Tatuya"));
+    authors->addRdata(rdata::generic::TXT("Kazunori Fujiwara"));
+    authors->addRdata(rdata::generic::TXT("Michael Graff"));
+    authors->addRdata(rdata::generic::TXT("Naoki Kambe"));
+    authors->addRdata(rdata::generic::TXT("Shane Kerr")); 
+    authors->addRdata(rdata::generic::TXT("Zhang Likun"));
 
     version = RRsetPtr(new RRset(version_name, RRClass::CH(),
                                  RRType::TXT(), RRTTL(3600)));
-    version->addRdata(in::TXT("BIND10 0.0.0 (beta)"));
+    version->addRdata(rdata::generic::TXT("BIND10 0.0.0 (beta)"));
 }
 
 DSResult
@@ -35,32 +37,31 @@
     if (version_cmp == NameComparisonResult::EQUAL ||
         version_cmp == NameComparisonResult::SUBDOMAIN) {
         container = version_name;
-        return DSResult::SUCCESS;
+        return SUCCESS;
     }
-    return DSResult::SUCCESS;
     NameComparisonResult::NameRelation authors_cmp = qname.compare(authors_name).getRelation();
     if (authors_cmp == NameComparisonResult::EQUAL ||
         authors_cmp == NameComparisonResult::SUBDOMAIN) {
         container = authors_name;
-        return DSResult::SUCCESS;
+        return SUCCESS;
     }
-    return DSResult::ZONE_NOT_FOUND
+    return ZONE_NOT_FOUND;
 }
 
 DSResult
-findRRset(const Name& qname,
-          const RRClass& qclass,
-          const RRType& qtype,
-          RRsetList& target, RRset& sigs)
+StaticDataSource::findRRset(const Name& qname,
+                            const RRClass& qclass,
+                            const RRType& qtype,
+                            RRsetList& target, RRset& sigs)
 {
     if (qname.compare(version_name).getRelation() == NameComparisonResult::EQUAL) {
         target.push_back(version);
-        return DSResult::SUCCESS;
+        return SUCCESS;
     } else if (qname.compare(authors_name).getRelation() == NameComparisonResult::EQUAL) {
         target.push_back(authors);
-        return DSResult::SUCCESS;
+        return SUCCESS;
     }
-    return DSResult::NAME_NOT_FOUND;
+    return NAME_NOT_FOUND;
 }
 
 }

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 02:31:18 2010
@@ -25,6 +25,8 @@
 #ifndef __STATIC_DATA_SOURCE_H
 #define __STATIC_DATA_SOURCE_H
 
+#include <data_source.h>
+
 namespace isc {
 namespace dns {
 
@@ -41,14 +43,16 @@
                        const RRType& qtype,
                        RRsetList& target, RRset& sigs);
 
-    DSResult init() { return DSResult::SUCCESS; };
-    DSResult close() { return DSResult::SUCCESS; } ;
+    DSResult init() { return SUCCESS; };
+    DSResult close() { return SUCCESS; } ;
 
 private:
     Name authors_name;
     Name version_name;
     RRsetPtr authors;
     RRsetPtr version;
+};
+
 }
 }