From 407a2b07e55a262905881c7d1e225d618e9824fb Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sun, 16 Apr 2017 18:48:30 -0700 Subject: 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 --- tshark.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'tshark.c') diff --git a/tshark.c b/tshark.c index a05f4a698b..4a0680e214 100644 --- a/tshark.c +++ b/tshark.c @@ -2586,14 +2586,15 @@ capture_input_new_packets(capture_session *cap_session, int to_read) * * one of the tap listeners requires a protocol tree; * - * a postdissector wants field values on the first pass; + * a postdissector wants field values or protocols + * on the first pass; * * we have custom columns (which require field values, which * currently requires that we build a protocol tree). */ create_proto_tree = (cf->rfcode || cf->dfcode || print_details || filtering_tap_listeners || - (tap_flags & TL_REQUIRES_PROTO_TREE) || postdissectors_want_fields() || + (tap_flags & TL_REQUIRES_PROTO_TREE) || postdissectors_want_hfids() || have_custom_cols(&cf->cinfo)); /* The protocol tree will be "visible", i.e., printed, only if we're @@ -2822,8 +2823,8 @@ process_packet_first_pass(capture_file *cf, epan_dissect_t *edt, epan_dissect_prime_with_dfilter(edt, cf->dfcode); /* This is the first pass, so prime the epan_dissect_t with the - fields postdissectors want on the first pass. */ - prime_epan_dissect_with_postdissector_wanted_fields(edt); + 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); @@ -3104,10 +3105,11 @@ load_cap_file(capture_file *cf, char *save_file, int out_file_type, * * 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()); tshark_debug("tshark: create_proto_tree = %s", create_proto_tree ? "TRUE" : "FALSE"); @@ -3306,14 +3308,15 @@ load_cap_file(capture_file *cf, char *save_file, int out_file_type, * * one of the tap listeners requires a protocol tree; * - * a postdissector wants field values on the first pass; + * a postdissector wants field values or protocols + * on the first pass; * * we have custom columns (which require field values, which * currently requires that we build a protocol tree). */ create_proto_tree = (cf->rfcode || cf->dfcode || print_details || filtering_tap_listeners || - (tap_flags & TL_REQUIRES_PROTO_TREE) || postdissectors_want_fields() || + (tap_flags & TL_REQUIRES_PROTO_TREE) || postdissectors_want_hfids() || have_custom_cols(&cf->cinfo)) tshark_debug("tshark: create_proto_tree = %s", create_proto_tree ? "TRUE" : "FALSE"); @@ -3556,8 +3559,8 @@ process_packet_single_pass(capture_file *cf, epan_dissect_t *edt, gint64 offset, 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); col_custom_prime_edt(edt, &cf->cinfo); -- cgit v1.2.1