[2428] Implement basic inclusion

diff --git a/src/lib/dns/master_loader.cc b/src/lib/dns/master_loader.cc
index a44fef1f0f08e16c07b5805b18bd5d5d9ddc0358..4457e387d3d9c7ec0f390637baa95369aab9ee44 100644 (file)
--- a/src/lib/dns/master_loader.cc
+++ b/src/lib/dns/master_loader.cc
@@ -105,19 +105,38 @@ public:
 
     bool loadIncremental(size_t count_limit);
 
+    void doInclude() {
+        // First, get the filename to include
+        const MasterToken::StringRegion
+            filename(lexer_.getNextToken(MasterLexer::QSTRING).
+                     getStringRegion());
+
+        // TODO: Handle the case where there's Name after the
+        // filename, meaning origin. Once $ORIGIN handling is
+        // done, it should be interconnected somehow.
+
+        // Push the filename. We abuse the fact that filename
+        // may not contain '\0' anywhere in it, so we can
+        // freely use the filename.beg directly.
+        pushSource(filename.beg);
+
+        // TODO: Eat any extra tokens at the end of line (they
+        // should not be here, of course).
+    }
+
     void handleDirective(const char* directive, size_t length) {
         // We use strncasecmp, because there seems to be no reasonable
         // way to compare strings case-insensitive in C++
 
         // Warning: The order of compared strings does matter. The length
         // parameter applies to the first one only.
-        if (strncasecmp(directive, "INCLUDE", length)) {
-
-        } else if (strncasecmp(directive, "ORIGIN", length)) {
+        if (strncasecmp(directive, "INCLUDE", length) == 0) {
+            doInclude();
+        } else if (strncasecmp(directive, "ORIGIN", length) == 0) {
             // TODO: Implement
             isc_throw(isc::NotImplemented,
                       "Origin directive not implemented yet");
-        } else if (strncasecmp(directive, "TTL", length)) {
+        } else if (strncasecmp(directive, "TTL", length) == 0) {
             // TODO: Implement
             isc_throw(isc::NotImplemented,
                       "TTL directive not implemented yet");

diff --git a/src/lib/dns/tests/master_loader_unittest.cc b/src/lib/dns/tests/master_loader_unittest.cc
index ca04b5c053833ec20ed634d3531aba280524baef..39740477c08d199fddbb42676e4baa64e6a2c033 100644 (file)
--- a/src/lib/dns/tests/master_loader_unittest.cc
+++ b/src/lib/dns/tests/master_loader_unittest.cc
@@ -160,15 +160,15 @@ TEST_F(MasterLoaderTest, include) {
         SCOPED_TRACE(*include);
         // Prepare input source that has no other content than just the
         // include of the real master file.
-        const string include_str = string(*include) + " " + TEST_DATA_SRCDIR +
-            "/example.org\n";
+        const string include_str = "$" + string(*include) + " " +
+            TEST_DATA_SRCDIR + "/example.org\n";
         stringstream ss(include_str);
         setLoader(ss, Name("example.org."), RRClass::IN(),
                   MasterLoader::MANY_ERRORS);
 
         loader_->load();
         EXPECT_TRUE(loader_->loadedSucessfully());
-        EXPECT_TRUE(errors_.empty());
+        EXPECT_TRUE(errors_.empty()) << errors_[0];
         EXPECT_TRUE(warnings_.empty());
 
         checkBasicRRs();