From 82adb33a48e066a5479a42a73382252fe3984943 Mon Sep 17 00:00:00 2001 From: Kovarththanan Rajaratnam Date: Wed, 19 Aug 2009 13:52:15 +0000 Subject: [PATCH] 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 --- file.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/file.c b/file.c index dd89a9a26a..f16ec3fb42 100644 --- a/file.c +++ b/file.c @@ -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.