diff options
| author | Merlin Chlosta <merlin.chlosta+gnuradio@ruhr-uni-bochum.de> | 2017-12-21 14:58:07 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-01-02 05:27:51 +0000 |
| commit | af6dee35715a4079acaa7d9a413b6f7d859c8c8b (patch) | |
| tree | 820d80152f3d8c5089a14292d7f4b5e69e64a049 /epan/print.h | |
| parent | 487eae350743ede43432ebef49268cc670d82fb2 (diff) | |
Add columns (_ws.col) to output formats json, ek, pdml
Bug: 13020
Change-Id: Ia83797a4e390be7cc59a9718735edc1c7f9a5712
Reviewed-on: https://code.wireshark.org/review/24928
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/print.h')
| -rw-r--r-- | epan/print.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/print.h b/epan/print.h index c815698b61..9d0e0ff45e 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); 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, FILE *fh, gboolean use_color); +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_finale(FILE *fh); // Implementations of proto_node_children_grouper_func @@ -110,6 +110,7 @@ WS_DLL_PUBLIC void write_json_proto_tree(output_fields_t* fields, gchar **protocolfilter, pf_flags protocolfilter_flags, epan_dissect_t *edt, + column_info *cinfo, proto_node_children_grouper_func node_children_grouper, FILE *fh); WS_DLL_PUBLIC void write_json_finale(FILE *fh); @@ -119,7 +120,8 @@ WS_DLL_PUBLIC void write_ek_proto_tree(output_fields_t* fields, gboolean print_hex_data, gchar **protocolfilter, pf_flags protocolfilter_flags, - epan_dissect_t *edt, FILE *fh); + epan_dissect_t *edt, + column_info *cinfo, FILE *fh); WS_DLL_PUBLIC void write_psml_preamble(column_info *cinfo, FILE *fh); WS_DLL_PUBLIC void write_psml_columns(epan_dissect_t *edt, FILE *fh, gboolean use_color); |