Changeset 1014

Timestamp:

04/07/07 17:54:30 (2 years ago)

Author:

ahu

Message:

improved support for multiline records in zones, plus accept @ as part of queries

Files:

• trunk/pdns/pdns/packethandler.cc (modified) (1 diff)
• trunk/pdns/pdns/zoneparser-tng.cc (modified) (3 diffs)
• trunk/pdns/regression-tests/test.com (modified) (1 diff)

trunk/pdns/pdns/packethandler.cc

@@ -548 +548 @@
-         (c >= 'A' && c <= 'Z') ||
-         (c >= '0' && c <= '9') ||
-
+ || c=='@'
-      return false;
-  }

trunk/pdns/pdns/zoneparser-tng.cc

@@ -179 +179 @@
-}
-
+bool findAndElide(string& line, char c)
+{
+  string::size_type pos, len = line.length();
+  bool inQuote=false;
+  for(pos = 0 ; pos < len; ++pos) {
+    if(line[pos]=='\\') 
+      pos++;
+    else if(line[pos]=='"') 
+      inQuote=!inQuote;
+    else if(line[pos]==c && !inQuote)
+      break;
+  }
+  if(pos != len) {
+    line.erase(pos, 1);
+    return true;
+  }
+  return false;
+}
+
+
-bool ZoneParserTNG::get(DNSResourceRecord& rr) 
-{
@@ -290 +310 @@
-
-  chopComment(rr.content);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        trim(d_line);
+        
+        bool ended = findAndElide(d_line, ')');
-        rr.content+=" "+d_line;
-
+
+
-      }
-  rr.content+=" "+d_line;
-  
-
+}
+
+
-  vector<string> soaparts;
-  switch(rr.qtype.getCode()) {
@@ -357 +372 @@
-  return false;
-}
-
-
-#if 0
-int main(int argc, char** argv)
-try
-{
-  reportAllTypes();
-  ZoneParserTNG zpt(argv[1]);
-  DNSResourceRecord rr;
-  while(zpt.get(rr)) {
-  }
-  
-
-}
-catch(...)
-{}
-#endif

trunk/pdns/regression-tests/test.com

@@ -1 +1 @@
-$TTL 3600
-$ORIGIN test.com.
-
-
+
-                        8H ; refresh
-                        2H ; retry