mcp: support multiple MCP and implement local GMCS
Subsystems (2)
v4 cover mcp: support multiple MCP and implement local GMCS
v4:
- move uinput-util.h to src/shared + adapt accordingly
- improve debug logs in profile
v3:
- add missing #include to fix build in the test environment
v2:
- fix compilation issues
- remove unnecessary code in get_media_cp_op_supported
***
For Media Control Client, add support for multiple GMCS / MCS services on the server. Revise the API accordingly.
For Media Control Server, make it a non-stub implementation (OTS still missing), and add an API the profile can use.
Add tests.
This changes the design of the previous MCP code, so it's mostly a rewrite.
The shared/mcp: commit doesn't fix the API in profiles/audio, that's done in the later mcp: commit, as it's a rewrite of the API.
TODO (for later): OTP/OTS parts -- requires design for OTP/OTS implementation first
TODO (for later): MPRIS integration to GMCS server -- this needs some redesign in media.c as it's hardcoded to AVRCP there.
Tested devices (MCS):
- Creative Zen Hybrid Pro (doesn't even connect without GMCS)
- Samsung Galaxy Buds Pro2
- Creative Aurvana Ace 2
Tested devices (MCP):
- Samsung Galaxy A56
Pauli Virtanen (7):
shared/mcp: support multiple MCP, and add non-stub MCS server
test-mcp: add tests for MCP / MCS
mcp: adapt to new MCP API to support multiple remote MCS services shared/uinput-util: extract uinput utility function from AVCTP
avctp: use uinput utilities from src/shared
mcp: add local GMCS service that emits uinput media keys shared/gatt-client: fix notify_data leak in notify_data_write_ccc
.gitignore | 1 + Makefile.am | 10 +- lib/bluetooth/uuid.h | 27 +- profiles/audio/avctp.c | 159 +- profiles/audio/mcp.c | 812 +++++++--- src/shared/gatt-client.c | 3 + src/shared/mcp.c | 3216 ++++++++++++++++++++++---------------- src/shared/mcp.h | 186 ++- src/shared/mcs.h | 51 +- src/shared/uinput-util.c | 195 +++ src/shared/uinput-util.h | 31 + unit/test-mcp.c | 1807 +++++++++++++++++++++ 12 files changed, 4742 insertions(+), 1756 deletions(-) create mode 100644 src/shared/uinput-util.c create mode 100644 src/shared/uinput-util.h create mode 100644 unit/test-mcp.c
Signature · 1 line
2.51.1
PATCH v4 1/7 shared/mcp: support multiple MCP, and add non-stub MCS server
For Media Control Client, add support for multiple GMCS / MCS services on the server. Revise the API accordingly.
For Media Control Server, make it a complete implementation (OTS still missing), and add an API the profile can use.
This is mostly a complete rewrite.
--- lib/bluetooth/uuid.h | 27 +- src/shared/mcp.c | 3216 ++++++++++++++++++++++++------------------ src/shared/mcp.h | 186 ++- src/shared/mcs.h | 51 +- 4 files changed, 2086 insertions(+), 1394 deletions(-)
lib/bluetooth/uuid.h +14 -13
@@ -198,20 +198,21 @@ extern "C" {#define AICS_AUDIO_INPUT_CP_CHRC_UUID 0X2B7B#define AICS_INPUT_DESCR_CHAR_UUID 0X2B7C +#define MCS_UUID 0x1848#define GMCS_UUID 0x1849 -#define MEDIA_PLAYER_NAME_CHRC_UUID 0x2b93 -#define MEDIA_TRACK_CHNGD_CHRC_UUID 0x2b96 -#define MEDIA_TRACK_TITLE_CHRC_UUID 0x2b97 -#define MEDIA_TRACK_DURATION_CHRC_UUID 0x2b98 -#define MEDIA_TRACK_POSTION_CHRC_UUID 0x2b99 -#define MEDIA_PLAYBACK_SPEED_CHRC_UUID 0x2b9a -#define MEDIA_SEEKING_SPEED_CHRC_UUID 0x2b9b -#define MEDIA_PLAYING_ORDER_CHRC_UUID 0x2ba1 -#define MEDIA_PLAY_ORDER_SUPPRTD_CHRC_UUID 0x2ba2 -#define MEDIA_STATE_CHRC_UUID 0x2ba3 -#define MEDIA_CP_CHRC_UUID 0x2ba4 -#define MEDIA_CP_OP_SUPPORTED_CHRC_UUID 0x2ba5 -#define MEDIA_CONTENT_CONTROL_ID_CHRC_UUID 0x2bba +#define MCS_MEDIA_PLAYER_NAME_CHRC_UUID 0x2b93 +#define MCS_TRACK_CHANGED_CHRC_UUID 0x2b96 +#define MCS_TRACK_TITLE_CHRC_UUID 0x2b97 +#define MCS_TRACK_DURATION_CHRC_UUID 0x2b98 +#define MCS_TRACK_POSITION_CHRC_UUID 0x2b99 +#define MCS_PLAYBACK_SPEED_CHRC_UUID 0x2b9a +#define MCS_SEEKING_SPEED_CHRC_UUID 0x2b9b +#define MCS_PLAYING_ORDER_CHRC_UUID 0x2ba1 +#define MCS_PLAYING_ORDER_SUPPORTED_CHRC_UUID 0x2ba2 +#define MCS_MEDIA_STATE_CHRC_UUID 0x2ba3 +#define MCS_MEDIA_CP_CHRC_UUID 0x2ba4 +#define MCS_MEDIA_CP_OP_SUPPORTED_CHRC_UUID 0x2ba5 +#define MCS_CCID_CHRC_UUID 0x2bba/* Telephony and Media Audio Service */ #define TMAS_UUID_STR "00001855-0000-1000-8000-00805f9b34fb"
src/shared/mcp.c +1879 -1337
2,966 lines not on this page · raw message
src/shared/mcp.h +146 -40
186 lines not on this page · raw message
src/shared/mcs.h +47 -4
51 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.51.1
Part of the diff is not shown here. View the raw message.
PATCH v4 2/7 test-mcp: add tests for MCP / MCS
In reply to Pauli VirtanenAdd tests for the Media Control Client / Server implementation.
This contains basic GGIT and state transition tests. Not all state transition tests are here, as they'd largely test the upper layer of the profile which is not tested now.
--- .gitignore | 1 + Makefile.am | 6 + unit/test-mcp.c | 1807 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1814 insertions(+) create mode 100644 unit/test-mcp.c
.gitignore +1 -0
@@ -120,6 +120,7 @@ unit/test-bass unit/test-battery unit/test-tmap unit/test-gmap +unit/test-mcp unit/test-profile tools/mgmt-tester tools/smp-tester
Makefile.am +6 -0
@@ -727,6 +727,12 @@ unit_test_gmap_SOURCES = unit/test-gmap.c $(btio_sources) unit_test_gmap_LDADD = src/libshared-glib.la \ lib/libbluetooth-internal.la $(GLIB_LIBS) +unit_tests += unit/test-mcp + +unit_test_mcp_SOURCES = unit/test-mcp.c $(btio_sources) +unit_test_mcp_LDADD = src/libshared-glib.la \ + lib/libbluetooth-internal.la $(GLIB_LIBS) + unit_tests += unit/test-battery unit_test_battery_SOURCES = unit/test-battery.c
unit/test-mcp.c new file +1807 -0
1,807 lines not on this page · raw message
Signature · 1 line
2.51.1
PATCH v4 3/7 mcp: adapt to new MCP API to support multiple remote MCS services
In reply to Pauli VirtanenRewrite to use the new shared/mcp API, adding support for multiple MCS services on the remote side.
--- profiles/audio/mcp.c | 647 +++++++++++++++++++++++++++---------------- 1 file changed, 407 insertions(+), 240 deletions(-)
profiles/audio/mcp.c +407 -240
@@ -22,6 +22,7 @@#include <sys/stat.h> #include <fcntl.h> #include <errno.h> +#include <math.h> #include <glib.h>
@@ -51,50 +52,54 @@#include "src/service.h" #include "src/log.h" #include "src/error.h" +#include "player.h" -#define GMCS_UUID_STR "00001849-0000-1000-8000-00805f9b34fb" +#define MCS_UUID_STR "00001848-0000-1000-8000-00805f9b34fb" +#define GMCS_UUID_STR "00001849-0000-1000-8000-00805f9b34fb" -struct mcp_data { -struct btd_device *device; -struct btd_service *service; + +/* +* Remote player +*/ + +struct remote_player {struct bt_mcp *mcp; -unsigned int state_id; - +uint8_t ccid;struct media_player *mp; +uint8_t playing_order; }; -static void mcp_debug (const char *str,void *user_data) -{ -DBG_IDX (0xffff ,"%s" , str); -} -static char *name2utf8 (const uint8_t *name,uint16_t len) { -char utf8_name[HCI_MAX_NAME_LENGTH +2 ]; +char *utf8_name; - len =MIN (len,sizeof (utf8_name) -1 ); + utf8_name =malloc (len +1 ); +if (!utf8_name) +return NULL ; -memset (utf8_name,0 ,sizeof (utf8_name)); -strncpy (utf8_name, (char *) name, len); +if (len) +memcpy (utf8_name, name, len); + + utf8_name[len] =0 ;strtoutf8 (utf8_name, len);/* Remove leading and trailing whitespace characters */ g_strstrip (utf8_name); -return g_strdup (utf8_name); +return utf8_name; }static const char *mcp_status_val_to_string (uint8_t status) {switch (status) { -case BT_MCS_STATUS_PLAYING : +case BT_MCS_STATE_PLAYING :return "playing" ; -case BT_MCS_STATUS_PAUSED : +case BT_MCS_STATE_PAUSED :return "paused" ; -case BT_MCS_STATUS_INACTIVE : +case BT_MCS_STATE_INACTIVE :return "stopped" ; -case BT_MCS_STATUS_SEEKING : +case BT_MCS_STATE_SEEKING :/* TODO: find a way for fwd/rvs seeking, probably by storing * control point operation sent before */
@@ -104,307 +109,469 @@ static const char *mcp_status_val_to_string(uint8_t status) } } -static struct mcp_data *mcp_data_new (struct btd_device *device) -{ -struct mcp_data *data; - - data = new0(struct mcp_data, 1); - data->device = device; - -return data; -} - -static void cb_player_name (struct bt_mcp *mcp,const uint8_t *value, -uint16_t length) +static void remote_media_player_name (void *data,const uint8_t *value, +uint16_t length) { +struct remote_player *remote = data;char *name; -struct media_player *mp =bt_mcp_get_user_data (mcp); name =name2utf8 (value, length); +if (!name) +return ; +DBG ("Media Player Name %s" , (const char *)name); -media_player_set_name (mp, name); +media_player_set_name (remote->mp, name); -g_free (name); +free (name); } -static void cb_track_changed (struct bt_mcp *mcp) +static void remote_track_changed (void *data) { +struct remote_player *remote = data; +DBG ("Track Changed" ); -/* Since track changed has happened -* track title notification is expected -*/ + +media_player_metadata_changed (remote->mp); } -static void cb_track_title (struct bt_mcp *mcp,const uint8_t *value, -uint16_t length) +static void remote_track_title (void *data,const uint8_t *value, +uint16_t length) { +struct remote_player *remote = data;char *name;uint16_t len; -struct media_player *mp =bt_mcp_get_user_data (mcp); name =name2utf8 (value, length); +if (!name) +return ; + len =strlen (name);DBG ("Track Title %s" , (const char *)name); -media_player_set_metadata (mp,NULL ,"Title" , name, len); -media_player_metadata_changed (mp); +media_player_set_metadata (remote->mp,NULL ,"Title" , name, len); +media_player_metadata_changed (remote->mp);g_free (name); } -static void cb_track_duration (struct bt_mcp *mcp,int32_t duration) +static void remote_track_duration (void *data,int32_t duration_centisec) { -struct media_player *mp =bt_mcp_get_user_data (mcp); -unsigned char buf[10 ]; +struct remote_player *remote = data; -/* MCP defines duration is int32 but api takes it as uint32 */ -snprintf ((char *)buf,10 ,"%d" , duration); -media_player_set_metadata (mp,NULL ,"Duration" , buf,sizeof (buf)); -media_player_metadata_changed (mp); -} - -static void cb_track_position (struct bt_mcp *mcp,int32_t duration) -{ -struct media_player *mp =bt_mcp_get_user_data (mcp); - -/* MCP defines duration is int32 but api takes it as uint32 */ -media_player_set_position (mp, duration); -} - -static void cb_media_state (struct bt_mcp *mcp,uint8_t status) -{ -struct media_player *mp =bt_mcp_get_user_data (mcp); - -media_player_set_status (mp,mcp_status_val_to_string (status)); -} - -static const struct bt_mcp_event_callback cbs = { - .player_name = cb_player_name, - .track_changed = cb_track_changed, - .track_title = cb_track_title, - .track_duration = cb_track_duration, - .track_position = cb_track_position, - .media_state = cb_media_state, -}; - -static int ct_play (struct media_player *mp,void *user_data) -{ -struct bt_mcp *mcp = user_data; - -return bt_mcp_play (mcp); -} - -static int ct_pause (struct media_player *mp,void *user_data) -{ -struct bt_mcp *mcp = user_data; - -return bt_mcp_pause (mcp); -} - -static int ct_stop (struct media_player *mp,void *user_data) -{ -struct bt_mcp *mcp = user_data; - -return bt_mcp_stop (mcp); -} - -static int ct_next (struct media_player *mp,void *user_data) -{ -struct bt_mcp *mcp = user_data; - -return bt_mcp_next_track (mcp); -} - -static int ct_previous (struct media_player *mp,void *user_data) -{ -struct bt_mcp *mcp = user_data; - -return bt_mcp_previous_track (mcp); -} - -static const struct media_player_callback ct_cbs = { - .play = ct_play, - .pause = ct_pause, - .stop = ct_stop, - .next = ct_next, - .previous = ct_previous, -}; - -static int mcp_probe (struct btd_service *service) -{ -struct btd_device *device =btd_service_get_device (service); -struct btd_adapter *adapter =device_get_adapter (device); -struct btd_gatt_database *database =btd_adapter_get_database (adapter); -struct mcp_data *data =btd_service_get_user_data (service); -char addr[18 ]; - -ba2str (device_get_address (device), addr); -DBG ("%s" , addr); - -/* Ignore, if we were probed for this device already */ -if (data) { -error ("Profile probed twice for the same device!" ); -return -EINVAL ; - } - - data =mcp_data_new (device); - data->service = service; - - data->mcp =bt_mcp_new (btd_gatt_database_get_db (database), -btd_device_get_gatt_db (device)); - -bt_mcp_set_debug (data->mcp, mcp_debug,NULL ,NULL ); -btd_service_set_user_data (service, data); - -return 0 ; -} - -static void mcp_data_free (struct mcp_data *data) -{ -DBG ("" ); - -if (data->service) { -btd_service_set_user_data (data->service,NULL ); -bt_mcp_set_user_data (data->mcp,NULL ); - } - -if (data->mp) { -media_player_destroy (data->mp); - data->mp =NULL ; - } - -bt_mcp_unref (data->mcp); -free (data); -} - -static void mcp_data_remove (struct mcp_data *data) -{ -DBG ("data %p" , data); - -mcp_data_free (data); -} - -static void mcp_remove (struct btd_service *service) -{ -struct btd_device *device =btd_service_get_device (service); -struct mcp_data *data; -char addr[18 ]; - -ba2str (device_get_address (device), addr); -DBG ("%s" , addr); - - data =btd_service_get_user_data (service); -if (!data) { -error ("MCP service not handled by profile" ); +if (duration_centisec ==BT_MCS_POSITION_UNAVAILABLE ) { +media_player_set_duration (remote->mp,0 );return ; } -mcp_data_remove (data); +if (duration_centisec <0 ) + duration_centisec =0 ; + +media_player_set_duration (remote->mp, duration_centisec *10 ); +} + +static void remote_track_position (void *data,int32_t position_centisec) +{ +struct remote_player *remote = data; + +if (position_centisec ==BT_MCS_POSITION_UNAVAILABLE ) { +media_player_set_position (remote->mp,0 ); +return ; + } + +if (position_centisec <0 ) + position_centisec =0 ; + +media_player_set_position (remote->mp, position_centisec *10 ); +} + +static void remote_playback_speed (void *data,int8_t value) +{ +/* TODO */ +} + +static void remote_seeking_speed (void *data,int8_t speed) +{ +/* TODO */ +} + +static const struct { +uint16_t basic; +uint16_t repeat; +bool shuffle; +bool single; +} playing_orders[] = { + {BT_MCS_ORDER_SINGLE_ONCE ,BT_MCS_ORDER_SINGLE_REPEAT , + .single = true }, + {BT_MCS_ORDER_IN_ORDER_ONCE ,BT_MCS_ORDER_IN_ORDER_REPEAT }, + {BT_MCS_ORDER_OLDEST_ONCE ,BT_MCS_ORDER_OLDEST_REPEAT }, + {BT_MCS_ORDER_NEWEST_ONCE ,BT_MCS_ORDER_NEWEST_REPEAT }, + {BT_MCS_ORDER_SHUFFLE_ONCE ,BT_MCS_ORDER_SHUFFLE_REPEAT , + .shuffle = true }, +}; + +static void remote_playing_order (void *data,uint8_t order) +{ +struct remote_player *remote = data; +const char *repeat ="off" ; +unsigned int i; +bool shuffle; + + remote->playing_order = order; + +for (i =0 ; i <ARRAY_SIZE (playing_orders); ++i) { + shuffle = playing_orders[i].shuffle; +if (order == playing_orders[i].basic) { +break ; + }else if (order == playing_orders[i].repeat) { + repeat = playing_orders[i].single ?"singletrack" : +"alltracks" ; +break ; + } + } +if (i ==ARRAY_SIZE (playing_orders)) +return ; + +media_player_set_setting (remote->mp,"Repeat" , repeat); +media_player_set_setting (remote->mp,"Shuffle" , shuffle ?"on" :"off" ); +} + +static void remote_media_state (void *data,uint8_t status) +{ +struct remote_player *remote = data; + +media_player_set_status (remote->mp,mcp_status_val_to_string (status)); +} + +static void remote_destroy (void *data) +{ +struct remote_player *remote = data; + +media_player_destroy (remote->mp); +free (data); +} + +static const struct bt_mcp_listener_callback remote_cb = { + .media_player_name = remote_media_player_name, + .track_changed = remote_track_changed, + .track_title = remote_track_title, + .track_duration = remote_track_duration, + .track_position = remote_track_position, + .playback_speed = remote_playback_speed, + .seeking_speed = remote_seeking_speed, + .playing_order = remote_playing_order, + .media_state = remote_media_state, + .destroy = remote_destroy, +}; + +static int remote_mp_play (struct media_player *mp,void *user_data) +{ +struct remote_player *remote = user_data; + +return bt_mcp_play (remote->mcp, remote->ccid); +} + +static int remote_mp_pause (struct media_player *mp,void *user_data) +{ +struct remote_player *remote = user_data; + +return bt_mcp_pause (remote->mcp, remote->ccid); +} + +static int remote_mp_stop (struct media_player *mp,void *user_data) +{ +struct remote_player *remote = user_data; + +return bt_mcp_stop (remote->mcp, remote->ccid); +} + +static int remote_mp_next (struct media_player *mp,void *user_data) +{ +struct remote_player *remote = user_data; + +return bt_mcp_next_track (remote->mcp, remote->ccid); +} + +static int remote_mp_previous (struct media_player *mp,void *user_data) +{ +struct remote_player *remote = user_data; + +return bt_mcp_previous_track (remote->mcp, remote->ccid); +} + +static bool remote_mp_set_setting (struct media_player *mp,const char *key, +const char *value,void *user_data) +{ +struct remote_player *remote = user_data; +unsigned int i; + +if (strcmp (key,"Repeat" ) ==0 ) { +bool repeat = (strcmp (value,"alltracks" ) ==0 ); +uint8_t order = remote->playing_order; + +/* Some sensible mapping, 1-to-1 not possible */ +for (i =0 ; i <ARRAY_SIZE (playing_orders); ++i) { +if (order == playing_orders[i].basic) { +if (repeat) + order = playing_orders[i].repeat; +break ; + }else if (order == playing_orders[i].repeat) { +if (!repeat) + order = playing_orders[i].basic; +break ; + } + } + +if (strcmp (value,"singletrack" ) ==0 ) + order =BT_MCS_ORDER_SINGLE_REPEAT ; + +DBG ("Set Repeat %s -> 0x%02x" , value, order); + +if (order == remote->playing_order) +return true; +return bt_mcp_set_playing_order (remote->mcp, remote->ccid, + order); + } + +if (strcmp (key,"Shuffle" ) ==0 ) { +bool shuffle = (strcmp (value,"off" ) !=0 ); +uint8_t order = remote->playing_order; + +/* Some sensible mapping, 1-to-1 not possible */ +switch (order) { +case BT_MCS_ORDER_SHUFFLE_ONCE : +if (!shuffle) + order =BT_MCS_ORDER_IN_ORDER_ONCE ; +break ; +case BT_MCS_ORDER_SHUFFLE_REPEAT : +if (!shuffle) + order =BT_MCS_ORDER_IN_ORDER_REPEAT ; +break ; +case BT_MCS_ORDER_SINGLE_ONCE : +case BT_MCS_ORDER_IN_ORDER_ONCE : +case BT_MCS_ORDER_OLDEST_ONCE : +case BT_MCS_ORDER_NEWEST_ONCE : +if (shuffle) + order =BT_MCS_ORDER_SHUFFLE_ONCE ; +break ; +case BT_MCS_ORDER_SINGLE_REPEAT : +case BT_MCS_ORDER_IN_ORDER_REPEAT : +case BT_MCS_ORDER_OLDEST_REPEAT : +case BT_MCS_ORDER_NEWEST_REPEAT : +if (shuffle) + order =BT_MCS_ORDER_SHUFFLE_REPEAT ; +break ; + } + +DBG ("Set Shuffle %s -> 0x%02x" , value, order); + +if (order == remote->playing_order) +return true; +return bt_mcp_set_playing_order (remote->mcp, remote->ccid, + order); + } + +return false; +} + +static const struct media_player_callback remote_mp_cb = { + .play = remote_mp_play, + .pause = remote_mp_pause, + .stop = remote_mp_stop, + .next = remote_mp_next, + .previous = remote_mp_previous, + .set_setting = remote_mp_set_setting, +}; + +static void mcp_ccid (void *data,uint8_t ccid,bool gmcs) +{ +struct btd_service *service = data; +struct btd_device *device =btd_service_get_device (service); +struct bt_mcp *mcp =btd_service_get_user_data (service); +struct remote_player *remote; +struct media_player *mp; + + mp =media_player_controller_create (device_get_path (device), + gmcs ?"mcp_gmcs" :"mcp_mcs" , ccid); +if (!mp) { +DBG ("Unable to create Media Player" ); +return ; + } + + remote = new0(struct remote_player, 1); + remote->mcp = mcp; + remote->ccid = ccid; + remote->mp = mp; + +media_player_set_callbacks (remote->mp, &remote_mp_cb, remote); + +if (!bt_mcp_add_listener (mcp, ccid, &remote_cb, remote)) { +DBG ("Unable to register Media Player with MCP" ); +media_player_destroy (mp); +free (remote); +return ; + } +} + +static void mcp_debug (void *data,const char *str) +{ +DBG_IDX (0xffff ,"%s" , str); +} + +static void mcp_ready (void *data) +{ +struct btd_service *service = data; + +btd_service_connecting_complete (service,0 ); +} + +static const struct bt_mcp_callback mcp_cb = { + .ccid = mcp_ccid, + .debug = mcp_debug, + .ready = mcp_ready, +}; + + +/* +* Profile +*/ + +static struct btd_profile mcp_gmcs_profile; + +static int add_service (struct btd_service *service) +{ +struct btd_device *device =btd_service_get_device (service); +struct bt_gatt_client *client =btd_device_get_gatt_client (device); +struct bt_mcp *mcp =btd_service_get_user_data (service); +bool gmcs; + +if (mcp) +return -EALREADY ; + + gmcs =btd_service_get_profile (service) == &mcp_gmcs_profile; + + mcp =bt_mcp_attach (client, gmcs, &mcp_cb, service); +if (!mcp) { +DBG ("Unable to attach MCP" ); +return -EINVAL ; + } + +btd_service_set_user_data (service, mcp); +return 0 ; +} + +static void remove_service (struct btd_service *service) +{ +struct bt_mcp *mcp =btd_service_get_user_data (service); + +btd_service_set_user_data (service,NULL ); +bt_mcp_detach (mcp); }static int mcp_accept (struct btd_service *service) {struct btd_device *device =btd_service_get_device (service); -struct bt_gatt_client *client =btd_device_get_gatt_client (device); -struct mcp_data *data =btd_service_get_user_data (service);char addr[18 ];ba2str (device_get_address (device), addr);DBG ("%s" , addr); -bt_mcp_attach (data->mcp, client); - - data->mp =media_player_controller_create (device_get_path (device), -"mcp" ,0 ); -if (data->mp ==NULL ) { -DBG ("Unable to create Media Player" ); -return -EINVAL ; - } - -media_player_set_callbacks (data->mp, &ct_cbs, data->mcp); - -bt_mcp_set_user_data (data->mcp, data->mp); -bt_mcp_set_event_callbacks (data->mcp, &cbs, data->mp); -btd_service_connecting_complete (service,0 ); - -return 0 ; +return add_service (service); }static int mcp_connect (struct btd_service *service) { -struct btd_device *device =btd_service_get_device (service); -char addr[18 ]; - -ba2str (device_get_address (device), addr); -DBG ("%s" , addr); -return 0 ; }static int mcp_disconnect (struct btd_service *service) {struct btd_device *device =btd_service_get_device (service); -struct mcp_data *data =btd_service_get_user_data (service);char addr[18 ];ba2str (device_get_address (device), addr);DBG ("%s" , addr); -if (data->mp) { -media_player_destroy (data->mp); - data->mp =NULL ; - } - -bt_mcp_detach (data->mcp); - +remove_service (service);btd_service_disconnecting_complete (service,0 ); -return 0 ; } -static int media_control_server_probe (struct btd_profile *p, -struct btd_adapter *adapter) +static int mcp_probe (struct btd_service *service) { -struct btd_gatt_database *database =btd_adapter_get_database (adapter); - -bt_mcp_register (btd_gatt_database_get_db (database)); -return 0 ; } -static void media_control_server_remove (struct btd_profile *p, -struct btd_adapter *adapter) +static void mcp_remove (struct btd_service *service) { - +remove_service (service); } -static struct btd_profile mcp_profile = { - .name ="mcp" , +static int gmcs_probe (struct btd_profile *p,struct btd_adapter *adapter) +{ +return 0 ; +} + +static void gmcs_remove (struct btd_profile *p,struct btd_adapter *adapter) +{ +} + +static struct btd_profile mcp_gmcs_profile = { + .name ="mcp-gmcs" , .priority =BTD_PROFILE_PRIORITY_MEDIUM , - .bearer =BTD_PROFILE_BEARER_LE , - .remote_uuid =GMCS_UUID_STR , - .device_probe = mcp_probe, - .device_remove = mcp_remove, + .bearer =BTD_PROFILE_BEARER_LE , + .remote_uuid =GMCS_UUID_STR , + .device_probe = mcp_probe, + .device_remove = mcp_remove, .accept = mcp_accept, .connect = mcp_connect, .disconnect = mcp_disconnect, - .adapter_probe = media_control_server_probe, - .adapter_remove = media_control_server_remove, + .adapter_probe = gmcs_probe, + .adapter_remove = gmcs_remove, - .experimental = true, + .experimental = true, +}; + +static struct btd_profile mcp_mcs_profile = { + .name ="mcp-mcs" , + .priority =BTD_PROFILE_PRIORITY_MEDIUM , + .bearer =BTD_PROFILE_BEARER_LE , + .remote_uuid =MCS_UUID_STR , + .device_probe = mcp_probe, + .device_remove = mcp_remove, + .accept = mcp_accept, + .connect = mcp_connect, + .disconnect = mcp_disconnect, + + .adapter_probe =NULL , + .adapter_remove =NULL , + + .experimental = true, };static int mcp_init (void ) { -return btd_profile_register (&mcp_profile); +int err; + + err =btd_profile_register (&mcp_gmcs_profile); +if (err) +return err; + + err =btd_profile_register (&mcp_mcs_profile); +if (err) { +btd_profile_unregister (&mcp_gmcs_profile); +return err; + } + +return err; }static void mcp_exit (void ) { -btd_profile_unregister (&mcp_profile); +btd_profile_unregister (&mcp_gmcs_profile); +btd_profile_unregister (&mcp_mcs_profile); } BLUETOOTH_PLUGIN_DEFINE(mcp, VERSION, BLUETOOTH_PLUGIN_PRIORITY_DEFAULT,
Signature · 1 line
2.51.1
PATCH v4 4/7 shared/uinput-util: extract uinput utility function from AVCTP
In reply to Pauli VirtanenExtract uinput utility function from AVCTP to src/shared so that it can be reused for MCS.
--- Makefile.am | 4 +- src/shared/uinput-util.c | 195 +++++++++++++++++++++++++++++++++++++++ src/shared/uinput-util.h | 31 +++++++ 3 files changed, 229 insertions(+), 1 deletion(-) create mode 100644 src/shared/uinput-util.c create mode 100644 src/shared/uinput-util.h
Makefile.am +3 -1
@@ -247,7 +247,9 @@ shared_sources = src/shared/io.h src/shared/timeout.h \ src/shared/lc3.h src/shared/tty.h \ src/shared/bap-defs.h \ src/shared/asha.h src/shared/asha.c \ - src/shared/battery.h src/shared/battery.c + src/shared/battery.h src/shared/battery.c \ + src/shared/uinput-util.h \ + src/shared/uinput-util.c if READLINE shared_sources += src/shared/shell.c src/shared/shell.h
src/shared/uinput-util.c new file +195 -0
195 lines not on this page · raw message
src/shared/uinput-util.h new file +31 -0
@@ -0,0 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* +* BlueZ - Bluetooth protocol stack for Linux +* +* Copyright (C) 2006-2010 Nokia Corporation +* Copyright (C) 2004-2010 Marcel Holtmann <[email protected]> +* Copyright (C) 2011 Texas Instruments, Inc. +* +* +*/ + +struct bt_uinput ; + +struct bt_uinput_key_map { +const char *name; +unsigned int code; +uint16_t uinput; +}; + +typedef void (*bt_uinput_debug_func_t )(const char *str,void *user_data); + +struct bt_uinput *bt_uinput_new (const char *name,const char *suffix, +const bdaddr_t *addr, +const struct input_id *dev_id, +const struct bt_uinput_key_map *key_map, +bt_uinput_debug_func_t debug, +void *user_data); +void bt_uinput_destroy (struct bt_uinput *uinput); + +void bt_uinput_send_key (struct bt_uinput *uinput,uint16_t key,bool pressed);
Signature · 1 line
2.51.1
PATCH v4 5/7 avctp: use uinput utilities from src/shared
In reply to Pauli VirtanenMake use of the src/shared version of uinput_create() / send_key
--- profiles/audio/avctp.c | 159 +++++++++-------------------------------- 1 file changed, 34 insertions(+), 125 deletions(-)
profiles/audio/avctp.c +34 -125
@@ -41,6 +41,7 @@#include "src/error.h" #include "src/shared/timeout.h" #include "src/shared/util.h" +#include "src/shared/uinput-util.h" #include "avctp.h" #include "avrcp.h"
@@ -191,7 +192,7 @@ struct avctp {avctp_state_t state; -int uinput; +struct bt_uinput *uinput;guint auth_id;unsigned int passthrough_id;
@@ -228,11 +229,7 @@ struct avctp_browsing_pdu_handler {GDestroyNotify destroy; }; -static const struct { -const char *name; -uint8_t avc; -uint16_t uinput; -} key_map[] = { +static const struct bt_uinput_key_map key_map[] = { {"SELECT" ,AVC_SELECT ,KEY_SELECT }, {"UP" ,AVC_UP ,KEY_UP }, {"DOWN" ,AVC_DOWN ,KEY_DOWN },
@@ -301,27 +298,6 @@ static gboolean avctp_passthrough_rsp(struct avctp *session, uint8_t code, uint8_t *operands, size_t operand_count, void *user_data); -static int send_event (int fd,uint16_t type,uint16_t code,int32_t value) -{ -struct input_event event; - -memset (&event,0 ,sizeof (event)); - event.type = type; - event.code = code; - event.value = value; - -return write (fd, &event,sizeof (event)); -} - -static void send_key (int fd,uint16_t key,int pressed) -{ -if (fd <0 ) -return ; - -send_event (fd,EV_KEY , key, pressed); -send_event (fd,EV_SYN ,SYN_REPORT ,0 ); -} -static bool auto_release (gpointer user_data) {struct avctp *session = user_data;
@@ -330,7 +306,7 @@ static bool auto_release(gpointer user_data)DBG ("AV/C: key press timeout" ); -send_key (session->uinput, session->key.op,0 ); +bt_uinput_send_key (session->uinput, session->key.op,0 );return FALSE; }
@@ -344,12 +320,12 @@ static void handle_press(struct avctp *session, uint16_t op)if (session->key.op == op) goto done; -send_key (session->uinput, session->key.op,0 ); +bt_uinput_send_key (session->uinput, session->key.op,0 ); } session->key.op = op; -send_key (session->uinput, op,1 ); +bt_uinput_send_key (session->uinput, op,1 ); done: session->key.timer = timeout_add_seconds(AVC_PRESS_TIMEOUT,
@@ -364,7 +340,7 @@ static void handle_release(struct avctp *session, uint16_t op) session->key.timer =0 ; } -send_key (session->uinput, op,0 ); +bt_uinput_send_key (session->uinput, op,0 ); } static size_t handle_panel_passthrough(struct avctp *session,
@@ -401,12 +377,12 @@ static size_t handle_panel_passthrough(struct avctp *session,for (i =0 ; key_map[i].name !=NULL ; i++) {uint8_t key_quirks; -if ((operands[0 ] &0x7F ) != key_map[i].avc) +if ((operands[0 ] &0x7F ) != key_map[i].code)continue ;DBG ("AV/C: %s %s" , key_map[i].name, status); - key_quirks = session->key_quirks[key_map[i].avc]; + key_quirks = session->key_quirks[key_map[i].code];if (key_quirks &QUIRK_NO_RELEASE ) {if (!pressed) {
@@ -415,8 +391,10 @@ static size_t handle_panel_passthrough(struct avctp *session, }DBG ("AV/C: treating key press as press + release" ); -send_key (session->uinput, key_map[i].uinput,1 ); -send_key (session->uinput, key_map[i].uinput,0 ); +bt_uinput_send_key (session->uinput, key_map[i].uinput, +1 ); +bt_uinput_send_key (session->uinput, key_map[i].uinput, +0 );break ; }
@@ -570,15 +548,14 @@ static void avctp_disconnected(struct avctp *session)if (session->key.timer >0 )timeout_remove (session->key.timer); -if (session->uinput >=0 ) { +if (session->uinput) {char address[18 ];ba2str (device_get_address (session->device), address);DBG ("AVCTP: closing uinput for %s" , address); -ioctl (session->uinput,UI_DEV_DESTROY ); -close (session->uinput); - session->uinput =-1 ; +bt_uinput_destroy (session->uinput); + session->uinput =NULL ; } server = session->server;
@@ -1154,92 +1131,16 @@ failed:return FALSE; } -static int uinput_create (struct btd_device *device,const char *name, -const char *suffix) +static void uinput_debug (const char *str,void *data) { -struct uinput_user_dev dev; -int fd, err, i; -char src[18 ]; - - fd =open ("/dev/uinput" ,O_RDWR ); -if (fd <0 ) { - fd =open ("/dev/input/uinput" ,O_RDWR ); -if (fd <0 ) { - fd =open ("/dev/misc/uinput" ,O_RDWR ); -if (fd <0 ) { - err = -errno; -error ("Can't open input device: %s (%d)" , -strerror (-err), -err); -return err; - } - } - } - -memset (&dev,0 ,sizeof (dev)); - -if (name) { -strncpy (dev.name, name,UINPUT_MAX_NAME_SIZE -1 ); - dev.name[UINPUT_MAX_NAME_SIZE -1 ] ='\0' ; - } - -if (suffix) { -int len, slen; - - len =strlen (dev.name); - slen =strlen (suffix); - -/* If name + suffix don't fit, truncate the name, then add the -* suffix. -*/ -if (len + slen <UINPUT_MAX_NAME_SIZE -1 ) { -strcpy (dev.name + len, suffix); - }else { - len =UINPUT_MAX_NAME_SIZE - slen -1 ; -strncpy (dev.name + len, suffix, slen); - dev.name[UINPUT_MAX_NAME_SIZE -1 ] ='\0' ; - } - } - - dev.id.bustype =BUS_BLUETOOTH ; - dev.id.vendor =btd_device_get_vendor (device); - dev.id.product =btd_device_get_product (device); - dev.id.version =btd_device_get_version (device); - -if (write (fd, &dev,sizeof (dev)) <0 ) { - err = -errno; -error ("Can't write device information: %s (%d)" , -strerror (-err), -err); -close (fd); -return err; - } - -ioctl (fd,UI_SET_EVBIT ,EV_KEY ); -ioctl (fd,UI_SET_EVBIT ,EV_REL ); -ioctl (fd,UI_SET_EVBIT ,EV_REP ); -ioctl (fd,UI_SET_EVBIT ,EV_SYN ); - -ba2strlc (btd_adapter_get_address (device_get_adapter (device)), src); -ioctl (fd,UI_SET_PHYS , src); - -for (i =0 ; key_map[i].name !=NULL ; i++) -ioctl (fd,UI_SET_KEYBIT , key_map[i].uinput); - -if (ioctl (fd,UI_DEV_CREATE ,NULL ) <0 ) { - err = -errno; -error ("Can't create uinput device: %s (%d)" , -strerror (-err), -err); -close (fd); -return err; - } - -send_event (fd,EV_REP ,REP_DELAY ,300 ); - -return fd; +DBG_IDX (0xffff ,"%s" , str); }static void init_uinput (struct avctp *session) { +struct btd_adapter *adapter =device_get_adapter (session->device);char name[UINPUT_MAX_NAME_SIZE ]; +struct input_id id;device_get_name (session->device, name,sizeof (name));if (g_str_equal (name,"Nokia CK-20W" )) {
@@ -1249,9 +1150,18 @@ static void init_uinput(struct avctp *session) session->key_quirks[AVC_PAUSE ] |=QUIRK_NO_RELEASE ; } - session->uinput =uinput_create (session->device, name," (AVRCP)" ); -if (session->uinput <0 ) -error ("AVRCP: failed to init uinput for %s" , name); + id.bustype =BUS_BLUETOOTH ; + id.vendor =btd_device_get_vendor (session->device); + id.product =btd_device_get_product (session->device); + id.version =btd_device_get_version (session->device); + + session->uinput =bt_uinput_new (name," (AVRCP)" , +btd_adapter_get_address (adapter), &id, key_map, + uinput_debug,NULL ); + +if (!session->uinput) +error ("AVRCP: failed to init uinput for %s: %s" , name, +strerror (errno));else DBG ("AVRCP: uinput initialized for %s" , name); }
@@ -1492,7 +1402,6 @@ static struct avctp *avctp_get_internal(struct btd_device *device) session->server = server; session->device =btd_device_ref (device); session->state =AVCTP_STATE_DISCONNECTED ; - session->uinput =-1 ; session->key.op =AVC_INVALID ; server->sessions =g_slist_append (server->sessions, session);
@@ -1793,7 +1702,7 @@ static const char *op2str(uint8_t op)int i;for (i =0 ; key_map[i].name !=NULL ; i++) { -if ((op &0x7F ) == key_map[i].avc) +if ((op &0x7F ) == key_map[i].code)return key_map[i].name; }
@@ -2232,7 +2141,7 @@ bool avctp_supports_avc(uint8_t avc)int i;for (i =0 ; key_map[i].name !=NULL ; i++) { -if (key_map[i].avc == avc) +if (key_map[i].code == avc)return true; }return false;
Signature · 1 line
2.51.1
PATCH v4 6/7 mcp: add local GMCS service that emits uinput media keys
In reply to Pauli VirtanenImplement simple GMCS service that is always inactive, and emits media key presses via uinput for Play/Pause/Stop/Next/Prev MCS commands.
In practice, this seems to be enough to support media control keys on headsets. Some headsets (Creative Zen Hybrid Pro) also refuse to connect if there is no GMCS service.
---
Notes:
Tested production devices:
- Creative Zen Hybrid Pro (doesn't even connect without GMCS)
- Samsung Galaxy Buds Pro2
profiles/audio/mcp.c | 173 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 173 insertions(+)
profiles/audio/mcp.c +173 -0
@@ -23,6 +23,8 @@#include <fcntl.h> #include <errno.h> #include <math.h> +#include <unistd.h> +#include <linux/uinput.h> #include <glib.h>
@@ -42,6 +44,7 @@#include "src/shared/gatt-server.h" #include "src/shared/mcp.h" #include "src/shared/mcs.h" +#include "src/shared/uinput-util.h" #include "btio/btio.h" #include "src/plugin.h"
@@ -433,6 +436,151 @@ static const struct bt_mcp_callback mcp_cb = { }; +/* +* Local player +*/ + +struct gmcs ; + +struct local_player { +struct bt_mcs *mcs; +struct media_player *mp; +struct gmcs *gmcs; +}; + +struct gmcs { +struct bt_uinput *uinput; +struct btd_adapter *adapter; +struct bt_mcs *mcs; +struct queue *players; +}; + +static const struct bt_uinput_key_map key_map[] = { + {"Play" ,BT_MCS_CMD_PLAY ,KEY_PLAYCD }, + {"Stop" ,BT_MCS_CMD_STOP ,KEY_STOPCD }, + {"Pause" ,BT_MCS_CMD_PAUSE ,KEY_PAUSECD }, + {"Next Track" ,BT_MCS_CMD_NEXT_TRACK ,KEY_NEXTSONG }, + {"Prev Track" ,BT_MCS_CMD_PREV_TRACK ,KEY_PREVIOUSSONG }, + {NULL } +}; + +static struct queue *servers; + +static bool gmcs_command (struct gmcs *gmcs,uint8_t cmd) +{ +unsigned int i; + +/* Emulate media key press */ +if (!gmcs->uinput) +return false; + +for (i =0 ; i <ARRAY_SIZE (key_map); ++i) { +if (key_map[i].code == cmd) { +DBG ("GMCS press %s" , key_map[i].name); +bt_uinput_send_key (gmcs->uinput, key_map[i].uinput,1 ); +bt_uinput_send_key (gmcs->uinput, key_map[i].uinput,0 ); +break ; + } + } + +/* We are always inactive, so command does not cause state changes and +* does not succeed, even though we do generate the key presses. +* This should be OK vs. MCP v1.0.1 p. 26 +*/ +return false; +} + +static bool gmcs_play (void *data) +{ +return gmcs_command (data,BT_MCS_CMD_PLAY ); +} + +static bool gmcs_pause (void *data) +{ +return gmcs_command (data,BT_MCS_CMD_PAUSE ); +} + +static bool gmcs_stop (void *data) +{ +return gmcs_command (data,BT_MCS_CMD_STOP ); +} + +static bool gmcs_next_track (void *data) +{ +return gmcs_command (data,BT_MCS_CMD_NEXT_TRACK ); +} + +static bool gmcs_previous_track (void *data) +{ +return gmcs_command (data,BT_MCS_CMD_PREV_TRACK ); +} + +static void gmcs_media_player_name (void *data,struct iovec *buf,size_t size) +{ +struct gmcs *gmcs = data; +int len; + + len =snprintf ((void *)buf->iov_base, size,"%s" , +btd_adapter_get_name (gmcs->adapter)); +if (len <0 ) + len =0 ; +else if ((size_t )len > size) + len = size; +util_iov_push (buf, len); +} + +static void gmcs_destroy (void *data) +{ +struct gmcs *gmcs = data; + +DBG ("destroy %p" , data); + +queue_remove (servers, gmcs); + +bt_uinput_destroy (gmcs->uinput); + +free (gmcs); +} + +static void gmcs_debug (void *data,const char *str) +{ +DBG_IDX (0xffff ,"%s" , str); +} + +static const struct bt_mcs_callback gmcs_cb = { + .media_player_name = gmcs_media_player_name, + .play = gmcs_play, + .pause = gmcs_pause, + .stop = gmcs_stop, + .next_track = gmcs_next_track, + .previous_track = gmcs_previous_track, + .debug = gmcs_debug, + .destroy = gmcs_destroy, +}; + +static void uinput_debug (const char *str,void *data) +{ +DBG_IDX (0xffff ,"%s" , str); +} + +static struct gmcs *gmcs_new (struct btd_adapter *adapter) +{ +struct gmcs *gmcs; +const char *name =btd_adapter_get_name (adapter); + + gmcs = new0(struct gmcs, 1); + gmcs->adapter = adapter; + gmcs->uinput =bt_uinput_new (name," (MCS)" , +btd_adapter_get_address (adapter),NULL , key_map, + uinput_debug, gmcs); +if (!gmcs->uinput) +error ("MCS: failed to init uinput for %s: %m" , name); + +DBG ("new %p" , gmcs); + +return gmcs; +} +/* * Profile */
@@ -510,11 +658,36 @@ static void mcp_remove(struct btd_service *service)static int gmcs_probe (struct btd_profile *p,struct btd_adapter *adapter) { +struct btd_gatt_database *database =btd_adapter_get_database (adapter); +struct gatt_db *db =btd_gatt_database_get_db (database); +struct gmcs *gmcs; + +DBG ("Add GMCS server %s" ,adapter_get_path (adapter)); + + gmcs =gmcs_new (adapter); +if (!gmcs) +return -EINVAL ; + + gmcs->mcs =bt_mcs_register (db, true, &gmcs_cb, gmcs); +if (!gmcs->mcs) { +gmcs_destroy (gmcs); +return -EINVAL ; + } + +if (!servers) + servers =queue_new (); +queue_push_tail (servers, gmcs); +return 0 ; }static void gmcs_remove (struct btd_profile *p,struct btd_adapter *adapter) { +struct btd_gatt_database *database =btd_adapter_get_database (adapter); +struct gatt_db *db =btd_gatt_database_get_db (database); + +DBG ("Remove GMCS server %s" ,adapter_get_path (adapter)); +bt_mcs_unregister_all (db); }static struct btd_profile mcp_gmcs_profile = {
Signature · 1 line
2.51.1
PATCH v4 7/7 shared/gatt-client: fix notify_data leak in notify_data_write_ccc
In reply to Pauli VirtanenCalling bt_gatt_client_unregister_notify() when ATT has disconnected leaks the reference to notify_data: in notify_data_write_ccc() the bt_gatt_client_write_value() fails, the destroy is never called, and notify_data_ref() is leaked.
Fix by balancing unref notify_data on write failure.
Log (unit/test-mcp):
Direct leak of 5760 byte(s) in 90 object(s) allocated from:
#0 0x7fd7e2ce6f2b in malloc
#1 0x0000004227e5 in util_malloc src/shared/util.c:46
#2 0x00000044a81c in register_notify src/shared/gatt-client.c:1782
#3 0x000000458367 in bt_gatt_client_register_notify src/shared/gatt-client.c:3685
#4 0x00000049f9f5 in foreach_mcs_char src/shared/mcp.c:1834
---
src/shared/gatt-client.c | 3 +++
1 file changed, 3 insertions(+)src/shared/gatt-client.c +3 -0
@@ -1691,6 +1691,9 @@ static bool notify_data_write_ccc(struct notify_data *notify_data, bool enable, callback,notify_data_ref (notify_data), notify_data_unref); +if (!att_id) +notify_data_unref (notify_data); + notify_data->chrc->ccc_write_id = notify_data->att_id = att_id;return !!att_id;
Signature · 1 line
2.51.1
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=1032419
---Test result---
Test Summary:
CheckPatch PENDING 0.29 seconds GitLint PENDING 0.36 seconds BuildEll PASS 20.82 seconds BluezMake PASS 649.15 seconds MakeCheck PASS 22.11 seconds MakeDistcheck PASS 242.22 seconds CheckValgrind PASS 309.15 seconds CheckSmatch FAIL 22.08 seconds bluezmakeextell FAIL 14.06 seconds IncrementalBuild PENDING 0.29 seconds ScanBuild FAIL 35.89 seconds
Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script
Output:
##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:
##############################
Test: CheckSmatch - FAIL
Desc: Run smatch tool with source
Output:
src/shared/crypto.c:271:21: warning: Variable length array is used.src/shared/crypto.c:272:23: warning: Variable length array is used.src/shared/gatt-helpers.c:768:31: warning: Variable length array is used.src/shared/gatt-helpers.c:830:31: warning: Variable length array is used.src/shared/gatt-helpers.c:1323:31: warning: Variable length array is used.src/shared/gatt-helpers.c:1354:23: warning: Variable length array is used.src/shared/gatt-server.c:278:25: warning: Variable length array is used.src/shared/gatt-server.c:618:25: warning: Variable length array is used.src/shared/gatt-server.c:716:25: warning: Variable length array is used.src/shared/bap.c:312:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/shell.c: note: in included file (through /usr/include/readline/readline.h):/usr/include/readline/rltypedefs.h:35:23: warning: non-ANSI function declaration of function 'Function'/usr/include/readline/rltypedefs.h:36:25: warning: non-ANSI function declaration of function 'VFunction'/usr/include/readline/rltypedefs.h:37:27: warning: non-ANSI function declaration of function 'CPFunction'/usr/include/readline/rltypedefs.h:38:29: warning: non-ANSI function declaration of function 'CPPFunction'
In file included from /usr/include/string.h:495,
from src/shared/uinput-util.c:21:
In function ‘strncpy’,
inlined from ‘bt_uinput_new’ at src/shared/uinput-util.c:132:4:/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error: ‘__builtin_strncpy’ specified bound depends on the length of the source argument [-Werror=stringop-overflow=]
106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/uinput-util.c: In function ‘bt_uinput_new’:
src/shared/uinput-util.c:121:10: note: length computed here
121 | slen = strlen(suffix);
| ^~~~~~~~~~~~~~cc1: all warnings being treated as errors
make[1]: *** [Makefile:7956: src/shared/libshared_mainloop_la-uinput-util.lo] Error 1 make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4220: all] Error 2
##############################
Test: bluezmakeextell - FAIL
Desc: Build Bluez with External ELL
Output:
In file included from /usr/include/string.h:495,
from src/shared/uinput-util.c:21:
In function ‘strncpy’,
inlined from ‘bt_uinput_new’ at src/shared/uinput-util.c:132:4:/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error: ‘__builtin_strncpy’ specified bound depends on the length of the source argument [-Werror=stringop-overflow=]
106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/uinput-util.c: In function ‘bt_uinput_new’:
src/shared/uinput-util.c:121:10: note: length computed here
121 | slen = strlen(suffix);
| ^~~~~~~~~~~~~~cc1: all warnings being treated as errors
make[1]: *** [Makefile:7956: src/shared/libshared_mainloop_la-uinput-util.lo] Error 1 make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4220: all] Error 2
##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series
Output:
##############################
Test: ScanBuild - FAIL
Desc: Run Scan Build
Output:
src/shared/gatt-client.c:451:21: warning: Use of memory after it is freed
gatt_db_unregister(op->client->db, op->db_id);
^~~~~~~~~~
src/shared/gatt-client.c:696:2: warning: Use of memory after it is freed
discovery_op_complete(op, false, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:996:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1102:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1296:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1361:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1636:6: warning: Use of memory after it is freed
if (read_db_hash(op)) {
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1641:2: warning: Use of memory after it is freed
discover_all(op);
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1697:56: warning: Use of memory after it is freed
notify_data->chrc->ccc_write_id = notify_data->att_id = att_id;
~~~~~~~~~~~~~~~~~~~ ^
src/shared/gatt-client.c:2150:6: warning: Use of memory after it is freed
if (read_db_hash(op)) {
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:2158:8: warning: Use of memory after it is freed
discovery_op_ref(op),
^~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:3183:2: warning: Use of memory after it is freed
complete_write_long_op(req, success, 0, false);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:3205:2: warning: Use of memory after it is freed
request_unref(req);
^~~~~~~~~~~~~~~~~~13 warnings generated.
In file included from /usr/include/string.h:495,
from src/shared/uinput-util.c:21:
In function ‘strncpy’,
inlined from ‘bt_uinput_new’ at src/shared/uinput-util.c:132:4:/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error: ‘__builtin_strncpy’ specified bound depends on the length of the source argument [-Werror=stringop-overflow=]
106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/uinput-util.c: In function ‘bt_uinput_new’:
src/shared/uinput-util.c:121:10: note: length computed here
121 | slen = strlen(suffix);
| ^~~~~~~~~~~~~~cc1: all warnings being treated as errors
make[1]: *** [Makefile:7956: src/shared/libshared_mainloop_la-uinput-util.lo] Error 1 make[1]: *** Waiting for unfinished jobs....src/shared/bap.c:1529:8: warning: Use of memory after it is freed
bap = bt_bap_ref_safe(bap);
^~~~~~~~~~~~~~~~~~~~
src/shared/bap.c:2323:20: warning: Use of memory after it is freed
return queue_find(stream->bap->streams, NULL, stream);
^~~~~~~~~~~~~~~~~~~~2 warnings generated.
make: *** [Makefile:4220: all] Error 2
---
Regards,
Linux Bluetooth