URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=16d111276d3a971c9b3f7bd1a3805af7add40c65
Submitter: Peter Wu (peter@xxxxxxxxxxxxx)
Changed: branch: master-2.6
Repository: wireshark
Commits:
16d1112 by Peter Wu (peter@xxxxxxxxxxxxx):
file: fix packet list update after dfilter change during live capture
During live captures, "cf->state==FILE_READ_IN_PROGRESS" holds and as
such setting "cf->redissection_queued" from "cf_filter_packets" will
prevent the packet list from being updated (no new packets are added and
display filter changes are not applied).
Fix this by not checking "cf->state" and instead perform an explicit
check to detect the "update_progress_dlg" issue (see original commit).
As "cf->read_lock" is implied by "cf->redissecting", remove that check
as well (see "rescan_packets").
Print a warning instead of aborting in "cf_read" since I am not sure if
that condition is currently prevented by its callers.
Bug: 14918
Change-Id: Ieb7d1ae3cbeef18f17c850ae3778822ee625dc68
Fixes: v2.9.0rc0-1110-g8e07b778f6 ("file: do not perform recursive redissections to avoid crashes")
Reviewed-on: https://code.wireshark.org/review/28538
Petri-Dish: Anders Broman <a.broman58@xxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
(cherry picked from commit 8a1e517befc032b5607ca34ea60399db5d2359c4)
Reviewed-on: https://code.wireshark.org/review/28577
Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
Actions performed:
from 47912aa [Automatic update for 2018-07-01]
adds 16d1112 file: fix packet list update after dfilter change during live capture
Summary of changes:
cfile.h | 1 +
file.c | 27 ++++++++++++++++++++++++---
2 files changed, 25 insertions(+), 3 deletions(-)