diff options
author | John Thacker <johnthacker@gmail.com> | 2023-02-13 20:55:36 -0500 |
---|---|---|
committer | John Thacker <johnthacker@gmail.com> | 2023-02-16 12:46:44 +0000 |
commit | 01172f5a1df56c8cdb62fcb11d59d5ec588ade24 (patch) | |
tree | 5bb288e0f02a657c80585237dea534449c063294 /file.c | |
parent | de2a2c5ddbca39f1372834ef26c1360020eab671 (diff) |
tshark: Support multiple -j and -J options, including mixed
Store the field filter strings in a wmem_map pointing to the
field flags for each string. This allows specifying multiple
filter options (-j or -J) on the command line, including some
of both.
Fix #17470
Diffstat (limited to 'file.c')
-rw-r--r-- | file.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2694,7 +2694,7 @@ write_pdml_packet(capture_file *cf, frame_data *fdata, wtap_rec *rec, fdata, NULL); /* Write out the information in that tree. */ - write_pdml_proto_tree(NULL, NULL, PF_NONE, &args->edt, &cf->cinfo, args->fh, FALSE); + write_pdml_proto_tree(NULL, NULL, &args->edt, &cf->cinfo, args->fh, FALSE); epan_dissect_reset(&args->edt); @@ -2993,7 +2993,7 @@ write_json_packet(capture_file *cf, frame_data *fdata, wtap_rec *rec, /* Write out the information in that tree. */ write_json_proto_tree(NULL, args->print_args->print_dissections, - args->print_args->print_hex, NULL, PF_NONE, + args->print_args->print_hex, NULL, &args->edt, &cf->cinfo, proto_node_group_children_by_unique, &args->jdumper); |