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-bootp.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-bootp.c')
| -rw-r--r-- | packet-bootp.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/packet-bootp.c b/packet-bootp.c index dd345e4d2d..3d9d40118b 100644 --- a/packet-bootp.c +++ b/packet-bootp.c @@ -2,7 +2,7 @@ * Routines for BOOTP/DHCP packet disassembly * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: packet-bootp.c,v 1.58 2001/12/03 03:59:33 guy Exp $ + * $Id: packet-bootp.c,v 1.59 2001/12/10 00:25:26 guy Exp $ * * The information used comes from: * RFC 951: Bootstrap Protocol @@ -1068,33 +1068,33 @@ dissect_bootp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const char *dhcp_type = NULL; const guint8 *vendor_class_id = NULL; - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "BOOTP"); - if (check_col(pinfo->fd, COL_INFO)) { + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BOOTP"); + if (check_col(pinfo->cinfo, COL_INFO)) { /* * In case we throw an exception fetching the opcode, etc. */ - col_clear(pinfo->fd, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); } op = tvb_get_guint8(tvb, 0); htype = tvb_get_guint8(tvb, 1); hlen = tvb_get_guint8(tvb, 2); - if (check_col(pinfo->fd, COL_INFO)) { + if (check_col(pinfo->cinfo, COL_INFO)) { switch (op) { case BOOTREQUEST: - col_add_fstr(pinfo->fd, COL_INFO, "Boot Request from %s", + col_add_fstr(pinfo->cinfo, COL_INFO, "Boot Request from %s", arphrdaddr_to_str(tvb_get_ptr(tvb, 28, hlen), hlen, htype)); break; case BOOTREPLY: - col_set_str(pinfo->fd, COL_INFO, "Boot Reply"); + col_set_str(pinfo->cinfo, COL_INFO, "Boot Reply"); break; default: - col_add_fstr(pinfo->fd, COL_INFO, "Unknown BOOTP message type (%u)", + col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown BOOTP message type (%u)", op); break; } @@ -1207,10 +1207,10 @@ dissect_bootp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * Yes, this is a DHCP packet, and "dhcp_type" is the * packet type. */ - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "DHCP"); - if (check_col(pinfo->fd, COL_INFO)) - col_add_fstr(pinfo->fd, COL_INFO, "DHCP %-8s - Transaction ID 0x%x", + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DHCP"); + if (check_col(pinfo->cinfo, COL_INFO)) + col_add_fstr(pinfo->cinfo, COL_INFO, "DHCP %-8s - Transaction ID 0x%x", dhcp_type, tvb_get_ntohl(tvb, 4)); if (tree) proto_tree_add_boolean_hidden(bp_tree, hf_bootp_dhcp, |