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

netlink: fix conflict 

'netlink-route.ifa_address' exists multiple times with NOT compatible types: FT_IPv4 and FT_IPv6

Change-Id: I3ba350cfc479a7733d48bc07b4102c8220126247
Reviewed-on: https://code.wireshark.org/review/28841
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Alexis La Goutte 2018-07-24 07:56:36 +02:00 committed by Anders Broman
parent b8e1d6944d
commit 4ff2c7b685
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-netlink-route.c
View File

@ -928,11 +928,11 @@ static header_field_info hfi_netlink_route_ifa_flags32 NETLINK_ROUTE_HFI_INIT =
CF_FUNC(hfi_netlink_route_ifa_flags_label), 0x00, NULL, HFILL };
static header_field_info hfi_netlink_route_ifa_addr6 NETLINK_ROUTE_HFI_INIT =
{ "Address", "netlink-route.ifa_address", FT_IPv6, BASE_NONE,
{ "Address", "netlink-route.ifa_address.ipv6", FT_IPv6, BASE_NONE,
NULL, 0x00, NULL, HFILL };
static header_field_info hfi_netlink_route_ifa_addr4 NETLINK_ROUTE_HFI_INIT =
{ "Address", "netlink-route.ifa_address", FT_IPv4, BASE_NONE,
{ "Address", "netlink-route.ifa_address.ipv4", FT_IPv4, BASE_NONE,
NULL, 0x00, NULL, HFILL };
static int