Remove Qt3 code from libmythupnp

mythtv/docs/doxygen-create-developer-docs.cfg

@@ -902,14 +902,6 @@ EXCLUDE_PATTERNS       = */moc/* \
                          */test/* \
                          */.git
 
-# Skip files from the Qt3Support module.
-EXCLUDE_PATTERNS      += mmembuf.cpp \
-                         mmembuf.h \
-                         msocketdevice.cpp \
-                         msocketdevice.h \
-                         msocketdevice_unix.cpp \
-                         msocketdevice_win.cpp
-
 # Example code
 EXCLUDE_PATTERNS      += example.cpp
 

mythtv/libs/libmyth/backendselect.cpp

@@ -36,7 +36,7 @@ BackendSelection::BackendSelection(
 
 BackendSelection::~BackendSelection()
 {
-    SSDP::RemoveListener(this);
+    SSDPCache::Instance()->removeListener(this);
 
     ItemMap::iterator it;
     for (it = m_devices.begin(); it != m_devices.end(); ++it)
@@ -253,7 +253,7 @@ void BackendSelection::Cancel(void)
 
 void BackendSelection::Load(void)
 {
-    SSDP::AddListener(this);
+    SSDPCache::Instance()->addListener(this);
     SSDP::Instance()->PerformSearch(SSDP::kBackendURI);
 }
 
@@ -334,7 +334,7 @@ void BackendSelection::customEvent(QEvent *event)
         if (message.startsWith("SSDP_ADD") &&
             URI.startsWith("urn:schemas-mythtv-org:device:MasterMediaServer:"))
         {
-            DeviceLocation *devLoc = SSDP::Find(URI, URN);
+            DeviceLocation *devLoc = SSDPCache::Instance()->Find(URI, URN);
             if (devLoc)
             {
                 AddItem(devLoc);

mythtv/libs/libmyth/mythcontext.cpp

@@ -1187,7 +1187,7 @@ int MythContext::Impl::UPnPautoconf(const std::chrono::milliseconds milliSeconds
         }
     }
 
-    SSDPCacheEntries *backends = SSDP::Find(SSDP::kBackendURI);
+    SSDPCacheEntries *backends = SSDPCache::Instance()->Find(SSDP::kBackendURI);
 
     if (!backends)
     {
@@ -1204,7 +1204,7 @@ int MythContext::Impl::UPnPautoconf(const std::chrono::milliseconds milliSeconds
     else
     {
         LOG(VB_GENERAL, LOG_ERR,
-            "No UPnP backends found, but SSDP::Find() not NULL");
+            "No UPnP backends found, but SSDPCache::Instance()->Find() not NULL");
     }
 
     if (count != 1)
@@ -1274,7 +1274,7 @@ bool MythContext::Impl::DefaultUPnP(QString& Error)
     searchTime.start();
     while (totalTime.elapsed() < timeout_ms)
     {
-        devicelocation = SSDP::Find(SSDP::kBackendURI, usn);
+        devicelocation = SSDPCache::Instance()->Find(SSDP::kBackendURI, usn);
         if (devicelocation)
             break;
 

mythtv/libs/libmythbase/portchecker.cpp

@@ -25,6 +25,7 @@
 #include <QCoreApplication>
 #include <QHostAddress>
 #include <QTcpSocket>
+#include <QThread>
 #include <QEventLoop>
 #include <QNetworkInterface>
 #include <QNetworkAddressEntry>
@@ -110,93 +111,110 @@ bool PortChecker::checkPort(QString &host, int port, std::chrono::milliseconds t
     MythTimer timer(MythTimer::kStartRunning);
     QTcpSocket socket(this);
     QAbstractSocket::SocketState state = QAbstractSocket::UnconnectedState;
-    int retryCount = 0;
     QString scope;
     bool testedAll = false;
     while (state != QAbstractSocket::ConnectedState
         && (timer.elapsed() < timeLimit))
     {
-        if (state == QAbstractSocket::UnconnectedState)
-        {
 // Windows does not need the scope on the ip address so we can skip
 // some processing
 #ifndef _WIN32
-            int iCardsEnd = 0;
-            if (islinkLocal && !gCoreContext->GetScopeForAddress(addr))
+        int iCardsEnd = 0;
+        if (islinkLocal && !gCoreContext->GetScopeForAddress(addr))
+        {
+            addr.setScopeId(QString());
+            while (addr.scopeId().isEmpty() && iCardsEnd<2)
             {
-                addr.setScopeId(QString());
-                while (addr.scopeId().isEmpty() && iCardsEnd<2)
+                // search for the next available IPV6 interface.
+                if (iCard.hasNext())
                 {
-                    // search for the next available IPV6 interface.
-                    if (iCard.hasNext())
+                    QNetworkInterface card = iCard.next();
+                    LOG(VB_GENERAL, LOG_DEBUG, QString("Trying interface %1").arg(card.name()));
+                    unsigned int flags = card.flags();
+                    if ((flags & QNetworkInterface::IsLoopBack)
+                     || !(flags & QNetworkInterface::IsRunning))
+                        continue;
+                    // check that IPv6 is enabled on that interface
+                    QList<QNetworkAddressEntry> addresses = card.addressEntries();
+                    bool foundv6 = false;
+                    for (const auto& ae : std::as_const(addresses))
                     {
-                        QNetworkInterface card = iCard.next();
-                        LOG(VB_GENERAL, LOG_DEBUG, QString("Trying interface %1").arg(card.name()));
-                        unsigned int flags = card.flags();
-                        if ((flags & QNetworkInterface::IsLoopBack)
-                         || !(flags & QNetworkInterface::IsRunning))
-                            continue;
-                        // check that IPv6 is enabled on that interface
-                        QList<QNetworkAddressEntry> addresses = card.addressEntries();
-                        bool foundv6 = false;
-                        for (const auto& ae : std::as_const(addresses))
-                        {
-                            if (ae.ip().protocol() == QAbstractSocket::IPv6Protocol)
-                            {
-                                foundv6 = true;
-                                break;
-                            }
-                        }
-                        if (foundv6)
+                        if (ae.ip().protocol() == QAbstractSocket::IPv6Protocol)
                         {
-                            scope = card.name();
-                            addr.setScopeId(scope);
+                            foundv6 = true;
                             break;
                         }
                     }
-                    else
+                    if (foundv6)
                     {
-                        // Get a new list in case a new interface
-                        // has been added.
-                        cards = QNetworkInterface::allInterfaces();
-                        iCard = cards;
-                        iCard.toFront();
-                        testedAll=true;
-                        iCardsEnd++;
+                        scope = card.name();
+                        addr.setScopeId(scope);
+                        break;
                     }
                 }
+                else
+                {
+                    // Get a new list in case a new interface
+                    // has been added.
+                    cards = QNetworkInterface::allInterfaces();
+                    iCard = cards;
+                    iCard.toFront();
+                    testedAll=true;
+                    iCardsEnd++;
+                }
             }
-            if (iCardsEnd > 1)
-            {
-                LOG(VB_GENERAL, LOG_ERR, LOC + QString("There is no IPV6 compatible interface for %1")
-                  .arg(host));
-                break;
-            }
-#endif
-            QString dest;
-            if (isIPAddress)
-                dest=addr.toString();
-            else
-                dest=host;
-            socket.connectToHost(dest, port);
-            retryCount=0;
         }
+        if (iCardsEnd > 1)
+        {
+            LOG(VB_GENERAL, LOG_ERR, LOC + QString("There is no IPV6 compatible interface for %1")
+              .arg(host));
+            break;
+        }
+#endif
+        QString dest;
+        if (isIPAddress)
+            dest=addr.toString();
         else
+            dest=host;
+        socket.connectToHost(dest, port);
+
+        MythTimer attempt_time {MythTimer::kStartRunning};
+        static constexpr std::chrono::milliseconds k_poll_interval {1ms};
+        while (state != QAbstractSocket::ConnectedState
+                && (timer.elapsed() < timeLimit)
+                && attempt_time.elapsed() < 3s
+               )
         {
-            retryCount++;
+            if (QCoreApplication::instance() != nullptr &&
+                QThread::currentThread() == QCoreApplication::instance()->thread()
+                )
+            {
+                QCoreApplication::processEvents(QEventLoop::AllEvents, k_poll_interval.count());
+                std::this_thread::sleep_for(1ns); // force thread to be de-scheduled
+            }
+            else
+            {
+                std::this_thread::sleep_for(k_poll_interval);
+            }
+            state = socket.state();
+            LOG(VB_GENERAL, LOG_DEBUG, LOC + QString("host %1 port %2 socket state %3, attempt time: %4")
+                .arg(host, QString::number(port), QString::number(state),
+                    QString::number(attempt_time.elapsed().count())
+                    )
+                );
+            // Check if user got impatient and canceled
+            if (m_cancelCheck)
+                break;
+            if (linkLocalOnly && testedAll
+                && state == QAbstractSocket::UnconnectedState
+                && attempt_time.elapsed() > 500ms
+                )
+                break;
         }
-        // This retry count of 6 means 3 seconds of waiting for
-        // connection before aborting and starting a new connection attempt.
-        if (retryCount > 6)
-            socket.abort();
-        processEvents();
+        socket.abort();
         // Check if user got impatient and canceled
         if (m_cancelCheck)
             break;
-        std::this_thread::sleep_for(500ms);
-        state = socket.state();
-        LOG(VB_GENERAL, LOG_DEBUG, LOC + QString("socket state %1")
-            .arg(state));
         if (linkLocalOnly
           && state == QAbstractSocket::UnconnectedState
           && testedAll)
@@ -208,8 +226,6 @@ bool PortChecker::checkPort(QString &host, int port, std::chrono::milliseconds t
        gCoreContext->SetScopeForAddress(addr);
        host = addr.toString();
     }
-    socket.abort();
-    processEvents();
     return (state == QAbstractSocket::ConnectedState);
 }
 
@@ -234,12 +250,6 @@ bool PortChecker::resolveLinkLocal(QString &host, int port, std::chrono::millise
     return checker.checkPort(host,port,timeLimit,true);
 }
 
-void PortChecker::processEvents(void)
-{
-    qApp->processEvents(QEventLoop::AllEvents, 250);
-    qApp->processEvents(QEventLoop::AllEvents, 250);
-}
-
 /**
  * Cancel the checkPort operation currently in progress.
  *

mythtv/libs/libmythbase/portchecker.h

@@ -59,7 +59,6 @@ class MBASE_PUBLIC PortChecker : public QObject
 
   private:
     bool m_cancelCheck {false};
-    static void processEvents(void);
 };
 
 #endif

mythtv/libs/libmythtv/recorders/satiputils.cpp

@@ -10,6 +10,7 @@
 #include "libmythbase/mythlogging.h"
 #include "libmythbase/mythtimer.h"
 #include "libmythupnp/ssdp.h"
+#include "libmythupnp/ssdpcache.h"
 
 #include "cardutil.h"
 #include "satiputils.h"
@@ -55,7 +56,7 @@ QStringList SatIP::doUPNPsearch(bool loginfo)
 {
     QStringList result;
 
-    SSDPCacheEntries *satipservers = SSDP::Find(SATIP_URI);
+    SSDPCacheEntries *satipservers = SSDPCache::Instance()->Find(SATIP_URI);
 
     if (!satipservers)
     {
@@ -73,7 +74,7 @@ QStringList SatIP::doUPNPsearch(bool loginfo)
     }
     else
     {
-        LOG(VB_GENERAL, LOG_ERR, LOC + "No UPnP Sat>IP servers found, but SSDP::Find() != NULL");
+        LOG(VB_GENERAL, LOG_ERR, LOC + "No UPnP Sat>IP servers found, but SSDPCache::Instance()->Find() != NULL");
     }
 
     EntryMap map;
@@ -139,7 +140,7 @@ QStringList SatIP::doUPNPsearch(bool loginfo)
 QStringList SatIP::findServers(void)
 {
     QStringList devs;
-    SSDPCacheEntries *satipservers = SSDP::Find(SATIP_URI);
+    SSDPCacheEntries *satipservers = SSDPCache::Instance()->Find(SATIP_URI);
     if (satipservers && satipservers->Count() > 0)
     {
         devs = SatIP::doUPNPsearch(false);

mythtv/libs/libmythtv/recorders/vboxutils.cpp

@@ -5,12 +5,14 @@
 #include <QString>
 #include <QStringList>
 #include <QDomDocument>
+#include <QRegularExpression>
 
 // MythTV headers
 #include "libmythbase/mythdownloadmanager.h"
 #include "libmythbase/mythlogging.h"
 #include "libmythbase/mythtimer.h"
 #include "libmythupnp/ssdp.h"
+#include "libmythupnp/ssdpcache.h"
 #include "vboxutils.h"
 
 #define LOC QString("VBox: ")
@@ -67,7 +69,7 @@ QStringList VBox::doUPNPSearch(void)
 {
     QStringList result;
 
-    SSDPCacheEntries *vboxes = SSDP::Find(VBOX_URI);
+    SSDPCacheEntries *vboxes = SSDPCache::Instance()->Find(VBOX_URI);
 
     if (!vboxes)
     {
@@ -84,7 +86,7 @@ QStringList VBox::doUPNPSearch(void)
     else
     {
         LOG(VB_GENERAL, LOG_ERR, LOC +
-            "No UPnP VBoxes found, but SSDP::Find() not NULL");
+            "No UPnP VBoxes found, but SSDPCache::Instance()->Find() not NULL");
     }
 
     EntryMap map;