Wireshark-commits: [Wireshark-commits] master-1.10 56552b7: Don't base interpretation of LINKTYPE_
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, 15 Feb 2015 22:05:18 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=56552b7b85fe1348ca000e2447d3b117f89c8332
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark

Commits:

56552b7 by Guy Harris (guy@xxxxxxxxxxxx):

    Don't base interpretation of LINKTYPE_ values on DLT_ value definitions.
    
    Instead, explicitly check for particular build platforms.  This means
    that the interpretation of the link-layer type values with different
    meanings on different platforms won't be dependent on the particular
    version of libpcap with which Wireshark happens to be built, and also
    means that we don't have to fix pcap-common.c to include pcap.h or
    net/bpf.h.
    
    Fix some comments while we're at it.
    
    Bug: 10956
    Change-Id: If331d9b92081fb0bdf416620fb2ad8dce57dea6b
    Reviewed-on: https://code.wireshark.org/review/7140
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 1917023fc157b896a23349c0eca8c95f22f2fb6f)
    Reviewed-on: https://code.wireshark.org/review/7142
    

Actions performed:

    from  5d1c410   [Automatic manuf, services and enterprise-numbers update for 2015-02-15]
    adds  56552b7   Don't base interpretation of LINKTYPE_ values on DLT_ value definitions.


Summary of changes:
 wiretap/pcap-common.c |   43 ++++++++++++++++---------------------------
 1 file changed, 16 insertions(+), 27 deletions(-)