diff mbox series

[BlueZ] avctp: Remove redundant UUID checks and additions

Message ID 20240322143830.1476938-1-xiaokeqinhealth@126.com (mailing list archive)
State New, archived
Headers show
Series [BlueZ] avctp: Remove redundant UUID checks and additions | expand

Checks

Context Check Description
tedd_an/pre-ci_am success Success
tedd_an/CheckPatch success CheckPatch PASS
tedd_an/GitLint success Gitlint PASS
tedd_an/BuildEll success Build ELL PASS
tedd_an/BluezMake success Bluez Make PASS
tedd_an/MakeCheck success Bluez Make Check PASS
tedd_an/MakeDistcheck success Make Distcheck PASS
tedd_an/CheckValgrind success Check Valgrind PASS
tedd_an/CheckSmatch success CheckSparse PASS
tedd_an/bluezmakeextell success Make External ELL PASS
tedd_an/IncrementalBuild success Incremental Build PASS
tedd_an/ScanBuild success Scan Build PASS

Commit Message

Yao Xiao March 22, 2024, 2:38 p.m. UTC
From: Xiao Yao <xiaoyao@rock-chips.com>

---
 profiles/audio/avctp.c | 6 ------
 1 file changed, 6 deletions(-)

Comments

Luiz Augusto von Dentz March 22, 2024, 3:28 p.m. UTC | #1
Hi,

On Fri, Mar 22, 2024 at 2:39 PM Xiao Yao <xiaokeqinhealth@126.com> wrote:
>
> From: Xiao Yao <xiaoyao@rock-chips.com>
>
> ---
>  profiles/audio/avctp.c | 6 ------
>  1 file changed, 6 deletions(-)
>
> diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c
> index 8ad146df1..6199ee951 100644
> --- a/profiles/audio/avctp.c
> +++ b/profiles/audio/avctp.c
> @@ -1597,12 +1597,6 @@ static void avctp_confirm_cb(GIOChannel *chan, gpointer data)
>         if (session == NULL)
>                 return;
>
> -       if (btd_device_get_service(device, AVRCP_REMOTE_UUID) == NULL)
> -               btd_device_add_uuid(device, AVRCP_REMOTE_UUID);
> -
> -       if (btd_device_get_service(device, AVRCP_TARGET_UUID) == NULL)
> -               btd_device_add_uuid(device, AVRCP_TARGET_UUID);

Patch description makes no sense to me, this code is adding the UUIDs
of AVCTP if the device over its PSM because at this point perhaps SDP
discovery is not complete.

>         switch (psm) {
>         case AVCTP_CONTROL_PSM:
>                 avctp_control_confirm(session, chan, device);
> --
> 2.34.1
>
>
bluez.test.bot@gmail.com March 22, 2024, 4:40 p.m. UTC | #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=837396

---Test result---

Test Summary:
CheckPatch                    PASS      0.45 seconds
GitLint                       PASS      0.34 seconds
BuildEll                      PASS      26.81 seconds
BluezMake                     PASS      1770.17 seconds
MakeCheck                     PASS      13.18 seconds
MakeDistcheck                 PASS      176.25 seconds
CheckValgrind                 PASS      244.12 seconds
CheckSmatch                   PASS      349.27 seconds
bluezmakeextell               PASS      120.00 seconds
IncrementalBuild              PASS      1522.33 seconds
ScanBuild                     PASS      999.12 seconds



---
Regards,
Linux Bluetooth
Yao Xiao March 22, 2024, 6:06 p.m. UTC | #3
Hi,

在 2024/3/22 23:28, Luiz Augusto von Dentz 写道:

> Hi,
>
> On Fri, Mar 22, 2024 at 2:39 PM Xiao Yao <xiaokeqinhealth@126.com> wrote:
>> From: Xiao Yao <xiaoyao@rock-chips.com>
>>
>> ---
>>   profiles/audio/avctp.c | 6 ------
>>   1 file changed, 6 deletions(-)
>>
>> diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c
>> index 8ad146df1..6199ee951 100644
>> --- a/profiles/audio/avctp.c
>> +++ b/profiles/audio/avctp.c
>> @@ -1597,12 +1597,6 @@ static void avctp_confirm_cb(GIOChannel *chan, gpointer data)
>>          if (session == NULL)
>>                  return;
>>
>> -       if (btd_device_get_service(device, AVRCP_REMOTE_UUID) == NULL)
>> -               btd_device_add_uuid(device, AVRCP_REMOTE_UUID);
>> -
>> -       if (btd_device_get_service(device, AVRCP_TARGET_UUID) == NULL)
>> -               btd_device_add_uuid(device, AVRCP_TARGET_UUID);
> Patch description makes no sense to me, this code is adding the UUIDs
> of AVCTP if the device over its PSM because at this point perhaps SDP
> discovery is not complete.
In the scenario encountered, the SDP service discovery has already
been completed, with the SDP record only containing AVRCP_REMOTE_UUID.
At this point, the device is added support for AVRCP_TARGET_UUID,
which leads to the following code being executed:
   controller_init(session);
     //avrcp.c:controller_init() 0x55bcdbd690 version 0x0000
     session->controller = controller;
However, avrcp_set_volume relies on session->controller, erroneously
issuing the AVRCP_SET_ABSOLUTE_VOLUME command.

Perhaps add a check to verify that SDP discovery has completed before
adding the UUID?

Additionally, there is another concern: is it appropriate to add support
for both AVRCP_REMOTE_UUID and AVRCP_TARGET_UUID before the completion
of SDP? if one of the UUIDs is not supported,how should it be handled?

>
>>          switch (psm) {
>>          case AVCTP_CONTROL_PSM:
>>                  avctp_control_confirm(session, chan, device);
>> --
>> 2.34.1
>>
>>
>
diff mbox series

Patch

diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c
index 8ad146df1..6199ee951 100644
--- a/profiles/audio/avctp.c
+++ b/profiles/audio/avctp.c
@@ -1597,12 +1597,6 @@  static void avctp_confirm_cb(GIOChannel *chan, gpointer data)
 	if (session == NULL)
 		return;
 
-	if (btd_device_get_service(device, AVRCP_REMOTE_UUID) == NULL)
-		btd_device_add_uuid(device, AVRCP_REMOTE_UUID);
-
-	if (btd_device_get_service(device, AVRCP_TARGET_UUID) == NULL)
-		btd_device_add_uuid(device, AVRCP_TARGET_UUID);
-
 	switch (psm) {
 	case AVCTP_CONTROL_PSM:
 		avctp_control_confirm(session, chan, device);