diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-07-12 19:42:57 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-07-12 19:42:57 +0000 |
| commit | 36e75d9f92d701e914f25d562bd58b3281525ed4 (patch) | |
| tree | 4e662f526d1ba2fb28b5ff23850ffcf5d89b8d69 /packet-hsrp.c | |
| parent | 8b9e7133eb13969e02a28987d07121309c0e665d (diff) | |
| download | wireshark-36e75d9f92d701e914f25d562bd58b3281525ed4.tar.gz wireshark-36e75d9f92d701e914f25d562bd58b3281525ed4.tar.bz2 wireshark-36e75d9f92d701e914f25d562bd58b3281525ed4.zip | |
Fixes to "proto_tree_add_item()" calls, and replacement of
"proto_tree_add_ipv4()" and "proto_tree_add_uint()" calls with
"proto_tree_add_item()" calls, from Heikki Vatiainen.
svn path=/trunk/; revision=3698
Diffstat (limited to 'packet-hsrp.c')
| -rw-r--r-- | packet-hsrp.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/packet-hsrp.c b/packet-hsrp.c index c4c32c0569..786122c468 100644 --- a/packet-hsrp.c +++ b/packet-hsrp.c @@ -4,7 +4,7 @@ * * Heikki Vatiainen <hessu@cs.tut.fi> * - * $Id: packet-hsrp.c,v 1.17 2001/06/18 02:17:46 guy Exp $ + * $Id: packet-hsrp.c,v 1.18 2001/07/12 19:42:57 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -126,13 +126,12 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int offset; guint8 hellotime, holdtime; guint8 auth_buf[8 + 1]; - guint32 virt_ip_addr; offset = 0; ti = proto_tree_add_item(tree, proto_hsrp, tvb, offset, tvb_length(tvb), FALSE); hsrp_tree = proto_item_add_subtree(ti, ett_hsrp); - proto_tree_add_uint(hsrp_tree, hf_hsrp_version, tvb, offset, 1, tvb_get_guint8(tvb, offset)); + proto_tree_add_item(hsrp_tree, hf_hsrp_version, tvb, offset, 1, FALSE); offset++; proto_tree_add_uint(hsrp_tree, hf_hsrp_opcode, tvb, offset, 1, opcode); offset++; @@ -150,11 +149,11 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (holdtime == HSRP_DEFAULT_HOLDTIME) ? "" : "Non-", holdtime); offset++; - proto_tree_add_item(hsrp_tree, hf_hsrp_priority, tvb, offset, 1, tvb_get_guint8(tvb, offset)); + proto_tree_add_item(hsrp_tree, hf_hsrp_priority, tvb, offset, 1, FALSE); offset++; - proto_tree_add_item(hsrp_tree, hf_hsrp_group, tvb, offset, 1, tvb_get_guint8(tvb, offset)); + proto_tree_add_item(hsrp_tree, hf_hsrp_group, tvb, offset, 1, FALSE); offset++; - proto_tree_add_item(hsrp_tree, hf_hsrp_reserved, tvb, offset, 1, tvb_get_guint8(tvb, offset)); + proto_tree_add_item(hsrp_tree, hf_hsrp_reserved, tvb, offset, 1, FALSE); offset++; tvb_memcpy(tvb, auth_buf, offset, 8); auth_buf[sizeof auth_buf - 1] = '\0'; @@ -163,8 +162,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (tvb_strneql(tvb, offset, "cisco", strlen("cisco"))) == 0 ? "" : "Non-", auth_buf); offset += 8; - tvb_memcpy(tvb, (guint8 *)&virt_ip_addr, offset, 4); - proto_tree_add_ipv4(hsrp_tree, hf_hsrp_virt_ip_addr, tvb, offset, 4, virt_ip_addr); + proto_tree_add_item(hsrp_tree, hf_hsrp_virt_ip_addr, tvb, offset, 4, FALSE); offset += 4; } |