Changeset 959

Timestamp:

02/18/07 20:49:14 (6 years ago)

Author:

ahu

Message:

remove bind1backend, remove old zoneparser, switch rest to zoneparser-tng

Location:

trunk/pdns/pdns/backends/bind

Files:

• Makefile.am (modified) (2 diffs)
• bindbackend.cc (deleted)
• bindbackend.hh (deleted)
• bindbackend2.cc (modified) (8 diffs)
• bindbackend2.hh (modified) (1 diff)
• bindparser.yy (modified) (2 diffs)
• zone2ldap.cc (modified) (13 diffs)
• zone2sql.cc (modified) (9 diffs)
• zoneparser.hh (deleted)
• zoneparser2.cc (deleted)

trunk/pdns/pdns/backends/bind/Makefile.am

@@ -1 +1 @@
 INCLUDES=-I../..
-noinst_LTLIBRARIES = libbindbackend.la libbind2backend.la
-
-libbindbackend_la_SOURCES=bindbackend.cc bindbackend.hh bindparser.yy \
-bindlexer.l zoneparser2.cc ../../misc.cc huffman.cc huffman.hh zoneparser.hh \
-bindparser.hh ../../unix_utility.cc
-
-libbindbackend_la_CXXFLAGS=$(AM_CXXFLAGS)
-libbindbackend_la_CFLAGS=$(AM_CFLAGS)
+noinst_LTLIBRARIES = libbind2backend.la
 
 libbind2backend_la_SOURCES=bindbackend2.cc bindbackend2.hh bindparser.yy \
-bindlexer.l zoneparser2.cc ../../misc.cc huffman.cc huffman.hh zoneparser.hh \
+bindlexer.l ../../zoneparser-tng.cc ../../misc.cc huffman.cc huffman.hh  \
 bindparser.hh ../../unix_utility.cc
 
@@ -18 +11 @@
 bin_PROGRAMS = zone2sql zone2ldap
 
-zone2sql_SOURCES=bindparser.yy bindlexer.l zoneparser2.cc \
+zone2sql_SOURCES=bindparser.yy bindlexer.l \
 ../../arguments.cc ../../logger.cc zone2sql.cc ../../statbag.cc ../../misc.cc \
 ../../unix_utility.cc ../../qtype.cc ../../dnspacket.cc \
-../../sillyrecords.cc
+../../sillyrecords.cc  ../../zoneparser-tng.cc ../../dnsrecords.cc \
+../../dnswriter.cc ../../rcpgenerator.cc ../../dnsparser.cc ../../base64.cc
 
-zone2ldap_SOURCES=bindparser.yy bindlexer.l zoneparser2.cc \
+
+zone2ldap_SOURCES=bindparser.yy bindlexer.l \
 ../../arguments.cc ../../logger.cc zone2ldap.cc ../../statbag.cc ../../misc.cc \
-../../unix_utility.cc ../../qtype.cc
+../../unix_utility.cc ../../qtype.cc  ../../zoneparser-tng.cc ../../dnsrecords.cc \
+../../dnswriter.cc ../../rcpgenerator.cc ../../dnsparser.cc ../../base64.cc
+
 
 

trunk/pdns/pdns/backends/bind/bindbackend2.cc

@@ -1 +1 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2002-2006  PowerDNS.COM BV
+    Copyright (C) 2002-2007  PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
@@ -34 +34 @@
 #include "bindbackend2.hh"
 #include "dnspacket.hh"
-
-#include "zoneparser.hh"
+#include "zoneparser-tng.hh"
 #include "bindparser.hh"
 #include "logger.hh"
@@ -322 +321 @@
 }
 
-static void InsertionCallback(shared_ptr<Bind2Backend::State> stage, unsigned int domain_id, const string &domain, const string &qtype, const string &content, int ttl, int prio)
-{
-  us->insert(stage, domain_id, domain, qtype, content, ttl, prio);
-}
-
 set<string> contents;
 
 /** This function adds a record to a domain with a certain id. 
     Much of the complication is due to the efforts to benefit from std::string reference counting copy on write semantics */
-void Bind2Backend::insert(shared_ptr<State> stage, int id, const string &qnameu, const string &qtype, const string &content, int ttl=300, int prio=25)
+void Bind2Backend::insert(shared_ptr<State> stage, int id, const string &qnameu, const QType &qtype, const string &content, int ttl=300, int prio=25)
 {
   // XXXX WRONG WRONG WRONG REWRITE
@@ -353 +347 @@
     bdr.qname=(records.end()-1)->qname;
 
-  bdr.qtype=QType(qtype.c_str()).getCode();
+  bdr.qtype=qtype.getCode();
   bdr.content=canonic(content); // I think this is wrong, the zoneparser should not come up with . terminated stuff XXX FIXME
   set<string>::const_iterator i=contents.find(bdr.content);
@@ -481 +475 @@
     }
 
