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.c | |
| parent | 74f9b279e9888b0449b569a1c474351ccc991d5e (diff) | |
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.c')
| -rw-r--r-- | epan/packet.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/epan/packet.c b/epan/packet.c index 4a3b5cbd64..bb43449d7f 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -3350,6 +3350,25 @@ postdissectors_want_fields(void) return FALSE; } +void +prime_epan_dissect_with_postdissector_wanted_fields(epan_dissect_t *edt) +{ + guint i; + + if (postdissectors == NULL) { + /* + * No postdissector expressed an interest in any fields. + */ + return; + } + for (i = 0; i < postdissectors->len; i++) { + if (POSTDISSECTORS(i).wanted_fields != NULL && + POSTDISSECTORS(i).wanted_fields->len != 0) + epan_dissect_prime_with_hfid_array(edt, + POSTDISSECTORS(i).wanted_fields); + } +} + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * |