QNX making the device discovery agent more robust

Change-Id: Ibb7da66092e0edca9ac3d7e801275de5d166d6d8
Reviewed-by: Alex <ablasche@gmail.com>

1 files changed, 14 insertions, 4 deletions

diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
index 4eb5da05..816cfddc 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
@@ -68,8 +68,13 @@ void QBluetoothServiceDiscoveryAgentPrivate::start(const QBluetoothAddress &addr
 {
     Q_Q(QBluetoothServiceDiscoveryAgent);
     qBBBluetoothDebug() << "Starting Service discovery for" << address.toString();
-    if ((m_rdfd = qt_safe_open((QByteArray("/pps/services/bluetooth/remote_devices/%1").append(address.toString().toUtf8().constData())).constData(), O_RDONLY)) == -1) {
-        qWarning() << "Failed to open " << "/pps/services/bluetooth/remote_devices/" << address.toString();
+    const char *filePath = QByteArray("/pps/services/bluetooth/remote_devices/").append(address.toString().toUtf8().constData()).constData();
+    if ((m_rdfd = qt_safe_open(filePath, O_RDONLY)) == -1) {
+        qWarning() << "Failed to open " << filePath;
+        error = QBluetoothServiceDiscoveryAgent::DeviceDiscoveryError;
+        errorString = QStringLiteral("Failed to open remote device file");
+        q->error(error);
+        return;
     } else {
         if (rdNotifier)
             delete rdNotifier;
@@ -84,7 +89,6 @@ void QBluetoothServiceDiscoveryAgentPrivate::start(const QBluetoothAddress &addr
             return;
         }
     }
-
     ppsRegisterControl();
     ppsSendControlMessage("service_query", QStringLiteral("{\"addr\":\"%1\"}").arg(address.toString()));
     ppsRegisterForEvent(QStringLiteral("service_query"), this);
@@ -95,7 +99,7 @@ void QBluetoothServiceDiscoveryAgentPrivate::stop()
     if (rdNotifier)
         delete rdNotifier;
     rdNotifier = 0;
-    ppsUnregisterControl();
+    ppsUnregisterControl(this);
 }
 
 void QBluetoothServiceDiscoveryAgentPrivate::remoteDevicesChanged(int fd)
@@ -141,6 +145,10 @@ void QBluetoothServiceDiscoveryAgentPrivate::remoteDevicesChanged(int fd)
             serviceInfo.setServiceUuid(suuid);
         }
 
+        //Check if the UUID is in the uuidFilter
+        if (!uuidFilter.isEmpty() && !uuidFilter.contains(suuid))
+            continue;
+
         serviceInfo.setAttribute(QBluetoothServiceInfo::ProtocolDescriptorList, protocolDescriptorList);
 
         QList<QBluetoothUuid> serviceClassId;
@@ -176,6 +184,7 @@ void QBluetoothServiceDiscoveryAgentPrivate::remoteDevicesChanged(int fd)
 void QBluetoothServiceDiscoveryAgentPrivate::controlReply(ppsResult result)
 {
     Q_Q(QBluetoothServiceDiscoveryAgent);
+    qBBBluetoothDebug() << "Control event" << result.msg;
     if (!result.errorMsg.isEmpty()) {
         qWarning() << Q_FUNC_INFO << result.errorMsg;
         errorString = result.errorMsg;
@@ -189,6 +198,7 @@ void QBluetoothServiceDiscoveryAgentPrivate::controlReply(ppsResult result)
 void QBluetoothServiceDiscoveryAgentPrivate::controlEvent(ppsResult result)
 {
     Q_Q(QBluetoothServiceDiscoveryAgent);
+    qBBBluetoothDebug() << "Control event" << result.msg;
     if (!result.errorMsg.isEmpty()) {
         qWarning() << Q_FUNC_INFO << result.errorMsg;
         errorString = result.errorMsg;