diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-17 20:16:06 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-11-18 07:33:08 +0000 |
| commit | 4adeb424f5cdb74ca1f98cd4b87bd72e4d811f03 (patch) | |
| tree | 6c73d6e0795cc5181ad53242581e4c7f2282081f /epan/dissectors/packet-vlan.c | |
| parent | 13297438d98e3388d650fc55c2a77d5b52367e1f (diff) | |
create_dissector_handle -> new_create_dissector_handle
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: I9c7d1c092bbae896ec0c2832617891346927f2e1
Reviewed-on: https://code.wireshark.org/review/11932
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-vlan.c')
| -rw-r--r-- | epan/dissectors/packet-vlan.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c index e87c559f70..fbbb5d32c4 100644 --- a/epan/dissectors/packet-vlan.c +++ b/epan/dissectors/packet-vlan.c @@ -134,8 +134,8 @@ columns_set_vlan(column_info *cinfo, guint16 tci) col_add_str(cinfo, COL_8021Q_VLAN_ID, id_str); } -static void -dissect_vlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_vlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item *ti; guint16 tci; @@ -199,6 +199,7 @@ dissect_vlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) call_dissector_with_data(ethertype_handle, tvb, pinfo, tree, ðertype_data); } + return tvb_captured_length(tvb); } void @@ -245,7 +246,7 @@ proto_register_vlan(void) "The (hexadecimal) Ethertype used to indicate 802.1QinQ VLAN in VLAN tunneling.", 16, &q_in_q_ethertype); - vlan_handle = create_dissector_handle(dissect_vlan, proto_vlan); + vlan_handle = new_create_dissector_handle(dissect_vlan, proto_vlan); } void |