text2pcap: Fix -i <proto> when IPv6 (-6) is specified
authorVasil Velichkov <vvvelichkov@gmail.com>
Mon, 29 Oct 2018 22:44:16 +0000 (00:44 +0200)
committerMichael Mann <mmann78@netscape.net>
Wed, 31 Oct 2018 02:45:27 +0000 (02:45 +0000)
commit5359a97d4383ca75606b6011006f44b040d5b92b
treecfe544c5ab7a7dc32c99684806c81ec34245bf37
parent25844263107e20b7bd1f3fabebf782456e06dbba
text2pcap: Fix -i <proto> when IPv6 (-6) is specified

When the -i <proto> option is specified the hdr_ip was always set to
TRUE which resulted in a wrong header length when the IPv6 (-6) option
is specified as well. To resolve this set hdr_ip only when -i is specified
without -4 or -6 options.

Change-Id: I21898f27ceaad603b9275ab6878ff4bd8f9586cd
Reviewed-on: https://code.wireshark.org/review/30411
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
test/suite_text2pcap.py
text2pcap.c