Networking fix for selecting correct interface for accessmanager

alamminsalo · Mar 18, 2016 · fa977a4 · fa977a4
1 parent 5cd64ae
commit fa977a4
Show file tree

Hide file tree

Showing 4 changed files with 109 additions and 6 deletions.
diff --git a/src/network/networkmanager.cpp b/src/network/networkmanager.cpp
@@ -2,14 +2,15 @@
 #include "../util/fileutils.h"
 #include "../util/jsonparser.h"
 #include "../util/m3u8parser.h"
+#include <QNetworkConfiguration>
+#include <QEventLoop>
 
 NetworkManager::NetworkManager()
 {
     operation = new QNetworkAccessManager();
 
-    //Set configuration
-    conf = new QNetworkConfigurationManager();
-    operation->setConfiguration(conf->defaultConfiguration());
+    //Select interface
+    selectNetworkInterface();
 
     //SSL errors handle (down the drain)
     connect(operation, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)), this, SLOT(handleSslErrors(QNetworkReply*,QList<QSslError>)));
@@ -22,7 +23,100 @@ NetworkManager::~NetworkManager()
 {
     qDebug() << "Destroyer: NetworkManager";
     operation->deleteLater();
-    conf->deleteLater();
+}
+
+void NetworkManager::selectNetworkInterface()
+{
+    //Chooses a working network interface from interfaces list, if default configuration doesn't work
+
+    QNetworkConfigurationManager conf;
+    connectionOK = false;
+    QString identifier;
+
+    QEventLoop loop;
+    connect(this, SIGNAL(finishedConnectionTest()), &loop, SLOT(quit()));
+
+    //Test default configuration
+    operation->setConfiguration(conf.defaultConfiguration());
+
+    testConnection();
+    loop.exec();
+
+    if (connectionOK == true) {
+        qDebug() << "Selected default network configuration";
+        return;
+    }
+
+    else {
+        qDebug() << "Failure on default configuration, attempt to choose another interaface..";
+
+        foreach (QNetworkInterface interface, QNetworkInterface::allInterfaces())
+        {
+            if (!interface.isValid())
+                continue;
+
+//            qDebug() << "Identifier: " << interface.name();
+//            qDebug() << "HW addr: " << interface.hardwareAddress();
+
+            bool isUp = interface.flags().testFlag(QNetworkInterface::IsUp);
+            bool isLoopback = interface.flags().testFlag(QNetworkInterface::IsLoopBack);
+            bool isActive = interface.flags().testFlag(QNetworkInterface::IsRunning);
+            bool isPtP = interface.flags().testFlag(QNetworkInterface::IsPointToPoint);
+
+//            qDebug() << "Properties: ";
+//            qDebug() << (isUp ? "Is up" : "Is down");
+
+//            if (isLoopback)
+//                qDebug() << "Loopback";
+
+//            qDebug() << (isActive ? "Active" : "Inactive");
+
+//            if (isPtP)
+//                qDebug() << "Is Point-to-Point";
+
+//            qDebug() << "";
+
+            if (isUp && isActive && !isLoopback) {
+                identifier = interface.name();
+                qDebug() << "Testing connection for interface " << identifier;
+                operation->setConfiguration(conf.configurationFromIdentifier(identifier));
+
+                testConnection();
+                loop.exec();
+
+                if (connectionOK == true) {
+                    qDebug() << "Success!";
+                    return;
+                }
+
+                else
+                    qDebug() << "Failure, trying another interface...";
+            }
+
+        }
+    }
+}
+
+void NetworkManager::testConnection()
+{
+    QNetworkRequest request;
+    request.setUrl(QUrl(TWITCH_API_BASE));
+
+    QNetworkReply *reply = operation->get(request);
+
+    connect(reply, SIGNAL(finished()), this, SLOT(testConnectionReply()));
+}
+
+void NetworkManager::testConnectionReply()
+{
+    QNetworkReply* reply = qobject_cast<QNetworkReply *>(sender());
+
+//    if (reply->error() == QNetworkReply::NoError)
+//        qDebug() << "Got response: " << reply->readAll();
+
+    connectionOK = (reply->error() == QNetworkReply::NoError);
+
+    emit finishedConnectionTest();
 }
 
 void NetworkManager::getStreams(const QString &url)

diff --git a/src/network/networkmanager.h b/src/network/networkmanager.h
@@ -4,6 +4,7 @@
 #include <QObject>
 #include <QtNetwork/QNetworkAccessManager>
 #include <QNetworkConfigurationManager>
+#include <QNetworkInterface>
 #include <QUrl>
 #include <QtNetwork/QNetworkReply>
 #include <QJsonDocument>
@@ -25,6 +26,9 @@ class NetworkManager: public QObject
 
 protected:
 
+    void selectNetworkInterface();
+    void testConnection();
+
     enum M3U8TYPE {
         LIVE = QNetworkRequest::CustomVerbAttribute + 1,
         VOD
@@ -49,6 +53,8 @@ class NetworkManager: public QObject
     QNetworkAccessManager *getManager() const;
 
 signals:
+    void finishedConnectionTest();
+
     void allStreamsOperationFinished(const QList<Channel *>&);
     void gamesOperationFinished(const QList<Game *>&);
     void gameStreamsOperationFinished(const QList<Channel *>&);
@@ -63,6 +69,7 @@ class NetworkManager: public QObject
     void fileOperationFinished(const QByteArray&);
 
 private slots:
+    void testConnectionReply();
     void handleSslErrors(QNetworkReply * reply, QList<QSslError> errors);
 
     void allStreamsReply();
@@ -78,7 +85,8 @@ private slots:
 
 private:
     QNetworkAccessManager *operation;
-    QNetworkConfigurationManager *conf;
+
+    bool connectionOK;
 };
 
 #endif // NETWORKMANAGER_H
diff --git a/src/network/urls.h b/src/network/urls.h
@@ -3,5 +3,6 @@
 
 #define KRAKEN_API "https://api.twitch.tv/kraken"
 #define TWITCH_API "https://api.twitch.tv/api"
+#define TWITCH_API_BASE "https://api.twitch.tv/kraken/base"
 
 #endif // URLS_H
diff --git a/src/qml/components/Channel.qml b/src/qml/components/Channel.qml
@@ -63,7 +63,7 @@ Rectangle {
             }
 
             onProgressChanged: {
-                if (progress >= 1.0)
+                if (progress > 0.99)
                     _spinner.visible = false
             }