Changeset 561

Timestamp:

01/18/06 23:01:16 (7 years ago)

Author:

ahu

Message:

opendbx updates by Norbert

Location:

trunk/pdns/modules/opendbxbackend

Files:

• odbxbackend.cc (modified) (4 diffs)
• odbxbackend.hh (modified) (3 diffs)
• odbxprivate.cc (modified) (1 diff)

trunk/pdns/modules/opendbxbackend/odbxbackend.cc

@@ -66 +66 @@
 {
         const char* tmp;
-        string stmt, type;
+        string stmt;
 
 
@@ -84 +84 @@
                         di.master = "";
                         di.last_check = 0;
+                        di.notified_serial = 0;
+                        di.kind = DomainInfo::Native;
                         di.backend = this;
-                        type = "";
+                        di.serial = 0;
 
                         if( ( tmp = odbx_field_value( m_result, 0 ) ) != NULL )
@@ -99 +101 @@
                         if( ( tmp = odbx_field_value( m_result, 2 ) ) != NULL )
                         {
+                                if( !strncmp( tmp, "SLAVE", 5 ) )
+                                {
+                                        di.kind = DomainInfo::Slave;
+                                }
+                                else if( !strncmp( tmp, "MASTER", 6 ) )
+                                {
+                                        di.kind = DomainInfo::Master;
+                                }
+                        }
+
+                        if( ( tmp = odbx_field_value( m_result, 3 ) ) != NULL )
+                        {
                                 di.master = string( tmp );
                         }
 
-                        if( ( tmp = odbx_field_value( m_result, 3 ) ) != NULL )
+                        if( ( tmp = odbx_field_value( m_result, 5 ) ) != NULL )
                         {
                                 di.last_check = strtol( tmp, NULL, 10 );
                         }
 
-                        if( ( tmp = odbx_field_value( m_result, 5 ) ) != NULL )
-                        {
-                                type = string( tmp );
-                        }
-
-                        di.kind = DomainInfo::Native;
-
-                        if( type == "SLAVE" )
+                        if( ( tmp = odbx_field_value( m_result, 6 ) ) != NULL )
                         {
                                 SOAData sd;
 
                                 sd.serial = 0;
-
-                                if( ( tmp = odbx_field_value( m_result, 6 ) ) != NULL )
-                                {
                                         DNSPacket::fillSOAData( string( tmp ), sd );
-                                }
-                                else
-                                {
-                                        L.log( m_myname + " getDomainInfo: No serial for '" + domain + "' found", Logger::Notice );
-                                }
-
                                 di.serial = sd.serial;
-                                di.kind = DomainInfo::Slave;
-                        }
-                        else if( type == "MASTER" )
-                        {
-                                di.kind = DomainInfo::Master;
                         }
                 }
@@ -260 +253 @@
                         if( ( tmp = odbx_field_value( m_result, 0 ) ) != NULL )
                         {
+                                rr.domain_id = strtol( tmp, NULL, 10 );
+                        }
+
+                        if( m_qname.empty() && ( tmp = odbx_field_value( m_result, 1 ) ) != NULL )
+                        {
+                                rr.qname = string( tmp );
+                        }
+
+                        if( ( tmp = odbx_field_value( m_result, 2 ) ) != NULL )
+                        {
+                                rr.qtype = QType( tmp );
+                        }
+
+                        if( ( tmp = odbx_field_value( m_result, 3 ) ) != NULL )
+                        {
+                                rr.ttl = strtoul( tmp, NULL, 10 );
+                        }
+
+                        if( ( tmp = odbx_field_value( m_result, 4 ) ) != NULL )
+                        {
+                                rr.priority = (u_int16_t) strtoul( tmp, NULL, 10 );
+                        }
+
+                        if( ( tmp = odbx_field_value( m_result, 5 ) ) != NULL )
+                        {
                                 rr.content = string( tmp );
-                        }
-
-                        if( ( tmp = odbx_field_value( m_result, 1 ) ) != NULL )
-                        {
-                                rr.ttl = strtoul( tmp, NULL, 10 );
-                        }
-
-                        if( ( tmp = odbx_field_value( m_result, 2 ) ) != NULL )
-                        {
-                                rr.priority = (u_int16_t) strtoul( tmp, NULL, 10 );
-                        }
-
-                        if( ( tmp = odbx_field_value( m_result, 3 ) ) != NULL )
-                        {
-                                rr.qtype = QType( tmp );
-                        }
-
-                        if( ( tmp = odbx_field_value( m_result, 4 ) ) != NULL )
-                        {
-                                rr.domain_id = strtol( tmp, NULL, 10 );
-                        }
-
-                        if( m_qname.empty() && ( tmp = odbx_field_value( m_result, 5 ) ) != NULL )
-                        {
-                                rr.qname = string( tmp );
                         }
 

