From a9d79ebb94b6e983283df90d4a909c8ee5e5b9fd Mon Sep 17 00:00:00 2001 From: Jakub Zawadzki Date: Sun, 20 Oct 2013 17:53:55 +0000 Subject: [PATCH] Try to fix recent test failures (wild guess, can't reproduce). svn path=/trunk/; revision=52717 --- file.c | 14 ++++++-------- 1 file 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) {