androiddump: Fix tcpdump encap type when libwiretap is used
authorMikael Kanstrup <mikael.kanstrup@sony.com>
Wed, 23 May 2018 15:10:27 +0000 (17:10 +0200)
committerRoland Knall <rknall@gmail.com>
Thu, 24 May 2018 07:55:00 +0000 (07:55 +0000)
commitafd0eef4f63839b30711cba6d0ebe334ff2ef450
tree154e9b84a49ffb42d8ef001c92abe47345abaa2e
parentc59fae221e3570d928666e82e213892261523d62
androiddump: Fix tcpdump encap type when libwiretap is used

androiddump determines encap type by parsing pcap global header from
tcpdump binary output. Only when libpcap is used with androiddump
this (pcap linktype) value can be used right away. Libwiretap
uses its own encap values but is feed with pcap linktype values
making the whole packet encapsulation invalid.

Fix by converting pcap linktype values into wiretap encap values

(For pcap linktype definitions see http://www.tcpdump.org/linktypes.html)
(For wtap encap defininitions see wiretap/wtap.h)

Fixes: bfef57ebb7 ("androiddump: Fix and simplify tcpdump capture")
Change-Id: I5ea86204b8e5774fd84d4007db8c2910680dbd53
Reviewed-on: https://code.wireshark.org/review/27747
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Florian Bezold <florian.bezold@esrlabs.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
extcap/androiddump.c