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-pgm.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-pgm.c')
| -rw-r--r-- | packet-pgm.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/packet-pgm.c b/packet-pgm.c index 5b642e6889..85e0b2ab04 100644 --- a/packet-pgm.c +++ b/packet-pgm.c @@ -1,7 +1,7 @@ /* packet-pgm.c * Routines for pgm packet disassembly * - * $Id: packet-pgm.c,v 1.11 2001/12/08 06:41:41 guy Exp $ + * $Id: packet-pgm.c,v 1.12 2001/12/10 00:25:31 guy Exp $ * * Copyright (c) 2000 by Talarian Corp * @@ -625,12 +625,12 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) char *gsi; int isdata = 0; - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "PGM"); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PGM"); /* Clear out the Info column. */ - if (check_col(pinfo->fd, COL_INFO)) - col_clear(pinfo->fd, COL_INFO); + if (check_col(pinfo->cinfo, COL_INFO)) + col_clear(pinfo->cinfo, COL_INFO); tvb_memcpy(tvb, (guint8 *)&pgmhdr, offset, sizeof(pgm_type)); hlen = sizeof(pgm_type); @@ -646,8 +646,8 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) plen = sizeof(pgm_spm_t); tvb_memcpy(tvb, (guint8 *)&spm, sizeof(pgm_type), plen); spm_ntoh(&spm); - 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, "%-5s sqn 0x%x gsi %s", pktname, spm.sqn, gsi); } break; @@ -657,8 +657,8 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) plen = sizeof(pgm_data_t); tvb_memcpy(tvb, (guint8 *)&data, sizeof(pgm_type), plen); data_ntoh(&data); - 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, "%-5s sqn 0x%x gsi %s tsdulen %d", pktname, data.sqn, gsi, pgmhdr.tsdulen); } @@ -671,8 +671,8 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) plen = sizeof(pgm_nak_t); tvb_memcpy(tvb, (guint8 *)&nak, sizeof(pgm_type), plen); nak_ntoh(&nak); - 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, "%-5s sqn 0x%x gsi %s", pktname, nak.sqn, gsi); } break; @@ -680,8 +680,8 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) plen = sizeof(pgm_ack_t); tvb_memcpy(tvb, (guint8 *)&ack, sizeof(pgm_type), plen); ack_ntoh(&ack); - 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, "%-5s sqn 0x%x gsi %s", pktname, ack.rx_max_sqn, gsi); } break; |