Re: [PATCH 1/3] monitor: Adjust for ERTM control bytes

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Vikram,

On Wed, Nov 12, 2014 at 10:53 AM, Vikrampal Yadav
<vikram.pal@xxxxxxxxxxx> wrote:
> Adjustment for ERTM control bytes fixed.
> ---
>  monitor/l2cap.c | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/monitor/l2cap.c b/monitor/l2cap.c
> index ebdd20f..b37f20f 100644
> --- a/monitor/l2cap.c
> +++ b/monitor/l2cap.c
> @@ -2621,6 +2621,9 @@ static void l2cap_frame(uint16_t index, bool in, uint16_t handle,
>                 connless_packet(index, in, handle, cid, data, size);
>                 break;
>         case 0x0003:
> +               /* Adjust for ERTM control bytes */
> +               data += 2;
> +               size -= 2;
>                 amp_packet(index, in, handle, cid, data, size);
>                 break;
>         case 0x0004:
> @@ -2635,6 +2638,9 @@ static void l2cap_frame(uint16_t index, bool in, uint16_t handle,
>         default:
>                 l2cap_frame_init(&frame, index, in, handle, cid, data, size);
>
> +               if (frame.mode > 0)
> +                       l2cap_frame_pull(&frame, &frame, 2);
> +
>                 print_indent(6, COLOR_CYAN, "Channel:", "", COLOR_OFF,
>                                 " %d len %d [PSM %d mode %d] {chan %d}",
>                                                 cid, size, frame.psm,
> --
> 1.9.1

This is probably not enough if we really want to do it right, please
check tools/parser/l2cap.c:l2cap_ctrl_ext_parse we most likely need to
do something similar but this time we should actually not pass
s-frames to be decoded further, only i-frames should contain data
relevant to profiles.



-- 
Luiz Augusto von Dentz
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux