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-icap.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-icap.c')
| -rw-r--r-- | packet-icap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packet-icap.c b/packet-icap.c index fe3b106d18..54fe489ca9 100644 --- a/packet-icap.c +++ b/packet-icap.c @@ -74,10 +74,10 @@ dissect_icap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) icap_type_t icap_type; int datalen; - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "ICAP"); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICAP"); - if (check_col(pinfo->fd, COL_INFO)) { + if (check_col(pinfo->cinfo, COL_INFO)) { /* * Put the first line from the buffer into the summary * if it's an ICAP header (but leave out the @@ -92,10 +92,10 @@ dissect_icap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) line = tvb_get_ptr(tvb, offset, linelen); icap_type = ICAP_OTHER; /* type not known yet */ if (is_icap_message(line, linelen, &icap_type)) - col_add_str(pinfo->fd, COL_INFO, + col_add_str(pinfo->cinfo, COL_INFO, format_text(line, linelen)); else - col_set_str(pinfo->fd, COL_INFO, "Continuation"); + col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); } if (tree) { |