diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-09-15 01:48:30 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-09-15 01:48:30 +0000 |
| commit | b38ee917b1953104c615056481d6df008ae94b53 (patch) | |
| tree | 55024f9c53f083dc056540b6d887fc4550064008 /epan/dissectors/packet-tacacs.c | |
| parent | a17cf67635c6e190c174bc131707804edca5c8f4 (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 done with a perl script on the dissectors directory (packet-*.c), followed by manual inspection of the output. The manual inspection yielded a few cases that really should have been proto_tree_add_uint or proto_tree_add_item, so I updated them accordingly.
The script didn't catch as many as I would have liked, but it's a start.
The most common (ab)use of proto_tree_add_uint_format was for appending strings to CRC/checksum values to note good or bad CRC/checksum.
svn path=/trunk/; revision=52045
Diffstat (limited to 'epan/dissectors/packet-tacacs.c')
| -rw-r--r-- | epan/dissectors/packet-tacacs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c index a453074472..14babdc45e 100644 --- a/epan/dissectors/packet-tacacs.c +++ b/epan/dissectors/packet-tacacs.c @@ -938,9 +938,9 @@ dissect_tacplus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PROTO_ITEM_SET_HIDDEN(hidden_item); version = tvb_get_guint8(tvb,0); - proto_tree_add_uint_format(tacplus_tree, hf_tacplus_majvers, tvb, 0, 1, + proto_tree_add_uint_format_value(tacplus_tree, hf_tacplus_majvers, tvb, 0, 1, version, - "Major version: %s", + "%s", (version&0xf0)==0xc0?"TACACS+":"Unknown Version"); proto_tree_add_uint(tacplus_tree, hf_tacplus_minvers, tvb, 0, 1, version&0xf); @@ -949,9 +949,9 @@ dissect_tacplus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(tacplus_tree, hf_tacplus_seqno, tvb, 2, 1, ENC_BIG_ENDIAN); flags = tvb_get_guint8(tvb,3); - tf = proto_tree_add_uint_format(tacplus_tree, hf_tacplus_flags, + tf = proto_tree_add_uint_format_value(tacplus_tree, hf_tacplus_flags, tvb, 3, 1, flags, - "Flags: 0x%02x (%s payload, %s)", flags, + "0x%02x (%s payload, %s)", flags, (flags&FLAGS_UNENCRYPTED) ? "Unencrypted" : "Encrypted", (flags&FLAGS_SINGLE) ? "Single connection" : "Multiple Connections" ); flags_tree = proto_item_add_subtree(tf, ett_tacplus_flags); |