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

Fix for bug 4323 & 4511: 

Call col_custom_prime_edt() when having custom columns on print and
export to csv and psml.

svn path=/trunk/; revision=31990
This commit is contained in:
Stig Bjørlykke 2010-02-24 20:24:05 +00:00
parent da5346bf77
commit 258c8363ec
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
file.c
View File

@ -2604,6 +2604,8 @@ print_packet(capture_file *cf, frame_data *fdata,
/* Fill in the column information if we're printing the summary
information. */
if (args->print_args->print_summary) {
if (have_custom_cols(&cf->cinfo))
col_custom_prime_edt(&edt, &cf->cinfo);
epan_dissect_run(&edt, pseudo_header, pd, fdata, &cf->cinfo);
epan_dissect_fill_in_columns(&edt, FALSE, TRUE);
} else
@ -2936,6 +2938,8 @@ write_psml_packet(capture_file *cf, frame_data *fdata,
if having custom columns. */
proto_tree_needed = have_custom_cols(&cf->cinfo);
epan_dissect_init(&edt, proto_tree_needed, proto_tree_needed);
if (proto_tree_needed)
col_custom_prime_edt(&edt, &cf->cinfo);
epan_dissect_run(&edt, pseudo_header, pd, fdata, &cf->cinfo);
epan_dissect_fill_in_columns(&edt, FALSE, TRUE);
@ -3010,6 +3014,8 @@ write_csv_packet(capture_file *cf, frame_data *fdata,
if having custom columns. */
proto_tree_needed = have_custom_cols(&cf->cinfo);
epan_dissect_init(&edt, proto_tree_needed, proto_tree_needed);
if (proto_tree_needed)
col_custom_prime_edt(&edt, &cf->cinfo);
epan_dissect_run(&edt, pseudo_header, pd, fdata, &cf->cinfo);
epan_dissect_fill_in_columns(&edt, FALSE, TRUE);