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

List:       kde-commits
Subject:    kdelibs/kdecore/network
From:       Thiago Macieira <thiago () kde ! org>
Date:       2005-02-28 4:30:34
Message-ID: 20050228043034.048A6148A2 () office ! kde ! org
[Download RAW message or body]

CVS commit by thiago: 

Fixing the bug in which the flags didn't get propagated correctly.
This was accidentally committed to KDE_3_4_BRANCH first. It shouldn't
have been.


  M +12 -7     kresolverstandardworkers.cpp   1.17


--- kdelibs/kdecore/network/kresolverstandardworkers.cpp  #1.16:1.17
@@ -47,4 +47,5 @@
 #include "kglobal.h"
 #include "kstandarddirs.h"
+#include "kapplication.h"
 
 #include "kresolver.h"
@@ -85,4 +86,7 @@ void KBlacklistWorker::init()
 void KBlacklistWorker::loadBlacklist()
 {
+  if (!kapp)
+    return;
+
   QStringList filelist = KGlobal::dirs()->findAllResources("config", "ipv6blacklist");
 
@@ -363,9 +367,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)
     { }
 
@@ -406,10 +411,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
@@ -868,5 +873,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,
@@ -938,5 +943,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]