-    ZoneParser ZP;
+
       
     vector<BindDomainInfo> domains=BP.getDomains();
@@ -488 +482 @@
 
     d_binddirectory=BP.getDirectory();
-    ZP.setDirectory(d_binddirectory);
-    ZoneParser::callback_t func=boost::bind(&InsertionCallback, staging, _1, _2, _3, _4, _5, _6);
-    ZP.setCallback(func);  
+    //    ZP.setDirectory(d_binddirectory);
+    //    ZoneParser::callback_t func=boost::bind(&InsertionCallback, staging, _1, _2, _3, _4, _5, _6);
+
 
     L<<Logger::Warning<<d_logprefix<<" Parsing "<<domains.size()<<" domain(s), will report when done"<<endl;
@@ -538 +532 @@
             bbd->d_records=shared_ptr<vector<Bind2DNSRecord> > (new vector<Bind2DNSRecord>); 
 
-            ZP.parse(i->filename, i->name, bbd->d_id); // calls callback for us
+            ZoneParserTNG zpt(i->filename, i->name, BP.getDirectory());
+            DNSResourceRecord rr;
+            while(zpt.get(rr)) {
+              insert(staging, bbd->d_id, rr.qname, rr.qtype, rr.content, rr.ttl, rr.priority);
+            }
+
+            //      ZP.parse(i->filename, i->name, bbd->d_id); // calls callback for us
             L<<Logger::Info<<d_logprefix<<" sorting '"<<i->name<<"'"<<endl;
 
@@ -638 +638 @@
     nukeZoneRecords(bbd); // ? do we need this?
     
-    ZoneParser ZP;
     us=this;
-
-    ZP.setDirectory(d_binddirectory);
-    ZoneParser::callback_t func=boost::bind(&InsertionCallback, staging, _1, _2, _3, _4, _5, _6);
-    ZP.setCallback(func);  
 
     staging->id_zone_map[bbd->d_id]=s_state->id_zone_map[bbd->d_id];
     staging->id_zone_map[bbd->d_id].d_records=shared_ptr<vector<Bind2DNSRecord> > (new vector<Bind2DNSRecord>);  // nuke it
 
-    ZP.parse(bbd->d_filename, bbd->d_name, bbd->d_id);
-    
+    ZoneParserTNG zpt(bbd->d_filename, bbd->d_name, d_binddirectory);
+    DNSResourceRecord rr;
+    while(zpt.get(rr)) {
+      insert(staging, bbd->d_id, rr.qname, rr.qtype, rr.content, rr.ttl, rr.priority);
+    }
+        
     sort(staging->id_zone_map[bbd->d_id].d_records->begin(), staging->id_zone_map[bbd->d_id].d_records->end());
     staging->id_zone_map[bbd->d_id].setCtime();

trunk/pdns/pdns/backends/bind/bindbackend2.hh

@@ -121 +121 @@
   };
 
-  void insert(shared_ptr<State> stage, int id, const string &qname, const string &qtype, const string &content, int ttl, int prio);  
+  void insert(shared_ptr<State> stage, int id, const string &qname, const QType &qtype, const string &content, int ttl, int prio);  
   void rediscover(string *status=0);
 

trunk/pdns/pdns/backends/bind/bindparser.yy

@@ -9 +9 @@
 #include <errno.h>
 #include "misc.hh"
-#include "zoneparser.hh"
 #include "ahuexception.hh"
 using namespace std;
@@ -127 +126 @@
         ZONETOK quotedname zone_block
         {
-                s_di.name=ZoneParser::canonic($2);
+                s_di.name=stripDot($2);
                 
                 parent->commit(s_di);

trunk/pdns/pdns/backends/bind/zone2ldap.cc

@@ -2 +2 @@
  *  PowerDNS BIND Zone to LDAP converter
  *  Copyright (C) 2003  Norbert Sendetzky
+ *  Copyright (C) 2007  bert hubert
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -24 +25 @@
 #include <stdio.h>
 #include "arguments.hh"
-#include "zoneparser.hh"
 #include "bindparser.hh"
 #include "statbag.hh"
+#include <boost/function.hpp>
 #include "misc.hh"
 #include "dns.hh"
-
+#include "zoneparser-tng.hh"
 
 using std::map;
 using std::string;
 using std::vector;
-
-
 
 StatBag S;
@@ -44 +43 @@
 map<string,bool> g_objects;
 
-
-
 static void callback_simple( unsigned int domain_id, const string &domain, const string &qtype, const string &content, int ttl, int prio )
 {
@@ -51 +48 @@
         string::size_type pos;
         vector<string> parts;
-        string domain2 = ZoneParser::canonic( domain );
+        string domain2 = stripDot( domain );
 
 
@@ -60 +57 @@
         }
 
-        host = ZoneParser::canonic( domain2.substr( 0, pos ) );
+        host = stripDot( domain2.substr( 0, pos ) );
 
         cout << "dn: dc=";
@@ -87 +84 @@
         cout << qtype << "Record: ";
         if( prio != 0 ) { cout << prio << " "; }
-        cout << ZoneParser::canonic( content ) << endl << endl;
+        cout << stripDot( content ) << endl << endl;
 }
 
