diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-06-14 23:17:25 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-06-15 15:18:37 +0000 |
| commit | 525fd71b367cc733535e25611728dbf18c7e98ff (patch) | |
| tree | 90d08870aa27d3611ca0c55fe1b42df5227af284 /epan/dissectors/packet-aim.c | |
| parent | d25a60c1c1db0d81e332272fe00ec4ef4fb03e65 (diff) | |
proto_tree_add_boolean -> proto_tree_add_bitmask_list_value
Change-Id: Ic644042d238b5f2abcd874bca92c6dea55804ba9
Reviewed-on: https://code.wireshark.org/review/15913
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-aim.c')
| -rw-r--r-- | epan/dissectors/packet-aim.c | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c index fe0de740ab..44fc8dc4e0 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.c @@ -1072,31 +1072,35 @@ dissect_aim_tlv_value_time(proto_item *ti _U_, guint16 valueid _U_, tvbuff_t *tv } int -dissect_aim_userclass(tvbuff_t *tvb, int offset, int len, proto_item *ti, guint32 flags) +dissect_aim_userclass(tvbuff_t *tvb, int offset, int len, proto_item *ti, guint32 value) { proto_tree *entry; + static const int * flags[] = { + &hf_aim_userclass_unconfirmed, + &hf_aim_userclass_administrator, + &hf_aim_userclass_aol, + &hf_aim_userclass_commercial, + &hf_aim_userclass_aim, + &hf_aim_userclass_away, + &hf_aim_userclass_icq, + &hf_aim_userclass_wireless, + &hf_aim_userclass_unknown100, + &hf_aim_userclass_imf, + &hf_aim_userclass_bot, + &hf_aim_userclass_unknown800, + &hf_aim_userclass_one_way_wireless, + &hf_aim_userclass_unknown2000, + &hf_aim_userclass_unknown4000, + &hf_aim_userclass_unknown8000, + &hf_aim_userclass_unknown10000, + &hf_aim_userclass_unknown20000, + &hf_aim_userclass_no_knock_knock, + &hf_aim_userclass_forward_mobile, + NULL + }; entry = proto_item_add_subtree(ti, ett_aim_userclass); - proto_tree_add_boolean(entry, hf_aim_userclass_unconfirmed, tvb, offset, len, flags); - proto_tree_add_boolean(entry, hf_aim_userclass_administrator, tvb, offset, len, flags); - proto_tree_add_boolean(entry, hf_aim_userclass_aol, tvb, offset, len, flags); - proto_tree_add_boolean(entry, hf_aim_userclass_commercial, tvb, offset, len, flags); - proto_tree_add_boolean(entry, hf_aim_userclass_aim, tvb, offset, len, flags); - proto_tree_add_boolean(entry, hf_aim_userclass_away, tvb, offset, len, flags); - proto_tree_add_boolean(entry, hf_aim_userclass_icq, tvb, offset, len, flags); - proto_tree_add_boolean(entry, hf_aim_userclass_wireless, tvb, offset, len, flags); - proto_tree_add_boolean(entry, hf_aim_userclass_unknown100, tvb, offset, len, flags); - proto_tree_add_boolean(entry, hf_aim_userclass_imf, tvb, offset, len, flags); - proto_tree_add_boolean(entry, hf_aim_userclass_bot, tvb, offset, len, flags); - proto_tree_add_boolean(entry, hf_aim_userclass_unknown800, tvb, offset, len, flags); - proto_tree_add_boolean(entry, hf_aim_userclass_one_way_wireless, tvb, offset, len, flags); - proto_tree_add_boolean(entry, hf_aim_userclass_unknown2000, tvb, offset, len, flags); - proto_tree_add_boolean(entry, hf_aim_userclass_unknown4000, tvb, offset, len, flags); - proto_tree_add_boolean(entry, hf_aim_userclass_unknown8000, tvb, offset, len, flags); - proto_tree_add_boolean(entry, hf_aim_userclass_unknown10000, tvb, offset, len, flags); - proto_tree_add_boolean(entry, hf_aim_userclass_unknown20000, tvb, offset, len, flags); - proto_tree_add_boolean(entry, hf_aim_userclass_no_knock_knock, tvb, offset, len, flags); - proto_tree_add_boolean(entry, hf_aim_userclass_forward_mobile, tvb, offset, len, flags); + proto_tree_add_bitmask_list_value(entry, tvb, offset, len, flags, value); return offset+len; } |