[PATCH 3/4] sdp: Make sdp_record_add to be handled by adapter

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Make sdp_record_add to be called from adapter. First write services to
sdp db then to adapter db without revokes to adapter.

Change-Id: I65d638096c91aadacc3cb5ef7a8a9181fa4dae6e
---
 profiles/audio/a2dp.c      |    2 +-
 profiles/audio/avrcp.c     |    4 ++--
 profiles/health/hdp_util.c |    2 +-
 profiles/network/server.c  |    2 +-
 profiles/sap/server.c      |    2 +-
 src/adapter.c              |   31 +++++++++++++++++++++++++++++++
 src/adapter.h              |    2 ++
 src/attrib-server.c        |    2 +-
 src/profile.c              |    2 +-
 src/sdpd-database.c        |   10 ----------
 10 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
index 3f3cc1b..384b143 100644
--- a/profiles/audio/a2dp.c
+++ b/profiles/audio/a2dp.c
@@ -1298,7 +1298,7 @@ struct a2dp_sep *a2dp_add_sep(struct btd_adapter *adapter, uint8_t type,
 		return NULL;
 	}
 
-	if (add_record_to_server(adapter_get_address(server->adapter),
+	if (adapter_add_record_to_server(adapter_get_address(server->adapter),
 								record) < 0) {
 		error("Unable to register A2DP service record");
 		sdp_record_free(record);
diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
index 9f164e4..6734b0b 100644
--- a/profiles/audio/avrcp.c
+++ b/profiles/audio/avrcp.c
@@ -3829,7 +3829,7 @@ done:
 		return -1;
 	}
 
-	if (add_record_to_server(adapter_get_address(adapter), record) < 0) {
+	if (adapter_add_record_to_server(adapter_get_address(adapter), record) < 0) {
 		error("Unable to register AVRCP target service record");
 		avrcp_target_server_remove(p, adapter);
 		sdp_record_free(record);
@@ -3912,7 +3912,7 @@ done:
 		return -1;
 	}
 
-	if (add_record_to_server(adapter_get_address(adapter), record) < 0) {
+	if (adapter_add_record_to_server(adapter_get_address(adapter), record) < 0) {
 		error("Unable to register AVRCP service record");
 		avrcp_controller_server_remove(p, adapter);
 		sdp_record_free(record);
diff --git a/profiles/health/hdp_util.c b/profiles/health/hdp_util.c
index b53f1db..30e59bb 100644
--- a/profiles/health/hdp_util.c
+++ b/profiles/health/hdp_util.c
@@ -733,7 +733,7 @@ gboolean hdp_update_sdp_record(struct hdp_adapter *adapter, GSList *app_list)
 	if (sdp_set_record_state(sdp_record, adapter->record_state++) < 0)
 		goto fail;
 
-	if (add_record_to_server(adapter_get_address(adapter->btd_adapter),
+	if (adapter_add_record_to_server(adapter_get_address(adapter->btd_adapter),
 					sdp_record) < 0)
 		goto fail;
 	adapter->sdp_handler = sdp_record->handle;
diff --git a/profiles/network/server.c b/profiles/network/server.c
index de48bec..980dc3a 100644
--- a/profiles/network/server.c
+++ b/profiles/network/server.c
@@ -587,7 +587,7 @@ static uint32_t register_server_record(struct network_server *ns)
 		return 0;
 	}
 
-	if (add_record_to_server(&ns->src, record) < 0) {
+	if (adapter_add_record_to_server(&ns->src, record) < 0) {
 		error("Failed to register service record");
 		sdp_record_free(record);
 		return 0;
diff --git a/profiles/sap/server.c b/profiles/sap/server.c
index dfcf0f1..34a2e38 100644
--- a/profiles/sap/server.c
+++ b/profiles/sap/server.c
@@ -1358,7 +1358,7 @@ int sap_server_register(const char *path, const bdaddr_t *src)
 		goto sdp_err;
 	}
 
-	if (add_record_to_server(src, record) < 0) {
+	if (adapter_add_record_to_server(src, record) < 0) {
 		error("Adding SAP SDP record to the SDP server failed.");
 		sdp_record_free(record);
 		goto sdp_err;
diff --git a/src/adapter.c b/src/adapter.c
index fd20d61..8e897ce 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -6307,6 +6307,37 @@ void adapter_start_sdp_server(uint16_t sdp_mtu, uint32_t sdp_flags) {
 		adapter_foreach(adapter_service_insert, services->data);
 }
 
+int adapter_add_record_to_server(const bdaddr_t *device, sdp_record_t *rec)
+{
+	int chck;
+	struct btd_adapter *adapter;
+
+	chck = add_record_to_server(device, rec);
+
+	//  Check if rec handle error occure
+	//
+	//  0       - Ok
+	//
+	//  handle == 0xffffffff
+	//  -ENOSPC - next handle < 0x10000
+	//
+	//  -EEXIST - record already exist
+	if (chck == 0) {
+		//  Add rec for each adapter
+		if (bacmp(device, BDADDR_ANY) == 0) {
+			adapter_foreach(adapter_service_insert, rec);
+			return chck;
+		}
+
+		//  Add rec for single adapter
+		adapter = adapter_find(device);
+		if (adapter)
+			adapter_service_insert(adapter, rec);
+	}
+
+	return chck;
+}
+
 void adapter_sdp_init_services_list(bdaddr_t *device)
 {
 	sdp_list_t *p;
diff --git a/src/adapter.h b/src/adapter.h
index ad01710..3a4b4d9 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -215,4 +215,6 @@ void btd_adapter_for_each_device(struct btd_adapter *adapter,
 			void (*cb)(struct btd_device *device, void *data),
 			void *data);
 
+int adapter_add_record_to_server(const bdaddr_t *device, sdp_record_t *rec);
+
 void adapter_sdp_init_services_list(bdaddr_t *device);
diff --git a/src/attrib-server.c b/src/attrib-server.c
index 3f629b0..67631d1 100644
--- a/src/attrib-server.c
+++ b/src/attrib-server.c
@@ -326,7 +326,7 @@ static uint32_t attrib_create_sdp_new(struct gatt_server *server,
 				"http://www.bluez.org/";);
 	}
 
-	if (add_record_to_server(adapter_get_address(server->adapter), record)
+	if (adapter_add_record_to_server(adapter_get_address(server->adapter), record)
 			== 0)
 		return record->handle;
 
diff --git a/src/profile.c b/src/profile.c
index 90c3535..8e9236c 100644
--- a/src/profile.c
+++ b/src/profile.c
@@ -1220,7 +1220,7 @@ static uint32_t ext_register_record(struct ext_profile *ext,
 		return 0;
 	}
 
-	if (add_record_to_server(src, rec) < 0) {
+	if (adapter_add_record_to_server(src, rec) < 0) {
 		error("Failed to register service record");
 		sdp_record_free(rec);
 		return 0;
diff --git a/src/sdpd-database.c b/src/sdpd-database.c
index 7228cd7..335ea0e 100644
--- a/src/sdpd-database.c
+++ b/src/sdpd-database.c
@@ -168,7 +168,6 @@ void sdp_svcdb_set_collectable(sdp_record_t *record, int sock)
  */
 void sdp_record_add(const bdaddr_t *device, sdp_record_t *rec)
 {
-	struct btd_adapter *adapter;
 	sdp_access_t *dev;
 
 	SDPDBG("Adding rec : 0x%lx", (long) rec);
@@ -184,15 +183,6 @@ void sdp_record_add(const bdaddr_t *device, sdp_record_t *rec)
 	dev->handle = rec->handle;
 
 	access_db = sdp_list_insert_sorted(access_db, dev, access_sort);
-
-	if (bacmp(device, BDADDR_ANY) == 0) {
-		adapter_foreach(adapter_service_insert, rec);
-		return;
-	}
-
-	adapter = adapter_find(device);
-	if (adapter)
-		adapter_service_insert(adapter, rec);
 }
 
 static sdp_list_t *record_locate(uint32_t handle)
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux