diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-09-16 10:39:06 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-09-16 10:39:06 +0000 |
| commit | 346f803d42ac477109e02df2578eb8c86ccf4c4f (patch) | |
| tree | 4277e1e48aeb6d492ceb835af645460070fb04ec /epan/dissectors/packet-hsrp.c | |
| parent | 58e4750ecbf593fb678c713da398979b7fb2ed5d (diff) | |
Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was all manual inspection and most cases were either:
1. Case sensitivity differences between hf_ field name and formatted string.
2. Unnecessary whitespace between hf_ field name and colon in formatted string
There are cases where the hf_ field name doesn't quite match the proto_tree_add_uint_format, but it's close enough that one of them should be "right", I'm just not sure which is, I just know the string in proto_tree_add_uint_format is the one displayed.
svn path=/trunk/; revision=52098
Diffstat (limited to 'epan/dissectors/packet-hsrp.c')
| -rw-r--r-- | epan/dissectors/packet-hsrp.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/epan/dissectors/packet-hsrp.c b/epan/dissectors/packet-hsrp.c index 6af4e30a17..8b2d6e3d3b 100644 --- a/epan/dissectors/packet-hsrp.c +++ b/epan/dissectors/packet-hsrp.c @@ -172,7 +172,7 @@ static gint hf_hsrp2_state = -1; static gint hf_hsrp2_group_state_tlv = -1; static gint hf_hsrp2_interface_state_tlv = -1; static gint hf_hsrp2_text_auth_tlv = -1; -/* static gint hf_hsrp2_md5_auth_tlv = -1; */ +static gint hf_hsrp2_md5_auth_tlv = -1; static gint hf_hsrp2_ipversion = -1; static gint hf_hsrp2_hellotime = -1; static gint hf_hsrp2_holdtime = -1; @@ -553,12 +553,12 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ /* offset += 8; */ } } else if (type == 4 && len == 28) { - /* Text Authentication TLV */ + /* MD5 Authentication TLV */ if (tree) { proto_tree *md5_auth_tlv; - ti = proto_tree_add_uint_format(hsrp_tree, hf_hsrp2_text_auth_tlv, tvb, offset, 1, type, - "MD5 Authentication TLV: Type=%d Len=%d", type, len); + ti = proto_tree_add_uint_format_value(hsrp_tree, hf_hsrp2_md5_auth_tlv, tvb, offset, 1, type, + "Type=%d Len=%d", type, len); offset+=2; /* Making MD5 Authentication TLV subtree */ @@ -709,12 +709,10 @@ void proto_register_hsrp(void) FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, -#if 0 { &hf_hsrp2_md5_auth_tlv, { "MD5 Authentication TLV", "hsrp2.md5_auth_tlv", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, -#endif { &hf_hsrp2_ipversion, { "IP Ver.", "hsrp2.ipversion", |