diff options
| author | Martin Kacer <kacer.martin@gmail.com> | 2016-06-28 13:01:25 +0200 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-06-29 08:29:16 +0000 |
| commit | ceae9e4d1fff4500b285dba021c3f239ff87779e (patch) | |
| tree | a9f61fe0b0a498030098f6f5aa62e15b08222e76 /epan/print.h | |
| parent | 348e364551782237800896920f32b10cc18e9f36 (diff) | |
| download | wireshark-ceae9e4d1fff4500b285dba021c3f239ff87779e.tar.gz | |
tshark fields filter added for other outputs
-e fields filter addded to ek|json|pdml output.
Bug: 12529
Change-Id: I1f0f8772eefceb5b71927925ce0c34af483571b9
Reviewed-on: https://code.wireshark.org/review/16193
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/print.h')
| -rw-r--r-- | epan/print.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/epan/print.h b/epan/print.h index c9cdda3c86..dc2c7ad081 100644 --- a/epan/print.h +++ b/epan/print.h @@ -79,6 +79,13 @@ typedef struct { * each new packet */ } print_args_t; +typedef enum { + FORMAT_CSV, /* CSV */ + FORMAT_JSON, /* JSON */ + FORMAT_EK, /* JSON bulk insert to Elasticsearch */ + FORMAT_XML, /* PDML output */ +} fields_format; + /* * Print user selected list of fields */ @@ -105,14 +112,14 @@ WS_DLL_PUBLIC gboolean proto_tree_print(print_args_t *print_args, 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(gchar **protocolfilter, epan_dissect_t *edt, FILE *fh); +WS_DLL_PUBLIC void write_pdml_proto_tree(output_fields_t* fields, gchar **protocolfilter, epan_dissect_t *edt, FILE *fh); WS_DLL_PUBLIC void write_pdml_finale(FILE *fh); WS_DLL_PUBLIC void write_json_preamble(FILE *fh); -WS_DLL_PUBLIC void write_json_proto_tree(print_args_t *print_args, gchar **protocolfilter, epan_dissect_t *edt, FILE *fh); +WS_DLL_PUBLIC void write_json_proto_tree(output_fields_t* fields, print_args_t *print_args, gchar **protocolfilter, epan_dissect_t *edt, FILE *fh); WS_DLL_PUBLIC void write_json_finale(FILE *fh); -WS_DLL_PUBLIC void write_ek_proto_tree(print_args_t *print_args, gchar **protocolfilter, epan_dissect_t *edt, FILE *fh); +WS_DLL_PUBLIC void write_ek_proto_tree(output_fields_t* fields, print_args_t *print_args, gchar **protocolfilter, epan_dissect_t *edt, 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); |