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-smb-mailslot.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-smb-mailslot.c')
| -rw-r--r-- | packet-smb-mailslot.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/packet-smb-mailslot.c b/packet-smb-mailslot.c index 7ebdedb8f9..ac6f8bd530 100644 --- a/packet-smb-mailslot.c +++ b/packet-smb-mailslot.c @@ -2,7 +2,7 @@ * Routines for SMB mailslot packet dissection * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-smb-mailslot.c,v 1.28 2001/11/28 11:33:54 guy Exp $ + * $Id: packet-smb-mailslot.c,v 1.29 2001/12/10 00:25:34 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -89,18 +89,18 @@ dissect_mailslot_smb(tvbuff_t *mshdr_tvb, tvbuff_t *setup_tvb, } pinfo->current_proto = "SMB Mailslot"; - if (check_col(pinfo->fd, COL_PROTOCOL)) { - col_set_str(pinfo->fd, COL_PROTOCOL, "SMB Mailslot"); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) { + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMB Mailslot"); } if ((tvb==NULL) || (tvb_reported_length(tvb)==0)) { /* Interim reply */ - col_set_str(pinfo->fd, COL_INFO, "Interim reply"); + col_set_str(pinfo->cinfo, COL_INFO, "Interim reply"); return TRUE; } - 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); } smb_info = pinfo->private_data; @@ -143,8 +143,8 @@ dissect_mailslot_smb(tvbuff_t *mshdr_tvb, tvbuff_t *setup_tvb, /* do the opcode field */ opcode = tvb_get_letohs(setup_tvb, offset); - if (check_col(pinfo->fd, COL_INFO)) { - col_add_str(pinfo->fd, COL_INFO, + if (check_col(pinfo->cinfo, COL_INFO)) { + col_add_str(pinfo->cinfo, COL_INFO, val_to_str(opcode, opcode_vals, "Unknown opcode: 0x%04x")); } |