diff options
Diffstat (limited to 'tfshark.c')
| -rw-r--r-- | tfshark.c | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -1100,8 +1100,8 @@ process_packet_first_pass(capture_file *cf, epan_dissect_t *edt, epan_dissect_prime_with_dfilter(edt, cf->rfcode); /* 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); @@ -1166,8 +1166,8 @@ process_packet_second_pass(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); col_custom_prime_edt(edt, &cf->cinfo); @@ -1342,10 +1342,11 @@ load_cap_file(capture_file *cf, int max_packet_count, gint64 max_byte_count) * * we're going to apply a read 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 || postdissectors_want_fields()); + (cf->rfcode != NULL || postdissectors_want_hfids()); /* We're not going to display the protocol tree on this pass, so it's not going to be "visible". */ @@ -1453,14 +1454,15 @@ load_cap_file(capture_file *cf, int max_packet_count, gint64 max_byte_count) * * 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 |