Wireshark-commits: [Wireshark-commits] master-2.4 32bc023: btle: Correctly detect l2cap fragment st
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 30 May 2019 21:23:43 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=32bc023c5051ba060661ca378b1364eab01fe522
Submitter: "Stig Bjørlykke <stig@xxxxxxxxxxxxx>"
Changed: branch: master-2.4
Repository: wireshark

Commits:

32bc023 by Jonas Jonsson (jonas@xxxxxxxxxxx):

    btle: Correctly detect l2cap fragment start
    
    The first L2CAP PDU fragment starts with the 4 octet long L2CAP header
    consisting of the Length and the CID fields. The Length field doesn't
    include the header itself. Thus the Length field in the BLE Data header
    will be 4 octets larger than the L2CAP PDU header Length field if the
    packet wouldn't be fragmented.
    
    The current implementation doesn't correctly detect the start fragment
    causing reassembly to fail as it compares the BLE Data Length with the
    L2CAP Length without compensating for the header.
    
    By increasing the L2CAP PDU Length field with the header length the
    reassembly works.
    
    Rename the variable to better reflect what length it actually
    represents.
    
    Bug: 15807
    Change-Id: Idcb6bdccc4daae756a63a9bae0839fe25ae99f23
    Reviewed-on: https://code.wireshark.org/review/33428
    Petri-Dish: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
    Reviewed-by: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
    (cherry picked from commit 49b6523c6cd4f8c56f428797283e150e63a52aad)
    Reviewed-on: https://code.wireshark.org/review/33429
    (cherry picked from commit 7b70ef08a0f9403c287177018c8d21a7e558cccf)
    Reviewed-on: https://code.wireshark.org/review/33430
    (cherry picked from commit 9997eef374dfe91b5376c3e59159eaeeb05beb23)
    Reviewed-on: https://code.wireshark.org/review/33431
    

Actions performed:

    from  f0d43d3   Fix handling of headers in body part.
     add  32bc023   btle: Correctly detect l2cap fragment start


Summary of changes:
 epan/dissectors/packet-btle.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)