osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

tshark: Optionally delimit packet summary columns with tabs 

This patch augments tshark's -T report with a "tabs" option.
When the -T tabs option is enabled an ASCII horizontal tab character
is inserted between each column of the human-readable one-line
packet summary record.

Change-Id: Id10a6e21e231eb2e52b6342ed05399db1a5fcfdf
Reviewed-on: https://code.wireshark.org/review/20537
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Jim Young 2017-03-13 21:04:24 -05:00 committed by Michael Mann
parent 2890e415bb
commit e66b05fa9d
2 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/tshark.pod
View File

@ -40,7 +40,7 @@ S<[ B<-R> E<lt>Read filterE<gt> ]>
S<[ B<-s> E<lt>capture snaplenE<gt> ]>
S<[ B<-S> E<lt>separatorE<gt> ]>
S<[ B<-t> a|ad|adoy|d|dd|e|r|u|ud|udoy ]>
S<[ B<-T> ek|fields|json|pdml|ps|psml|text ]>
S<[ B<-T> ek|fields|json|pdml|ps|psml|tabs|text ]>
S<[ B<-u> E<lt>seconds typeE<gt>]>
S<[ B<-U> E<lt>tap_nameE<gt>]>
S<[ B<-v> ]>
@ -748,7 +748,7 @@ was captured
The default format is relative.
=item -T ek|fields|json|jsonraw|pdml|ps|psml|text
=item -T ek|fields|json|jsonraw|pdml|ps|psml|tabs|text
Set the format of the output when viewing decoded packet data. The
options are one of:
@ -795,6 +795,10 @@ B<psml> Packet Summary Markup Language, an XML-based format for the summary
information of a decoded packet. This information is equivalent to the
information shown in the one-line summary printed by default.
B<tabs> Similar to the default B<text> report except the human-readable one-line
summary of each packet will include an ASCII horizontal tab (0x09) character
as a delimiter between each column.
B<text> Text of a human-readable one-line summary of each of the packets, or a
multi-line view of the details of each of the packets, depending on
whether the B<-V> flag was specified. This is the default.

48
tshark.c
View File

