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-smpp.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-smpp.c')
| -rw-r--r-- | packet-smpp.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/packet-smpp.c b/packet-smpp.c index 8b1547d4a7..c6e57cce59 100644 --- a/packet-smpp.c +++ b/packet-smpp.c @@ -2,7 +2,7 @@ * Routines for Short Message Peer to Peer dissection * Copyright 2001, Tom Uijldert <tom.uijldert@cmg.nl> * - * $Id: packet-smpp.c,v 1.2 2001/12/04 06:35:51 guy Exp $ + * $Id: packet-smpp.c,v 1.3 2001/12/10 00:25:35 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1355,22 +1355,22 @@ dissect_smpp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sequence_number = tvb_get_ntohl(tvb, offset); offset += 4; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "SMPP"); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMPP"); - if (check_col(pinfo->fd, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->fd, COL_INFO); - col_add_fstr(pinfo->fd, COL_INFO, "SMPP %s", + col_clear(pinfo->cinfo, COL_INFO); + col_add_fstr(pinfo->cinfo, COL_INFO, "SMPP %s", val_to_str(command_id,vals_command_id,"unknown operation")); if (command_id & 0x80000000) - col_append_fstr(pinfo->fd, COL_INFO, ": \"%s\"", + col_append_fstr(pinfo->cinfo, COL_INFO, ": \"%s\"", val_to_str(command_status, vals_command_status, "reserved error")); if (command_length > tvb_reported_length(tvb)) - col_append_str(pinfo->fd, COL_INFO, " [short packet]"); + col_append_str(pinfo->cinfo, COL_INFO, " [short packet]"); if (command_length < tvb_reported_length(tvb)) - col_append_str(pinfo->fd, COL_INFO, " [trailing data]"); + col_append_str(pinfo->cinfo, COL_INFO, " [trailing data]"); } /* In the interest of speed, if "tree" is NULL, don't do any work not |