diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2016-08-20 13:22:30 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-08-21 14:53:34 +0000 |
| commit | c0ab12b23e5ca3a48d5f42600d1162a57dfdeca2 (patch) | |
| tree | 468d113eac3b8cbbe49238475c2127ad388f7044 /epan/dissectors/packet-netlink.h | |
| parent | 9902117f1a2eb47bb5bd1a0323a3d3891ef17d5b (diff) | |
netlink-netfilter,nflog: use NFPROTO_xxx instead of AF_xxx
These constants are mostly overlapping, except for NFPROTO_ARP. A manual
study of the Linux v4.7 code shows which fields to use and also reveal
that nflog.family can never be NFPROTO_ARP because (1) bridge traffic
use NFPROTO_BRIDGE and (2) arptables has no ULOG/NFLOG target.
This patch affects how some family fields are displayed but do not
affect subdissector calls.
Change-Id: I7cc73a8dcf73fe68c7ccaaa0f3b329fe484c8bfe
Reviewed-on: https://code.wireshark.org/review/17190
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-netlink.h')
| -rw-r--r-- | epan/dissectors/packet-netlink.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/epan/dissectors/packet-netlink.h b/epan/dissectors/packet-netlink.h index 673fd019ad..361aaaf429 100644 --- a/epan/dissectors/packet-netlink.h +++ b/epan/dissectors/packet-netlink.h @@ -82,6 +82,19 @@ enum { WS_NLMSG_MIN_TYPE = 0x10 /** type < WS_NLMSG_MIN_TYPE are reserved */ }; +/* from <linux/netfilter.h>. Looks like AF_xxx, except for NFPROTO_ARP */ +enum ws_nfproto { + WS_NFPROTO_UNSPEC = 0, + WS_NFPROTO_INET = 1, + WS_NFPROTO_IPV4 = 2, + WS_NFPROTO_ARP = 3, + WS_NFPROTO_NETDEV = 5, + WS_NFPROTO_BRIDGE = 7, + WS_NFPROTO_IPV6 = 10, + WS_NFPROTO_DECNET = 12, +}; +extern const value_string nfproto_family_vals[]; + #define PACKET_NETLINK_MAGIC 0x4A5ACCCE struct packet_netlink_data { |