Changeset 1154 for trunk/pdns/modules/opendbxbackend/odbxprivate.cc

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)

Files:

• trunk/pdns/modules/opendbxbackend/odbxprivate.cc (modified) (5 diffs)

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 )