Changeset 1154

Timestamp:

03/09/08 16:31:37 (2 years ago)

Author:

ahu

Message:

Norbert sends:
Here's an update for the OpenDBX backend:
- Fix for SQLite2/3 locking problem on concurrent reads/writes
- Fixes compilation on Solaris (u_int vs. uint)
- Support for autoserial (needs triggers)

Location:

trunk/pdns/modules/opendbxbackend

Files:

• odbxbackend.cc (modified) (8 diffs)
• odbxbackend.hh (modified) (6 diffs)
• odbxprivate.cc (modified) (5 diffs)

trunk/pdns/modules/opendbxbackend/odbxbackend.cc

@@ -107 +107 @@
                         di.serial = 0;
 
-                        if( ( tmp = odbx_field_value( m_result, 0 ) ) != NULL )
-                        {
-                                di.id = strtol( tmp, NULL, 10 );
-                        }
-
-                        if( ( tmp = odbx_field_value( m_result, 1 ) ) != NULL )
-                        {
-                                di.zone = string( tmp, odbx_field_length( m_result, 1 ) );
+                        if( ( tmp = odbx_field_value( m_result, 6 ) ) != NULL )
+                        {
+                                SOAData sd;
+
+                                sd.serial = 0;
+                                fillSOAData( string( tmp, odbx_field_length( m_result, 6 ) ), sd );
+
+                                if( sd.serial == 0 && ( tmp = odbx_field_value( m_result, 5 ) ) != NULL )
+                                {
+                                        sd.serial = strtol( tmp, NULL, 10 );
+                                }
+
+                                di.serial = sd.serial;
+                        }
+
+                        if( ( tmp = odbx_field_value( m_result, 4 ) ) != NULL )
+                        {
+                                di.last_check = strtol( tmp, NULL, 10 );
+                        }
+
+                        if( ( tmp = odbx_field_value( m_result, 3 ) ) != NULL )
+                        {
+                                stringtok(di.masters, string( tmp, odbx_field_length( m_result, 3 ) ), ", \t");
                         }
 
@@ -129 +144 @@
                         }
 
-                        if( ( tmp = odbx_field_value( m_result, 3 ) ) != NULL )
-                        {
-                                string masters = string( tmp, odbx_field_length( m_result, 3 ) );
-                                stringtok(di.masters, masters, ", \t");
-                        }
-
-                        if( ( tmp = odbx_field_value( m_result, 5 ) ) != NULL )
-                        {
-                                di.last_check = strtol( tmp, NULL, 10 );
-                        }
-
-                        if( ( tmp = odbx_field_value( m_result, 6 ) ) != NULL )
-                        {
-                                SOAData sd;
-
-                                sd.serial = 0;
-                                fillSOAData( string( tmp, odbx_field_length( m_result, 6 ) ), sd );
-                                di.serial = sd.serial;
+                        if( ( tmp = odbx_field_value( m_result, 1 ) ) != NULL )
+                        {
+                                di.zone = string( tmp, odbx_field_length( m_result, 1 ) );
+                        }
+
+                        if( ( tmp = odbx_field_value( m_result, 0 ) ) != NULL )
+                        {
+                                di.id = strtol( tmp, NULL, 10 );
                         }
                 }