@@ -97 +94 @@
         string dn, net;
         vector<string> parts;
-        string domain2 = ZoneParser::canonic( domain );
+        string domain2 = stripDot( domain );
 
         stringtok( parts, domain2, "." );
@@ -143 +140 @@
         cout << qtype << "Record: ";
         if( prio != 0 ) { cout << prio << " "; }
-        cout << ZoneParser::canonic( content ) << endl << endl;
+        cout << stripDot( content ) << endl << endl;
 }
 
@@ -151 +148 @@
 {
         BindParser BP;
-        ZoneParser ZP;
         vector<string> parts;
 
@@ -182 +178 @@
                 g_basedn = args["basedn"];
                 g_dnsttl = args.mustDo( "dnsttl" );
-
-                ZP.setCallback( &callback_simple );
+                typedef boost::function<void(unsigned int, const string &, const string &, const string &, int, int)> callback_t;
+                callback_t callback = callback_simple;
                 if( args["layout"] == "tree" )
                 {
-                        ZP.setCallback( &callback_tree );
+                        callback=callback_tree;
                 }
 
@@ -193 +189 @@
                         BP.setVerbose( args.mustDo( "verbose" ) );
                         BP.parse( args["named-conf"] );
-                        ZP.setDirectory( BP.getDirectory() );
+//                      ZP.setDirectory( BP.getDirectory() );
                         const vector<BindDomainInfo> &domains = BP.getDomains();
 
@@ -204 +200 @@
                                                 cerr << "Parsing file: " << i->filename << ", domain: " << i->name << endl;
                                                 g_zonename = i->name;
-                                                ZP.parse( i->filename, i->name, 0 );
+                                                ZoneParserTNG zpt(i->filename, i->name, BP.getDirectory());
+                                                DNSResourceRecord rr;
+                                                while(zpt.get(rr))
+                                                        callback(0, rr.qname, rr.qtype.getName(), rr.content, rr.ttl, rr.priority);
                                         }
                                 }
@@ -226 +225 @@
 
                         g_zonename = args["zone-name"];
-                        ZP.setDirectory( "." );
-                        ZP.parse( args["zone-file"], args["zone-name"], 0 );
+                        ZoneParserTNG zpt(args["zone-file"], args["zone-name"]);
+                        DNSResourceRecord rr;
+                        while(zpt.get(rr))
+                                callback(0, rr.qname, rr.qtype.getName(), rr.content, rr.ttl, rr.priority);
                 }
         }

trunk/pdns/pdns/backends/bind/zone2sql.cc

@@ -1 +1 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2002  PowerDNS.COM BV
+    Copyright (C) 2002 - 2007  PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
@@ -35 +35 @@
 #include "dns.hh"
 #include "arguments.hh"
-#include "zoneparser.hh"
 #include "bindparser.hh"
 #include "statbag.hh"
 #include "misc.hh"
 #include "dnspacket.hh"
+#include "zoneparser-tng.hh"
 
 StatBag S;
