[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-13 3:02:56
Message-ID: 20050213030256.36A1E1D1BD () office ! kde ! org
[Download RAW message or body]

CVS commit by thiago: 

Moved ipv6blacklist to work only on non-IPv4 hosts. This way, this can
no longer be considered for "adblocking", but it can be used to kill
broken sites.

The old feature of full blocking is no longer present.

CCMAIL:kde-core-devel@kde.org


  M +15 -1     kresolverstandardworkers.cpp   1.16


--- kdelibs/kdecore/network/kresolverstandardworkers.cpp  #1.15:1.16
@@ -231,4 +231,9 @@ namespace
         my_h_errno = HOST_NOT_FOUND;
 
+        // check blacklist
+        if (m_af != AF_INET && 
+            KBlacklistWorker::isBlacklisted(QString::fromLatin1(m_hostname)))
+          break;
+
 # ifdef USE_GETHOSTBYNAME2_R
         buf = new char[buflen];
@@ -378,4 +383,13 @@ namespace
   bool GetAddrInfoThread::run()
   {
+    // check blacklist
+    if ((m_af != AF_INET && m_af != AF_UNSPEC) && 
+        KBlacklistWorker::isBlacklisted(QString::fromLatin1(m_node)))
+      {
+        results.setError(KResolver::NoName);
+        finished();
+        return false;           // failed
+      }
+
     do
       {
@@ -988,5 +1002,5 @@ void KNetwork::Internal::initStandardWor
   KBlacklistWorker::init();
 
-  KResolverWorkerFactoryBase::registerNewWorker(new KResolverWorkerFactory<KBlacklistWorker>);
+  //KResolverWorkerFactoryBase::registerNewWorker(new KResolverWorkerFactory<KBlacklistWorker>);
   KResolverWorkerFactoryBase::registerNewWorker(new KResolverWorkerFactory<KStandardWorker>);
 


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