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-diameter.c | |
parent | a81a607ed5e3d291940ab75dd82d28d72c222b48 (diff) |
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-diameter.c')
-rw-r--r-- | packet-diameter.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/packet-diameter.c b/packet-diameter.c index a4028be99a..6fbad7677a 100644 --- a/packet-diameter.c +++ b/packet-diameter.c @@ -1,7 +1,7 @@ /* packet-diameter.c * Routines for Diameter packet disassembly * - * $Id: packet-diameter.c,v 1.36 2001/12/03 03:59:34 guy Exp $ + * $Id: packet-diameter.c,v 1.37 2001/12/10 00:25:27 guy Exp $ * * Copyright (c) 2001 by David Frascone <dave@frascone.com> * @@ -972,10 +972,10 @@ static guint32 dissect_diameter_common(tvbuff_t *tvb, size_t start, packet_info } /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_add_str(pinfo->fd, COL_PROTOCOL, "Diameter"); - if (check_col(pinfo->fd, COL_INFO)) - col_clear(pinfo->fd, COL_INFO); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_add_str(pinfo->cinfo, COL_PROTOCOL, "Diameter"); + if (check_col(pinfo->cinfo, COL_INFO)) + col_clear(pinfo->cinfo, COL_INFO); /* Copy our header */ tvb_memcpy(tvb, (guint8*) &dh, offset, sizeof(dh)); @@ -1002,7 +1002,7 @@ static guint32 dissect_diameter_common(tvbuff_t *tvb, size_t start, packet_info commandCode = DIAM_GET_COMMAND(dh); /* Set up our flags */ - if (check_col(pinfo->fd, COL_INFO) || tree) { + if (check_col(pinfo->cinfo, COL_INFO) || tree) { flagstr[0]=0; for (i = 0; i < 8; i++) { bpos = 1 << i; @@ -1040,8 +1040,8 @@ static guint32 dissect_diameter_common(tvbuff_t *tvb, size_t start, packet_info BadPacket = TRUE; } - if (check_col(pinfo->fd, COL_INFO)) { - col_add_fstr(pinfo->fd, COL_INFO, + if (check_col(pinfo->cinfo, COL_INFO)) { + col_add_fstr(pinfo->cinfo, COL_INFO, "%s%s%s%s%s vendor=%s (hop-id=%d) (end-id=%d) RPE=%d%d%d", (BadPacket)?"***** Bad Packet!: ":"", (flags & DIAM_FLAGS_P)?"Proxyable ":"", @@ -1222,7 +1222,7 @@ safe_dissect_mip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* The contained packet is a MIP registration request; dissect it with the MIP dissector. */ - col_set_writable(pinfo->fd, FALSE); + col_set_writable(pinfo->cinfo, FALSE); /* Also, save the current values of the addresses, and restore them when we're finished dissecting the contained packet, so @@ -1319,7 +1319,7 @@ static void dissect_avps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *avp_tree avpLength = avph.avp_flagsLength & 0x00ffffff; /* Set up our flags string */ - if (check_col(pinfo->fd, COL_INFO) || avp_tree) { + if (check_col(pinfo->cinfo, COL_INFO) || avp_tree) { flagstr[0]=0; for (i = 0; i < 8; i++) { bpos = 1 << i; |