From e234ce8804e6d27656d5db332ea521392be7d25f Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Mon, 24 Aug 2015 12:30:56 -0700 Subject: Rework tapping in Qt dialogs. Add cf_cb_file_retap_started and cf_cb_file_retap_finished to file.[ch]. Add their associated signals to CaptureFile. Add registerTapListener and removeTapListeners to WiresharkDialog, which collect and automatically remove tap listeners. Add beginRetapPackets and endRetapPackets, which can be used to wrap critical sections so that we don't delete ourselves while tapping. Don't cancel tapping on close in WiresharkDialog. Use beginRetapPackets and endRetapPackets in WiresharkDialog and FollowStreamDialog. We will likely need to add them elsewhere. Update comments. Change-Id: I1788a6ade0817c31aa3419216df96be5e36b2178 Reviewed-on: https://code.wireshark.org/review/10261 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs --- file.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'file.c') diff --git a/file.c b/file.c index 77b59f89a5..ce209ba466 100644 --- a/file.c +++ b/file.c @@ -2127,6 +2127,8 @@ cf_retap_packets(capture_file *cf) return CF_READ_ABORTED; } + cf_callback_invoke(cf_cb_file_retap_started, cf); + /* Do we have any tap listeners with filters? */ filtering_tap_listeners = have_filtering_tap_listeners(); @@ -2156,6 +2158,8 @@ cf_retap_packets(capture_file *cf) epan_dissect_cleanup(&callback_args.edt); + cf_callback_invoke(cf_cb_file_retap_finished, cf); + switch (ret) { case PSP_FINISHED: /* Completed successfully. */ -- cgit v1.2.3