diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-12-13 16:54:16 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-12-14 12:17:49 +0000 |
| commit | 0960ac4dfdbfba5a81c56a49cfc6201ecd8f48e3 (patch) | |
| tree | 3d88cd321da2fade206b9ccddff22b70ecdfae28 /epan/dissectors/packet-clip.c | |
| parent | 9319357f5e27c10f2d29e78fcdf9d323c2af36b0 (diff) | |
Create capture dissector tables.
They are modeled after dissection dissector tables, but for the moment, don't have/need the flexibility. They are intended to be much simpler/faster than full dissection.
The two most used/needed are "wtap_encap" and "ethertype", so they were the basis of starting to use and test capture dissector table API. Others may be added in the future.
The "capture dissector" function signature needed a bit of tweeking to handling "claiming" of a packet.
The current application of this is capture functions returning TRUE if they affected a "type" of packet count. Returning FALSE ends up considering the packet an "other" type.
Change-Id: I81d06a6ccb2c03665f087258a46b9d78d513d6cd
Reviewed-on: https://code.wireshark.org/review/12607
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.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-clip.c b/epan/dissectors/packet-clip.c index 60528c12fa..634ff224b0 100644 --- a/epan/dissectors/packet-clip.c +++ b/epan/dissectors/packet-clip.c @@ -43,10 +43,10 @@ static expert_field ei_no_link_info = EI_INIT; static dissector_handle_t ip_handle; -static void +static gboolean capture_clip( const guchar *pd, int offset, int len, packet_counts *ld, const union wtap_pseudo_header *pseudo_header _U_ ) { - capture_ip(pd, offset, len, ld, pseudo_header); + return capture_ip(pd, offset, len, ld, pseudo_header); } static int @@ -109,8 +109,6 @@ proto_register_clip(void) proto_register_subtree_array(ett, array_length(ett)); expert_clip = expert_register_protocol(proto_clip); expert_register_field_array(expert_clip, ei, array_length(ei)); - - register_capture_dissector(WTAP_ENCAP_LINUX_ATM_CLIP, capture_clip, proto_clip); } void @@ -126,6 +124,8 @@ proto_reg_handoff_clip(void) clip_handle = create_dissector_handle(dissect_clip, proto_clip); /* XXX - no protocol, can't be disabled */ dissector_add_uint("wtap_encap", WTAP_ENCAP_LINUX_ATM_CLIP, clip_handle); + + register_capture_dissector("wtap_encap", WTAP_ENCAP_LINUX_ATM_CLIP, capture_clip, proto_clip); } /* |