aboutsummaryrefslogtreecommitdiffstats
path: root/tshark.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2017-06-11 12:03:13 -0400
committerAnders Broman <a.broman58@gmail.com>2017-06-12 03:23:38 +0000
commit585d17ae7f03d76713cf8ab2959260d19dabc619 (patch)
treeb9d43744966ae757091c7db606604e6e2fd90a6d /tshark.c
parentf4dd096afb6bb7b3ed7f036a9def10a5c27dcd66 (diff)
Add support for color xml attributes in psml and pdml formats.
Bug: 6682 Change-Id: I19330d06aa3d5692503c61369c3c650d595971f5 Reviewed-on: https://code.wireshark.org/review/22077 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stephen Donnelly <stephen.donnelly@endace.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'tshark.c')
-rw-r--r--tshark.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/tshark.c b/tshark.c
index 1c4c618a3f..eae9acf34e 100644
--- a/tshark.c
+++ b/tshark.c
@@ -444,6 +444,8 @@ print_usage(FILE *output)
fprintf(output, " a directory named \"destdir\"\n");
fprintf(output, " --color color output text similarly to the Wireshark GUI,\n");
fprintf(output, " requires a terminal with 24-bit color support\n");
+ fprintf(output, " Also supplies color attributes to pdml and psml formats\n");
+ fprintf(output, " (Note that attributes are nonstandard)\n");
fprintf(output, "\n");
fprintf(output, "Miscellaneous:\n");
@@ -3863,7 +3865,7 @@ print_packet(capture_file *cf, epan_dissect_t *edt)
break;
case WRITE_XML:
- write_psml_columns(edt, stdout);
+ write_psml_columns(edt, stdout, dissect_color);
return !ferror(stdout);
case WRITE_FIELDS: /*No non-verbose "fields" format */
case WRITE_JSON:
@@ -3889,7 +3891,7 @@ print_packet(capture_file *cf, epan_dissect_t *edt)
break;
case WRITE_XML:
- write_pdml_proto_tree(output_fields, protocolfilter, protocolfilter_flags, edt, stdout);
+ write_pdml_proto_tree(output_fields, protocolfilter, protocolfilter_flags, edt, stdout, dissect_color);
printf("\n");
return !ferror(stdout);
case WRITE_FIELDS: