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-rlogin.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-rlogin.c')
| -rw-r--r-- | packet-rlogin.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/packet-rlogin.c b/packet-rlogin.c index 7049d80fe8..0073623c00 100644 --- a/packet-rlogin.c +++ b/packet-rlogin.c @@ -2,7 +2,7 @@ * Routines for unix rlogin packet dissection * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-rlogin.c,v 1.23 2001/12/03 03:59:38 guy Exp $ + * $Id: packet-rlogin.c,v 1.24 2001/12/10 00:25:33 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -171,8 +171,8 @@ rlogin_state_machine( rlogin_hash_entry_t *hash_info, tvbuff_t *tvb, tvb_memcpy(tvb, (guint8 *)hash_info->name, 0, stringlen); hash_info->name[stringlen] = '\0'; - if (check_col(pinfo->fd, COL_INFO)) /* update summary */ - col_append_str(pinfo->fd, COL_INFO, + if (check_col(pinfo->cinfo, COL_INFO)) /* update summary */ + col_append_str(pinfo->cinfo, COL_INFO, ", User information"); } } @@ -365,14 +365,14 @@ dissect_rlogin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hash_info); } - if (check_col(pinfo->fd, COL_PROTOCOL)) /* update protocol */ - col_set_str(pinfo->fd, COL_PROTOCOL, "Rlogin"); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) /* update protocol */ + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Rlogin"); - if (check_col(pinfo->fd, COL_INFO)){ /* display packet info*/ + if (check_col(pinfo->cinfo, COL_INFO)){ /* display packet info*/ char temp[1000]; - col_clear(pinfo->fd, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); if ( hash_info->name[0]) { strcpy( temp, "User name: "); strcat( temp, hash_info->name); @@ -411,7 +411,7 @@ dissect_rlogin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } - col_add_str(pinfo->fd, COL_INFO, temp); + col_add_str(pinfo->cinfo, COL_INFO, temp); } rlogin_state_machine( hash_info, tvb, pinfo); |