From 8641192db38d14218994b79e3bd53d2066f74615 Mon Sep 17 00:00:00 2001 From: guy Date: Sun, 11 Sep 2005 21:25:37 +0000 Subject: Replace tvb_memcpy() calls that extract IPv4 addresses into a guint32, and that extract IPv6 addresses into a "struct e_in6_addr", with tvb_get_ipv4() and tvb_get_ipv6() calls - except for some that we remove, by using proto_tree_add_item(), rather than replacing. Have epan/tvbuff.h include epan/ipv6-utils.h, to define "struct e_in6_addr" (not necessary to declare the tvbuff routines, but including it there means "struct e_in6_addr" is guaranteed to be defined before those declarations, so we don't get compiler complaints if we define it *after* those declarations). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@15758 f5534014-38df-0310-8fa8-9805f1628bb7 --- epan/dissectors/packet-chdlc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'epan/dissectors/packet-chdlc.c') diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c index 9550544704..c000e0310e 100644 --- a/epan/dissectors/packet-chdlc.c +++ b/epan/dissectors/packet-chdlc.c @@ -298,7 +298,7 @@ dissect_slarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case SLARP_REQUEST: case SLARP_REPLY: if (check_col(pinfo->cinfo, COL_INFO)) { - tvb_memcpy(tvb, (guint8 *)&address, 4, 4); + address = tvb_get_ipv4(tvb, 4); col_add_fstr(pinfo->cinfo, COL_INFO, "%s, from %s, mask %s", match_strval(code, slarp_ptype_vals), get_hostname(address), -- cgit v1.2.3