aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-oampdu.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-11-17 20:16:06 -0500
committerAnders Broman <a.broman58@gmail.com>2015-11-18 07:33:08 +0000
commit4adeb424f5cdb74ca1f98cd4b87bd72e4d811f03 (patch)
tree6c73d6e0795cc5181ad53242581e4c7f2282081f /epan/dissectors/packet-oampdu.c
parent13297438d98e3388d650fc55c2a77d5b52367e1f (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-oampdu.c')
-rw-r--r--epan/dissectors/packet-oampdu.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-oampdu.c b/epan/dissectors/packet-oampdu.c
index 921856010e..9b1fc12338 100644
--- a/epan/dissectors/packet-oampdu.c
+++ b/epan/dissectors/packet-oampdu.c
@@ -1014,8 +1014,8 @@ dissect_oampdu_vendor_specific(tvbuff_t *tvb, proto_tree *tree);
* Dominique Bastien (dbastien@accedian.com)
* + add support for 802.3ah-2004.
*/
-static void
-dissect_oampdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+static int
+dissect_oampdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
int offset = 0;
guint8 oampdu_code;
@@ -1159,6 +1159,7 @@ dissect_oampdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
default:
break;
}
+ return tvb_captured_length(tvb);
}
/*
@@ -2634,7 +2635,7 @@ proto_reg_handoff_oampdu(void)
{
dissector_handle_t oampdu_handle;
- oampdu_handle = create_dissector_handle(dissect_oampdu, proto_oampdu);
+ oampdu_handle = new_create_dissector_handle(dissect_oampdu, proto_oampdu);
dissector_add_uint("slow.subtype", OAM_SUBTYPE, oampdu_handle);
}