Wireshark-commits: [Wireshark-commits] master eaee707: dissectors: can: Handle CAN id flags
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: Sun, 13 Jan 2019 21:14:01 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=eaee707941f605c9ea7db9b9d8d7797421b9b5be
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

eaee707 by Maksim Salau (maksim.salau@xxxxxxxxx):

    dissectors: can: Handle CAN id flags
    
    The change adds support of CAN flags stored in ids.
    The flags allow dissectors to distinguish error frames,
    remote transmission request frames and identify id type used (either
    standard 11-bit or extended 29-bit).
    
    Addition of bit flags allowed to add more checks whether a CAN frame may
    be decoded by a particular dissector. I.e. some dissectors work only
    with 11-bit ids (CANopen, DeviceNet) some only with 29-bit (J1939,
    ISObus), others should be fine with bot types (OBD-II, ISO 15765).
    
    The change also fixes 2 bugs in the DeviceNet dissector:
    * removed byte swapping of CAN id (the pcap file seems to be broken;
      verified dissector operation with random traffic generated by cangen)
    * fixed "Warn Dissector bug, protocol DeviceNet, in packet N":
      added a default value for fragmented message type string value lookup.
    
    Bug: 15418
    Change-Id: I70e91130789bb3367fe19e51489cd34e97d678a6
    Reviewed-on: https://code.wireshark.org/review/31471
    Petri-Dish: Anders Broman <a.broman58@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  eba51f9   pfcp: Update to 3GPP TS 29.244 V15.4.0
     add  eaee707   dissectors: can: Handle CAN id flags


Summary of changes:
 epan/dissectors/packet-caneth.c    | 24 +++++++++++++++++-------
 epan/dissectors/packet-canopen.c   |  6 ++++++
 epan/dissectors/packet-devicenet.c | 15 +++++++--------
 epan/dissectors/packet-iso15765.c  | 16 +++++++++++-----
 epan/dissectors/packet-isobus.c    |  7 +++++++
 epan/dissectors/packet-j1939.c     | 34 +++++++++++++++++-----------------
 epan/dissectors/packet-obd-ii.c    | 22 +++++++++++++++-------
 epan/dissectors/packet-socketcan.c | 33 +++++++++++++++------------------
 epan/dissectors/packet-socketcan.h |  3 ++-
 9 files changed, 97 insertions(+), 63 deletions(-)