Debugger: Add optional 'host' argument to -qmljsdebugger

Change-Id: I5bb2e48e2ad2019b8a92f6f8842b88027fcd2d28
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

6 files changed, 41 insertions, 20 deletions

diff --git a/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp b/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp
index 7d120cacb0..4dfed6c673 100644
--- a/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp
+++ b/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp
@@ -115,10 +115,11 @@ bool QmlOstPlugin::waitForMessage()
     return d->protocol->waitForReadyRead(-1);
 }
 
-void QmlOstPlugin::setPort(int port, bool block)
+void QmlOstPlugin::setPort(int port, bool block, const QString &hostaddress)
 {
     Q_UNUSED(port);
     Q_UNUSED(block);
+    Q_UNUSED(hostaddress);
 
     Q_D(QmlOstPlugin);
 
diff --git a/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.h b/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.h
index 41c3a07f25..257962570c 100644
--- a/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.h
+++ b/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.h
@@ -63,7 +63,7 @@ public:
     ~QmlOstPlugin();
 
     void setServer(QQmlDebugServer *server);
-    void setPort(int port, bool bock);
+    void setPort(int port, bool bock, const QString &hostaddress);
 
     bool isConnected() const;
     void send(const QByteArray &message);
diff --git a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp
index e5f31b6f5c..724155a8f5 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp
+++ b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp
@@ -56,6 +56,7 @@ public:
 
     int port;
     bool block;
+    QString hostaddress;
     QTcpSocket *socket;
     QPacketProtocol *protocol;
     QTcpServer *tcpServer;
@@ -129,11 +130,12 @@ bool QTcpServerConnection::waitForMessage()
     return d->protocol->waitForReadyRead(-1);
 }
 
-void QTcpServerConnection::setPort(int port, bool block)
+void QTcpServerConnection::setPort(int port, bool block, const QString &hostaddress)
 {
     Q_D(QTcpServerConnection);
     d->port = port;
     d->block = block;
+    d->hostaddress = hostaddress;
 
     listen();
     if (block)
@@ -146,7 +148,17 @@ void QTcpServerConnection::listen()
 
     d->tcpServer = new QTcpServer(this);
     QObject::connect(d->tcpServer, SIGNAL(newConnection()), this, SLOT(newConnection()));
-    if (d->tcpServer->listen(QHostAddress::Any, d->port))
+    QHostAddress hostaddress;
+    if (!d->hostaddress.isEmpty()) {
+        if (!hostaddress.setAddress(d->hostaddress)) {
+            hostaddress = QHostAddress::Any;
+            qDebug("QML Debugger: Incorrect host address provided. So accepting connections "
+                     "from any host.");
+        }
+    } else {
+        hostaddress = QHostAddress::Any;
+    }
+    if (d->tcpServer->listen(hostaddress, d->port))
         qDebug("QML Debugger: Waiting for connection on port %d...", d->port);
     else
         qWarning("QML Debugger: Unable to listen to port %d.", d->port);
@@ -194,4 +206,3 @@ void QTcpServerConnection::invalidPacket()
 }
 
 QT_END_NAMESPACE
-
diff --git a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h
index e81c9f7f0f..e2b32b0e4a 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h
+++ b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h
@@ -62,7 +62,7 @@ public:
     ~QTcpServerConnection();
 
     void setServer(QQmlDebugServer *server);
-    void setPort(int port, bool bock);
+    void setPort(int port, bool bock, const QString &hostaddress);
 
     bool isConnected() const;
     void send(const QList<QByteArray> &messages);
diff --git a/src/qml/debugger/qqmldebugserver.cpp b/src/qml/debugger/qqmldebugserver.cpp
index ec3f9dafc2..dcf93b400e 100644
--- a/src/qml/debugger/qqmldebugserver.cpp
+++ b/src/qml/debugger/qqmldebugserver.cpp
@@ -117,9 +117,10 @@ public:
         m_pluginName = pluginName;
     }
 
-    void setPort(int port, bool block) {
+    void setPort(int port, bool block, QString &hostAddress) {
         m_port = port;
         m_block = block;
+        m_hostAddress = hostAddress;
     }
 
     void run();
@@ -128,6 +129,7 @@ private:
     QString m_pluginName;
     int m_port;
     bool m_block;
+    QString m_hostAddress;
 };
 
 QQmlDebugServerPrivate::QQmlDebugServerPrivate() :
