diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2017-04-17 00:54:32 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-04-17 02:06:56 +0000 |
| commit | 61c5e8e76d215cd0f1ea2139ecafbada1f933973 (patch) | |
| tree | a9961f61e8e6a91278252df9c65f38111b6347f8 /epan/dissectors/packet-netlink.c | |
| parent | 407a2b07e55a262905881c7d1e225d618e9824fb (diff) | |
genl: make subdissectors responsible for header
Allow subdissectors to specify the command field for the Generic Netlink
message header, similar to how Netlink subdissectors handle the Netlink
message header (for its type field).
Pass the root tree instead of the genl tree to subdissectors (so
subdissectors can add their own layer).
Change-Id: I3e56f538661b7e8a51d2411da14d181ead820c4b
Reviewed-on: https://code.wireshark.org/review/21150
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-netlink.c')
| -rw-r--r-- | epan/dissectors/packet-netlink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-netlink.c b/epan/dissectors/packet-netlink.c index 3d73982eea..22cedaa68d 100644 --- a/epan/dissectors/packet-netlink.c +++ b/epan/dissectors/packet-netlink.c @@ -348,7 +348,7 @@ dissect_netlink_header(tvbuff_t *tvb, proto_tree *tree, int offset, int encoding proto_tree *fh_hdr; proto_item *pi; - fh_hdr = proto_tree_add_subtree(tree, tvb, offset, 16, ett_netlink_msghdr, NULL, "Header"); + fh_hdr = proto_tree_add_subtree(tree, tvb, offset, 16, ett_netlink_msghdr, NULL, "Netlink message header"); proto_tree_add_item(fh_hdr, &hfi_netlink_hdr_len, tvb, offset, 4, encoding); offset += 4; @@ -497,7 +497,7 @@ dissect_netlink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *_data */ proto_tree *fh_hdr; - fh_hdr = proto_tree_add_subtree(tree, tvb, offset, 4, ett_netlink_msghdr, NULL, "Header"); + fh_hdr = proto_tree_add_subtree(tree, tvb, offset, 4, ett_netlink_msghdr, NULL, "Netlink message header"); proto_tree_add_item(fh_hdr, &hfi_netlink_hdr_len, tvb, offset, 4, encoding); /* XXX invalid expert */ |