diff options
author | Gilbert Ramirez <gram@alumni.rice.edu> | 2001-11-21 23:16:26 +0000 |
---|---|---|
committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2001-11-21 23:16:26 +0000 |
commit | 8743a4a8a7613095d833e380744a358b7074b0c8 (patch) | |
tree | fdf1228846948ec5e1c08b7b50f1d81d1f379ffc /epan/epan.h | |
parent | bd90493d46399161487bb21997af3e6450c5425d (diff) |
Remove the global packet_info called "pi". Dissectors now only
access their own "pinfo". A packet_info is stored in epan_dissect_t,
which is created for the dissection of a single packet.
GUI functions which need to access the packet_info of the currently
selected packet used to use "pi"; now they use cfile.edt->pi. cfile's
"edt" member is the epan_dissect_t of the currently-selected packet.
The functionality of blank_packetinfo() was moved into
dissect_packet(), as that's the only place that called blank_packetinfo(),
after a spurious call to blank_packetinfo() was removed from
packet_list_select_cb().
svn path=/trunk/; revision=4246
Diffstat (limited to 'epan/epan.h')
-rw-r--r-- | epan/epan.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/epan/epan.h b/epan/epan.h index a45387ffc5..263f3a806c 100644 --- a/epan/epan.h +++ b/epan/epan.h @@ -1,6 +1,6 @@ /* epan.h * - * $Id: epan.h,v 1.7 2001/10/21 21:47:58 guy Exp $ + * $Id: epan.h,v 1.8 2001/11/21 23:16:23 gram Exp $ * * Ethereal Protocol Analyzer Library * @@ -11,8 +11,11 @@ #include <glib.h> +struct _epan_dissect_t; + /* XXX - for now */ #include "packet.h" +#include "packet_info.h" void epan_init(const char * plugindir, void (register_all_protocols)(void), void (register_all_handoffs)(void)); @@ -45,9 +48,10 @@ epan_free(epan_t*); * as the structures that the epan_dissect_t contains might have pointers * to addresses in your byte array. */ -typedef struct { +typedef struct _epan_dissect_t { tvbuff_t *tvb; proto_tree *tree; + packet_info pi; } epan_dissect_t; epan_dissect_t* |