osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

We shouldn't conditionalise on _filtering_ tap listerners to determine whether tapping should be performed or not. We also need to handle _normal_ tap listerners. This change backs out the regression introduced in r29435. 

Thanks to Didier: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3916

svn path=/trunk/; revision=29475
This commit is contained in:
Kovarththanan Rajaratnam 2009-08-19 13:52:15 +00:00
parent 69069395df
commit 82adb33a48
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
file.c
View File

@ -1090,13 +1090,9 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf,
col_custom_prime_edt(&edt, cinfo);
#endif
if (filtering_tap_listeners)
tap_queue_init(&edt);
tap_queue_init(&edt);
epan_dissect_run(&edt, pseudo_header, buf, fdata, cinfo);
if (filtering_tap_listeners)
tap_push_tapped_queue(&edt);
tap_push_tapped_queue(&edt);
/* If we have a display filter, apply it if we're refiltering, otherwise
leave the "passed_dfilter" flag alone.