@@ -154 +159 @@
         {
                 L.log( m_myname + " getDomainInfo: Caught STL exception - " + e.what(),  Logger::Error );
+                return false;
+        }
+
+        return true;
+}
+
+
+
+bool OdbxBackend::getSOA( const string& domain, SOAData& sd, DNSPacket* p )
+{
+        const char* tmp;
+
+
+        try
+        {
+                DLOG( L.log( m_myname + " getSOA()", Logger::Debug ) );
+
+                string stmt = getArg( "sql-lookupsoa" );
+                string& stmtref = strbind( ":name", escape( toLower( domain ), READ ), stmt );
+
+                if( !execStmt( stmtref.c_str(), stmtref.size(), READ ) ) { return false; }
+                if( !getRecord( READ ) ) { return false; }
+
+                do
+                {
+                        sd.serial = 0;
+
+                        if( ( tmp = odbx_field_value( m_result, 2 ) ) != NULL )
+                        {
+                                fillSOAData( string( tmp, odbx_field_length( m_result, 2 ) ), sd );
+                        }
+
+                        if( sd.serial == 0 && ( tmp = odbx_field_value( m_result, 1 ) ) != NULL )
+                        {
+                                sd.serial = strtol( tmp, NULL, 10 );
+                        }
+
+                        if( ( tmp = odbx_field_value( m_result, 0 ) ) != NULL )
+                        {
+                                sd.domain_id = strtol( tmp, NULL, 10 );
+                        }
+
+                        if( sd.nameserver.empty() )
+                        {
+                                sd.nameserver = arg()["default-soa-name"];
+                        }
+
+                        if( sd.hostmaster.empty() )
+                        {
+                                sd.hostmaster = "hostmaster." + domain;
+                        }
+
+                        sd.db = this;
+                }
+                while( getRecord( READ ) );
+        }
+        catch( exception& e )
+        {
+                L.log( m_myname + " getSOA: Caught STL exception - " + e.what(),  Logger::Error );
                 return false;
         }
@@ -212 +276 @@
                 m_result = NULL;
                 m_qname = qname;
-                
+
                 if( zoneid < 0 )
                 {
@@ -232 +296 @@
                                 stmtref = strbind( ":type", qtype.getName(), stmt );
                         }
-                        
+
                         size_t len = snprintf( m_buffer, sizeof( m_buffer ) - 1, "%d", zoneid );
 
@@ -307 +371 @@
                         if( ( tmp = odbx_field_value( m_result, 4 ) ) != NULL )
                         {
-                                rr.priority = (u_int16_t) strtoul( tmp, NULL, 10 );
+                                rr.priority = (uint16_t) strtoul( tmp, NULL, 10 );
                         }
 
@@ -328 +392 @@
 
 
-void OdbxBackend::setFresh( u_int32_t domain_id )
+void OdbxBackend::setFresh( uint32_t domain_id )
 {
         size_t len;
@@ -371 +435 @@
 
 
-void OdbxBackend::setNotified( u_int32_t domain_id, u_int32_t serial )
+void OdbxBackend::setNotified( uint32_t domain_id, uint32_t serial )
 {
         try

trunk/pdns/modules/opendbxbackend/odbxbackend.hh

@@ -46 +46 @@
 
 
-bool checkSlave( u_int32_t last, u_int32_t notified, SOAData* sd, DomainInfo* di );
-bool checkMaster( u_int32_t last, u_int32_t notified, SOAData* sd, DomainInfo* di );
+bool checkSlave( uint32_t last, uint32_t notified, SOAData* sd, DomainInfo* di );
+bool checkMaster( uint32_t last, uint32_t notified, SOAData* sd, DomainInfo* di );
 
 
@@ -66 +66 @@
         string escape( const string& str, QueryType type );
         bool connectTo( const vector<string>& host, QueryType type );
-        bool getDomainList( const string& query, vector<DomainInfo>* list, bool (*check_fcn)(u_int32_t,u_int32_t,SOAData*,DomainInfo*) );
+        bool getDomainList( const string& query, vector<DomainInfo>* list, bool (*check_fcn)(uint32_t,uint32_t,SOAData*,DomainInfo*) );
         bool execStmt( const char* stmt, unsigned long length, QueryType type );
         bool getRecord( QueryType type );
@@ -77 +77 @@
 
         void lookup( const QType& qtype, const string& qdomain, DNSPacket* p = 0, int zoneid = -1 );
+        bool getSOA( const string& domain, SOAData& sd, DNSPacket* p );
         bool list( const string& target, int domain_id );
         bool get( DNSResourceRecord& rr );
@@ -93 +94 @@
         void getUnfreshSlaveInfos( vector<DomainInfo>* unfresh );
 
-        void setFresh( u_int32_t domain_id );
-        void setNotified( u_int32_t domain_id, u_int32_t serial );
+        void setFresh( uint32_t domain_id );
+        void setNotified( uint32_t domain_id, uint32_t serial );
 };
 
@@ -117 +118 @@
                 declare( suffix, "password","Password for connecting to the DBMS","");
 
-                declare( suffix, "sql-list", "AXFR query", "SELECT \"domain_id\", \"name\", \"type\", \"ttl\", \"prio\", \"content\" FROM \"records\" WHERE \"domain_id\"=:id" );
+                declare( suffix, "sql-list", "AXFR query", "SELECT r.\"domain_id\", r.\"name\", r.\"type\", r.\"ttl\", r.\"prio\", r.\"content\" FROM \"records\" r WHERE r.\"domain_id\"=:id" );
 
-                declare( suffix, "sql-lookup", "Lookup query","SELECT \"domain_id\", \"name\", \"type\", \"ttl\", \"prio\", \"content\" FROM \"records\" WHERE \"name\"=':name'" );
-                declare( suffix, "sql-lookupid", "Lookup query with id","SELECT \"domain_id\", \"name\", \"type\", \"ttl\", \"prio\", \"content\" FROM \"records\" WHERE \"domain_id\"=:id AND \"name\"=':name'" );
-                declare( suffix, "sql-lookuptype", "Lookup query with type","SELECT \"domain_id\", \"name\", \"type\", \"ttl\", \"prio\", \"content\" FROM \"records\" WHERE \"name\"=':name' AND \"type\"=':type'" );
-                declare( suffix, "sql-lookuptypeid", "Lookup query with type and id","SELECT \"domain_id\", \"name\", \"type\", \"ttl\", \"prio\", \"content\" FROM \"records\" WHERE \"domain_id\"=:id AND \"name\"=':name' AND \"type\"=':type'" );
+                declare( suffix, "sql-lookup", "Lookup query","SELECT r.\"domain_id\", r.\"name\", r.\"type\", r.\"ttl\", r.\"prio\", r.\"content\" FROM \"records\" r WHERE r.\"name\"=':name'" );
+                declare( suffix, "sql-lookupid", "Lookup query with id","SELECT r.\"domain_id\", r.\"name\", r.\"type\", r.\"ttl\", r.\"prio\", r.\"content\" FROM \"records\" r WHERE r.\"domain_id\"=:id AND r.\"name\"=':name'" );
+                declare( suffix, "sql-lookuptype", "Lookup query with type","SELECT r.\"domain_id\", r.\"name\", r.\"type\", r.\"ttl\", r.\"prio\", r.\"content\" FROM \"records\" r WHERE r.\"name\"=':name' AND r.\"type\"=':type'" );
+                declare( suffix, "sql-lookuptypeid", "Lookup query with type and id","SELECT r.\"domain_id\", r.\"name\", r.\"type\", r.\"ttl\", r.\"prio\", r.\"content\" FROM \"records\" r WHERE r.\"domain_id\"=:id AND r.\"name\"=':name' AND r.\"type\"=':type'" );
+                declare( suffix, "sql-lookupsoa","Lookup query for SOA record","SELECT d.\"id\", d.\"auto_serial\", r.\"content\" FROM \"records\" r JOIN \"domains\" d ON r.\"domain_id\"=d.\"id\" WHERE r.\"name\"=':name' AND r.\"type\"='SOA' AND d.\"status\"='A'" );
 
-                declare( suffix, "sql-zonedelete","Delete all records for this zone","DELETE FROM \"records\" WHERE \"domain_id\"=:id" );
-                declare( suffix, "sql-zoneinfo","Get domain info","SELECT d.\"id\", d.\"name\", d.\"type\", d.\"master\", d.\"last_check\", r.\"content\" FROM \"domains\" d LEFT JOIN \"records\" r ON ( d.\"id\"=r.\"domain_id\" AND r.\"type\"='SOA' ) WHERE d.\"name\"=':name' AND d.\"status\"='A'" );
+                declare( suffix, "sql-zonedelete","Delete all records for this zone","DELETE FROM \"records\" r WHERE r.\"domain_id\"=:id" );
+                declare( suffix, "sql-zoneinfo","Get domain info","SELECT d.\"id\", d.\"name\", d.\"type\", d.\"master\", d.\"last_check\", d.\"auto_serial\", r.\"content\" FROM \"domains\" d LEFT JOIN \"records\" r ON ( d.\"id\"=r.\"domain_id\" AND r.\"type\"='SOA' ) WHERE d.\"name\"=':name' AND d.\"status\"='A'" );
 
                 declare( suffix, "sql-transactbegin", "Start transaction", "BEGIN" );
@@ -134 +136 @@
                 declare( suffix, "sql-insert-record","Feed record into table", "INSERT INTO \"records\" ( \"domain_id\", \"name\", \"type\", \"ttl\", \"prio\", \"content\" ) VALUES ( %d, '%s', '%s', %d, %d, '%s' )" );
 
-                declare( suffix, "sql-update-serial", "Set zone to notified", "UPDATE \"domains\" SET \"notified_serial\"=%d WHERE \"id\"=%d" );
-                declare( suffix, "sql-update-lastcheck", "Set time of last check", "UPDATE \"domains\" SET \"last_check\"=%d WHERE \"id\"=%d" );
+                declare( suffix, "sql-update-serial", "Set zone to notified", "UPDATE \"domains\" d SET d.\"notified_serial\"=%d WHERE d.\"id\"=%d" );
+                declare( suffix, "sql-update-lastcheck", "Set time of last check", "UPDATE \"domains\" d SET d.\"last_check\"=%d WHERE d.\"id\"=%d" );
 
-                declare( suffix, "sql-master", "Get master record for zone", "SELECT \"master\" FROM \"domains\" WHERE \"name\"=':name' AND \"status\"='A' AND \"type\"='SLAVE'" );
-                declare( suffix, "sql-supermaster","Get supermaster info", "SELECT \"account\" FROM \"supermasters\" WHERE \"ip\"=':ip' AND \"nameserver\"=':ns'" );
+                declare( suffix, "sql-master", "Get master record for zone", "SELECT d.\"master\" FROM \"domains\" d WHERE d.\"name\"=':name' AND d.\"status\"='A' AND d.\"type\"='SLAVE'" );
+                declare( suffix, "sql-supermaster","Get supermaster info", "SELECT s.\"account\" FROM \"supermasters\" s WHERE s.\"ip\"=':ip' AND s.\"nameserver\"=':ns'" );
 
-                declare( suffix, "sql-infoslaves", "Get all unfresh slaves", "SELECT d.\"id\", d.\"name\", d.\"master\", d.\"notified_serial\", d.\"last_check\", r.\"change_date\", r.\"content\" FROM \"domains\" d LEFT JOIN \"records\" r ON ( d.\"id\"=r.\"domain_id\" AND r.\"type\"='SOA' ) WHERE d.\"status\"='A' AND d.\"type\"='SLAVE'" );
-                declare( suffix, "sql-infomasters", "Get all updated masters", "SELECT d.\"id\", d.\"name\", d.\"master\", d.\"notified_serial\", d.\"last_check\", r.\"change_date\", r.\"content\" FROM \"domains\" d JOIN \"records\" r ON d.\"id\"=r.\"domain_id\" WHERE d.\"status\"='A' AND d.\"type\"='MASTER' AND r.\"type\"='SOA'" );
+                declare( suffix, "sql-infoslaves", "Get all unfresh slaves", "SELECT d.\"id\", d.\"name\", d.\"master\", d.\"last_check\", d.\"notified_serial\", d.\"auto_serial\", r.\"content\" FROM \"domains\" d LEFT JOIN \"records\" r ON ( d.\"id\"=r.\"domain_id\" AND r.\"type\"='SOA' ) WHERE d.\"status\"='A' AND d.\"type\"='SLAVE'" );
+                declare( suffix, "sql-infomasters", "Get all updated masters", "SELECT d.\"id\", d.\"name\", d.\"master\", d.\"last_check\", d.\"notified_serial\", d.\"auto_serial\", r.\"content\" FROM \"domains\" d LEFT JOIN \"records\" r ON ( d.\"id\"=r.\"domain_id\" AND r.\"type\"='SOA' ) WHERE d.\"status\"='A' AND d.\"type\"='MASTER'" );
 
                 declare( suffix, "host", "depricated, use host-read and host-write instead","" );

trunk/pdns/modules/opendbxbackend/odbxprivate.cc

@@ -19 +19 @@
                 odbx_finish( m_handle[type] );
                 m_handle[type] = NULL;
+        }
+
+        if( type == WRITE && getArg( "backend" ) == "sqlite" )
+        {
+                L.log( m_myname + " Using same SQLite connection for reading and writeing to '" + hosts[odbx_host_index[READ]] + "'", Logger::Notice );
+                m_handle[WRITE] = m_handle[READ];
+                return true;
         }
 
@@ -157 +164 @@
 
 
-bool OdbxBackend::getDomainList( const string& stmt, vector<DomainInfo>* list, bool (*check_fcn)(u_int32_t,u_int32_t,SOAData*,DomainInfo*) )
+bool OdbxBackend::getDomainList( const string& stmt, vector<DomainInfo>* list, bool (*check_fcn)(uint32_t,uint32_t,SOAData*,DomainInfo*) )
 {
         const char* tmp;
-        u_int32_t nlast, nserial;
+        uint32_t nlast, nserial;
         DomainInfo di;
         SOAData sd;
@@ -189 +196 @@
                 if( ( tmp = odbx_field_value( m_result, 4 ) ) != NULL )
                 {
+                        nserial = strtol( tmp, NULL, 10 );
+                }
+
+                if( ( tmp = odbx_field_value( m_result, 3 ) ) != NULL )
+                {
                         nlast = strtol( tmp, NULL, 10 );
-                }
-
-                if( ( tmp = odbx_field_value( m_result, 3 ) ) != NULL )
-                {
-                        nserial = strtol( tmp, NULL, 10 );
                 }
 
@@ -229 +236 @@
 
 
-bool checkSlave( u_int32_t nlast, u_int32_t nserial, SOAData* sd, DomainInfo* di )
-{
-        if( nlast + sd->refresh < (u_int32_t) time( 0 ) )
+bool checkSlave( uint32_t nlast, uint32_t nserial, SOAData* sd, DomainInfo* di )
+{
+        if( nlast + sd->refresh < (uint32_t) time( 0 ) )
         {
                 di->kind = DomainInfo::Slave;
@@ -242 +249 @@
 
 
-bool checkMaster( u_int32_t nlast, u_int32_t nserial, SOAData* sd, DomainInfo* di )
+bool checkMaster( uint32_t nlast, uint32_t nserial, SOAData* sd, DomainInfo* di )
 {
         if( nserial != sd->serial )