summaryrefslogtreecommitdiff
path: root/file.c
diff options
context:
space:
mode:
authorJakub Zawadzki <darkjames-ws@darkjames.pl>2013-10-20 17:53:55 +0000
committerJakub Zawadzki <darkjames-ws@darkjames.pl>2013-10-20 17:53:55 +0000
commita9d79ebb94b6e983283df90d4a909c8ee5e5b9fd (patch)
treefcccb57dd3cacceff8d60b12035f0f407930fdc9 /file.c
parentcf9bbdeceffbec1798dfc8cda6d2d1af51670770 (diff)
downloadwireshark-a9d79ebb94b6e983283df90d4a909c8ee5e5b9fd.tar.gz
Try to fix recent test failures (wild guess, can't reproduce).
svn path=/trunk/; revision=52717
Diffstat (limited to 'file.c')
-rw-r--r--file.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/file.c b/file.c
index 2555c66f4a..950d553578 100644
--- a/file.c
+++ b/file.c
@@ -1256,15 +1256,13 @@ read_packet(capture_file *cf, dfilter_t *dfcode, epan_dissect_t *edt,
passed = TRUE;
if (cf->rfcode) {
- gboolean old_visible;
+ epan_dissect_t rf_edt;
- old_visible = proto_tree_set_visible(edt->tree, TRUE);
- epan_dissect_prime_dfilter(edt, cf->rfcode);
- epan_dissect_run(edt, phdr, frame_tvbuff_new(&fdlocal, buf), &fdlocal, NULL);
- passed = dfilter_apply_edt(cf->rfcode, edt);
-
- epan_dissect_reset(edt);
- proto_tree_set_visible(edt->tree, old_visible);
+ epan_dissect_init(&rf_edt, cf->epan, TRUE, FALSE);
+ epan_dissect_prime_dfilter(&rf_edt, cf->rfcode);
+ epan_dissect_run(&rf_edt, phdr, frame_tvbuff_new(&fdlocal, buf), &fdlocal, NULL);
+ passed = dfilter_apply_edt(cf->rfcode, &rf_edt);
+ epan_dissect_cleanup(&rf_edt);
}
if (passed) {