Wireshark-commits: [Wireshark-commits] master 51fb508: androiddump: Add packets with same encap typ

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 20 Nov 2018 05:08:44 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=51fb5081b361870b1525c2457198a5d8c99032eb
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

51fb508 by Mikael Kanstrup (mikael.kanstrup@xxxxxxxx):

    androiddump: Add packets with same encap type as used when open wtap
    
    Already when selecting the extcap interface to use the encap type is
    known. For some reason when adding packets the type is explicitly
    checked for certain values and if not known type is set to
    WTAP_ENCAP_WIRESHARK_UPPER_PDU.
    
    This conversion break tcpdump function for all but ETHERNET interface
    type. For example NLMON and 802.11 radiotap interfaces does not work.
    
    This problem has probably been there since quite a while back but was not
    seen (in the sense that current capture looked OK). Though when:
    
    "3aec5e1 Catch attempts to write multiple encapsulation types if unsupported."
    
    got applied the encap type mismatch is now detected and packet capture stops.
    As encap type is known already when selecting the interface to use, fix
    this by simply reusing the initial value when dumping the packets.
    
    Change-Id: Ica9824e715c47b285c985ea48cbae0e10e18d542
    Reviewed-on: https://code.wireshark.org/review/30715
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  57c3ebb   ICMPv6: Add Extended Echo (Probe) RFC8335
     add  51fb508   androiddump: Add packets with same encap type as used when open wtap


Summary of changes:
 extcap/androiddump.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)