diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-11-20 02:28:14 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-11-20 02:28:14 +0000 |
| commit | f34e11fabead2968fab30e5c3caab8b377aaa287 (patch) | |
| tree | e2711798ee2270721ea8aca29b2419bbe78bcf5a /epan/dissectors/packet-cisco-metadata.c | |
| parent | ea278d3bf871239989365121270410930f197377 (diff) | |
| download | wireshark-f34e11fabead2968fab30e5c3caab8b377aaa287.tar.gz | |
Convert ethertype() function into a pure dissector. Bug 9454 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9454)
The main driving force for this was my new Decode As functionality (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9450) that wants a dissector/subdissector table relationship for all dissectors wanting to use Decode As functionality. The ethertype() function provides the value to the "ethertype" subdissector table, so I think it should be matched to a dissector. Only odd side effect is the display filter of "ethertype" returns no packets because there is no "item" associated with the dissector.
svn path=/trunk/; revision=53443
Diffstat (limited to 'epan/dissectors/packet-cisco-metadata.c')
| -rw-r--r-- | epan/dissectors/packet-cisco-metadata.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/epan/dissectors/packet-cisco-metadata.c b/epan/dissectors/packet-cisco-metadata.c index 53ba92b0b6..7d42fed385 100644 --- a/epan/dissectors/packet-cisco-metadata.c +++ b/epan/dissectors/packet-cisco-metadata.c @@ -32,6 +32,8 @@ #include "packet-ieee8023.h" #endif +static dissector_handle_t ethertype_handle; + static int proto_cmd = -1; static int hf_cmd_version = -1; @@ -48,6 +50,7 @@ static void dissect_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint16 encap_proto; + ethertype_data_t ethertype_data; proto_tree *cmd_tree = NULL; gint offset = 0; @@ -88,8 +91,14 @@ dissect_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { #endif - ethertype(encap_proto, tvb, 8, pinfo, tree, cmd_tree, - hf_eth_type, hf_cmd_trailer, 0); + ethertype_data.etype = encap_proto; + ethertype_data.offset_after_ethertype = 8; + ethertype_data.fh_tree = cmd_tree; + ethertype_data.etype_id = hf_eth_type; + ethertype_data.trailer_id = hf_cmd_trailer; + ethertype_data.fcs_len = 0; + + call_dissector_with_data(ethertype_handle, tvb, pinfo, tree, ðertype_data); } void @@ -130,6 +139,8 @@ proto_reg_handoff_cmd(void) { dissector_handle_t cmd_handle; + ethertype_handle = find_dissector("ethertype"); + cmd_handle = create_dissector_handle(dissect_cmd, proto_cmd); dissector_add_uint("ethertype", ETHERTYPE_CMD, cmd_handle); } |