mgmt: Add support of mgmt TLV API
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH 1/5 mgmt: Add support of mgmt TLV API
From: Howard Chung <[email protected]>
This adds API to send multiple TLVs to kernel, it is useful for mgmt set system config command.
--- src/shared/mgmt.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++ src/shared/mgmt.h | 9 +++++ 2 files changed, 103 insertions(+)
src/shared/mgmt.c +94 -0
@@ -68,6 +68,11 @@ struct mgmt_notify {void *user_data; }; +struct mgmt_tlv_list { +struct queue *tlv_queue; +uint16_t size; +}; +static void destroy_request (void *data) {struct mgmt_request *request = data;
@@ -558,6 +563,95 @@ static struct mgmt_request *create_request(uint16_t opcode, uint16_t index,return request; } +struct mgmt_tlv_list *mgmt_tlv_list_new (void ) +{ + struct mgmt_tlv_list *tlv_list = new0(struct mgmt_tlv_list, 1); + + tlv_list->tlv_queue =queue_new (); + tlv_list->size =0 ; + +return tlv_list; +} + +static struct mgmt_tlv *mgmt_tlv_new (uint16_t type,uint8_t length, +void *value) +{ +struct mgmt_tlv *entry =malloc (sizeof (*entry) + length); + +if (!entry) +return NULL ; + + entry->type =htobs (type); + entry->length = length; +memcpy (entry->value, value, length); + +return entry; +} + +static void mgmt_tlv_free (struct mgmt_tlv *entry) +{ +free (entry); +} + +void mgmt_tlv_list_free (struct mgmt_tlv_list *tlv_list) +{ +queue_destroy (tlv_list->tlv_queue,NULL ); +free (tlv_list); +} + +bool mgmt_tlv_add (struct mgmt_tlv_list *tlv_list,uint16_t type,uint8_t length, +void *value) +{ +struct mgmt_tlv *entry =mgmt_tlv_new (type, length, value); + +if (!entry) +return false; + +if (!queue_push_tail (tlv_list->tlv_queue, entry)) { +mgmt_tlv_free (entry); +return false; + } + + tlv_list->size +=sizeof (*entry) + entry->length; +return true; +} + +static void mgmt_tlv_to_buf (void *data,void *user_data) +{ +struct mgmt_tlv *entry = data; +uint8_t **buf_ptr = user_data; +size_t entry_size =sizeof (*entry) + entry->length; + +memcpy (*buf_ptr, entry, entry_size); + *buf_ptr += entry_size; +} + +unsigned int mgmt_send_tlv (struct mgmt *mgmt,uint16_t opcode,uint16_t index, +struct mgmt_tlv_list *tlv_list, +mgmt_request_func_t callback, +void *user_data,mgmt_destroy_func_t destroy) +{ +uint8_t *buf, *buf_ptr; +unsigned int ret; + +if (!tlv_list) +return 0 ; + + buf =malloc (tlv_list->size); + +if (!buf) +return 0 ; + + buf_ptr = buf; + +queue_foreach (tlv_list->tlv_queue, mgmt_tlv_to_buf, &buf_ptr); + + ret =mgmt_send (mgmt, opcode, index, tlv_list->size, (void *)buf, + callback, user_data, destroy); +free (buf); +return ret; +} + unsigned int mgmt_send(struct mgmt *mgmt, uint16_t opcode, uint16_t index, uint16_t length, const void *param, mgmt_request_func_t callback,
src/shared/mgmt.h +9 -0
@@ -16,6 +16,7 @@typedef void (*mgmt_destroy_func_t )(void *user_data);struct mgmt ; +struct mgmt_tlv_list ;struct mgmt *mgmt_new (int fd);struct mgmt *mgmt_new_default (void );
@@ -33,6 +34,14 @@ bool mgmt_set_close_on_unref(struct mgmt *mgmt, bool do_close);typedef void (*mgmt_request_func_t )(uint8_t status,uint16_t length,const void *param,void *user_data); +struct mgmt_tlv_list *mgmt_tlv_list_new (void ); +void mgmt_tlv_list_free (struct mgmt_tlv_list *tlv_list); +bool mgmt_tlv_add (struct mgmt_tlv_list *tlv_list,uint16_t type,uint8_t length, +void *value); +unsigned int mgmt_send_tlv (struct mgmt *mgmt,uint16_t opcode,uint16_t index, +struct mgmt_tlv_list *tlv_list, +mgmt_request_func_t callback, +void *user_data,mgmt_destroy_func_t destroy); unsigned int mgmt_send(struct mgmt *mgmt, uint16_t opcode, uint16_t index, uint16_t length, const void *param, mgmt_request_func_t callback,
Signature · 1 line
2.26.2
Luiz Augusto von Dentz
maintainerPATCH 2/5 shared/mgmt: Add mgmt_tlv_add_fixed
From: Luiz Augusto von Dentz <[email protected]>
This adds mgmt_tlv_add_fixed macro which can be used to add fixed sized value.
--- src/shared/mgmt.h | 3 +++ 1 file changed, 3 insertions(+)
src/shared/mgmt.h +3 -0
@@ -38,6 +38,9 @@ struct mgmt_tlv_list *mgmt_tlv_list_new(void);void mgmt_tlv_list_free (struct mgmt_tlv_list *tlv_list);bool mgmt_tlv_add (struct mgmt_tlv_list *tlv_list,uint16_t type,uint8_t length,void *value); +#define mgmt_tlv_add_fixed (_list, _type, _value) \ + mgmt_tlv_add(_list, _type, sizeof(*(_value)), _value) + unsigned int mgmt_send_tlv(struct mgmt *mgmt, uint16_t opcode, uint16_t index, struct mgmt_tlv_list *tlv_list, mgmt_request_func_t callback,
Signature · 1 line
2.26.2
Luiz Augusto von Dentz
maintainerPATCH 3/5 core: Split LE and BR/EDR parameters
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This splits LE and BR/EDR config parameters and checks main_conf.mode when parsing them.
--- profiles/scanparam/scan.c | 8 +- src/adapter.c | 392 ++++++++++++++++---------------------- src/hcid.h | 86 +++++---- src/main.c | 291 +++++++++++++++++----------- src/main.conf | 78 ++++---- 5 files changed, 429 insertions(+), 426 deletions(-)
profiles/scanparam/scan.c +4 -4
@@ -64,12 +64,12 @@ static void write_scan_params(struct scan *scan)/* Unless scan parameters are configured, use the known kernel default * parameters */ -put_le16 (main_opts.default_params.le_scan_interval_autoconnect ? - main_opts.default_params.le_scan_interval_autoconnect : +put_le16 (main_opts.defaults.le.scan_interval_autoconnect ? + main_opts.defaults.le.scan_interval_autoconnect :0x60 , &value[0 ]); -put_le16 (main_opts.default_params.le_scan_win_autoconnect ? - main_opts.default_params.le_scan_win_autoconnect : +put_le16 (main_opts.defaults.le.scan_win_autoconnect ? + main_opts.defaults.le.scan_win_autoconnect :0x30 , &value[2 ]); bt_gatt_client_write_without_response(scan->client, scan->iwhandle,
src/adapter.c +159 -233
426 lines not on this page · raw message
src/hcid.h +47 -39
98 lines not on this page · raw message
src/main.c +176 -115
382 lines not on this page · raw message
src/main.conf +43 -35
114 lines not on this page · raw message
Signature · 1 line
2.26.2
Luiz Augusto von Dentz
maintainerPATCH 4/5 core: Rename main_opts to btd_opts
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
Use btd_ prefix since this is a daemon API.
--- plugins/neard.c | 6 +- profiles/audio/a2dp.c | 2 +- profiles/audio/avdtp.c | 2 +- profiles/scanparam/scan.c | 8 +- src/adapter.c | 160 ++++++++++++------------- src/device.c | 24 ++-- src/gatt-client.c | 10 +- src/gatt-database.c | 18 +-- src/hcid.h | 4 +- src/main.c | 240 +++++++++++++++++++------------------- 10 files changed, 237 insertions(+), 237 deletions(-)
plugins/neard.c +3 -3
@@ -220,9 +220,9 @@ static DBusMessage *create_request_oob_reply(struct btd_adapter *adapter, len =eir_create_oob (btd_adapter_get_address (adapter),btd_adapter_get_name (adapter),btd_adapter_get_class (adapter), hash, - randomizer, main_opts.did_vendor, - main_opts.did_product, main_opts.did_version, - main_opts.did_source, + randomizer, btd_opts.did_vendor, + btd_opts.did_product, btd_opts.did_version, + btd_opts.did_source,btd_adapter_get_services (adapter), eir); reply =dbus_message_new_method_return (msg);
profiles/audio/a2dp.c +1 -1
@@ -2324,7 +2324,7 @@ static bool a2dp_server_listen(struct a2dp_server *server)if (server->io)return true; -if (main_opts.mps ==MPS_OFF ) +if (btd_opts.mps ==MPS_OFF ) mode =BT_IO_MODE_BASIC ;else mode =BT_IO_MODE_STREAMING ;
profiles/audio/avdtp.c +1 -1
@@ -2438,7 +2438,7 @@ static GIOChannel *l2cap_connect(struct avdtp *session) src =btd_adapter_get_address (device_get_adapter (session->device)); -if (main_opts.mps ==MPS_OFF ) +if (btd_opts.mps ==MPS_OFF ) mode =BT_IO_MODE_BASIC ;else mode =BT_IO_MODE_STREAMING ;
profiles/scanparam/scan.c +4 -4
@@ -64,12 +64,12 @@ static void write_scan_params(struct scan *scan)/* Unless scan parameters are configured, use the known kernel default * parameters */ -put_le16 (main_opts.defaults.le.scan_interval_autoconnect ? - main_opts.defaults.le.scan_interval_autoconnect : +put_le16 (btd_opts.defaults.le.scan_interval_autoconnect ? + btd_opts.defaults.le.scan_interval_autoconnect :0x60 , &value[0 ]); -put_le16 (main_opts.defaults.le.scan_win_autoconnect ? - main_opts.defaults.le.scan_win_autoconnect : +put_le16 (btd_opts.defaults.le.scan_win_autoconnect ? + btd_opts.defaults.le.scan_win_autoconnect :0x30 , &value[2 ]); bt_gatt_client_write_without_response(scan->client, scan->iwhandle,
src/adapter.c +80 -80
356 lines not on this page · raw message
src/device.c +12 -12
@@ -553,7 +553,7 @@ static void browse_request_free(struct browse_req *req)static bool gatt_cache_is_enabled (struct btd_device *device) { -switch (main_opts.gatt_cache) { +switch (btd_opts.gatt_cache) {case BT_GATT_CACHE_YES :return device_is_paired (device, device->bdaddr_type);case BT_GATT_CACHE_NO :
@@ -4084,7 +4084,7 @@ static struct btd_device *device_new(struct btd_adapter *adapter, device->db_id =gatt_db_register (device->db, gatt_service_added, gatt_service_removed, device,NULL ); - device->refresh_discovery = main_opts.refresh_discovery; + device->refresh_discovery = btd_opts.refresh_discovery;return btd_device_ref (device); }
@@ -4284,7 +4284,7 @@ void device_update_last_seen(struct btd_device *device, uint8_t bdaddr_type)if (device->temporary_timer)g_source_remove (device->temporary_timer); - device->temporary_timer =g_timeout_add_seconds (main_opts.tmpto, + device->temporary_timer =g_timeout_add_seconds (btd_opts.tmpto, device_disappeared, device); }
@@ -5169,7 +5169,7 @@ static void gatt_client_init(struct btd_device *device) {gatt_client_cleanup (device); -if (!device->connect && !main_opts.reverse_discovery) { +if (!device->connect && !btd_opts.reverse_discovery) {DBG ("Reverse service discovery disabled: skipping GATT client" );return ; }
@@ -5222,7 +5222,7 @@ static void gatt_server_init(struct btd_device *device,gatt_server_cleanup (device); device->server =bt_gatt_server_new (db, device->att, device->att_mtu, - main_opts.key_size); + btd_opts.key_size);if (!device->server) {error ("Failed to initialize bt_gatt_server" );return ;
@@ -5285,7 +5285,7 @@ bool device_attach_att(struct btd_device *dev, GIOChannel *io) }if (dev->att) { -if (main_opts.gatt_channels ==bt_att_get_channels (dev->att)) { +if (btd_opts.gatt_channels ==bt_att_get_channels (dev->att)) {DBG ("EATT channel limit reached" );return false; }
@@ -5313,7 +5313,7 @@ bool device_attach_att(struct btd_device *dev, GIOChannel *io) } } - dev->att_mtu =MIN (mtu, main_opts.gatt_mtu); + dev->att_mtu =MIN (mtu, btd_opts.gatt_mtu); attrib =g_attrib_new (io, cid ==ATT_CID ?BT_ATT_DEFAULT_LE_MTU : dev->att_mtu, false);
@@ -5690,7 +5690,7 @@ void btd_device_set_temporary(struct btd_device *device, bool temporary) device->disable_auto_connect = TRUE;device_set_auto_connect (device, FALSE); } - device->temporary_timer =g_timeout_add_seconds (main_opts.tmpto, + device->temporary_timer =g_timeout_add_seconds (btd_opts.tmpto, device_disappeared, device);return ;
@@ -6091,7 +6091,7 @@ void device_bonding_complete(struct btd_device *device, uint8_t bdaddr_type,bonding_request_free (bonding); }else if (!state->svc_resolved) {if (!device->browse && !device->discov_timer && - main_opts.reverse_discovery) { + btd_opts.reverse_discovery) {/* If we are not initiators and there is no currently * active discovery or discovery timer, set discovery * timer */
@@ -6135,7 +6135,7 @@ unsigned int device_wait_for_svc_complete(struct btd_device *dev, dev->svc_callbacks =g_slist_prepend (dev->svc_callbacks, cb); -if (state->svc_resolved || !main_opts.reverse_discovery) +if (state->svc_resolved || !btd_opts.reverse_discovery) cb->idle_id =g_idle_add (svc_idle_cb, cb);else if (dev->discov_timer >0 ) {g_source_remove (dev->discov_timer);
@@ -6415,12 +6415,12 @@ int device_confirm_passkey(struct btd_device *device, uint8_t type,/* Just-Works repairing policy */ if (confirm_hint &&device_is_paired (device, type)) { -if (main_opts.jw_repairing ==JW_REPAIRING_NEVER ) { +if (btd_opts.jw_repairing ==JW_REPAIRING_NEVER ) {btd_adapter_confirm_reply (device->adapter, &device->bdaddr, type, FALSE);return 0 ; - }else if (main_opts.jw_repairing ==JW_REPAIRING_ALWAYS ) { + }else if (btd_opts.jw_repairing ==JW_REPAIRING_ALWAYS ) {btd_adapter_confirm_reply (device->adapter, &device->bdaddr, type, TRUE);
src/gatt-client.c +5 -5
@@ -2174,13 +2174,13 @@ static void eatt_connect(struct btd_gatt_client *client)char addr[18 ];int i; -if (bt_att_get_channels (att) == main_opts.gatt_channels) +if (bt_att_get_channels (att) == btd_opts.gatt_channels)return ;ba2str (device_get_address (dev), addr); -for (i =bt_att_get_channels (att); i < main_opts.gatt_channels; i++) { -int defer_timeout = i +1 < main_opts.gatt_channels ?1 :0 ; +for (i =bt_att_get_channels (att); i < btd_opts.gatt_channels; i++) { +int defer_timeout = i +1 < btd_opts.gatt_channels ?1 :0 ;DBG ("Connection attempt to: %s defer %s" , addr, defer_timeout ?"true" :"false" );
@@ -2198,7 +2198,7 @@ static void eatt_connect(struct btd_gatt_client *client)BT_IO_OPT_MODE ,BT_IO_MODE_EXT_FLOWCTL ,BT_IO_OPT_PSM ,BT_ATT_EATT_PSM ,BT_IO_OPT_SEC_LEVEL ,BT_IO_SEC_LOW , -BT_IO_OPT_MTU , main_opts.gatt_mtu, +BT_IO_OPT_MTU , btd_opts.gatt_mtu,BT_IO_OPT_DEFER_TIMEOUT , defer_timeout, BT_IO_OPT_INVALID);if (!io) {
@@ -2216,7 +2216,7 @@ static void eatt_connect(struct btd_gatt_client *client)device_get_le_address_type (dev),BT_IO_OPT_PSM ,BT_ATT_EATT_PSM ,BT_IO_OPT_SEC_LEVEL ,BT_IO_SEC_LOW , -BT_IO_OPT_MTU , main_opts.gatt_mtu, +BT_IO_OPT_MTU , btd_opts.gatt_mtu, BT_IO_OPT_INVALID);if (!io) { error("EATT bt_io_connect(%s): %s", addr,
src/gatt-database.c +9 -9
@@ -1232,10 +1232,10 @@ static void device_info_read_pnp_id_cb(struct gatt_db_attribute *attrib, {uint8_t pdu[7 ]; - pdu[0 ] = main_opts.did_source; -put_le16 (main_opts.did_vendor, &pdu[1 ]); -put_le16 (main_opts.did_product, &pdu[3 ]); -put_le16 (main_opts.did_version, &pdu[5 ]); + pdu[0 ] = btd_opts.did_source; +put_le16 (btd_opts.did_vendor, &pdu[1 ]); +put_le16 (btd_opts.did_product, &pdu[3 ]); +put_le16 (btd_opts.did_version, &pdu[5 ]);gatt_db_attribute_read_result (attrib, id,0 , pdu,sizeof (pdu)); }
@@ -1248,7 +1248,7 @@ static void populate_devinfo_service(struct btd_gatt_database *database)bt_uuid16_create (&uuid,UUID_DIS ); service =gatt_db_add_service (database->db, &uuid, true,3 ); -if (main_opts.did_source >0 ) { +if (btd_opts.did_source >0 ) {bt_uuid16_create (&uuid,GATT_CHARAC_PNP_ID ); gatt_db_service_add_characteristic(service, &uuid, BT_ATT_PERM_READ,
@@ -1267,7 +1267,7 @@ static void register_core_services(struct btd_gatt_database *database)populate_gap_service (database);populate_gatt_service (database); -if (main_opts.did_source >0 ) +if (btd_opts.did_source >0 )populate_devinfo_service (database); }
@@ -3639,7 +3639,7 @@ struct btd_gatt_database *btd_gatt_database_new(struct btd_adapter *adapter) }/* If just just 1 channel is enabled EATT is not required */ -if (main_opts.gatt_channels ==1 ) +if (btd_opts.gatt_channels ==1 ) goto bredr;/* EATT socket */
@@ -3650,7 +3650,7 @@ struct btd_gatt_database *btd_gatt_database_new(struct btd_adapter *adapter)btd_adapter_get_address_type (adapter),BT_IO_OPT_PSM ,BT_ATT_EATT_PSM ,BT_IO_OPT_SEC_LEVEL ,BT_IO_SEC_LOW , -BT_IO_OPT_MTU , main_opts.gatt_mtu, +BT_IO_OPT_MTU , btd_opts.gatt_mtu, BT_IO_OPT_INVALID);if (!database->eatt_io) {g_error_free (gerr);
@@ -3663,7 +3663,7 @@ bredr:BT_IO_OPT_SOURCE_BDADDR , addr,BT_IO_OPT_PSM ,BT_ATT_PSM ,BT_IO_OPT_SEC_LEVEL ,BT_IO_SEC_MEDIUM , -BT_IO_OPT_MTU , main_opts.gatt_mtu, +BT_IO_OPT_MTU , btd_opts.gatt_mtu, BT_IO_OPT_INVALID);if (database->bredr_io ==NULL ) {error ("Failed to start listening: %s" , gerr->message);
src/hcid.h +2 -2
@@ -80,7 +80,7 @@ struct btd_defaults {struct btd_le_defaults le; }; -struct main_opts { +struct btd_opts {char *name;uint32_t class;gboolean pairable;
@@ -113,7 +113,7 @@ struct main_opts {enum jw_repairing_t jw_repairing; }; -extern struct main_opts main_opts; +extern struct btd_opts btd_opts;gboolean plugin_init (const char *enable,const char *disable);void plugin_cleanup (void );
src/main.c +120 -120
511 lines not on this page · raw message
Signature · 1 line
2.26.2
Luiz Augusto von Dentz
maintainerPATCH 5/5 core: Rename hcid.h to btd.h
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
Since we use btd term for daemon APIs it makes sense to use it also for the header name instead of hcid.
---
Makefile.am | 2 +-
plugins/neard.c | 2 +-
plugins/policy.c | 2 +-
profiles/audio/a2dp.c | 2 +-
profiles/audio/avdtp.c | 2 +-
profiles/scanparam/scan.c | 2 +-
src/adapter.c | 2 +-
src/agent.c | 2 +-
src/{hcid.h => btd.h} | 0
src/device.c | 2 +-
src/gatt-client.c | 2 +-
src/gatt-database.c | 2 +-
src/main.c | 2 +-
src/plugin.c | 2 +-
src/rfkill.c | 2 +-
15 files changed, 14 insertions(+), 14 deletions(-)
rename src/{hcid.h => btd.h} (100%)Makefile.am +1 -1
@@ -272,7 +272,7 @@ src_bluetoothd_SOURCES = $(builtin_sources) \ src/bluetooth.ver \ src/main.c src/log.h src/log.c \ src/backtrace.h src/backtrace.c \ - src/rfkill.c src/hcid.h src/sdpd.h \ + src/rfkill.c src/btd.h src/sdpd.h \ src/sdpd-server.c src/sdpd-request.c \ src/sdpd-service.c src/sdpd-database.c \ src/attrib-server.h src/attrib-server.c \
plugins/neard.c +1 -1
@@ -29,7 +29,7 @@#include "src/device.h" #include "src/eir.h" #include "src/agent.h" -#include "src/hcid.h" +#include "src/btd.h" #define NEARD_NAME "org.neard"#define NEARD_PATH "/"
plugins/policy.c +1 -1
@@ -30,7 +30,7 @@#include "src/device.h" #include "src/service.h" #include "src/profile.h" -#include "src/hcid.h" +#include "src/btd.h" #define CONTROL_CONNECT_TIMEOUT 2#define SOURCE_RETRY_TIMEOUT 2
profiles/audio/a2dp.c +1 -1
@@ -30,7 +30,7 @@#include "gdbus/gdbus.h" -#include "src/hcid.h" +#include "src/btd.h" #include "src/plugin.h" #include "src/adapter.h" #include "src/device.h"
profiles/audio/avdtp.c +1 -1
@@ -29,7 +29,7 @@#include "lib/uuid.h" #include "btio/btio.h" -#include "src/hcid.h" +#include "src/btd.h" #include "src/log.h" #include "src/shared/util.h" #include "src/shared/queue.h"
profiles/scanparam/scan.c +1 -1
@@ -32,7 +32,7 @@#include "src/shared/gatt-db.h" #include "src/shared/gatt-client.h" #include "attrib/att.h" -#include "src/hcid.h" +#include "src/btd.h" #define SCAN_INTERVAL_WIN_UUID 0x2A4F#define SCAN_REFRESH_UUID 0x2A31
src/adapter.c +1 -1
@@ -48,7 +48,7 @@#include "src/shared/gatt-db.h" #include "btio/btio.h" -#include "hcid.h" +#include "btd.h" #include "sdpd.h" #include "adapter.h" #include "device.h"
src/agent.c +1 -1
@@ -30,7 +30,7 @@#include "log.h" #include "error.h" -#include "hcid.h" +#include "btd.h" #include "dbus-common.h" #include "adapter.h" #include "device.h"
src/btd.h renamed from src/hcid.h +0 -0
src/device.c +1 -1
@@ -44,7 +44,7 @@#include "btio/btio.h" #include "lib/mgmt.h" #include "attrib/att.h" -#include "hcid.h" +#include "btd.h" #include "adapter.h" #include "gatt-database.h" #include "attrib/gattrib.h"
src/gatt-client.c +1 -1
@@ -30,7 +30,7 @@#include "log.h" #include "error.h" -#include "hcid.h" +#include "btd.h" #include "adapter.h" #include "device.h" #include "src/shared/io.h"
src/gatt-database.c +1 -1
@@ -31,7 +31,7 @@#include "src/shared/gatt-server.h" #include "log.h" #include "error.h" -#include "hcid.h" +#include "btd.h" #include "adapter.h" #include "device.h" #include "gatt-database.h"
src/main.c +1 -1
@@ -42,7 +42,7 @@#include "shared/mainloop.h" #include "lib/uuid.h" #include "shared/util.h" -#include "hcid.h" +#include "btd.h" #include "sdpd.h" #include "adapter.h" #include "device.h"
src/plugin.c +1 -1
@@ -24,7 +24,7 @@#include "btio/btio.h" #include "src/plugin.h" #include "src/log.h" -#include "src/hcid.h" +#include "src/btd.h" static GSList *plugins =NULL ;
src/rfkill.c +1 -1
@@ -28,7 +28,7 @@#include "log.h" #include "adapter.h" -#include "hcid.h" +#include "btd.h" enum rfkill_type {RFKILL_TYPE_ALL =0 ,
Signature · 1 line
2.26.2
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=372299
---Test result---
##############################
Test: CheckPatch - FAIL
Output:
core: Split LE and BR/EDR parameters
WARNING:STATIC_CONST_CHAR_ARRAY: static const char * array should probably be static const char * const #602: FILE: src/main.c:84:
+static const char *br_options[] = {
WARNING:STATIC_CONST_CHAR_ARRAY: static const char * array should probably be static const char * const #616: FILE: src/main.c:98:
+static const char *le_options[] = {
- total: 0 errors, 2 warnings, 1036 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
Your patch has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
##############################
Test: CheckGitLint - PASS
##############################
Test: CheckBuild - PASS
##############################
Test: MakeCheck - PASS
---
Regards,
Linux Bluetooth
Luiz Augusto von Dentz
maintainerHi,
Quoted 150 lines · Luiz Augusto von Dentz
From: Howard Chung <[email protected]>
This adds API to send multiple TLVs to kernel, it is useful for mgmt set system config command.
--- src/shared/mgmt.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++ src/shared/mgmt.h | 9 +++++ 2 files changed, 103 insertions(+)src/shared/mgmt.c +94
-0@@ -68,6 +68,11 @@ struct mgmt_notify {void *user_data; }; +struct mgmt_tlv_list { +struct queue *tlv_queue; +uint16_t size; +}; +static void destroy_request (void *data) {struct mgmt_request *request = data;@@ -558,6 +563,95 @@ static struct mgmt_request *create_request(uint16_t opcode, uint16_t index,return request; } +struct mgmt_tlv_list *mgmt_tlv_list_new (void ) +{ + struct mgmt_tlv_list *tlv_list = new0(struct mgmt_tlv_list, 1); + + tlv_list->tlv_queue =queue_new (); + tlv_list->size =0 ; + +return tlv_list; +} + +static struct mgmt_tlv *mgmt_tlv_new (uint16_t type,uint8_t length, +void *value) +{ +struct mgmt_tlv *entry =malloc (sizeof (*entry) + length); + +if (!entry) +return NULL ; + + entry->type =htobs (type); + entry->length = length; +memcpy (entry->value, value, length); + +return entry; +} + +static void mgmt_tlv_free (struct mgmt_tlv *entry) +{ +free (entry); +} + +void mgmt_tlv_list_free (struct mgmt_tlv_list *tlv_list) +{ +queue_destroy (tlv_list->tlv_queue,NULL ); +free (tlv_list); +} + +bool mgmt_tlv_add (struct mgmt_tlv_list *tlv_list,uint16_t type,uint8_t length, +void *value) +{ +struct mgmt_tlv *entry =mgmt_tlv_new (type, length, value); + +if (!entry) +return false; + +if (!queue_push_tail (tlv_list->tlv_queue, entry)) { +mgmt_tlv_free (entry); +return false; + } + + tlv_list->size +=sizeof (*entry) + entry->length; +return true; +} + +static void mgmt_tlv_to_buf (void *data,void *user_data) +{ +struct mgmt_tlv *entry = data; +uint8_t **buf_ptr = user_data; +size_t entry_size =sizeof (*entry) + entry->length; + +memcpy (*buf_ptr, entry, entry_size); + *buf_ptr += entry_size; +} + +unsigned int mgmt_send_tlv (struct mgmt *mgmt,uint16_t opcode,uint16_t index, +struct mgmt_tlv_list *tlv_list, +mgmt_request_func_t callback, +void *user_data,mgmt_destroy_func_t destroy) +{ +uint8_t *buf, *buf_ptr; +unsigned int ret; + +if (!tlv_list) +return 0 ; + + buf =malloc (tlv_list->size); + +if (!buf) +return 0 ; + + buf_ptr = buf; + +queue_foreach (tlv_list->tlv_queue, mgmt_tlv_to_buf, &buf_ptr); + + ret =mgmt_send (mgmt, opcode, index, tlv_list->size, (void *)buf, + callback, user_data, destroy); +free (buf); +return ret; +} + unsigned int mgmt_send(struct mgmt *mgmt, uint16_t opcode, uint16_t index, uint16_t length, const void *param, mgmt_request_func_t callback,src/shared/mgmt.h +9
-1@@ -16,6 +16,7 @@typedef void (*mgmt_destroy_func_t )(void *user_data);struct mgmt ; +struct mgmt_tlv_list ;struct mgmt *mgmt_new (int fd);struct mgmt *mgmt_new_default (void );@@ -33,6 +34,14 @@ bool mgmt_set_close_on_unref(struct mgmt *mgmt, bool do_close);typedef void (*mgmt_request_func_t )(uint8_t status,uint16_t length,const void *param,void *user_data); +struct mgmt_tlv_list *mgmt_tlv_list_new (void ); +void mgmt_tlv_list_free (struct mgmt_tlv_list *tlv_list); +bool mgmt_tlv_add (struct mgmt_tlv_list *tlv_list,uint16_t type,uint8_t length, +void *value); +unsigned int mgmt_send_tlv (struct mgmt *mgmt,uint16_t opcode,uint16_t index, +struct mgmt_tlv_list *tlv_list, +mgmt_request_func_t callback, +void *user_data,mgmt_destroy_func_t destroy); unsigned int mgmt_send(struct mgmt *mgmt, uint16_t opcode, uint16_t index, uint16_t length, const void *param, mgmt_request_func_t callback, --
Quoted 2 lines
2.26.2
Pushed.
Signature · 1 line
Luiz Augusto von Dentz