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-gsm_a.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-gsm_a.c')
-rw-r--r-- | epan/dissectors/packet-gsm_a.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/epan/dissectors/packet-gsm_a.c b/epan/dissectors/packet-gsm_a.c index a2a6e21b70..70419b8aa3 100644 --- a/epan/dissectors/packet-gsm_a.c +++ b/epan/dissectors/packet-gsm_a.c @@ -94,7 +94,6 @@ #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/ipv6-utils.h> #include <epan/tap.h> #include <epan/emem.h> @@ -11098,7 +11097,7 @@ de_sm_pco(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add proto_tree_add_text(tree,tvb, curr_offset-3, 2, "Parameter: (%u) P-CSCF Address" , prot ); proto_tree_add_text(tree,tvb, curr_offset-1, 1, "Length: 0x%02x (%u)", e_len , e_len); - tvb_memcpy(tvb, (guint8 *)&ipv6_addr, curr_offset, 16); + tvb_get_ipv6(tvb, curr_offset, &ipv6_addr); proto_tree_add_text(tree, tvb, curr_offset, 16, "IPv6: %s", ip6_to_str(&ipv6_addr)); @@ -11113,7 +11112,7 @@ de_sm_pco(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add proto_tree_add_text(tree,tvb, curr_offset-3, 2, "Parameter: (%u) DNS Server Address" , prot ); proto_tree_add_text(tree,tvb, curr_offset-1, 1, "Length: 0x%02x (%u)", e_len , e_len); - tvb_memcpy(tvb, (guint8 *)&ipv6_addr, curr_offset, 16); + tvb_get_ipv6(tvb, curr_offset, &ipv6_addr); proto_tree_add_text(tree, tvb, curr_offset, 16, "IPv6: %s", ip6_to_str(&ipv6_addr)); @@ -11285,7 +11284,7 @@ de_sm_pdp_addr(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar tvb, curr_offset+2, 0, "IPv6: length is wrong"); } else { - tvb_memcpy(tvb, (guint8 *)&ipv6_addr, curr_offset+2, 16); + tvb_get_ipv6(tvb, curr_offset+2, &ipv6_addr); proto_tree_add_text(tree, tvb, curr_offset+2, len-2, "IPv6: %s", ip6_to_str(&ipv6_addr)); @@ -12203,7 +12202,7 @@ de_sm_tflow_temp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gch { struct e_in6_addr ipv6_addr; - tvb_memcpy(tvb, (guint8 *)&ipv6_addr, curr_offset, 16); + tvb_get_ipv6(tvb, curr_offset, &ipv6_addr); proto_tree_add_text(tree, tvb, curr_offset+2, len-2, "Packet filter content: IPv6 %s", ip6_to_str(&ipv6_addr)); |