From: Kush <kush.agrawal@samsung.com>
Date: Fri, 28 Feb 2020 09:52:38 +0000 (+0530)
Subject: [CONPRO-1571] Fix for DeleteObserver in case of GATT adapter
X-Git-Tag: accepted/tizen/unified/20200407.130847~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F98%2F229398%2F1;p=platform%2Fupstream%2Fiotivity.git

[CONPRO-1571] Fix for DeleteObserver in case of GATT adapter

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/666
(cherry-picked from bd25a20961dc89dd4c7fedb5a3f4e881ddb53b0a)

Change-Id: Id9259093a010533ec20fc4061f2283d7d69d016a
Signed-off-by: Kush <kush.agrawal@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
---

diff --git a/resource/csdk/stack/src/ocobserve.c b/resource/csdk/stack/src/ocobserve.c
index 7495f2b..9eef8d6 100644
--- a/resource/csdk/stack/src/ocobserve.c
+++ b/resource/csdk/stack/src/ocobserve.c
@@ -773,7 +773,7 @@ OCStackResult DeleteObserverUsingDevAddr(const OCDevAddr *devAddr)
         if (out)
         {
             if ((strcmp(out->devAddr.addr, devAddr->addr) == 0)
-                    && out->devAddr.port == devAddr->port)
+                    && (out->devAddr.port == devAddr->port || OC_ADAPTER_GATT_BTLE == devAddr->adapter))
             {
                 OIC_LOG_V(INFO, TAG, "deleting observer id  %u with %s:%u",
                           out->observeId, out->devAddr.addr, out->devAddr.port);