diff options
author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-08 12:42:10 +0000 |
---|---|---|
committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-08 12:42:10 +0000 |
commit | fa01b39f338b16d809dc94a4161d59dee88346ab (patch) | |
tree | 6a12c879ecaa8198e8bcebe4aba422d92e11b820 /epan/dissectors | |
parent | 4af107edfed1488c1fcc48e13bec6f8c15b4c3cc (diff) |
Add more LINUX_AF_* values, create value_string_ext for them. Use it in netlink, nflog.
svn path=/trunk/; revision=53852
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-netlink-route.c | 11 | ||||
-rw-r--r-- | epan/dissectors/packet-nflog.c | 8 |
2 files changed, 6 insertions, 13 deletions
diff --git a/epan/dissectors/packet-netlink-route.c b/epan/dissectors/packet-netlink-route.c index 4a91a35644..5f5853cc9e 100644 --- a/epan/dissectors/packet-netlink-route.c +++ b/epan/dissectors/packet-netlink-route.c @@ -30,6 +30,7 @@ #include <glib.h> #include <epan/packet.h> +#include <epan/aftypes.h> #include "packet-arp.h" #include "packet-netlink.h" @@ -481,9 +482,8 @@ dissect_netlink_route_if_attrs(tvbuff_t *tvb, struct netlink_route_info *info, p /* IP address */ static header_field_info hfi_netlink_route_ifa_family NETLINK_ROUTE_HFI_INIT = - { "Address type", "netlink-route.ifa_family", FT_UINT8, BASE_DEC, - /* XXX .strings = _linux_family_vals (nflog) */ - NULL, 0x00, NULL, HFILL }; + { "Address type", "netlink-route.ifa_family", FT_UINT8, BASE_DEC | BASE_EXT_STRING, + &linux_af_vals_ext, 0x00, NULL, HFILL }; static int dissect_netlink_route_ifaddrmsg(tvbuff_t *tvb, struct netlink_route_info *info _U_, proto_tree *tree, int offset) @@ -496,9 +496,8 @@ dissect_netlink_route_ifaddrmsg(tvbuff_t *tvb, struct netlink_route_info *info _ /* Route */ static header_field_info hfi_netlink_route_rt_family NETLINK_ROUTE_HFI_INIT = - { "Address family", "netlink-route.rt_family", FT_UINT8, BASE_DEC, - /* XXX .strings = _linux_family_vals (nflog) */ - NULL, 0x00, NULL, HFILL }; + { "Address family", "netlink-route.rt_family", FT_UINT8, BASE_DEC | BASE_EXT_STRING, + &linux_af_vals_ext, 0x00, NULL, HFILL }; static header_field_info hfi_netlink_route_rt_dst_len NETLINK_ROUTE_HFI_INIT = { "Length of destination", "netlink-route.rt_dst_len", FT_UINT8, BASE_DEC, diff --git a/epan/dissectors/packet-nflog.c b/epan/dissectors/packet-nflog.c index a0beebc393..1e028ce97a 100644 --- a/epan/dissectors/packet-nflog.c +++ b/epan/dissectors/packet-nflog.c @@ -67,12 +67,6 @@ static const enum_val_t byte_order_types[] = { { NULL, NULL, 0 } }; -static const value_string _linux_family_vals[] = { - { LINUX_AF_INET, "IP" }, - { LINUX_AF_INET6, "IPv6" }, - { 0, NULL } -}; - static const value_string _encoding_vals[] = { { ENC_BIG_ENDIAN, "Big Endian" }, { ENC_LITTLE_ENDIAN, "Little Endian" }, @@ -113,7 +107,7 @@ static header_field_info *hfi_nflog = NULL; /* Header */ static header_field_info hfi_nflog_family NFLOG_HFI_INIT = - { "Family", "nflog.family", FT_UINT8, BASE_DEC, VALS(_linux_family_vals), 0x00, NULL, HFILL }; + { "Family", "nflog.family", FT_UINT8, BASE_DEC | BASE_EXT_STRING, &linux_af_vals_ext, 0x00, NULL, HFILL }; static header_field_info hfi_nflog_version NFLOG_HFI_INIT = { "Version", "nflog.version", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }; |