diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-01-14 03:44:58 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-01-14 03:44:58 +0000 |
| commit | 6cfdeed2800a7b9bb8ddb1b1d40b2a4b6ddc23b9 (patch) | |
| tree | 083d5704c0b3ba29be7a9fb4093e5116ca8f826c /epan/dissectors/packet-dhcp-failover.c | |
| parent | c24fd241c203646e545de548ba798841c274e73c (diff) | |
Replace ip_to_str((tvb_get_ptr(...)) with tvb_ip_to_str().
Replace ip6_to_str((tvb_get_ptr(...)) with tvb_ip6_to_str().
There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().
Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s.
Replace some memcpy()+tvb_get_ptr() with tvb_memcpy().
svn path=/trunk/; revision=35529
Diffstat (limited to 'epan/dissectors/packet-dhcp-failover.c')
| -rw-r--r-- | epan/dissectors/packet-dhcp-failover.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c index f7191f6087..6f155f6ef2 100644 --- a/epan/dissectors/packet-dhcp-failover.c +++ b/epan/dissectors/packet-dhcp-failover.c @@ -524,8 +524,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "assigned ip address is not 4 bytes long"); break; } - assigned_ip_address_str = ip_to_str( - tvb_get_ptr(tvb, offset, 4)); + assigned_ip_address_str = tvb_ip_to_str(tvb, offset); proto_item_append_text(oi, ", %s ", assigned_ip_address_str); @@ -542,7 +541,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "sending server ip address is not 4 bytes long"); break; } - sending_server_ip_address_str = ip_to_str(tvb_get_ptr(tvb,offset,option_length)); + sending_server_ip_address_str = tvb_ip_to_str(tvb, offset); proto_item_append_text(oi, ", %s ", sending_server_ip_address_str); @@ -588,8 +587,7 @@ 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); + 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, htype); |