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-wsp.c | |
| parent | 0bb7a6e0038f5e90851c6d866d3f4d2e75903ab2 (diff) | |
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-wsp.c')
| -rw-r--r-- | epan/dissectors/packet-wsp.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index e644e5bf04..6cd52b9a1d 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -54,7 +54,6 @@ #include <string.h> #include <glib.h> #include <epan/packet.h> -#include <epan/ipv6-utils.h> #include <epan/conversation.h> #include "packet-wap.h" @@ -4606,7 +4605,7 @@ dissect_redirect(tvbuff_t *tvb, int offset, packet_info *pinfo, */ goto unknown_address_type; } - tvb_memcpy(tvb, (guint8 *)&address_ipv4, offset, 4); + address_ipv4 = tvb_get_ipv4(tvb, offset); if (tree) { proto_tree_add_ipv4 (addr_tree, hf_address_ipv4_addr, @@ -4642,7 +4641,7 @@ dissect_redirect(tvbuff_t *tvb, int offset, packet_info *pinfo, */ goto unknown_address_type; } - tvb_memcpy(tvb, (guint8 *)&address_ipv6, offset, 16); + tvb_get_ipv6(tvb, offset, &address_ipv6); if (tree) { proto_tree_add_ipv6 (addr_tree, hf_address_ipv6_addr, @@ -4796,7 +4795,7 @@ add_addresses(proto_tree *tree, tvbuff_t *tvb, int hf) */ goto unknown_address_type; } - tvb_memcpy(tvb, (guint8 *)&address_ipv4, offset, 4); + address_ipv4 = tvb_get_ipv4(tvb, offset); proto_tree_add_ipv4 (addr_tree, hf_address_ipv4_addr, tvb, offset, 4, address_ipv4); break; @@ -4811,7 +4810,7 @@ add_addresses(proto_tree *tree, tvbuff_t *tvb, int hf) */ goto unknown_address_type; } - tvb_memcpy(tvb, (guint8 *)&address_ipv6, offset, 16); + tvb_get_ipv6(tvb, offset, &address_ipv6); proto_tree_add_ipv6 (addr_tree, hf_address_ipv6_addr, tvb, offset, 16, (guint8 *)&address_ipv6); break; |