audio: Remove profile enabling/disabling logic
Luiz Augusto von Dentz
maintainerPATCH v2 1/3 audio: Remove profile enabling/disabling logic
From: Luiz Augusto von Dentz <[email protected]>
This should be handle by the core for all profiles
---
v2: Match only local_uuid to avoid end up disabling both roles whenever one role is disabled.
profiles/audio/audio.conf | 4 --- profiles/audio/manager.c | 62 ++++++----------------------------------------- 2 files changed, 8 insertions(+), 58 deletions(-)
profiles/audio/audio.conf +0 -4
@@ -6,7 +6,3 @@ # Switch to master role for incoming connections (defaults to true) #Master=true - -# If we want to disable support for specific services -# Defaults to supporting the services: Sink, Control -#Disable=Source
profiles/audio/manager.c +8 -54
81 lines not on this page · raw message
Signature · 1 line
1.8.1.4
Luiz Augusto von Dentz
maintainerPATCH v2 2/3 audio: Fix not using opposite role for local servers
From: Luiz Augusto von Dentz <[email protected]>
Local role should be the opposite of the remote role otherwise if either audio-source or audio-sink is disabled none will work.
--- profiles/audio/manager.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
profiles/audio/manager.c +4 -4
@@ -331,8 +331,8 @@ static struct btd_profile a2dp_source_profile = { .connect = a2dp_source_connect, .disconnect = a2dp_source_disconnect, - .adapter_probe = a2dp_source_server_probe, - .adapter_remove = a2dp_source_server_remove, + .adapter_probe = a2dp_sink_server_probe, + .adapter_remove = a2dp_sink_server_remove, };static struct btd_profile a2dp_sink_profile = {
@@ -347,8 +347,8 @@ static struct btd_profile a2dp_sink_profile = { .connect = a2dp_sink_connect, .disconnect = a2dp_sink_disconnect, - .adapter_probe = a2dp_sink_server_probe, - .adapter_remove = a2dp_sink_server_remove, + .adapter_probe = a2dp_source_server_probe, + .adapter_remove = a2dp_source_server_remove, };static struct btd_profile avrcp_profile = {
Signature · 1 line
1.8.1.4
Luiz Augusto von Dentz
maintainerPATCH v2 3/3 core: Add DisableProfiles entry to main.conf
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This entry can be used to globally disable profiles, this is specially useful for qualification purposes where some platforms may decide to only qualify a subset of the supported profiles.
--- src/main.c | 17 +++++++++++++++-- src/main.conf | 4 ++++ src/profile.c | 22 +++++++++++++++++++++- src/profile.h | 2 +- 4 files changed, 41 insertions(+), 4 deletions(-)
src/main.c +15 -2
@@ -65,6 +65,7 @@#define SHUTDOWN_GRACE_SECONDS 10struct main_opts main_opts; +static char **disabled_profiles =NULL ;static const char *const supported_options[] = {"Name" ,
@@ -76,6 +77,7 @@ static const char * const supported_options[] = {"ReverseServiceDiscovery" ,"NameResolving" ,"DebugKeys" , + "DisableProfiles" };static GKeyFile *load_config (const char *file)
@@ -263,6 +265,15 @@ static void parse_config(GKeyFile *config)g_clear_error (&err); else main_opts.debug_keys = boolean; + + str =g_key_file_get_string (config,"General" ,"DisableProfiles" , &err); +if (err) { +DBG ("%s" , err->message); +g_clear_error (&err); + }else { + disabled_profiles =g_strsplit (str," " ,-1 ); +g_free (str); + } }static void init_defaults (void )
@@ -538,7 +549,7 @@ int main(int argc, char *argv[])btd_device_init ();btd_agent_init (); -btd_profile_init (); +btd_profile_init (disabled_profiles);if (option_experimental) gdbus_flags =G_DBUS_FLAG_ENABLE_EXPERIMENTAL ;
@@ -600,8 +611,10 @@ int main(int argc, char *argv[])g_main_loop_unref (event_loop); -if (config) +if (config) {g_key_file_free (config); +g_strfreev (disabled_profiles); + }disconnect_dbus ();
src/main.conf +4 -0
@@ -46,3 +46,7 @@ # makes debug link keys valid only for the duration of the connection # that they were created for. #DebugKeys = false + +# Disable Profile, both driver name and 128 bits UUIDs can be used. +# By default all profiles are enabled. +#DisableProfiles = <profile1> <profile2> ...
src/profile.c +21 -1
@@ -585,6 +585,7 @@ static GSList *custom_props = NULL;static GSList *profiles =NULL ;static GSList *ext_profiles =NULL ; +static char **blacklist =NULL ;void btd_profile_foreach (void (*func)(struct btd_profile *p,void *data),void *data)
@@ -610,6 +611,23 @@ void btd_profile_foreach(void (*func)(struct btd_profile *p, void *data),int btd_profile_register (struct btd_profile *profile) { +int i; + +if (blacklist ==NULL ) + goto done; + +for (i =0 ; blacklist[i]; i++) { +if (g_pattern_match_simple (blacklist[i], profile->name)) +return -EPROTONOSUPPORT ; + +if (profile->local_uuid ==NULL ) +continue ; + +if (strcasecmp (blacklist[i], profile->local_uuid) ==0 ) +return -EPROTONOSUPPORT ; + } + +done: profiles =g_slist_append (profiles, profile);return 0 ; }
@@ -2335,8 +2353,10 @@ bool btd_profile_remove_custom_prop(const char *uuid, const char *name)return false; } -void btd_profile_init (void ) +void btd_profile_init (char **disabled_profiles) { + blacklist = disabled_profiles; +g_dbus_register_interface (btd_get_dbus_connection (),"/org/bluez" ,"org.bluez.ProfileManager1" , methods,NULL ,NULL ,NULL ,NULL );
src/profile.h +1 -1
@@ -74,5 +74,5 @@ bool btd_profile_add_custom_prop(const char *uuid, const char *type, void *user_data);bool btd_profile_remove_custom_prop (const char *uuid,const char *name); -void btd_profile_init (void ); +void btd_profile_init (char **disabled_profiles);void btd_profile_cleanup (void );
Signature · 1 line
1.8.1.4
Hi Luiz,
Quoted 4 lines · Luiz Augusto von Dentz
This should be handle by the core for all profiles
---
v2: Match onlylocal_uuidto avoid end up disabling both roles whenever one role is disabled.
The first two patches of this set have been applied while I think 3/3 needs a bit more discussion.
Johan