diff options
author | Michael Mann <mmann78@netscape.net> | 2015-11-15 16:51:45 -0500 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-11-16 22:00:30 +0000 |
commit | 799d6fd057b0c20a7692a1181d811a8ff3a88d04 (patch) | |
tree | 31d6d1248aee7c3192ae6d854b43eeb2c0b996a0 /epan/dissectors/packet-ismp.c | |
parent | 92bb13a4d22a48c43aa5fa6910c68829edebfdd0 (diff) |
create_dissector_handle -> new_create_dissector_handle
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: I96aa9cf53533cbb07105aa400d42922baf3016b3
Reviewed-on: https://code.wireshark.org/review/11860
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ismp.c')
-rw-r--r-- | epan/dissectors/packet-ismp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c index 69b5f66caf..fe68fca7b6 100644 --- a/epan/dissectors/packet-ismp.c +++ b/epan/dissectors/packet-ismp.c @@ -487,8 +487,8 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp /* Code to actually dissect the packets */ -static void -dissect_ismp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_ismp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { int offset = 0; guint16 message_type = 0; @@ -534,6 +534,8 @@ dissect_ismp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* if Enterasys Discover Protocol, dissect it */ if(message_type == ISMPTYPE_EDP) dissect_ismp_edp(tvb, pinfo, offset, tree); + + return tvb_captured_length(tvb); } @@ -880,7 +882,7 @@ proto_reg_handoff_ismp(void) { dissector_handle_t ismp_handle; - ismp_handle = create_dissector_handle(dissect_ismp, + ismp_handle = new_create_dissector_handle(dissect_ismp, proto_ismp); dissector_add_uint("ethertype", ETHERTYPE_ISMP, ismp_handle); } |