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-ldap.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-ldap.c')
| -rw-r--r-- | packet-ldap.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/packet-ldap.c b/packet-ldap.c index 60a9e20434..c778d64d38 100644 --- a/packet-ldap.c +++ b/packet-ldap.c @@ -1,7 +1,7 @@ /* packet-ldap.c * Routines for ldap packet dissection * - * $Id: packet-ldap.c,v 1.29 2001/12/03 03:59:36 guy Exp $ + * $Id: packet-ldap.c,v 1.30 2001/12/10 00:25:30 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -885,10 +885,10 @@ dissect_ldap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int first_time = 1; int ret; - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "LDAP"); - if (check_col(pinfo->fd, COL_INFO)) - col_clear(pinfo->fd, COL_INFO); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LDAP"); + if (check_col(pinfo->cinfo, COL_INFO)) + col_clear(pinfo->cinfo, COL_INFO); if (tree) { @@ -908,8 +908,8 @@ dissect_ldap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) message_start = a.offset; if (read_sequence(&a, &messageLength)) { - if (first_time && check_col(pinfo->fd, COL_INFO)) - col_set_str(pinfo->fd, COL_INFO, "Invalid LDAP packet"); + if (first_time && check_col(pinfo->cinfo, COL_INFO)) + col_set_str(pinfo->cinfo, COL_INFO, "Invalid LDAP packet"); if (ldap_tree) proto_tree_add_text(ldap_tree, tvb, offset, 1, "Invalid LDAP packet"); break; @@ -918,8 +918,8 @@ dissect_ldap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) message_id_start = a.offset; if (read_integer(&a, 0, -1, 0, &messageId, ASN1_INT)) { - if (first_time && check_col(pinfo->fd, COL_INFO)) - col_set_str(pinfo->fd, COL_INFO, "Invalid LDAP packet (No Message ID)"); + if (first_time && check_col(pinfo->cinfo, COL_INFO)) + col_set_str(pinfo->cinfo, COL_INFO, "Invalid LDAP packet (No Message ID)"); if (ldap_tree) proto_tree_add_text(ldap_tree, tvb, message_id_start, 1, "Invalid LDAP packet (No Message ID)"); @@ -936,8 +936,8 @@ dissect_ldap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (first_time) { - if (check_col(pinfo->fd, COL_INFO)) - col_add_fstr(pinfo->fd, COL_INFO, "MsgId=%u MsgType=%s", + if (check_col(pinfo->cinfo, COL_INFO)) + col_add_fstr(pinfo->cinfo, COL_INFO, "MsgId=%u MsgType=%s", messageId, typestr); first_time = 0; if (!tree) |