aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-clip.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-11-15 08:00:10 -0500
committerMichael Mann <mmann78@netscape.net>2015-11-16 03:50:05 +0000
commitbbdd89b973353a0df1d98d884c38f3832670bfea (patch)
tree9b992f923f565af2fcab30902508a191de85ca53 /epan/dissectors/packet-clip.c
parent6012ba8f008bfba24fd44ce7a2a3055572453dce (diff)
create_dissector_handle -> new_create_dissector_handle
Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: Ie514f126352e7598acc4f7c38db9c61d105d5e48 Reviewed-on: https://code.wireshark.org/review/11850 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-clip.c')
-rw-r--r--epan/dissectors/packet-clip.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-clip.c b/epan/dissectors/packet-clip.c
index 7c35c6f503..28e5350096 100644
--- a/epan/dissectors/packet-clip.c
+++ b/epan/dissectors/packet-clip.c
@@ -49,8 +49,8 @@ capture_clip( const guchar *pd, int len, packet_counts *ld ) {
capture_ip(pd, 0, len, ld);
}
-static void
-dissect_clip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+static int
+dissect_clip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
proto_item *fh_item;
@@ -90,6 +90,7 @@ dissect_clip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
expert_add_info(pinfo, fh_item, &ei_no_link_info);
call_dissector(ip_handle, tvb, pinfo, tree);
+ return tvb_captured_length(tvb);
}
void
@@ -122,7 +123,7 @@ proto_reg_handoff_clip(void)
*/
ip_handle = find_dissector("ip");
- clip_handle = create_dissector_handle(dissect_clip, -1);
+ clip_handle = new_create_dissector_handle(dissect_clip, -1);
/* XXX - no protocol, can't be disabled */
dissector_add_uint("wtap_encap", WTAP_ENCAP_LINUX_ATM_CLIP, clip_handle);
}