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/packet.h | |
| parent | bd90493d46399161487bb21997af3e6450c5425d (diff) | |
| download | wireshark-8743a4a8a7613095d833e380744a358b7074b0c8.tar.gz wireshark-8743a4a8a7613095d833e380744a358b7074b0c8.tar.bz2 wireshark-8743a4a8a7613095d833e380744a358b7074b0c8.zip | |
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/packet.h')
| -rw-r--r-- | epan/packet.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/packet.h b/epan/packet.h index 52e5acfeba..ce27cbc4a8 100644 --- a/epan/packet.h +++ b/epan/packet.h @@ -1,7 +1,7 @@ /* packet.h * Definitions for packet disassembly structures and routines * - * $Id: packet.h,v 1.39 2001/11/20 21:59:18 guy Exp $ + * $Id: packet.h,v 1.40 2001/11/21 23:16:23 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -35,6 +35,7 @@ #include "frame_data.h" #include "packet_info.h" #include "column-utils.h" +#include "epan.h" #define hi_nibble(b) (((b) & 0xf0) >> 4) #define lo_nibble(b) ((b) & 0x0f) @@ -223,9 +224,9 @@ extern void init_all_protocols(void); /* * Dissectors should never modify the packet data. */ -extern void dissect_packet(tvbuff_t **p_tvb, +extern void dissect_packet(struct _epan_dissect_t *edt, union wtap_pseudo_header *pseudo_header, const u_char *pd, - frame_data *fd, proto_tree *tree); + frame_data *fd); extern void dissect_data(tvbuff_t *tvb, int, packet_info *pinfo, proto_tree *tree); |