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 /tshark.c | |
| 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 'tshark.c')
| -rw-r--r-- | tshark.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -3910,7 +3910,7 @@ print_packet(capture_file *cf, epan_dissect_t *edt) return !ferror(stdout); } if (print_details) { - write_pdml_proto_tree(output_fields, protocolfilter, protocolfilter_flags, edt, stdout, dissect_color); + write_pdml_proto_tree(output_fields, protocolfilter, protocolfilter_flags, edt, &cf->cinfo, stdout, dissect_color); printf("\n"); return !ferror(stdout); } @@ -3934,7 +3934,7 @@ print_packet(capture_file *cf, epan_dissect_t *edt) if (print_details) { write_json_proto_tree(output_fields, print_dissections_expanded, print_hex, protocolfilter, protocolfilter_flags, - edt, node_children_grouper, stdout); + edt, &cf->cinfo, node_children_grouper, stdout); return !ferror(stdout); } break; @@ -3945,14 +3945,14 @@ print_packet(capture_file *cf, epan_dissect_t *edt) if (print_details) { write_json_proto_tree(output_fields, print_dissections_none, TRUE, protocolfilter, protocolfilter_flags, - edt, node_children_grouper, stdout); + edt, &cf->cinfo, node_children_grouper, stdout); return !ferror(stdout); } break; case WRITE_EK: write_ek_proto_tree(output_fields, print_summary, print_hex, protocolfilter, - protocolfilter_flags, edt, stdout); + protocolfilter_flags, edt, &cf->cinfo, stdout); return !ferror(stdout); } |