diff options
| author | Martin Kacer <kacer.martin@gmail.com> | 2016-06-13 15:47:44 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-06-17 06:09:29 +0000 |
| commit | 42b060905e6a84c1413803e59766802089f6349d (patch) | |
| tree | 2eec8bc60f00414ab720776ab226f87ced48ade1 /epan/print.h | |
| parent | 0aa5f6c6c70959c24caee61a88889b1b86d610f1 (diff) | |
tshark JSON and Elasticsearch output
Added ouput -T for json|ek
Added -j switch fo filter EK json|ek fields.
Added -x switch to work with json|ek to insert raw fields.
Bug: 11754
Change-Id: Iad5a9092b843c074b0b774d1745fa14fca09f6b7
Reviewed-on: https://code.wireshark.org/review/15869
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/print.h')
| -rw-r--r-- | epan/print.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/epan/print.h b/epan/print.h index 8ee35e04ba..b152ac5f7a 100644 --- a/epan/print.h +++ b/epan/print.h @@ -108,6 +108,12 @@ WS_DLL_PUBLIC void write_pdml_preamble(FILE *fh, const gchar* filename); WS_DLL_PUBLIC void write_pdml_proto_tree(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 *jsonfilter, 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 *jsonfilter, 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); WS_DLL_PUBLIC void write_psml_finale(FILE *fh); |