diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-12-10 00:26:21 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-12-10 00:26:21 +0000 |
| commit | 23319ff023bcb144347a1307b958359b5226c699 (patch) | |
| tree | b347f1669210e07039ec31051cbb2c5e82422e6b /packet-portmap.c | |
| parent | a81a607ed5e3d291940ab75dd82d28d72c222b48 (diff) | |
| download | wireshark-23319ff023bcb144347a1307b958359b5226c699.tar.gz wireshark-23319ff023bcb144347a1307b958359b5226c699.tar.bz2 wireshark-23319ff023bcb144347a1307b958359b5226c699.zip | |
Move the pointer to the "column_info" structure in the "frame_data"
structure to the "packet_info" structure; only stuff that's permanently
stored with each frame should be in the "frame_data" structure, and the
"column_info" structure is not guaranteed to hold the column values for
that frame at all times - it was only in the "frame_data" structure so
that it could be passed to dissectors, and, as all dissectors are now
passed a pointer to a "packet_info" structure, it could just as well be
put in the "packet_info" structure.
That saves memory, by shrinking the "frame_data" structure (there's one
of those per frame), and also lets us clean up the code a bit.
svn path=/trunk/; revision=4370
Diffstat (limited to 'packet-portmap.c')
| -rw-r--r-- | packet-portmap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packet-portmap.c b/packet-portmap.c index 4cfe351972..286d3d8f14 100644 --- a/packet-portmap.c +++ b/packet-portmap.c @@ -1,7 +1,7 @@ /* packet-portmap.c * Routines for portmap dissection * - * $Id: packet-portmap.c,v 1.31 2001/06/18 02:17:50 guy Exp $ + * $Id: packet-portmap.c,v 1.32 2001/12/10 00:25:32 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -239,7 +239,7 @@ int dissect_callit_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* Dissect the arguments for this procedure. Make the columns non-writable, so the dissector won't change them out from under us. */ - col_set_writable(pinfo->fd, FALSE); + col_set_writable(pinfo->cinfo, FALSE); offset = dissect_rpc_indir_call(tvb, pinfo, tree, offset, hf_portmap_args, prog, vers, proc); @@ -260,7 +260,7 @@ int dissect_callit_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, /* Dissect the result of this procedure. Make the columns non-writable, so the dissector won't change them out from under us. */ - col_set_writable(pinfo->fd, FALSE); + col_set_writable(pinfo->cinfo, FALSE); offset = dissect_rpc_indir_reply(tvb, pinfo, tree, offset, hf_portmap_result, hf_portmap_prog, hf_portmap_version, hf_portmap_proc); @@ -381,7 +381,7 @@ int dissect_rpcb_rmtcallres(tvbuff_t *tvb, int offset, packet_info *pinfo, /* Dissect the result of this procedure. Make the columns non-writable, so the dissector won't change them out from under us. */ - col_set_writable(pinfo->fd, FALSE); + col_set_writable(pinfo->cinfo, FALSE); offset = dissect_rpc_indir_reply(tvb, pinfo, tree, offset, hf_portmap_result, hf_portmap_prog, hf_portmap_version, hf_portmap_proc); |