advertising: Fix creating another mgmt instance
Luiz Augusto von Dentz
maintainerPATCH 1/1 advertising: Fix creating another mgmt instance
From: Luiz Augusto von Dentz <[email protected]>
adapter already instanciate a instance of mgmt so just reuse that instead of creating a new one.
--- src/adapter.c | 2 +- src/advertising.c | 15 ++++++++------- src/advertising.h | 3 ++- 3 files changed, 11 insertions(+), 9 deletions(-)
src/adapter.c +1 -1
@@ -7973,7 +7973,7 @@ static int adapter_register(struct btd_adapter *adapter)return -EINVAL ; } - adapter->adv_manager =btd_adv_manager_new (adapter); + adapter->adv_manager =btd_adv_manager_new (adapter, adapter->mgmt); db =btd_gatt_database_get_db (adapter->database); adapter->db_id = gatt_db_register(db, services_modified,
src/advertising.c +8 -7
@@ -17,8 +17,6 @@* */ -#include "advertising.h" -#include <stdint.h> #include <stdbool.h> #include <errno.h>
@@ -39,6 +37,7 @@#include "src/shared/mgmt.h" #include "src/shared/queue.h" #include "src/shared/util.h" +#include "advertising.h" #define LE_ADVERTISING_MGR_IFACE "org.bluez.LEAdvertisingManager1"#define LE_ADVERTISEMENT_IFACE "org.bluez.LEAdvertisement1"
@@ -1046,14 +1045,15 @@ static void read_adv_features_callback(uint8_t status, uint16_t length,remove_advertising (manager,0 ); } -static struct btd_adv_manager *manager_create (struct btd_adapter *adapter) +static struct btd_adv_manager *manager_create (struct btd_adapter *adapter, +struct mgmt *mgmt) {struct btd_adv_manager *manager; manager = new0(struct btd_adv_manager, 1); manager->adapter = adapter; - manager->mgmt =mgmt_new_default (); + manager->mgmt =mgmt_ref (mgmt);if (!manager->mgmt) {error ("Failed to access management interface" );
@@ -1087,14 +1087,15 @@ fail:return NULL ; } -struct btd_adv_manager *btd_adv_manager_new (struct btd_adapter *adapter) +struct btd_adv_manager *btd_adv_manager_new (struct btd_adapter *adapter, +struct mgmt *mgmt) {struct btd_adv_manager *manager; -if (!adapter) +if (!adapter || !mgmt)return NULL ; - manager =manager_create (adapter); + manager =manager_create (adapter, mgmt);if (!manager)return NULL ;
src/advertising.h +2 -1
@@ -20,6 +20,7 @@struct btd_adapter ;struct btd_adv_manager ; -struct btd_adv_manager *btd_adv_manager_new (struct btd_adapter *adapter); +struct btd_adv_manager *btd_adv_manager_new (struct btd_adapter *adapter, +struct mgmt *mgmt);void btd_adv_manager_destroy (struct btd_adv_manager *manager);void btd_adv_manager_refresh (struct btd_adv_manager *manager);
Signature · 1 line
2.14.3
Hi,
Quoted 95 lines · Luiz Augusto von Dentz
From: Luiz Augusto von Dentz <[email protected]>
adapter already instanciate a instance of mgmt so just reuse that instead of creating a new one.
--- src/adapter.c | 2 +- src/advertising.c | 15 ++++++++------- src/advertising.h | 3 ++- 3 files changed, 11 insertions(+), 9 deletions(-)src/adapter.c +1
-1@@ -7973,7 +7973,7 @@ static int adapter_register(struct btd_adapter *adapter)return -EINVAL ; } - adapter->adv_manager =btd_adv_manager_new (adapter); + adapter->adv_manager =btd_adv_manager_new (adapter, adapter->mgmt); db =btd_gatt_database_get_db (adapter->database); adapter->db_id = gatt_db_register(db, services_modified,src/advertising.c +8
-7@@ -17,8 +17,6 @@* */ -#include "advertising.h" -#include <stdint.h> #include <stdbool.h> #include <errno.h> @@ -39,6 +37,7 @@#include "src/shared/mgmt.h" #include "src/shared/queue.h" #include "src/shared/util.h" +#include "advertising.h" #define LE_ADVERTISING_MGR_IFACE "org.bluez.LEAdvertisingManager1"#define LE_ADVERTISEMENT_IFACE "org.bluez.LEAdvertisement1"@@ -1046,14 +1045,15 @@ static void read_adv_features_callback(uint8_t status, uint16_t length,remove_advertising (manager,0 ); } -static struct btd_adv_manager *manager_create (struct btd_adapter *adapter) +static struct btd_adv_manager *manager_create (struct btd_adapter *adapter, +struct mgmt *mgmt) {struct btd_adv_manager *manager; manager = new0(struct btd_adv_manager, 1); manager->adapter = adapter; - manager->mgmt =mgmt_new_default (); + manager->mgmt =mgmt_ref (mgmt);if (!manager->mgmt) {error ("Failed to access management interface" );@@ -1087,14 +1087,15 @@ fail:return NULL ; } -struct btd_adv_manager *btd_adv_manager_new (struct btd_adapter *adapter) +struct btd_adv_manager *btd_adv_manager_new (struct btd_adapter *adapter, +struct mgmt *mgmt) {struct btd_adv_manager *manager; -if (!adapter) +if (!adapter || !mgmt)return NULL ; - manager =manager_create (adapter); + manager =manager_create (adapter, mgmt);if (!manager)return NULL ;src/advertising.h +2
-2@@ -20,6 +20,7 @@struct btd_adapter ;struct btd_adv_manager ; -struct btd_adv_manager *btd_adv_manager_new (struct btd_adapter *adapter); +struct btd_adv_manager *btd_adv_manager_new (struct btd_adapter *adapter, +struct mgmt *mgmt);void btd_adv_manager_destroy (struct btd_adv_manager *manager);void btd_adv_manager_refresh (struct btd_adv_manager *manager); --
Quoted 1 line
2.14.3
Applied.
Signature · 1 line
Luiz Augusto von Dentz