Changeset 952

Timestamp:

02/18/07 14:25:23 (2 years ago)

Author:

ahu

Message:

teach zoneparser-tng about $ORIGIN and $GENERATE, is now feature complete to take over zoneparser in main pdns auth server

Files:

• trunk/pdns/pdns/zoneparser-tng.cc (modified) (3 diffs)
• trunk/pdns/pdns/zoneparser-tng.hh (modified) (3 diffs)

trunk/pdns/pdns/zoneparser-tng.cc

@@ -1 +1 @@
-/*
-    PowerDNS Versatile Database Driven Nameserver
-6
+7
-
-    This program is free software; you can redistribute it and/or modify
@@ -86 +86 @@
-}
-
+bool ZoneParserTNG::getTemplateLine()
+{
+  if(d_templatecounter > d_templatestop || d_templateparts.empty()) // no template, or done with
+    return false;
+
+  string retline;
+  for(parts_t::const_iterator iter = d_templateparts.begin() ; iter != d_templateparts.end(); ++iter) {
+    if(iter != d_templateparts.begin())
+      retline+=" ";
+
+    string part=makeString(d_templateline, *iter);
+    
+    /* a part can contain a 'naked' $, an escaped $ (\$), or ${offset,width,radix}, with width defaulting to 0, 
+       and radix beging 'd', 'o', 'x' or 'X', defaulting to 'd'. 
+
+       The width is zero-padded, so if the counter is at 1, the offset is 15, with is 3, and the radix is 'x',
+       output will be '010', from the input of ${15,3,x}
+    */
+
+    string outpart;
+    outpart.reserve(part.size()+5);
+    bool inescape=false;
+
+    for(string::size_type pos = 0; pos < part.size() ; ++pos) {
+      char c=part[pos];
+      if(inescape) {
+        outpart.append(1, c);
+        inescape=false;
+        continue;
+      }
+        
+      if(part[pos]=='\\') {
+        inescape=true;
+        continue;
+      }
+      if(c=='$') {
+        if(pos + 1 == part.size() || part[pos+1]!='{') {  // a trailing $, or not followed by {
+          outpart.append(lexical_cast<string>(d_templatecounter));
+          continue;
+        }
+        
+        // need to deal with { case 
+        
+        pos+=2;
+        string::size_type startPos=pos;
+        for(; pos < part.size() && part[pos]!='}' ; ++pos)
+          ;
+        
+        if(pos == part.size()) // partial spec
+          break;
+
+        // we are on the '}'
+
+        string spec(part.c_str() + startPos, part.c_str() + pos);
+        int offset=0, width=0;
+        char radix='d';
+        sscanf(spec.c_str(), "%d,%d,%c", &offset, &width, &radix);  // parse format specifier
+
+        char format[12];
+        snprintf(format, sizeof(format) - 1, "%%0%d%c", width, radix); // make into printf-style format
+
+        char tmp[80];
+        snprintf(tmp, sizeof(tmp)-1, format, d_templatecounter + offset); // and do the actual printing
+        outpart+=tmp;
+      }
+      else
+        outpart.append(1, c);
+    }
+    retline+=outpart;
+  }
+  d_templatecounter+=d_templatestep;
+
+  d_line = retline;
+  return true;
+}
+
-bool ZoneParserTNG::get(DNSResourceRecord& rr) 
-{
- retry:;
-
+TemplateLine() && !get
-    return false;
-
-  chomp(d_line, " \r\n\x1a");
-
+
+
-  vstringtok(parts, d_line);
-
@@ -106 +183 @@
-      stackFile(unquotify(makeString(d_line, parts[1])));
-    }
-
+
+
+
-    else if(command=="$GENERATE" && parts.size() > 2) {
-      // $GENERATE 1-127 $ CNAME $.0
-      string range=makeString(d_line, parts[1]);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    else
-      throw exception("Can't parse zone line '"+d_line+"'");

trunk/pdns/pdns/zoneparser-tng.hh

@@ -1 +1 @@
-/*
-    PowerDNS Versatile Database Driven Nameserver
-6
+7
-
-    This program is free software; you can redistribute it and/or modify
@@ -35 +35 @@
-  bool get(DNSResourceRecord& rr);
-  typedef runtime_error exception;
+  typedef deque<pair<string::size_type, string::size_type> > parts_t;
-private:
-  bool getLine();
+  bool getTemplateLine();
-  void stackFile(const std::string& fname);
-  stack<FILE *> d_fps;
@@ -43 +45 @@
-  string d_zonename;
-  int d_defaultttl;
+  uint32_t d_templatecounter, d_templatestop, d_templatestep;
+  string d_templateline;
+  parts_t d_templateparts;
-};
-