From: Grzegorz Kolodziejczyk <grzegorz.kolodziejczyk@codecoup.pl>
Date: Fri, 19 Jan 2018 16:41:27 +0000 (+0100)
Subject: tools/btpclient: Initial check of ad_proxy presence in stop adv cmd
X-Git-Tag: accepted/tizen/unified/20190522.085452~1^2~43
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F39%2F205039%2F1;p=platform%2Fupstream%2Fbluez.git

tools/btpclient: Initial check of ad_proxy presence in stop adv cmd

This patch covers with fail response if no advertising proxy was
registered at command beginning.

Change-Id: I6dcbf3b95e82b83c6ef782b272c924c2c9780f5d
Signed-off-by: Amit Purwar <amit.purwar@samsung.com>
---

diff --git a/tools/btpclient.c b/tools/btpclient.c
index 2565a01..24990ec 100644
--- a/tools/btpclient.c
+++ b/tools/btpclient.c
@@ -1162,19 +1162,15 @@ static void btp_gap_stop_advertising(uint8_t index, const void *param,
 	}
 
 	if (!l_dbus_proxy_get_property(adapter->proxy, "Powered", "b", &prop) ||
-							!prop || !ad.registered)
+				!prop || !adapter->ad_proxy || !ad.registered)
 		goto failed;
 
-	if (adapter->ad_proxy) {
-		if (!l_dbus_proxy_method_call(adapter->ad_proxy,
+	if (!l_dbus_proxy_method_call(adapter->ad_proxy,
 						"UnregisterAdvertisement",
 						unreg_advertising_setup,
 						stop_advertising_reply,
-						NULL, NULL)) {
-			status = BTP_ERROR_FAIL;
-			goto failed;
-		}
-	}
+						NULL, NULL))
+		goto failed;
 
 	return;