diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-10-20 19:27:24 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-10-20 19:27:24 +0000 |
| commit | 77368c3668ee6d2a802eb9cf4d0a639f7ebf16e6 (patch) | |
| tree | f92d055cb7296bed1d2cc96c450ddc591ee7cfc0 /tshark.c | |
| parent | 6dc977b7d2b0f807d21ef2978fc81e10c7bb00be (diff) | |
| download | wireshark-77368c3668ee6d2a802eb9cf4d0a639f7ebf16e6.tar.gz | |
Introduce epan_dissect_run_with_taps() which run dissection with taps.
unexport tap_queue_init, tap_push_tapped_queue
svn path=/trunk/; revision=45670
Diffstat (limited to 'tshark.c')
| -rw-r--r-- | tshark.c | 12 |
1 files changed, 2 insertions, 10 deletions
@@ -2632,8 +2632,6 @@ process_packet_second_pass(capture_file *cf, frame_data *fdata, col_custom_prime_edt(&edt, &cf->cinfo); - tap_queue_init(&edt); - /* We only need the columns if either 1) some tap needs the columns @@ -2647,9 +2645,7 @@ process_packet_second_pass(capture_file *cf, frame_data *fdata, else cinfo = NULL; - epan_dissect_run(&edt, phdr, pd, fdata, cinfo); - - tap_push_tapped_queue(&edt); + epan_dissect_run_with_taps(&edt, phdr, pd, fdata, cinfo); /* Run the read filter if we have one. */ if (cf->rfcode) @@ -3083,8 +3079,6 @@ process_packet(capture_file *cf, gint64 offset, struct wtap_pkthdr *whdr, col_custom_prime_edt(&edt, &cf->cinfo); - tap_queue_init(&edt); - /* We only need the columns if either 1) some tap needs the columns @@ -3101,9 +3095,7 @@ process_packet(capture_file *cf, gint64 offset, struct wtap_pkthdr *whdr, frame_data_set_before_dissect(&fdata, &cf->elapsed_time, &first_ts, prev_dis, prev_cap); - epan_dissect_run(&edt, whdr, pd, &fdata, cinfo); - - tap_push_tapped_queue(&edt); + epan_dissect_run_with_taps(&edt, whdr, pd, &fdata, cinfo); /* Run the read filter if we have one. */ if (cf->rfcode) |