Wireshark-commits: [Wireshark-commits] master-2.2 c84ce03: Handle ETH_P_CANFD as well as ETH_P_CAN.
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: Fri, 26 Aug 2016 00:00:05 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c84ce0378b6f118d13180bd790e41de408a9367b
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

c84ce03 by Guy Harris (guy@xxxxxxxxxxxx):

    Handle ETH_P_CANFD as well as ETH_P_CAN.
    
    Both of them need to have the CAN ID/flags field of the header
    byte-swapped as necessary to make sure it's in the *reading* host's byte
    order, not the *writing* host's byte order, if the two are different.
    
    Change-Id: Iac1589fdd9fe4d9ee6fbac8d821b48694d68919b
    Reviewed-on: https://code.wireshark.org/review/17333
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 17f977ec5695259ec02c7e6e4cd24e3e2ed263c1)
    Reviewed-on: https://code.wireshark.org/review/17334
    

Actions performed:

    from  ddbae1c   One more change for the removal of LINKTYPE_SOCKETCAN_HOSTENDIAN.
    adds  c84ce03   Handle ETH_P_CANFD as well as ETH_P_CAN.


Summary of changes:
 wiretap/pcap-common.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)