diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-07-11 05:47:02 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-07-11 05:47:02 +0000 |
| commit | ce81449ed9294f0104598762ce293c3521820987 (patch) | |
| tree | 26efdeea2934c6e99869fc3e5761451043dc3e05 /epan/epan.c | |
| parent | 19d2d0dc765cd2417d693746226472207190434a (diff) | |
packet dissection now takes pointer to tvb instead of guint8 data
implement frame_tvbuff, right now almost a copy of 'real' tvb.
svn path=/trunk/; revision=50497
Diffstat (limited to 'epan/epan.c')
| -rw-r--r-- | epan/epan.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/epan.c b/epan/epan.c index 47cfada4bb..554e86e2ea 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -197,13 +197,13 @@ epan_dissect_fake_protocols(epan_dissect_t *edt, const gboolean fake_protocols) void epan_dissect_run(epan_dissect_t *edt, struct wtap_pkthdr *phdr, - const guint8* data, frame_data *fd, column_info *cinfo) + tvbuff_t *tvb, frame_data *fd, column_info *cinfo) { #ifdef HAVE_LUA wslua_prime_dfilter(edt); /* done before entering wmem scope */ #endif wmem_enter_packet_scope(); - dissect_packet(edt, phdr, data, fd, cinfo); + dissect_packet(edt, phdr, tvb, fd, cinfo); /* free all memory allocated */ ep_free_all(); @@ -212,11 +212,11 @@ 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) + tvbuff_t *tvb, frame_data *fd, column_info *cinfo) { wmem_enter_packet_scope(); tap_queue_init(edt); - dissect_packet(edt, phdr, data, fd, cinfo); + dissect_packet(edt, phdr, tvb, fd, cinfo); tap_push_tapped_queue(edt); /* free all memory allocated */ |