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-smtp.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-smtp.c')
| -rw-r--r-- | packet-smtp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/packet-smtp.c b/packet-smtp.c index a242785258..fd443b61f3 100644 --- a/packet-smtp.c +++ b/packet-smtp.c @@ -1,7 +1,7 @@ /* packet-smtp.c * Routines for SMTP packet disassembly * - * $Id: packet-smtp.c,v 1.22 2001/12/03 03:59:39 guy Exp $ + * $Id: packet-smtp.c,v 1.23 2001/12/10 00:25:36 guy Exp $ * * Copyright (c) 2000 by Richard Sharpe <rsharpe@ns.aus.com> * @@ -307,10 +307,10 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * fields ... */ - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "SMTP"); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMTP"); - if (check_col(pinfo->fd, COL_INFO)) { /* Add the appropriate type here */ + if (check_col(pinfo->cinfo, COL_INFO)) { /* Add the appropriate type here */ /* * If it is a request, we have to look things up, otherwise, just @@ -324,18 +324,18 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (frame_data->pdu_type) { case SMTP_PDU_MESSAGE: - col_set_str(pinfo->fd, COL_INFO, "Message Body"); + col_set_str(pinfo->cinfo, COL_INFO, "Message Body"); break; case SMTP_PDU_EOM: - col_add_fstr(pinfo->fd, COL_INFO, "EOM: %s", + col_add_fstr(pinfo->cinfo, COL_INFO, "EOM: %s", format_text(line, linelen)); break; case SMTP_PDU_CMD: - col_add_fstr(pinfo->fd, COL_INFO, "Command: %s", + col_add_fstr(pinfo->cinfo, COL_INFO, "Command: %s", format_text(line, linelen)); break; @@ -344,7 +344,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { - col_add_fstr(pinfo->fd, COL_INFO, "Response: %s", + col_add_fstr(pinfo->cinfo, COL_INFO, "Response: %s", format_text(line, linelen)); } |