diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-02-11 03:33:11 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-02-11 03:33:11 +0000 |
| commit | be81bc949a8d0e111b4d8e176963a234b38bf223 (patch) | |
| tree | 17f4b141df07d882fa98dcee57fa873bb259ed5b /epan/dissectors/packet-dhcp-failover.c | |
| parent | 0f59bc7c4521cc6139dfe44d9775d06d99b8a583 (diff) | |
Rename arphrdaddr_to_str() to tvb_arphrdaddr_to_str() and make it take a pointer a TVB
and an offset instead of (generally) a pointer into a TVB.
svn path=/trunk/; revision=35913
Diffstat (limited to 'epan/dissectors/packet-dhcp-failover.c')
| -rw-r--r-- | epan/dissectors/packet-dhcp-failover.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c index 6f155f6ef2..c5ff494f1d 100644 --- a/epan/dissectors/packet-dhcp-failover.c +++ b/epan/dissectors/packet-dhcp-failover.c @@ -360,7 +360,6 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 opcode; guint16 option_length; guint8 htype, reject_reason, message_digest_type; - const guint8 *chaddr; guint8 binding_status; const gchar *assigned_ip_address_str, *sending_server_ip_address_str; guint32 addresses_transferred; @@ -587,9 +586,8 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } htype = tvb_get_guint8(tvb, offset); - chaddr = tvb_get_ptr(tvb, offset+1, option_length-1); htype_str = arphrdtype_to_str(htype, "Unknown (0x%02x)"); - chaddr_str = arphrdaddr_to_str(chaddr, option_length-1, + chaddr_str = tvb_arphrdaddr_to_str(tvb, offset+1, option_length-1, htype); proto_item_append_text(oi, ", %s, %s", htype_str, |