osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

pcapng (dissector): fix 'pcapng.options.option.data.ipv4' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 

Change-Id: I9f6e713a50e0c73d0ecc7a66b62dffe270d4a35f
Reviewed-on: https://code.wireshark.org/review/13678
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Alexis La Goutte 2016-02-03 07:36:57 +01:00 committed by Anders Broman
parent d8e276883f
commit 91613a04db
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/file-pcapng.c
View File

@ -1480,7 +1480,7 @@ proto_register_pcapng(void)
NULL, HFILL }
},
{ &hf_pcapng_option_data_ipv6,
{ "IPv6", "pcapng.options.option.data.ipv4",
{ "IPv6", "pcapng.options.option.data.ipv6",
FT_IPv6, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},