Fix endianness conversion order bug when handling 128bit Qt Uuid

QBluetoothUuid.toUInt128() always returns big endian notation.
We have to convert it to host order before we convert to Bluetooth
order.

Task-number: QTBUG-53421
Change-Id: Ibab4f06fa70739adb163523c803a203608454427
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>

2 files changed, 18 insertions, 5 deletions

diff --git a/src/bluetooth/qleadvertiser_bluez.cpp b/src/bluetooth/qleadvertiser_bluez.cpp
index c1b38acb..ff00b2b1 100644
--- a/src/bluetooth/qleadvertiser_bluez.cpp
+++ b/src/bluetooth/qleadvertiser_bluez.cpp
@@ -285,7 +285,13 @@ void QLeAdvertiserBluez::setServicesData(const QLowEnergyAdvertisingData &src, A
             services32 << service32;
             continue;
         }
-        services128 << service.toUInt128();
+
+        // QBluetoothUuid::toUInt128() is always Big-Endian
+        // convert it to host order
+        quint128 hostOrder;
+        quint128 qtUuidOrder = service.toUInt128();
+        ntoh128(&qtUuidOrder, &hostOrder);
+        services128 << hostOrder;
     }
     addServicesData(dest, services16);
     addServicesData(dest, services32);
diff --git a/src/bluetooth/qlowenergycontroller_bluez.cpp b/src/bluetooth/qlowenergycontroller_bluez.cpp
index adac55fc..d4fe0232 100644
--- a/src/bluetooth/qlowenergycontroller_bluez.cpp
+++ b/src/bluetooth/qlowenergycontroller_bluez.cpp
@@ -235,10 +235,14 @@ template<typename T> static void putDataAndIncrement(const T &src, char *&dst)
 template<> void putDataAndIncrement(const QBluetoothUuid &uuid, char *&dst)
 {
     const int uuidSize = getUuidSize(uuid);
-    if (uuidSize == 2)
+    if (uuidSize == 2) {
         putBtData(uuid.toUInt16(), dst);
-    else
-        putBtData(uuid.toUInt128(), dst);
+    } else {
+        quint128 hostOrder;
+        quint128 qtUuidOrder = uuid.toUInt128();
+        ntoh128(&qtUuidOrder, &hostOrder);
+        putBtData(hostOrder, dst);
+    }
     dst += uuidSize;
 }
 template<> void putDataAndIncrement(const QByteArray &value, char *&dst)
@@ -2925,7 +2929,10 @@ static QByteArray uuidToByteArray(const QBluetoothUuid &uuid)
         putBtData(uuid.toUInt16(), ba.data());
     } else {
         ba.resize(16);
-        putBtData(uuid.toUInt128(), ba.data());
+        quint128 hostOrder;
+        quint128 qtUuidOrder = uuid.toUInt128();
+        ntoh128(&qtUuidOrder, &hostOrder);
+        putBtData(hostOrder, ba.data());
     }
     return ba;
 }