Changeset 8 for trunk/src/network/qdns.cpp

Timestamp:

Nov 16, 2005, 8:36:46 PM (20 years ago)

Author:

dmik

Message:

Transferred Qt for OS/2 version 3.3.1-rc5 sources from the CVS

File:

• trunk/src/network/qdns.cpp (modified) (12 diffs)

trunk/src/network/qdns.cpp

@@ -79 +79 @@
 #include <dlfcn.h>
 #endif
+#if defined(Q_OS_OS2)
+//@@TODO (dmik): currently these headers are not used
+//  (see comments to QDns::doSynchronousLookup())
+//#include <netinet/in.h>
+//#include <resolv.h>
+#endif
 
 //#define QDNS_DEBUG
@@ -105 +111 @@
 static bool ipv6support = FALSE;
 
+#if defined(Q_OS_OS2)
+//@@TODO (dmik): currently qdns_res_init() is not used
+//  (see comments to QDns::doSynchronousLookup())
+#else
 static int qdns_res_init()
 {
@@ -116 +126 @@
     else
         return -1;
-#elif defined(Q_OS_UNIX)
+#elif defined(Q_OS_UNIX) || defined(Q_OS_OS2) 
     return res_init();
 #else
@@ -122 +132 @@
 #endif
 }
+#endif
 
 
@@ -129 +140 @@
     {
 #if defined(Q_DNS_SYNCHRONOUS)
-#if defined(Q_OS_UNIX)
+#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
         noEventLoop = qApp==0 || qApp->loopLevel()==0;
 #else
@@ -881 +892 @@
 {
     if ( !globalManager ) {
+        new QDnsManager();
         qAddPostRoutine(cleanupDns);
-        new QDnsManager();
     }
     return globalManager;
@@ -2443 +2454 @@
 }
 
-#elif defined(Q_OS_UNIX)
+#elif defined(Q_OS_UNIX) || defined(Q_OS_OS2)
 
 #if defined(Q_DNS_SYNCHRONOUS)
 void QDns::doSynchronousLookup()
 {
+#if defined(Q_OS_OS2)
+    //@@TODO (dmik): we can use the code below on OS/2 also but this will
+    //  require linking against the additional library containing res_*
+    //  functions and global data, which is normally not used anywhere else
+    //  (because QDns implementation does lookups diretcly to achieve
+    //  asynchronous behavior) and will just waste some system resources.
+    //  Anyhow, is synchronous behavior really necessary? Do nothing for now.
+#else
     if ( t!=None && !l.isEmpty() ) {
         QValueListIterator<QString> it = n.begin();
@@ -2499 +2518 @@
         emit resultsReady();
     }
+#endif
 }
 #endif
@@ -2517 +2537 @@
 
     // read resolv.conf manually.
+#if defined(Q_OS_OS2)
+    char *etc = getenv( "ETC" );
+    if ( !etc ) {
+        etc = "x:\\MPTN\\ETC";
+        ULONG boot = 0;
+        DosQuerySysInfo( QSV_BOOT_DRIVE, QSV_BOOT_DRIVE, (PVOID)boot, sizeof(boot) );
+        *etc = (char)(boot + 'A' - 1);
+    }
+    // currently, resolv takes precedence over resolv2 assuming that resolv
+    // is created for PPP connections and therefore should override resolv2
+    // which is created for permanent LAN connections.
+    QFile resolvConf( QString( etc ) + "\\resolv" );
+    if ( !resolvConf.exists() )
+        resolvConf.setName( QString( etc ) + "\\resolv2" ); 
+#else
     QFile resolvConf("/etc/resolv.conf");
+#endif    
     if (resolvConf.open(IO_ReadOnly)) {
         QTextStream stream( &resolvConf );
@@ -2529 +2565 @@
             if ( type == "nameserver" ) {
                 QHostAddress *address = new QHostAddress();
-                if ( address->setAddress( QString(line[1]) ) ) {
+                if ( address->setAddress( list[1] ) ) {
                     // only add ipv6 addresses from resolv.conf if
                     // this host supports ipv6.
@@ -2548 +2584 @@
     }
 
+#if defined(Q_OS_OS2)
+//@@TODO (dmik): currently the code below is not used
+//  (see comments to QDns::doSynchronousLookup())
+#else
     if (ns->isEmpty()) {
 #if defined(Q_MODERN_RES_API)
@@ -2594 +2634 @@
         }
     }
-
+#endif    
+
+#if defined(Q_OS_OS2)
+    QFile hosts( QString( etc ) + "\\hosts" );
+#else
     QFile hosts( QString::fromLatin1( "/etc/hosts" ) );
+#endif    
     if ( hosts.open( IO_ReadOnly ) ) {
         // read the /etc/hosts file, creating long-life A and PTR RRs