@ -183,6 +183,7 @@ static gboolean print_details; /* TRUE if we're to print packet details info
static gboolean print_hex; /* TRUE if we're to print hex/ascci information */
static gboolean line_buffered;
static gboolean really_quiet = FALSE;
static gchar* delimiter_char = " ";
static print_format_e print_format = PR_FMT_TEXT;
static print_stream_t *print_stream = NULL;
@ -388,7 +389,7 @@ print_usage(FILE *output)
fprintf(output, " -P print packet summary even when writing to a file\n");
fprintf(output, " -S <separator> the line separator to print between packets\n");
fprintf(output, " -x add output of hex and ASCII dump (Packet Bytes)\n");
fprintf(output, " -T pdml|ps|psml|json|jsonraw|ek|text|fields\n");
fprintf(output, " -T pdml|ps|psml|json|jsonraw|ek|tabs|text|fields|?\n");
fprintf(output, " format of text output (def: text)\n");
fprintf(output, " -j <protocolfilter> protocols layers filter if -T ek|pdml|json selected\n");
fprintf(output, " (e.g. \"ip ip.flags text\", filter does not expand child\n");
@ -406,7 +407,7 @@ print_usage(FILE *output)
fprintf(output, " aggregator=,|/s|<char> select comma, space, printable character as\n");
fprintf(output, " aggregator\n");
fprintf(output, " quote=d|s|n select double, single, no quotes for values\n");
fprintf(output, " -t a|ad|d|dd|e|r|u|ud output format of time stamps (def: r: rel. to first)\n");
fprintf(output, " -t a|ad|d|dd|e|r|u|ud|? output format of time stamps (def: r: rel. to first)\n");
fprintf(output, " -u s|hms output format of seconds (def: s: seconds)\n");
fprintf(output, " -l flush standard output after each packet\n");
fprintf(output, " -q be more quiet on stdout (e.g. when using statistics)\n");
@ -1079,6 +1080,7 @@ main(int argc, char *argv[])
/* Print format defaults to this. */
print_format = PR_FMT_TEXT;
delimiter_char = " ";
output_fields = output_fields_new();
@ -1299,6 +1301,10 @@ main(int argc, char *argv[])
if (strcmp(optarg, "text") == 0) {
output_action = WRITE_TEXT;
print_format = PR_FMT_TEXT;
} else if (strcmp(optarg, "tabs") == 0) {
output_action = WRITE_TEXT;
print_format = PR_FMT_TEXT;
delimiter_char = "\t";
} else if (strcmp(optarg, "ps") == 0) {
output_action = WRITE_TEXT;
print_format = PR_FMT_PS;
@ -1353,7 +1359,10 @@ main(int argc, char *argv[])
"\t\"text\" Text of a human-readable one-line summary of each of the\n"
"\t packets, or a multi-line view of the details of each of the\n"
"\t packets, depending on whether the -V flag was specified.\n"
"\t This is the default.");
"\t This is the default.\n"
"\t\"tabs\" Similar to the text report except that each column of the\n"
"\t human-readable one-line summary is delimited with an ASCII\n"
"\t horizontal tab character.");
exit_status = INVALID_OPTION;
goto clean_exit;
}
@ -3762,6 +3771,7 @@ print_columns(capture_file *cf)
size_t column_len;
size_t col_len;
col_item_t* col_item;
gchar str_format[11];
line_bufp = get_line_buf(256);
buf_offset = 0;
@ -3860,12 +3870,13 @@ print_columns(capture_file *cf)
case COL_DEF_DST:
case COL_RES_DST:
case COL_UNRES_DST:
put_string(line_bufp + buf_offset, " " UTF8_RIGHTWARDS_ARROW " ", 5);
g_snprintf(str_format, sizeof(str_format), " %s%s", UTF8_RIGHTWARDS_ARROW, delimiter_char);
put_string(line_bufp + buf_offset, str_format, 5);
buf_offset += 5;
break;
default:
put_string(line_bufp + buf_offset, " ", 1);
put_string(line_bufp + buf_offset, delimiter_char, 1);
buf_offset += 1;
break;
}
@ -3879,12 +3890,13 @@ print_columns(capture_file *cf)
case COL_DEF_DL_DST:
case COL_RES_DL_DST:
case COL_UNRES_DL_DST:
put_string(line_bufp + buf_offset, " " UTF8_RIGHTWARDS_ARROW " ", 5);
g_snprintf(str_format, sizeof(str_format), " %s%s", UTF8_RIGHTWARDS_ARROW, delimiter_char);
put_string(line_bufp + buf_offset, str_format, 5);
buf_offset += 5;
break;
default:
put_string(line_bufp + buf_offset, " ", 1);
put_string(line_bufp + buf_offset, delimiter_char, 1);
buf_offset += 1;
break;
}
@ -3898,12 +3910,13 @@ print_columns(capture_file *cf)
case COL_DEF_NET_DST:
case COL_RES_NET_DST:
case COL_UNRES_NET_DST:
put_string(line_bufp + buf_offset, " " UTF8_RIGHTWARDS_ARROW " ", 5);
g_snprintf(str_format, sizeof(str_format), " %s%s", UTF8_RIGHTWARDS_ARROW, delimiter_char);
put_string(line_bufp + buf_offset, str_format, 5);
buf_offset += 5;
break;
default:
put_string(line_bufp + buf_offset, " ", 1);
put_string(line_bufp + buf_offset, delimiter_char, 1);
buf_offset += 1;
break;
}
@ -3917,12 +3930,13 @@ print_columns(capture_file *cf)
case COL_DEF_SRC:
case COL_RES_SRC:
case COL_UNRES_SRC:
put_string(line_bufp + buf_offset, " " UTF8_LEFTWARDS_ARROW " ", 5);
g_snprintf(str_format, sizeof(str_format), " %s%s", UTF8_LEFTWARDS_ARROW, delimiter_char);
put_string(line_bufp + buf_offset, str_format, 5);
buf_offset += 5;
break;
default:
put_string(line_bufp + buf_offset, " ", 1);
put_string(line_bufp + buf_offset, delimiter_char, 1);
buf_offset += 1;
break;
}
@ -3936,12 +3950,13 @@ print_columns(capture_file *cf)
case COL_DEF_DL_SRC:
case COL_RES_DL_SRC:
case COL_UNRES_DL_SRC:
put_string(line_bufp + buf_offset, " " UTF8_LEFTWARDS_ARROW " ", 5);
g_snprintf(str_format, sizeof(str_format), " %s%s", UTF8_LEFTWARDS_ARROW, delimiter_char);
put_string(line_bufp + buf_offset, str_format, 5);
buf_offset += 5;
break;
default:
put_string(line_bufp + buf_offset, " ", 1);
put_string(line_bufp + buf_offset, delimiter_char, 1);
buf_offset += 1;
break;
}
@ -3955,19 +3970,20 @@ print_columns(capture_file *cf)
case COL_DEF_NET_SRC:
case COL_RES_NET_SRC:
case COL_UNRES_NET_SRC:
put_string(line_bufp + buf_offset, " " UTF8_LEFTWARDS_ARROW " ", 5);
g_snprintf(str_format, sizeof(str_format), " %s%s", UTF8_LEFTWARDS_ARROW, delimiter_char);
put_string(line_bufp + buf_offset, str_format, 5);
buf_offset += 5;
break;
default:
put_string(line_bufp + buf_offset, " ", 1);
put_string(line_bufp + buf_offset, delimiter_char, 1);
buf_offset += 1;
break;
}
break;
default:
put_string(line_bufp + buf_offset, " ", 1);
put_string(line_bufp + buf_offset, delimiter_char, 1);
buf_offset += 1;
break;
}