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 /epan | |
| parent | 6dc977b7d2b0f807d21ef2978fc81e10c7bb00be (diff) | |
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 'epan')
| -rw-r--r-- | epan/epan.c | 12 | ||||
| -rw-r--r-- | epan/epan.h | 4 | ||||
| -rw-r--r-- | epan/libwireshark.def | 3 |
3 files changed, 17 insertions, 2 deletions
diff --git a/epan/epan.c b/epan/epan.c index 5d1292e5f3..8647a5c78e 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -199,6 +199,18 @@ epan_dissect_run(epan_dissect_t *edt, struct wtap_pkthdr *phdr, } void +epan_dissect_run_with_taps(epan_dissect_t *edt, struct wtap_pkthdr *phdr, + const guint8* data, frame_data *fd, column_info *cinfo) +{ + /* free all memory allocated during previous packet */ + ep_free_all(); + + tap_queue_init(edt); + dissect_packet(edt, phdr, data, fd, cinfo); + tap_push_tapped_queue(edt); +} + +void epan_dissect_reset(epan_dissect_t *edt) { /* epan_dissect_cleanup(edt) without freeing tree */ diff --git a/epan/epan.h b/epan/epan.h index e618b33a64..122111f7cd 100644 --- a/epan/epan.h +++ b/epan/epan.h @@ -154,6 +154,10 @@ void epan_dissect_run(epan_dissect_t *edt, struct wtap_pkthdr *phdr, const guint8* data, frame_data *fd, column_info *cinfo); +void +epan_dissect_run_with_taps(epan_dissect_t *edt, struct wtap_pkthdr *phdr, + const guint8* data, frame_data *fd, column_info *cinfo); + /** Prime a proto_tree using the fields/protocols used in a dfilter. */ void epan_dissect_prime_dfilter(epan_dissect_t *edt, const dfilter_t *dfcode); diff --git a/epan/libwireshark.def b/epan/libwireshark.def index 7f5e918cc8..6de632af9c 100644 --- a/epan/libwireshark.def +++ b/epan/libwireshark.def @@ -411,6 +411,7 @@ epan_dissect_init epan_dissect_new epan_dissect_prime_dfilter epan_dissect_run +epan_dissect_run_with_taps epan_dissect_reset epan_get_compiled_version_info epan_get_runtime_version_info @@ -1050,9 +1051,7 @@ t38_T30_data_vals DATA t38_T30_indicator_vals DATA t38_add_address T_h323_message_body_vals DATA -tap_push_tapped_queue tap_build_interesting -tap_queue_init tap_queue_packet tcp_dissect_pdus tap_listeners_require_dissection |