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 /epan/print.h | |
| 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 'epan/print.h')
| -rw-r--r-- | epan/print.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/epan/print.h b/epan/print.h index 9473611cd3..9331377a9f 100644 --- a/epan/print.h +++ b/epan/print.h @@ -94,7 +94,7 @@ WS_DLL_PUBLIC gboolean proto_tree_print(print_dissections_e print_dissections, WS_DLL_PUBLIC gboolean print_hex_data(print_stream_t *stream, epan_dissect_t *edt, guint hexdump_options); WS_DLL_PUBLIC void write_pdml_preamble(FILE *fh, const gchar* filename); -WS_DLL_PUBLIC void write_pdml_proto_tree(output_fields_t* fields, gchar **protocolfilter, pf_flags protocolfilter_flags, epan_dissect_t *edt, column_info *cinfo, FILE *fh, gboolean use_color); +WS_DLL_PUBLIC void write_pdml_proto_tree(output_fields_t* fields, wmem_map_t *protocolfilter, epan_dissect_t *edt, column_info *cinfo, FILE *fh, gboolean use_color); WS_DLL_PUBLIC void write_pdml_finale(FILE *fh); // Implementations of proto_node_children_grouper_func @@ -107,8 +107,7 @@ WS_DLL_PUBLIC json_dumper write_json_preamble(FILE *fh); WS_DLL_PUBLIC void write_json_proto_tree(output_fields_t* fields, print_dissections_e print_dissections, gboolean print_hex_data, - gchar **protocolfilter, - pf_flags protocolfilter_flags, + wmem_map_t *protocolfilter, epan_dissect_t *edt, column_info *cinfo, proto_node_children_grouper_func node_children_grouper, @@ -118,8 +117,7 @@ WS_DLL_PUBLIC void write_json_finale(json_dumper *dumper); WS_DLL_PUBLIC void write_ek_proto_tree(output_fields_t* fields, gboolean print_summary, gboolean print_hex_data, - gchar **protocolfilter, - pf_flags protocolfilter_flags, + wmem_map_t *protocolfilter, epan_dissect_t *edt, column_info *cinfo, FILE *fh); |