diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-22 22:59:08 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-23 13:09:55 +0000 |
| commit | 2bbbb4879c3e0885fd971bd75ca88a183feb92f0 (patch) | |
| tree | 9bbd51756fa6230f3555612e27863b316371ad38 /epan/dissectors/packet-gmrp.c | |
| parent | 073cfb33ec84f12d7904f0e6ed2b0a5d049f4ded (diff) | |
register_dissector -> new_register_dissector
Change-Id: Ic368dd8e83cf39e0c934da0ae2744778e2d54ce6
Reviewed-on: https://code.wireshark.org/review/12050
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-gmrp.c')
| -rw-r--r-- | epan/dissectors/packet-gmrp.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/epan/dissectors/packet-gmrp.c b/epan/dissectors/packet-gmrp.c index 6d66f89a83..d73732ce88 100644 --- a/epan/dissectors/packet-gmrp.c +++ b/epan/dissectors/packet-gmrp.c @@ -107,8 +107,8 @@ static const value_string event_vals[] = { /* Code to actually dissect the packets */ -static void -dissect_gmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_gmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item *ti; proto_tree *gmrp_tree, *msg_tree, *attr_tree; @@ -142,7 +142,7 @@ dissect_gmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) call_dissector(data_handle, tvb_new_subset_remaining(tvb, GARP_PROTOCOL_ID + 2), pinfo, tree); - return; + return tvb_captured_length(tvb); } offset += 2; @@ -173,7 +173,7 @@ dissect_gmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) call_dissector(data_handle, tvb_new_subset_remaining(tvb, offset), pinfo, tree); - return; + return tvb_captured_length(tvb); } } @@ -192,7 +192,7 @@ dissect_gmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) call_dissector(data_handle, tvb_new_subset_remaining(tvb, offset), pinfo, tree); - return; + return tvb_captured_length(tvb); } attr_index = 0; @@ -227,7 +227,7 @@ dissect_gmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) call_dissector(data_handle, tvb_new_subset_remaining(tvb, offset), pinfo, tree); - return; + return tvb_captured_length(tvb); } } else @@ -260,7 +260,7 @@ dissect_gmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) call_dissector(data_handle, tvb_new_subset_remaining(tvb, offset), pinfo, tree); - return; + return tvb_captured_length(tvb); } break; @@ -275,7 +275,7 @@ dissect_gmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) call_dissector(data_handle, tvb_new_subset_remaining(tvb, offset), pinfo, tree); - return; + return tvb_captured_length(tvb); } /* Show attribute value */ @@ -304,7 +304,7 @@ dissect_gmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) call_dissector(data_handle, tvb_new_subset_remaining(tvb, offset), pinfo, tree); - return; + return tvb_captured_length(tvb); } break; @@ -313,7 +313,7 @@ dissect_gmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) call_dissector(data_handle, tvb_new_subset_remaining(tvb, offset), pinfo, tree); - return; + return tvb_captured_length(tvb); } } @@ -324,6 +324,7 @@ dissect_gmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) msg_index++; } + return tvb_captured_length(tvb); } @@ -393,7 +394,7 @@ proto_register_gmrp(void) expert_gmrp = expert_register_protocol(proto_gmrp); expert_register_field_array(expert_gmrp, ei, array_length(ei)); - register_dissector("gmrp", dissect_gmrp, proto_gmrp); + new_register_dissector("gmrp", dissect_gmrp, proto_gmrp); } |