[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdelibs/kdecore/network
From:       Thiago Macieira <thiago () kde ! org>
Date:       2005-02-28 4:35:17
Message-ID: 20050228043517.650AB148A2 () office ! kde ! org
[Download RAW message or body]

CVS commit by thiago: 

(Backport 1.16:1.17, modified) Backporting the fix.


  M +10 -7     kresolverstandardworkers.cpp   1.10.2.4


--- kdelibs/kdecore/network/kresolverstandardworkers.cpp  #1.10.2.3:1.10.2.4
@@ -42,4 +42,6 @@
 #include <qstrlist.h>
 
+#include "kapplication.h"
+
 #include "kresolver.h"
 #include "ksocketaddress.h"
@@ -245,9 +247,10 @@ namespace
     QCString m_serv;
     int m_af;
+    int m_flags;
     KResolverResults& results;
 
-    GetAddrInfoThread(const char* node, const char* serv, int af,
+    GetAddrInfoThread(const char* node, const char* serv, int af, int flags,
                       KResolverResults* res) :
-      m_node(node), m_serv(serv), m_af(af), results(*res)
+      m_node(node), m_serv(serv), m_af(af), m_flags(flags), results(*res)
     { }
 
@@ -283,10 +286,10 @@ namespace
       hint.ai_socktype = SOCK_STREAM; // default
 
-    if (flags() & KResolver::Passive)
+    if (m_flags & KResolver::Passive)
       hint.ai_flags |= AI_PASSIVE;
-    if (flags() & KResolver::CanonName)
+    if (m_flags & KResolver::CanonName)
       hint.ai_flags |= AI_CANONNAME;
 # ifdef AI_NUMERICHOST
-    if (flags() & KResolver::NoResolve)
+    if (m_flags & KResolver::NoResolve)
       hint.ai_flags |= AI_NUMERICHOST;
 # endif
@@ -734,5 +737,5 @@ bool KStandardWorker::run()
         worker = new GetAddrInfoThread(m_encodedName, 
                                        serviceName().latin1(),
-                                       families[i].af, res);
+                                       families[i].af, flags(), res);
 #else
         worker = new GetHostByNameThread(m_encodedName, port, scopeid,
@@ -804,5 +807,5 @@ bool KGetAddrinfoWorker::run()
   // make an AF_UNSPEC getaddrinfo(3) call
   GetAddrInfoThread worker(m_encodedName, serviceName().latin1(), 
-                           AF_UNSPEC, &results);
+                           AF_UNSPEC, flags(), &results);
 
   if (!worker.run())


[prev in list] [next in list] [prev in thread] [next in thread]