trunk/pdns/modules/opendbxbackend/odbxbackend.hh

@@ -114 +114 @@
                 declare( suffix, "password","Password for connecting to the DBMS","");
 
-                declare( suffix, "sql-list", "AXFR query", "SELECT content, ttl, prio, type, domain_id, name FROM records WHERE domain_id=':id'" );
+                declare( suffix, "sql-list", "AXFR query", "SELECT domain_id, name, type, ttl, prio, content FROM records WHERE domain_id=':id'" );
 
-                declare( suffix, "sql-lookup", "Lookup query","SELECT content, ttl, prio, type, domain_id, name FROM records WHERE name=':name'" );
-                declare( suffix, "sql-lookupid", "Lookup query with id","SELECT content, ttl, prio, type, domain_id, name FROM records WHERE name=':name' AND domain_id=':id'" );
-                declare( suffix, "sql-lookuptype", "Lookup query with type","SELECT content, ttl, prio, type, domain_id, name FROM records WHERE type=':type' AND name=':name'" );
-                declare( suffix, "sql-lookuptypeid", "Lookup query with type and id","SELECT content, ttl, prio, type, domain_id, name FROM records WHERE type=':type' AND name=':name' AND 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-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.master, d.last_check, d.notified_serial, d.type, r.content FROM domains AS d LEFT JOIN records AS r ON d.id=r.domain_id WHERE ( d.name=':name' AND r.type='SOA' ) OR ( d.name=':name' AND r.domain_id IS NULL )" );
+                declare( suffix, "sql-zoneinfo","Get domain info","SELECT d.id, d.name, d.type, d.master, d.last_check, r.content FROM domains AS d LEFT JOIN records AS r ON d.id=r.domain_id WHERE ( d.name=':name' AND r.type='SOA' ) OR ( d.name=':name' AND r.domain_id IS NULL )" );
 
                 declare( suffix, "sql-transactbegin", "Start transaction", "BEGIN" );
@@ -128 +128 @@
                 declare( suffix, "sql-transactabort", "Abort transaction", "ROLLBACK" );
 
-                declare( suffix, "sql-insert-slave","Add slave domain", "INSERT INTO domains ( type, name, master, account ) VALUES ( 'SLAVE', '%s', '%s', '%s' )" );
+                declare( suffix, "sql-insert-slave","Add slave domain", "INSERT INTO domains ( name, type, master, account ) VALUES ( '%s', 'SLAVE', '%s', '%s' )" );
                 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' )" );
 
@@ -134 +134 @@
                 declare( suffix, "sql-update-lastcheck", "Set time of last check", "UPDATE domains SET last_check='%d' WHERE id='%d'" );
 
-                declare( suffix, "sql-master", "Get master record for zone", "SELECT master FROM domains WHERE type='SLAVE' AND name=':name'" );
+                declare( suffix, "sql-master", "Get master record for zone", "SELECT master FROM domains WHERE name=':name' AND type='SLAVE'" );
                 declare( suffix, "sql-supermaster","Get supermaster info", "SELECT account FROM supermasters WHERE ip=':ip' AND nameserver=':ns'" );
 
-                declare( suffix, "sql-infoslaves", "Get all unfresh slaves", "SELECT d.id, d.name, d.master, d.last_check, d.notified_serial, r.change_date, r.content FROM domains AS d LEFT JOIN records AS r ON d.id=r.domain_id WHERE ( d.type='SLAVE' AND r.type='SOA' ) OR ( d.type='SLAVE' AND r.domain_id IS NULL )" );
-                declare( suffix, "sql-infomasters", "Get all updated masters", "SELECT d.id, d.name, d.master, d.last_check, d.notified_serial, r.change_date, r.content FROM domains AS d, records AS r WHERE d.type='MASTER' AND d.id=r.domain_id AND r.type='SOA'" );
+                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 AS d LEFT JOIN records AS r ON d.id=r.domain_id WHERE ( d.type='SLAVE' AND r.type='SOA' ) OR ( d.type='SLAVE' AND r.domain_id IS NULL )" );
+                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 AS d, records AS r WHERE d.type='MASTER' AND d.id=r.domain_id AND r.type='SOA'" );
         }
 

trunk/pdns/modules/opendbxbackend/odbxprivate.cc

@@ -139 +139 @@
                 if( ( tmp = odbx_field_value( m_result, 4 ) ) != NULL )
                 {
+                        nlast = strtol( tmp, NULL, 10 );
+                }
+
+                if( ( tmp = odbx_field_value( m_result, 3 ) ) != NULL )
+                {
                         nserial = strtol( tmp, NULL, 10 );
-                }
-
-                if( ( tmp = odbx_field_value( m_result, 3 ) ) != NULL )
-                {
-                        nlast = strtol( tmp, NULL, 10 );
                 }