From 5760025af31f375af983d6d262ee7f90db78e45e Mon Sep 17 00:00:00 2001
From: "bernhard.trinnes" <bernhard.trinnes@nymea.io>
Date: Tue, 9 Jun 2020 11:14:33 +0200
Subject: [PATCH] fixed mDNS discovery bridgeId

---
 philipshue/integrationpluginphilipshue.cpp | 28 +++++++++++++---------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/philipshue/integrationpluginphilipshue.cpp b/philipshue/integrationpluginphilipshue.cpp
index 0e4fe3ed..bd1f785c 100644
--- a/philipshue/integrationpluginphilipshue.cpp
+++ b/philipshue/integrationpluginphilipshue.cpp
@@ -87,14 +87,13 @@ void IntegrationPluginPhilipsHue::init()
             QString thingId = thing->paramValue(bridgeThingIdParamTypeId).toString();
             if (entry.protocol() == QAbstractSocket::IPv4Protocol) {
 
-                QString name = entry.name().split(" - ").first();
-                QString id = entry.name().split(" - ").last();
-
-                if (thingId.contains(id)) {
-                    thing->setParamValue(bridgeThingHostParamTypeId, entry.hostAddress().toString());
-                    HueBridge *bridge = m_bridges.key(thing);
-                    bridge->setHostAddress(entry.hostAddress());
-                    //TODO also add upnp to update the address
+                foreach (const QString &txtEntry, entry.txt()) {
+                    QStringList parts = txtEntry.split('=');
+                    if (parts.length() == 2 && parts.first() == "bridgeid" && parts.last().toLower() == thingId) {
+                        thing->setParamValue(bridgeThingHostParamTypeId, entry.hostAddress().toString());
+                        HueBridge *bridge = m_bridges.key(thing);
+                        bridge->setHostAddress(entry.hostAddress());
+                    }
                 }
             }
         }
@@ -127,13 +126,20 @@ void IntegrationPluginPhilipsHue::discoverThings(ThingDiscoveryInfo *info)
          * service: hue
          * name: Philips Hue - xxxxxx where xxxxxx are the last 6 digits of the bridge ID.
         */
-        if (!entry.serviceType().contains("_hue._tcp._local")) {
+        if (!entry.serviceType().contains("_hue._tcp._local") || entry.protocol() != QAbstractSocket::IPv4Protocol) {
             continue;
         }
         qCDebug(dcPhilipsHue()) << "Zeroconf entry:" << entry;
 
-        QString name = entry.name().split(" - ").first();
-        QString id = entry.name().split(" - ").last();
+        QString id;
+        foreach (const QString &txt, entry.txt()) {
+            QString field = txt.split("=").first();
+            QString value = txt.split("=").last();
+            if (field == "bridgeid") {
+                id = value;
+                break;
+            }
+        }
         QHostAddress address = entry.hostAddress();
 
         ParamList params;