diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-04-12 13:52:07 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-04-12 23:33:37 +0000 |
| commit | 847c25c5a7e7c5653870c4bd60625da1c64c86f1 (patch) | |
| tree | 386b51025493bda76c077334293d931eded5afdf /epan/packet.h | |
| parent | 74f9b279e9888b0449b569a1c474351ccc991d5e (diff) | |
| download | wireshark-847c25c5a7e7c5653870c4bd60625da1c64c86f1.tar.gz | |
Prime the epan_dissect_t with postdissector wanted fields if necessary.
This makes sure that postdissectors that indicate that they need certain
fields in the first pass will get them.
While we're at it:
Fix the field-fetching code in TRANSUM not to assume it got any
instances of the field being fetched.
Rename process_packet_first_pass() in sharkd to process_packet(), as
it's the only routine in sharkd that processes packets.
Rename process_packet() in tshark and tfshark to
process_packet_single_pass(), as it's what's used if we're only doing
one-pass analysis.
Clean up comments and whitespace.
Change-Id: I3769af952c66f5ca4b68002ad6213858ab9cab9b
Reviewed-on: https://code.wireshark.org/review/21063
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/packet.h')
| -rw-r--r-- | epan/packet.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/epan/packet.h b/epan/packet.h index 47eed6fe33..e0625ae226 100644 --- a/epan/packet.h +++ b/epan/packet.h @@ -25,6 +25,7 @@ #include "proto.h" #include "tvbuff.h" +#include "epan.h" #include "value_string.h" #include "frame_data.h" #include "packet_info.h" @@ -803,12 +804,15 @@ extern void call_all_postdissectors(tvbuff_t *tvb, packet_info *pinfo, proto_tre /* * Return TRUE if at least one postdissector wants fields, FALSE otherwise. - * XXX - at some point this should return a bag of all fields requested by - * all postdissectors, so we can prime the epan_dissect_t with them rather - * than constructing a bogus tap with a bogus filter. */ WS_DLL_PUBLIC gboolean postdissectors_want_fields(void); +/* + * Prime an epan_dissect_t with all the fields wanted by postdissectors. + */ +WS_DLL_PUBLIC void +prime_epan_dissect_with_postdissector_wanted_fields(epan_dissect_t *edt); + /** @} */ #ifdef __cplusplus |