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-ldap.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-ldap.c')
| -rw-r--r-- | epan/dissectors/packet-ldap.c | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index fae5f52787..ba13fce40e 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -4624,23 +4624,20 @@ dissect_ldap_oid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* static void ldap_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - proto_tree_add_boolean(tree, hf_ldap_AccessMask_ADS_CONTROL_ACCESS, tvb, offset, 4, access); - - proto_tree_add_boolean(tree, hf_ldap_AccessMask_ADS_LIST_OBJECT, tvb, offset, 4, access); - - proto_tree_add_boolean(tree, hf_ldap_AccessMask_ADS_DELETE_TREE, tvb, offset, 4, access); - - proto_tree_add_boolean(tree, hf_ldap_AccessMask_ADS_WRITE_PROP, tvb, offset, 4, access); - - proto_tree_add_boolean(tree, hf_ldap_AccessMask_ADS_READ_PROP, tvb, offset, 4, access); - - proto_tree_add_boolean(tree, hf_ldap_AccessMask_ADS_SELF_WRITE, tvb, offset, 4, access); - - proto_tree_add_boolean(tree, hf_ldap_AccessMask_ADS_LIST, tvb, offset, 4, access); - - proto_tree_add_boolean(tree, hf_ldap_AccessMask_ADS_DELETE_CHILD, tvb, offset, 4, access); + static const int * access_flags[] = { + &hf_ldap_AccessMask_ADS_CONTROL_ACCESS, + &hf_ldap_AccessMask_ADS_LIST_OBJECT, + &hf_ldap_AccessMask_ADS_DELETE_TREE, + &hf_ldap_AccessMask_ADS_WRITE_PROP, + &hf_ldap_AccessMask_ADS_READ_PROP, + &hf_ldap_AccessMask_ADS_SELF_WRITE, + &hf_ldap_AccessMask_ADS_LIST, + &hf_ldap_AccessMask_ADS_DELETE_CHILD, + &hf_ldap_AccessMask_ADS_CREATE_CHILD, + NULL + }; - proto_tree_add_boolean(tree, hf_ldap_AccessMask_ADS_CREATE_CHILD, tvb, offset, 4, access); + proto_tree_add_bitmask_list_value(tree, tvb, offset, 4, access_flags, access); } struct access_mask_info ldap_access_mask_info = { "LDAP", /* Name of specific rights */ @@ -5673,7 +5670,7 @@ void proto_register_ldap(void) { NULL, HFILL }}, /*--- End of included file: packet-ldap-hfarr.c ---*/ -#line 2189 "./asn1/ldap/packet-ldap-template.c" +#line 2186 "./asn1/ldap/packet-ldap-template.c" }; /* List of subtrees */ @@ -5747,7 +5744,7 @@ void proto_register_ldap(void) { &ett_ldap_T_warning, /*--- End of included file: packet-ldap-ettarr.c ---*/ -#line 2203 "./asn1/ldap/packet-ldap-template.c" +#line 2200 "./asn1/ldap/packet-ldap-template.c" }; /* UAT for header fields */ static uat_field_t custom_attribute_types_uat_fields[] = { @@ -5917,7 +5914,7 @@ proto_reg_handoff_ldap(void) /*--- End of included file: packet-ldap-dis-tab.c ---*/ -#line 2356 "./asn1/ldap/packet-ldap-template.c" +#line 2353 "./asn1/ldap/packet-ldap-template.c" } |