diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-09-11 21:25:37 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-09-11 21:25:37 +0000 |
| commit | 25c4bc9379996f934e7648f2ab8b8db3857439f6 (patch) | |
| tree | 802a39b3b32b8079ff58c90a7a4e4be6385eb515 /epan/dissectors/packet-chdlc.c | |
| parent | 0bb7a6e0038f5e90851c6d866d3f4d2e75903ab2 (diff) | |
| download | wireshark-25c4bc9379996f934e7648f2ab8b8db3857439f6.tar.gz | |
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).
svn path=/trunk/; revision=15758
Diffstat (limited to 'epan/dissectors/packet-chdlc.c')
| -rw-r--r-- | epan/dissectors/packet-chdlc.c | 2 |
1 files changed, 1 insertions, 1 deletions
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), |