@@ -76 +76 @@
   if(qtype=="SOA") {
     //    cerr<<"Juh: "<<dirty_hack_num<<", "<<lastsoa_domain_id<<", "<<lastsoa_qname<<", "<<domain<<endl;
-    if(dirty_hack_num==lastsoa_domain_id && lastsoa_qname!=ZoneParser::canonic(domain)) {
+    if(dirty_hack_num==lastsoa_domain_id && lastsoa_qname!=stripDot(domain)) {
       dirty_hack_num++;
       cerr<<"Second SOA in zone, raised domain_id"<<endl;
@@ -90 +90 @@
         
         if(mode==POSTGRES) {
-          cout<<"insert into domains (name,type) values ("<<toLower(sqlstr(ZoneParser::canonic(domain)))<<",'NATIVE');"<<endl;
+          cout<<"insert into domains (name,type) values ("<<toLower(sqlstr(stripDot(domain)))<<",'NATIVE');"<<endl;
         }
         else if(mode==ORACLE) {
@@ -99 +99 @@
     SOAData soadata;
     DNSPacket::fillSOAData(content, soadata);
-    soadata.hostmaster=ZoneParser::canonic(soadata.hostmaster);
-    soadata.nameserver=ZoneParser::canonic(soadata.nameserver);
+    soadata.hostmaster=stripDot(soadata.hostmaster);
+    soadata.nameserver=stripDot(soadata.nameserver);
     content=DNSPacket::serializeSOAData(soadata);
 
 
-    lastsoa_qname=ZoneParser::canonic(domain);
+    lastsoa_qname=stripDot(domain);
   }
   
@@ -111 +111 @@
   if(mode==MYSQL) {
     cout<<"insert into records (domain_id, name,type,content,ttl,prio) values ("<< dirty_hack_num<<", "<<
-      sqlstr(ZoneParser::canonic(domain))<<", "<<
+      sqlstr(stripDot(domain))<<", "<<
       sqlstr(qtype)<<", "<<
-      sqlstr(ZoneParser::canonic(content))<<", "<<ttl<<", "<<prio<<");\n";
+      sqlstr(stripDot(content))<<", "<<ttl<<", "<<prio<<");\n";
   }
   if(mode==POSTGRES) {
     cout<<"insert into records (domain_id, name,type,content,ttl,prio) select id ,"<<
-      sqlstr(toLower(ZoneParser::canonic(domain)))<<", "<<
+      sqlstr(toLower(stripDot(domain)))<<", "<<
       sqlstr(qtype)<<", "<<
-      sqlstr(ZoneParser::canonic(content))<<", "<<ttl<<", "<<prio<< 
+      sqlstr(stripDot(content))<<", "<<ttl<<", "<<prio<< 
       " from domains where name="<<toLower(sqlstr(lastsoa_qname))<<";\n";
   }
   else if(mode==ORACLE) {
     cout<<"insert into Records (id,ZoneId, name,type,content,TimeToLive,Priority) select RECORDS_ID_SEQUENCE.nextval,id ,"<<
-      sqlstr(toLower(ZoneParser::canonic(domain)))<<", "<<
+      sqlstr(toLower(stripDot(domain)))<<", "<<
       sqlstr(qtype)<<", "<<
-      sqlstr(ZoneParser::canonic(content))<<", "<<ttl<<", "<<prio<< 
+      sqlstr(stripDot(content))<<", "<<ttl<<", "<<prio<< 
       " from Domains where name="<<toLower(sqlstr(lastsoa_qname))<<";\n";
   }
   else if(mode==BARE) {
     cout<< dirty_hack_num<<"\t"<<
-      sqlstr(ZoneParser::canonic(domain))<<"\t"<<
-      sqlstr(qtype)<<"\t"<<sqlstr(ZoneParser::canonic(content))<<"\t"<<prio<<"\t"<<ttl<<"\n";
+      sqlstr(stripDot(domain))<<"\t"<<
+      sqlstr(qtype)<<"\t"<<sqlstr(stripDot(content))<<"\t"<<prio<<"\t"<<ttl<<"\n";
   }
 
@@ -214 +214 @@
       BP.parse(namedfile.empty() ? "./named.conf" : namedfile);
     
-      ZoneParser ZP;
-    
       const vector<BindDomainInfo> &domains=BP.getDomains();
 
       int numdomains=domains.size();
       int tick=numdomains/100;
-      ZP.setDirectory(BP.getDirectory());
-      ZP.setCallback(&callback);  
+      //      ZP.setDirectory(BP.getDirectory());
     
       for(vector<BindDomainInfo>::const_iterator i=domains.begin();
@@ -253 +250 @@
               lastsoa_qname=i->name;
             }
-            ZP.parse(i->filename,i->name,0);
+            ZoneParserTNG zpt(i->filename, i->name, BP.getDirectory());
+            DNSResourceRecord rr;
+            while(zpt.get(rr)) 
+              callback(0, rr.qname, rr.qtype.getName(), rr.content, rr.ttl, rr.priority);
           }
           catch(AhuException &ae) {
@@ -269 +269 @@
     }
     else {
+      ZoneParserTNG zpt(zonefile, arg()["zone-name"]);
+      DNSResourceRecord rr;
       dirty_hack_num=-1; // trigger first SOA output
-      ZoneParser ZP;
-      ZP.setDirectory(".");
-      ZP.setCallback(&callback);  
-      ZP.parse(zonefile,arg()["zone-name"],0);
+      while(zpt.get(rr)) 
+        callback(0, rr.qname, rr.qtype.getName(), rr.content, rr.ttl, rr.priority);
+
     }
     cerr<<"Parsed "<<num_records<<" records"<<endl;