[Tizen] Fix ipv6 link local interface issue (#22888)

* [Tizen] Fix ipv6 link local interface issue Signed-off-by: kibak.yoon <[email protected]> Signed-off-by: Wootak Jung <[email protected]> * Add error handling logic Signed-off-by: kibak.yoon <[email protected]> Signed-off-by: Wootak Jung <[email protected]>
project-chip · Sep 28, 2022 · 3bd7c37 · 3bd7c37
1 parent 46fd14a
commit 3bd7c37
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/src/platform/Tizen/DnssdImpl.cpp b/src/platform/Tizen/DnssdImpl.cpp
@@ -299,11 +299,13 @@ void OnResolve(dnssd_error_e result, dnssd_service_h service, void * data)
     char * ipv4           = nullptr;
     char * ipv6           = nullptr;
     int port              = 0;
+    char * interface      = nullptr;
     unsigned short txtLen = 0;
     uint8_t * txtRecord   = nullptr;
     std::vector<TextEntry> textEntries;
     DnssdService dnssdService = {};
     chip::Inet::IPAddress ipAddr;
+    CHIP_ERROR err = CHIP_NO_ERROR;
 
     // In fact, if cancel resolve fails, we can not do anything about it
     int ret = dnssd_cancel_resolve_service(service);
@@ -352,6 +354,14 @@ void OnResolve(dnssd_error_e result, dnssd_service_h service, void * data)
 
     dnssdService.mPort = static_cast<uint16_t>(port);
 
+    ret = dnssd_service_get_interface(service, &interface);
+    VerifyOrExit(ret == DNSSD_ERROR_NONE, ChipLogError(DeviceLayer, "dnssd_service_get_interface() failed. ret: %d", ret));
+
+    err = chip::Inet::InterfaceId::InterfaceNameToId(interface, dnssdService.mInterface);
+    VerifyOrExit(
+        err == CHIP_NO_ERROR,
+        ChipLogError(DeviceLayer, "chip::Inet::InterfaceId::InterfaceNameToId() failed. ret: %" CHIP_ERROR_FORMAT, err.Format()));
+
     ret = dnssd_service_get_all_txt_record(service, &txtLen, reinterpret_cast<void **>(&txtRecord));
     VerifyOrExit(ret == DNSSD_ERROR_NONE, ChipLogError(DeviceLayer, "dnssd_service_get_all_txt_record() failed. ret: %d", ret));
 
@@ -371,7 +381,14 @@ void OnResolve(dnssd_error_e result, dnssd_service_h service, void * data)
     return;
 
 exit:
-    rCtx->mCallback(rCtx->mCbContext, nullptr, chip::Span<chip::Inet::IPAddress>(), GetChipError(ret));
+    if (err == CHIP_NO_ERROR)
+    {
+        rCtx->mCallback(rCtx->mCbContext, nullptr, chip::Span<chip::Inet::IPAddress>(), GetChipError(ret));
+    }
+    else
+    {
+        rCtx->mCallback(rCtx->mCbContext, nullptr, chip::Span<chip::Inet::IPAddress>(), err);
+    }
     rCtx->mInstance->RemoveContext(rCtx);
 }