diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-02-03 07:36:57 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-02-03 13:03:50 +0000 |
| commit | 91613a04db4d6381df06b582b4375609f6613f0c (patch) | |
| tree | 1f466ea0cfd1d1b094e375c4a79386244aa8d1d9 | |
| parent | d8e276883fd1313c978ac4d58f49e07d396bef23 (diff) | |
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>
| -rw-r--r-- | epan/dissectors/file-pcapng.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/file-pcapng.c b/epan/dissectors/file-pcapng.c index c56110efcd..133b3c6330 100644 --- a/epan/dissectors/file-pcapng.c +++ b/epan/dissectors/file-pcapng.c @@ -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 } }, |