@@ -214,7 +216,7 @@ void QQmlDebugServerThread::run()
             = server->d_func()->loadConnectionPlugin(m_pluginName);
     if (connection) {
         connection->setServer(QQmlDebugServer::instance());
-        connection->setPort(m_port, m_block);
+        connection->setPort(m_port, m_block, m_hostAddress);
     } else {
         QCoreApplicationPrivate *appD = static_cast<QCoreApplicationPrivate*>(QObjectPrivate::get(qApp));
         qWarning() << QString(QLatin1String("QML Debugger: Ignoring \"-qmljsdebugger=%1\". "
@@ -258,8 +260,9 @@ QQmlDebugServer *QQmlDebugServer::instance()
         int port = 0;
         bool block = false;
         bool ok = false;
+        QString hostAddress;
 
-        // format: qmljsdebugger=port:3768[,block] OR qmljsdebugger=ost[,block]
+        // format: qmljsdebugger=port:3768[,host:<ip address>][,block] OR qmljsdebugger=ost[,block]
         if (!appD->qmljsDebugArgumentsString().isEmpty()) {
             if (!QQmlEnginePrivate::qml_debugging_enabled) {
                 qWarning() << QString(QLatin1String(
@@ -270,24 +273,30 @@ QQmlDebugServer *QQmlDebugServer::instance()
             }
 
             QString pluginName;
-            if (appD->qmljsDebugArgumentsString().indexOf(QLatin1String("port:")) == 0) {
-                int separatorIndex = appD->qmljsDebugArgumentsString().indexOf(QLatin1Char(','));
-                port = appD->qmljsDebugArgumentsString().mid(5, separatorIndex - 5).toInt(&ok);
-                pluginName = QStringLiteral("qmldbg_tcp");
-            } else if (appD->qmljsDebugArgumentsString().contains(QLatin1String("ost"))) {
-                pluginName = QStringLiteral("qmldbg_ost");
-                ok = true;
+            QStringList lstjsDebugArguments = appD->qmljsDebugArgumentsString()
+                                                                    .split(QLatin1Char(','));
+            foreach (const QString &strArgument, lstjsDebugArguments) {
+                if (strArgument.startsWith(QLatin1String("port:"))) {
+                    port = strArgument.mid(5).toInt(&ok);
+                    pluginName = QLatin1String("qmldbg_tcp");
+                } else if (strArgument.startsWith(QLatin1String("host:"))) {
+                    hostAddress = strArgument.mid(5);
+                } else if (strArgument == QLatin1String("block")) {
+                    block = true;
+                } else {
+                    qWarning() << QString::fromLatin1("QML Debugger: Invalid argument '%1' "
+                                                      "detected. Ignoring the same.")
+                                                       .arg(strArgument);
+                }
             }
 
-            block = appD->qmljsDebugArgumentsString().contains(QLatin1String("block"));
-
             if (ok) {
                 qQmlDebugServer = new QQmlDebugServer();
                 QQmlDebugServerThread *thread = new QQmlDebugServerThread;
                 qQmlDebugServer->d_func()->thread = thread;
                 qQmlDebugServer->moveToThread(thread);
                 thread->setPluginName(pluginName);
-                thread->setPort(port, block);
+                thread->setPort(port, block, hostAddress);
                 thread->start();
 
                 if (block) {
diff --git a/src/qml/debugger/qqmldebugserverconnection_p.h b/src/qml/debugger/qqmldebugserverconnection_p.h
index ab9e7bd73f..920e82ed47 100644
--- a/src/qml/debugger/qqmldebugserverconnection_p.h
+++ b/src/qml/debugger/qqmldebugserverconnection_p.h
@@ -69,7 +69,7 @@ public:
     virtual ~QQmlDebugServerConnection() {}
 
     virtual void setServer(QQmlDebugServer *server) = 0;
-    virtual void setPort(int port, bool bock) = 0;
+    virtual void setPort(int port, bool bock, const QString &hostaddress) = 0;
     virtual bool isConnected() const = 0;
     virtual void send(const QList<QByteArray> &messages) = 0;
     virtual void disconnect() = 0;