Received-SPF: pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Sonny Sasaka <sonnysasaka@chromium.org>
To:     linux-bluetooth@vger.kernel.org
Cc:     Miao Chou <mcchou@chromium.org>
Subject: [PATCH 4/5] Implement RemoveServiceRecord method
Date:   Wed,  1 Apr 2020 15:14:33 -0700
Message-Id: <20200401221434.12185-4-sonnysasaka@chromium.org>
In-Reply-To: <20200401221434.12185-1-sonnysasaka@chromium.org>
References: <20200401221434.12185-1-sonnysasaka@chromium.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-bluetooth-owner@vger.kernel.org
Precedence: bulk

From: Miao Chou <mcchou@chromium.org>

This implements the RemoveServiceRecord method of org.bluez.Adapter1 interface.
---
 src/adapter.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/adapter.c b/src/adapter.c
index c02aaf32b..1be3e7984 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -3834,6 +3834,29 @@ failed_to_alloc:
 	return btd_error_failed(msg, "Failed to allocate SDP record");
 }
 
+static DBusMessage *remove_service_record(DBusConnection *conn,
+					DBusMessage *msg, void *user_data)
+{
+	struct btd_adapter *adapter = user_data;
+	uint32_t rec_handle = 0xffffffff;
+	sdp_record_t *rec = NULL;
+
+	if (!(adapter->current_settings & MGMT_SETTING_POWERED))
+		return btd_error_not_ready(msg);
+
+	if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_UINT32, &rec_handle,
+							DBUS_TYPE_INVALID))
+		return btd_error_invalid_args(msg);
+
+	rec = sdp_record_find(rec_handle);
+	if (!rec)
+		return btd_error_does_not_exist(msg);
+
+	adapter_service_remove(adapter, rec_handle);
+
+	return dbus_message_new_method_return(msg);
+}
+
 static const GDBusMethodTable adapter_methods[] = {
 	{ GDBUS_ASYNC_METHOD("StartDiscovery", NULL, NULL, start_discovery) },
 	{ GDBUS_METHOD("SetDiscoveryFilter",
@@ -3852,6 +3875,8 @@ static const GDBusMethodTable adapter_methods[] = {
 			GDBUS_ARGS({"record", "a{q(yuv)}"}),
 			GDBUS_ARGS({"handle", "u"}),
 			create_service_record)},
+	{ GDBUS_METHOD("RemoveServiceRecord", GDBUS_ARGS({"handle", "u"}), NULL,
+			remove_service_record)},
 	{ }
 };
 
-- 
2.24.1