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-msdp.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-msdp.c')
| -rw-r--r-- | epan/dissectors/packet-msdp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-msdp.c b/epan/dissectors/packet-msdp.c index 1c6c61e150..4be3ec5e0f 100644 --- a/epan/dissectors/packet-msdp.c +++ b/epan/dissectors/packet-msdp.c @@ -175,8 +175,8 @@ static void dissect_msdp_notification(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, guint16 tlv_len); -static void -dissect_msdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_msdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item *ti; proto_tree *msdp_tree; @@ -230,7 +230,7 @@ dissect_msdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tvb_reported_length_remaining(tvb, offset) > 0) proto_tree_add_item(msdp_tree, hf_msdp_trailing_junk, tvb, offset, -1, ENC_NA); - return; + return tvb_captured_length(tvb); } /* Both Source-Active and Source-Active Response have the same format @@ -427,7 +427,7 @@ static void dissect_msdp_notification(tvbuff_t *tvb, packet_info *pinfo, proto_t * sent back. */ next_tvb = tvb_new_subset_remaining(tvb, *offset); - dissect_msdp(next_tvb, pinfo, tree); + dissect_msdp(next_tvb, pinfo, tree, NULL); } break; case FSM_ERROR: @@ -585,7 +585,7 @@ proto_reg_handoff_msdp(void) { dissector_handle_t msdp_handle; - msdp_handle = create_dissector_handle(dissect_msdp, proto_msdp); + msdp_handle = new_create_dissector_handle(dissect_msdp, proto_msdp); dissector_add_uint("tcp.port", 639, msdp_handle); ip_handle = find_dissector("ip"); |