Changeset 12 for psi/trunk

Timestamp:

09/05/06 01:09:16 (2 years ago)

Author:

dmik

Message:

CuteStuff/Network?: Added alternative implementation of the NDns class using the QDns functionality (necessary because NO_NDNS macro doesn't work properly but on some platforms it's better to use the standard QDns class for DNS resolving). The MAP_NDNS_TO_QDNS C++ macro must be defined to enable this implementation.

Location:

psi/trunk/cutestuff/network

Files:

• ndns.cpp (modified) (12 diffs)
• ndns.h (modified) (2 diffs)

psi/trunk/cutestuff/network/ndns.cpp

@@ -48 +48 @@
 //! QString ip_address = dns.resultString();
 //! \endcode
+//!
+//! \note The MAP_NDNS_TO_QDNS macro can be used to use QDns to implement the
+//! NDns functionality. This is a but stupid, because it is supposed that if
+//! NO_NDNS macro is defined, QDns is directly used instead of NDns in the
+//! relevant sources. However, I (dmik) couln't get the DNS resolver working
+//! when NO_NDNS is defined and was too lazy to debug why. The reason for using
+//! QDns instead of NDns is pretty simple: it's impossible to cancel the async
+//! gethostbyname() request executed on a worker thread (for example, during
+//! application termination). As a result, in case of a lost connection (or
+//! whatever), Psi won't close until the gethostbyname() timeout expires which
+//! can take quite a while on OS/2. On the other hand, QDns is fully asynchronus
+//! there, so NDns is absolutely not necessary.
 
 #include"ndns.h"
@@ -56 +68 @@
 #include<qeventloop.h>
 
-#ifdef Q_OS_UNIX
+#if !defined(MAP_NDNS_TO_QDNS)
+
+#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
 #include<netdb.h>
 #include<sys/types.h>
@@ -67 +81 @@
 #endif
 
+#endif
+
 // CS_NAMESPACE_BEGIN
+
+#if defined(MAP_NDNS_TO_QDNS)
+
+// dummy methods necessary because MOC doesn't understand #ifdefs and such
+NDnsManager::NDnsManager() {}
+NDnsManager::~NDnsManager() {}
+bool NDnsManager::event(QEvent *e) { return false; }
+void NDnsManager::app_aboutToQuit() {}
+
+#else // !MAP_NDNS_TO_QDNS
 
 //! \if _hide_doc_
@@ -248 +274 @@
 }
 
+#endif // !MAP_NDNS_TO_QDNS
+
 
 //----------------------------------------------------------------------------
@@ -261 +289 @@
 :QObject(parent)
 {
+#if defined(MAP_NDNS_TO_QDNS)
+        connect(&qdns, SIGNAL(resultsReady()), this, SIGNAL(resultsReady())); 
+#endif  
 }
 
@@ -267 +298 @@
 NDns::~NDns()
 {
+#if !defined(MAP_NDNS_TO_QDNS)
         stop();
+#endif  
 }
 
@@ -274 +307 @@
 void NDns::resolve(const QString &host)
 {
+#if defined(MAP_NDNS_TO_QDNS)
+        qdns.setLabel(host);
+        if (qdns.recordType() != QDns::A) 
+                qdns.setRecordType(QDns::A);
+#else
         stop();
         if(!man)
                 man = new NDnsManager;
         man->resolve(this, host);
+#endif  
 }
 
@@ -285 +324 @@
 void NDns::stop()
 {
+#if defined(MAP_NDNS_TO_QDNS)
+        qdns.setRecordType(QDns::None);
+#else
         if(man)
                 man->stop(this);
+#endif  
 }
 
@@ -294 +337 @@
 uint NDns::result() const
 {
+#if defined(MAP_NDNS_TO_QDNS)
+        QHostAddress addr;
+        QValueList<QHostAddress> list = qdns.addresses();
+        if (!list.isEmpty())
+                addr = list.first();
         return addr.ip4Addr();
+#else
+        return addr.ip4Addr();
+#endif  
 }
 
@@ -302 +353 @@
 QString NDns::resultString() const
 {
+#if defined(MAP_NDNS_TO_QDNS)
+        QHostAddress addr;
+        QValueList<QHostAddress> list = qdns.addresses();
+        if (!list.isEmpty())
+                addr = list.first();
         return addr.toString();
+#else
+        return addr.toString();
+#endif  
 }
 
@@ -309 +368 @@
 bool NDns::isBusy() const
 {
+#if defined(MAP_NDNS_TO_QDNS)
+        return qdns.isWorking();
+#else
         if(!man)
                 return false;
         return man->isBusy(this);
-}
+#endif  
+}
+
+#if !defined(MAP_NDNS_TO_QDNS)
 
 void NDns::finished(const QHostAddress &a)
@@ -374 +439 @@
 }
 
+#endif // !MAP_NDNS_TO_QDNS
+
 // CS_NAMESPACE_END

psi/trunk/cutestuff/network/ndns.h

@@ -28 +28 @@
 #include<qhostaddress.h>
 
+#if defined(MAP_NDNS_TO_QDNS)
+#include <qdns.h>
+#endif
+
 // CS_NAMESPACE_BEGIN
 
+#if !defined(MAP_NDNS_TO_QDNS)
 class NDnsWorker;
 class NDnsManager;
+#endif
 
 class NDns : public QObject
@@ -51 +57 @@
 
 private:
+#if defined(MAP_NDNS_TO_QDNS)
+        QDns qdns;
+#else
         QHostAddress addr;
 
         friend class NDnsManager;
         void finished(const QHostAddress &);
+#endif  
 };