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

Allow tshark to print custom columns. 

svn path=/trunk/; revision=24678
This commit is contained in:
Stig Bjørlykke 2008-03-17 23:30:37 +00:00
parent 30b7c91158
commit 3c3c2224f9
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tshark.c
View File

@ -1410,6 +1410,11 @@ main(int argc, char *argv[])
for (i = 0; i < cfile.cinfo.num_cols; i++) {
cfile.cinfo.col_fmt[i] = get_column_format(i);
cfile.cinfo.col_title[i] = g_strdup(get_column_title(i));
if (cfile.cinfo.col_fmt[i] == COL_CUSTOM) {
cfile.cinfo.col_custom_field[i] = g_strdup(get_column_custom_field(i));
} else {
cfile.cinfo.col_custom_field[i] = NULL;
}
cfile.cinfo.fmt_matx[i] = (gboolean *) g_malloc0(sizeof(gboolean) *
NUM_COL_FMTS);
get_column_format_matches(cfile.cinfo.fmt_matx[i], cfile.cinfo.col_fmt[i]);
@ -2422,7 +2427,7 @@ process_packet(capture_file *cf, gint64 offset, const struct wtap_pkthdr *whdr,
}
passed = TRUE;
if (cf->rfcode || verbose || num_tap_filters!=0)
if (cf->rfcode || verbose || num_tap_filters!=0 || have_custom_cols(&cf->cinfo))
create_proto_tree = TRUE;
else
create_proto_tree = FALSE;
@ -2437,6 +2442,8 @@ process_packet(capture_file *cf, gint64 offset, const struct wtap_pkthdr *whdr,
if (cf->rfcode)
epan_dissect_prime_dfilter(edt, cf->rfcode);
col_custom_prime_edt(edt, &cf->cinfo);
tap_queue_init(edt);
/* We only need the columns if we're printing packet info but we're