diff options
Diffstat (limited to 'asn1/ldap/packet-ldap-template.c')
-rw-r--r-- | asn1/ldap/packet-ldap-template.c | 92 |
1 files changed, 38 insertions, 54 deletions
diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c index 597d66d6d0..06b13dcfd8 100644 --- a/asn1/ldap/packet-ldap-template.c +++ b/asn1/ldap/packet-ldap-template.c @@ -186,6 +186,12 @@ static int hf_ldap_AccessMask_ADS_DELETE_TREE = -1; static int hf_ldap_AccessMask_ADS_LIST_OBJECT = -1; static int hf_ldap_AccessMask_ADS_CONTROL_ACCESS = -1; static int hf_ldap_LDAPMessage_PDU = -1; +static int hf_ldap_object_security_flag = -1; +static int hf_ldap_ancestor_first_flag = -1; +static int hf_ldap_public_data_only_flag = -1; +static int hf_ldap_incremental_value_flag = -1; +static int hf_ldap_oid = -1; +static int hf_ldap_gssapi_encrypted_payload = -1; #include "packet-ldap-hf.c" @@ -1269,12 +1275,7 @@ static void sasl_len - ver_len, plurality(sasl_len - ver_len, "", "s")); - if (sasl_tree) { - proto_tree_add_text(sasl_tree, gssapi_tvb, ver_len, -1, - "GSS-API Encrypted payload (%d byte%s)", - sasl_len - ver_len, - plurality(sasl_len - ver_len, "", "s")); - } + proto_tree_add_item(sasl_tree, hf_ldap_gssapi_encrypted_payload, gssapi_tvb, ver_len, -1, ENC_NA); } } } else { @@ -1676,58 +1677,21 @@ dissect_ldap_oid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) oidname=oid_resolved_from_string(oid); if(oidname){ - proto_tree_add_text(tree, tvb, 0, tvb_captured_length(tvb), "OID: %s (%s)",oid,oidname); + proto_tree_add_string_format_value(tree, hf_ldap_oid, tvb, 0, tvb_captured_length(tvb), oid, "%s (%s)",oid,oidname); } else { - proto_tree_add_text(tree, tvb, 0, tvb_captured_length(tvb), "OID: %s",oid); + proto_tree_add_string(tree, hf_ldap_oid, tvb, 0, tvb_captured_length(tvb), oid); } } #define LDAP_ACCESSMASK_ADS_CREATE_CHILD 0x00000001 -static const true_false_string ldap_AccessMask_ADS_CREATE_CHILD_tfs = { - "ADS CREATE CHILD is SET", - "Ads create child is NOT set", -}; - #define LDAP_ACCESSMASK_ADS_DELETE_CHILD 0x00000002 -static const true_false_string ldap_AccessMask_ADS_DELETE_CHILD_tfs = { - "ADS DELETE CHILD is SET", - "Ads delete child is NOT set", -}; #define LDAP_ACCESSMASK_ADS_LIST 0x00000004 -static const true_false_string ldap_AccessMask_ADS_LIST_tfs = { - "ADS LIST is SET", - "Ads list is NOT set", -}; #define LDAP_ACCESSMASK_ADS_SELF_WRITE 0x00000008 -static const true_false_string ldap_AccessMask_ADS_SELF_WRITE_tfs = { - "ADS SELF WRITE is SET", - "Ads self write is NOT set", -}; #define LDAP_ACCESSMASK_ADS_READ_PROP 0x00000010 -static const true_false_string ldap_AccessMask_ADS_READ_PROP_tfs = { - "ADS READ PROP is SET", - "Ads read prop is NOT set", -}; #define LDAP_ACCESSMASK_ADS_WRITE_PROP 0x00000020 -static const true_false_string ldap_AccessMask_ADS_WRITE_PROP_tfs = { - "ADS WRITE PROP is SET", - "Ads write prop is NOT set", -}; #define LDAP_ACCESSMASK_ADS_DELETE_TREE 0x00000040 -static const true_false_string ldap_AccessMask_ADS_DELETE_TREE_tfs = { - "ADS DELETE TREE is SET", - "Ads delete tree is NOT set", -}; #define LDAP_ACCESSMASK_ADS_LIST_OBJECT 0x00000080 -static const true_false_string ldap_AccessMask_ADS_LIST_OBJECT_tfs = { - "ADS LIST OBJECT is SET", - "Ads list object is NOT set", -}; #define LDAP_ACCESSMASK_ADS_CONTROL_ACCESS 0x00000100 -static const true_false_string ldap_AccessMask_ADS_CONTROL_ACCESS_tfs = { - "ADS CONTROL ACCESS is SET", - "Ads control access is NOT set", -}; static void ldap_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) @@ -2208,35 +2172,55 @@ void proto_register_ldap(void) { NULL, 0, NULL, HFILL }}, { &hf_ldap_AccessMask_ADS_CREATE_CHILD, - { "Create Child", "ldap.AccessMask.ADS_CREATE_CHILD", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_CREATE_CHILD_tfs), LDAP_ACCESSMASK_ADS_CREATE_CHILD, NULL, HFILL }}, + { "Ads Create Child", "ldap.AccessMask.ADS_CREATE_CHILD", FT_BOOLEAN, 32, TFS(&tfs_set_notset), LDAP_ACCESSMASK_ADS_CREATE_CHILD, NULL, HFILL }}, { &hf_ldap_AccessMask_ADS_DELETE_CHILD, - { "Delete Child", "ldap.AccessMask.ADS_DELETE_CHILD", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_DELETE_CHILD_tfs), LDAP_ACCESSMASK_ADS_DELETE_CHILD, NULL, HFILL }}, + { "Ads Delete Child", "ldap.AccessMask.ADS_DELETE_CHILD", FT_BOOLEAN, 32, TFS(&tfs_set_notset), LDAP_ACCESSMASK_ADS_DELETE_CHILD, NULL, HFILL }}, { &hf_ldap_AccessMask_ADS_LIST, - { "List", "ldap.AccessMask.ADS_LIST", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_LIST_tfs), LDAP_ACCESSMASK_ADS_LIST, NULL, HFILL }}, + { "Ads List", "ldap.AccessMask.ADS_LIST", FT_BOOLEAN, 32, TFS(&tfs_set_notset), LDAP_ACCESSMASK_ADS_LIST, NULL, HFILL }}, { &hf_ldap_AccessMask_ADS_SELF_WRITE, - { "Self Write", "ldap.AccessMask.ADS_SELF_WRITE", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_SELF_WRITE_tfs), LDAP_ACCESSMASK_ADS_SELF_WRITE, NULL, HFILL }}, + { "Ads Self Write", "ldap.AccessMask.ADS_SELF_WRITE", FT_BOOLEAN, 32, TFS(&tfs_set_notset), LDAP_ACCESSMASK_ADS_SELF_WRITE, NULL, HFILL }}, { &hf_ldap_AccessMask_ADS_READ_PROP, - { "Read Prop", "ldap.AccessMask.ADS_READ_PROP", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_READ_PROP_tfs), LDAP_ACCESSMASK_ADS_READ_PROP, NULL, HFILL }}, + { "Ads Read Prop", "ldap.AccessMask.ADS_READ_PROP", FT_BOOLEAN, 32, TFS(&tfs_set_notset), LDAP_ACCESSMASK_ADS_READ_PROP, NULL, HFILL }}, { &hf_ldap_AccessMask_ADS_WRITE_PROP, - { "Write Prop", "ldap.AccessMask.ADS_WRITE_PROP", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_WRITE_PROP_tfs), LDAP_ACCESSMASK_ADS_WRITE_PROP, NULL, HFILL }}, + { "Ads Write Prop", "ldap.AccessMask.ADS_WRITE_PROP", FT_BOOLEAN, 32, TFS(&tfs_set_notset), LDAP_ACCESSMASK_ADS_WRITE_PROP, NULL, HFILL }}, { &hf_ldap_AccessMask_ADS_DELETE_TREE, - { "Delete Tree", "ldap.AccessMask.ADS_DELETE_TREE", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_DELETE_TREE_tfs), LDAP_ACCESSMASK_ADS_DELETE_TREE, NULL, HFILL }}, + { "Ads Delete Tree", "ldap.AccessMask.ADS_DELETE_TREE", FT_BOOLEAN, 32, TFS(&tfs_set_notset), LDAP_ACCESSMASK_ADS_DELETE_TREE, NULL, HFILL }}, { &hf_ldap_AccessMask_ADS_LIST_OBJECT, - { "List Object", "ldap.AccessMask.ADS_LIST_OBJECT", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_LIST_OBJECT_tfs), LDAP_ACCESSMASK_ADS_LIST_OBJECT, NULL, HFILL }}, + { "Ads List Object", "ldap.AccessMask.ADS_LIST_OBJECT", FT_BOOLEAN, 32, TFS(&tfs_set_notset), LDAP_ACCESSMASK_ADS_LIST_OBJECT, NULL, HFILL }}, { &hf_ldap_AccessMask_ADS_CONTROL_ACCESS, - { "Control Access", "ldap.AccessMask.ADS_CONTROL_ACCESS", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_CONTROL_ACCESS_tfs), LDAP_ACCESSMASK_ADS_CONTROL_ACCESS, NULL, HFILL }}, + { "Ads Control Access", "ldap.AccessMask.ADS_CONTROL_ACCESS", FT_BOOLEAN, 32, TFS(&tfs_set_notset), LDAP_ACCESSMASK_ADS_CONTROL_ACCESS, NULL, HFILL }}, { &hf_ldap_LDAPMessage_PDU, { "LDAPMessage", "ldap.LDAPMessage_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_ldap_object_security_flag, + { "Flag Object_Security", "ldap.object_security_flag", FT_BOOLEAN, 32, NULL, 0x00000001, NULL, HFILL }}, + + { &hf_ldap_ancestor_first_flag, + { "Flag Ancestor_First", "ldap.ancestor_first_flag", FT_BOOLEAN, 32, NULL, 0x00000800, NULL, HFILL }}, + + { &hf_ldap_public_data_only_flag, + { "Flag Public_Data_Only", "ldap.public_data_only_flag", FT_BOOLEAN, 32, NULL, 0x00002000, NULL, HFILL }}, + + { &hf_ldap_incremental_value_flag, + { "Flag Incremental_Value", "ldap.incremental_value_flag", FT_BOOLEAN, 32, NULL, 0x80000000, NULL, HFILL }}, + + { &hf_ldap_oid, + { "OID", "ldap.oid", FT_STRING, BASE_NONE, + NULL, 0, NULL, HFILL }}, + + { &hf_ldap_gssapi_encrypted_payload, + { "GSS-API Encrypted payload", "ldap.gssapi_encrypted_payload", FT_BYTES, BASE_NONE, + NULL, 0, NULL, HFILL }}, + #include "packet-ldap-hfarr.c" }; |