Patch for v0.9g

core/backends/lan/lanlinkprovider.cpp

@@ -229,6 +229,16 @@ void LanLinkProvider::newConnection()
         connect(socket, SIGNAL(readyRead()),
                 this, SLOT(dataReceived()));
 
+        QTimer* timer = new QTimer(socket);
+        timer->setSingleShot(true);
+        timer->setInterval(1000);
+        connect(socket, &QSslSocket::encrypted,
+                timer, &QObject::deleteLater);
+        connect(timer, &QTimer::timeout, socket, [socket] {
+            qCWarning(KDECONNECT_CORE) << "LanLinkProvider/newConnection: Host timed out without sending any identity." << socket->peerAddress();
+            socket->disconnectFromHost();
+        });
+        timer->start();
     }
 
 }

core/backends/lan/lanlinkprovider.cpp.orig

@@ -0,0 +1,317 @@
+/**
+ * Copyright 2013 Albert Vaca <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "lanlinkprovider.h"
+#include "core_debug.h"
+
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <netdb.h>
+
+#include <QHostInfo>
+#include <QTcpServer>
+#include <QUdpSocket>
+#include <QtGlobal>
+#include <QNetworkSession>
+#include <QNetworkConfigurationManager>
+
+#include "landevicelink.h"
+#include <kdeconnectconfig.h>
+
+LanLinkProvider::LanLinkProvider()
+{
+    mTcpPort = 0;
+
+    mUdpServer = new QUdpSocket(this);
+    connect(mUdpServer, SIGNAL(readyRead()), this, SLOT(newUdpConnection()));
+
+    mTcpServer = new QTcpServer(this);
+    connect(mTcpServer,SIGNAL(newConnection()),this, SLOT(newConnection()));
+
+    //Detect when a network interface changes status, so we announce ourelves in the new network
+    QNetworkConfigurationManager* networkManager;
+    networkManager = new QNetworkConfigurationManager(this);
+    connect(networkManager, &QNetworkConfigurationManager::configurationChanged, [this, networkManager](QNetworkConfiguration config) {
+        Q_UNUSED(config);
+        //qCDebug(KDECONNECT_CORE) << config.name() << " state changed to " << config.state();
+        //qCDebug(KDECONNECT_CORE) << "Online status: " << (networkManager->isOnline()? "online":"offline");
+        onNetworkChange();
+    });
+}
+
+LanLinkProvider::~LanLinkProvider()
+{
+
+}
+
+void LanLinkProvider::onStart()
+{
+    mUdpServer->bind(QHostAddress::Any, port, QUdpSocket::ShareAddress);
+
+    mTcpPort = port;
+    while (!mTcpServer->listen(QHostAddress::Any, mTcpPort)) {
+        mTcpPort++;
+        if (mTcpPort > 1764) { //No ports available?
+            qCritical(KDECONNECT_CORE) << "Error opening a port in range 1714-1764";
+            mTcpPort = 0;
+            return;
+        }
+    }
+
+    onNetworkChange();
+}
+
+void LanLinkProvider::onStop()
+{
+    mUdpServer->close();
+    mTcpServer->close();
+}
+
+//I'm in a new network, let's be polite and introduce myself
+void LanLinkProvider::onNetworkChange()
+{
+    if (!mTcpServer->isListening()) {
+        //Not started
+        return;
+    }
+
+    Q_ASSERT(mTcpPort != 0);
+
+    qCDebug(KDECONNECT_CORE()) << "Broadcasting identity packet";
+    NetworkPackage np("");
+    NetworkPackage::createIdentityPackage(&np);
+    np.set("tcpPort", mTcpPort);
+    mUdpSocket.writeDatagram(np.serialize(), QHostAddress("255.255.255.255"), port);
+}
+
+//I'm the existing device, a new device is kindly introducing itself.
+//I will create a TcpSocket and try to connect. This can result in either connected() or connectError().
+void LanLinkProvider::newUdpConnection()
+{
+    while (mUdpServer->hasPendingDatagrams()) {
+        QByteArray datagram;
+        datagram.resize(mUdpServer->pendingDatagramSize());
+        QHostAddress sender;
+
+        mUdpServer->readDatagram(datagram.data(), datagram.size(), &sender);
+
+        NetworkPackage* receivedPackage = new NetworkPackage("");
+        bool success = NetworkPackage::unserialize(datagram, receivedPackage);
+
+        if (!success || receivedPackage->type() != PACKAGE_TYPE_IDENTITY) {
+            delete receivedPackage;
+            continue;
+        }
+
+        if (receivedPackage->get<QString>("deviceId") == KdeConnectConfig::instance()->deviceId()) {
+            //qCDebug(KDECONNECT_CORE) << "Ignoring my own broadcast";
+            delete receivedPackage;
+            continue;
+        }
+
+        int tcpPort = receivedPackage->get<int>("tcpPort", port);
+
+        //qCDebug(KDECONNECT_CORE) << "Received Udp identity package from" << sender << " asking for a tcp connection on port " << tcpPort;
+
+        QTcpSocket* socket = new QTcpSocket(this);
+        receivedIdentityPackages[socket].np = receivedPackage;
+        receivedIdentityPackages[socket].sender = sender;
+        connect(socket, SIGNAL(connected()), this, SLOT(connected()));
+        connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(connectError()));
+        socket->connectToHost(sender, tcpPort);
+    }
+}
+
+void LanLinkProvider::connectError()
+{
+    QTcpSocket* socket = qobject_cast<QTcpSocket*>(sender());
+    if (!socket) return;
+    disconnect(socket, SIGNAL(connected()), this, SLOT(connected()));
+    disconnect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(connectError()));
+
+    qCDebug(KDECONNECT_CORE) << "Fallback (1), try reverse connection (send udp packet)";
+    NetworkPackage np("");
+    NetworkPackage::createIdentityPackage(&np);
+    np.set("tcpPort", mTcpPort);
+    mUdpSocket.writeDatagram(np.serialize(), receivedIdentityPackages[socket].sender, port);
+
+    //The socket we created didn't work, and we didn't manage
+    //to create a LanDeviceLink from it, deleting everything.
+    delete receivedIdentityPackages[socket].np;
+    receivedIdentityPackages.remove(socket);
+    delete socket;
+}
+
+void LanLinkProvider::connected()
+{
+    QTcpSocket* socket = qobject_cast<QTcpSocket*>(sender());
+    if (!socket) return;
+    disconnect(socket, SIGNAL(connected()), this, SLOT(connected()));
+    disconnect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(connectError()));
+
+    configureSocket(socket);
+
+    NetworkPackage* receivedPackage = receivedIdentityPackages[socket].np;
+    const QString& deviceId = receivedPackage->get<QString>("deviceId");
+    //qCDebug(KDECONNECT_CORE) << "Connected" << socket->isWritable();
+
+    LanDeviceLink* deviceLink = new LanDeviceLink(deviceId, this, socket);
+
+    NetworkPackage np2("");
+    NetworkPackage::createIdentityPackage(&np2);
+    bool success = deviceLink->sendPackage(np2);
+
+    if (success) {
+
+        //qCDebug(KDECONNECT_CORE) << "Handshaking done (i'm the existing device)";
+
+        connect(deviceLink, SIGNAL(destroyed(QObject*)),
+                this, SLOT(deviceLinkDestroyed(QObject*)));
+
+        Q_EMIT onConnectionReceived(*receivedPackage, deviceLink);
+
+        //We kill any possible link from this same device
+        QMap< QString, DeviceLink* >::iterator oldLinkIterator = mLinks.find(deviceId);
+        if (oldLinkIterator != mLinks.end()) {
+            DeviceLink* oldLink = oldLinkIterator.value();
+            disconnect(oldLink, SIGNAL(destroyed(QObject*)),
+                        this, SLOT(deviceLinkDestroyed(QObject*)));
+            oldLink->deleteLater();
+            mLinks.erase(oldLinkIterator);
+        }
+
+        mLinks[deviceId] = deviceLink;
+
+    } else {
+        //I think this will never happen, but if it happens the deviceLink
+        //(or the socket that is now inside it) might not be valid. Delete them.
+        delete deviceLink;
+        qCDebug(KDECONNECT_CORE) << "Fallback (2), try reverse connection (send udp packet)";
+        mUdpSocket.writeDatagram(np2.serialize(), receivedIdentityPackages[socket].sender, port);
+    }
+
+    delete receivedPackage;
+    receivedIdentityPackages.remove(socket);
+    //We don't delete the socket because now it's owned by the LanDeviceLink
+}
+
+//I'm the new device and this is the answer to my UDP identity package (no data received yet)
+void LanLinkProvider::newConnection()
+{
+    //qCDebug(KDECONNECT_CORE) << "LanLinkProvider newConnection";
+
+    while (mTcpServer->hasPendingConnections()) {
+        QTcpSocket* socket = mTcpServer->nextPendingConnection();
+        configureSocket(socket);
+        //This socket is still managed by us (and child of the QTcpServer), if
+        //it disconnects before we manage to pass it to a LanDeviceLink, it's
+        //our responsibility to delete it. We do so with this connection.
+        connect(socket, SIGNAL(disconnected()),
+                socket, SLOT(deleteLater()));
+        connect(socket, SIGNAL(readyRead()),
+                this, SLOT(dataReceived()));
+
+    }
+
+}
+
+//I'm the new device and this is the answer to my UDP identity package (data received)
+void LanLinkProvider::dataReceived()
+{
+    QTcpSocket* socket = qobject_cast<QTcpSocket*>(sender());
+
+    const QByteArray data = socket->readLine();
+
+    //qCDebug(KDECONNECT_CORE) << "LanLinkProvider received reply:" << data;
+
+    NetworkPackage np("");
+    bool success = NetworkPackage::unserialize(data, &np);
+    //qCDebug(KDECONNECT_CORE) << "LanLinkProvider received reply:" << data;
+
+    if (!success || np.type() != PACKAGE_TYPE_IDENTITY) {
+        qCDebug(KDECONNECT_CORE) << "LanLinkProvider/newConnection: Not an identification package (wuh?)";
+        return;
+    }
+
+    //qCDebug(KDECONNECT_CORE) << "Handshaking done (i'm the new device)";
+
+    //This socket will now be owned by the LanDeviceLink, forget about it
+    disconnect(socket, SIGNAL(readyRead()),
+               this, SLOT(dataReceived()));
+    disconnect(socket, SIGNAL(disconnected()),
+               socket, SLOT(deleteLater()));
+
+    const QString& deviceId = np.get<QString>("deviceId");
+    LanDeviceLink* deviceLink = new LanDeviceLink(deviceId, this, socket);
+    connect(deviceLink, SIGNAL(destroyed(QObject*)),
+            this, SLOT(deviceLinkDestroyed(QObject*)));
+
+    Q_EMIT onConnectionReceived(np, deviceLink);
+
+    QMap< QString, DeviceLink* >::iterator oldLinkIterator = mLinks.find(deviceId);
+    if (oldLinkIterator != mLinks.end()) {
+        DeviceLink* oldLink = oldLinkIterator.value();
+        disconnect(oldLink, SIGNAL(destroyed(QObject*)),
+                    this, SLOT(deviceLinkDestroyed(QObject*)));
+        oldLink->deleteLater();
+        mLinks.erase(oldLinkIterator);
+    }
+
+    mLinks[deviceId] = deviceLink;
+
+}
+
+void LanLinkProvider::deviceLinkDestroyed(QObject* destroyedDeviceLink)
+{
+    //qCDebug(KDECONNECT_CORE) << "deviceLinkDestroyed";
+    const QString id = destroyedDeviceLink->property("deviceId").toString();
+    QMap< QString, DeviceLink* >::iterator oldLinkIterator = mLinks.find(id);
+    if (oldLinkIterator != mLinks.end() && oldLinkIterator.value() == destroyedDeviceLink) {
+        mLinks.erase(oldLinkIterator);
+    }
+
+}
+
+void LanLinkProvider::configureSocket(QTcpSocket* socket)
+{
+    int fd = socket->socketDescriptor();
+
+    socket->setSocketOption(QAbstractSocket::KeepAliveOption, QVariant(1));
+
+    #ifdef TCP_KEEPIDLE
+        // time to start sending keepalive packets (seconds)
+        int maxIdle = 10;
+        setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &maxIdle, sizeof(maxIdle));
+    #endif
+
+    #ifdef TCP_KEEPINTVL
+        // interval between keepalive packets after the initial period (seconds)
+        int interval = 5;
+        setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &interval, sizeof(interval));
+    #endif
+
+    #ifdef TCP_KEEPCNT
+        // number of missed keepalive packets before disconnecting
+        int count = 3;
+        setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &count, sizeof(count));
+    #endif
+
+}