aboutsummaryrefslogtreecommitdiffstats
path: root/sharkd.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2017-04-16 18:48:30 -0700
committerGuy Harris <guy@alum.mit.edu>2017-04-17 01:49:01 +0000
commit407a2b07e55a262905881c7d1e225d618e9824fb (patch)
treeff273d3ca4dc747c9dc397244a04d90872c3b4d0 /sharkd.c
parent1bfc8580e322450f8afaaf797e236469b948c984 (diff)
Rename some routines and structure members.
They deal with sets of hfids, which can belong to protocols as well as fields (I guess you could argue that a protocol is a field, but...). Change-Id: Ibd103cfa26427ead4ef54be89f1251908004cfae Reviewed-on: https://code.wireshark.org/review/21154 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'sharkd.c')
-rw-r--r--sharkd.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sharkd.c b/sharkd.c
index 0bd92225b0..48279c9990 100644
--- a/sharkd.c
+++ b/sharkd.c
@@ -308,8 +308,8 @@ process_packet(capture_file *cf, epan_dissect_t *edt,
epan_dissect_prime_with_dfilter(edt, cf->dfcode);
/* This is the first and only pass, so prime the epan_dissect_t
- with the fields postdissectors want on the first pass. */
- prime_epan_dissect_with_postdissector_wanted_fields(edt);
+ with the hfids postdissectors want on the first pass. */
+ prime_epan_dissect_with_postdissector_wanted_hfids(edt);
frame_data_set_before_dissect(&fdlocal, &cf->elapsed_time,
&ref, prev_dis);
@@ -378,10 +378,11 @@ load_cap_file(capture_file *cf, int max_packet_count, gint64 max_byte_count)
*
* we're going to apply a display filter;
*
- * a postdissector wants field values on the first pass.
+ * a postdissector wants field values or protocols
+ * on the first pass.
*/
create_proto_tree =
- (cf->rfcode != NULL || cf->dfcode != NULL || postdissectors_want_fields());
+ (cf->rfcode != NULL || cf->dfcode != NULL || postdissectors_want_hfids());
/* We're not going to display the protocol tree on this pass,
so it's not going to be "visible". */