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-vlan.c | |
parent | ea278d3bf871239989365121270410930f197377 (diff) |
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-vlan.c')
-rw-r--r-- | epan/dissectors/packet-vlan.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c index 805cc17b0d..951219f31c 100644 --- a/epan/dissectors/packet-vlan.c +++ b/epan/dissectors/packet-vlan.c @@ -45,6 +45,7 @@ static gboolean vlan_summary_in_tree = TRUE; static dissector_handle_t vlan_handle; +static dissector_handle_t ethertype_handle; static header_field_info *hfi_vlan = NULL; @@ -173,8 +174,16 @@ dissect_vlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_802_3(encap_proto, is_802_2, tvb, 4, pinfo, tree, vlan_tree, hfi_vlan_len.id, hfi_vlan_trailer.id, &ei_vlan_len, 0); } else { - ethertype(encap_proto, tvb, 4, pinfo, tree, vlan_tree, - hfi_vlan_etype.id, hfi_vlan_trailer.id, 0); + ethertype_data_t ethertype_data; + + ethertype_data.etype = encap_proto; + ethertype_data.offset_after_ethertype = 4; + ethertype_data.fh_tree = vlan_tree; + ethertype_data.etype_id = hfi_vlan_etype.id; + ethertype_data.trailer_id = hfi_vlan_trailer.id; + ethertype_data.fcs_len = 0; + + call_dissector_with_data(ethertype_handle, tvb, pinfo, tree, ðertype_data); } } @@ -242,6 +251,7 @@ proto_reg_handoff_vlan(void) } old_q_in_q_ethertype = q_in_q_ethertype; + ethertype_handle = find_dissector("ethertype"); dissector_add_uint("ethertype", q_in_q_ethertype, vlan_handle); } |