diff options
Diffstat (limited to 'epan/dissectors/packet-dap.c')
-rw-r--r-- | epan/dissectors/packet-dap.c | 118 |
1 files changed, 59 insertions, 59 deletions
diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c index b46f34fd04..ed8c55d420 100644 --- a/epan/dissectors/packet-dap.c +++ b/epan/dissectors/packet-dap.c @@ -749,28 +749,28 @@ dissect_dap_FamilyGrouping(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off } -static const asn_namedbit ServiceControlOptions_bits[] = { - { 0, &hf_dap_ServiceControlOptions_preferChaining, -1, -1, "preferChaining", NULL }, - { 1, &hf_dap_ServiceControlOptions_chainingProhibited, -1, -1, "chainingProhibited", NULL }, - { 2, &hf_dap_ServiceControlOptions_localScope, -1, -1, "localScope", NULL }, - { 3, &hf_dap_ServiceControlOptions_dontUseCopy, -1, -1, "dontUseCopy", NULL }, - { 4, &hf_dap_ServiceControlOptions_dontDereferenceAliases, -1, -1, "dontDereferenceAliases", NULL }, - { 5, &hf_dap_ServiceControlOptions_subentries, -1, -1, "subentries", NULL }, - { 6, &hf_dap_ServiceControlOptions_copyShallDo, -1, -1, "copyShallDo", NULL }, - { 7, &hf_dap_ServiceControlOptions_partialNameResolution, -1, -1, "partialNameResolution", NULL }, - { 8, &hf_dap_ServiceControlOptions_manageDSAIT, -1, -1, "manageDSAIT", NULL }, - { 9, &hf_dap_ServiceControlOptions_noSubtypeMatch, -1, -1, "noSubtypeMatch", NULL }, - { 10, &hf_dap_ServiceControlOptions_noSubtypeSelection, -1, -1, "noSubtypeSelection", NULL }, - { 11, &hf_dap_ServiceControlOptions_countFamily, -1, -1, "countFamily", NULL }, - { 12, &hf_dap_ServiceControlOptions_dontSelectFriends, -1, -1, "dontSelectFriends", NULL }, - { 13, &hf_dap_ServiceControlOptions_dontMatchFriends, -1, -1, "dontMatchFriends", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * ServiceControlOptions_bits[] = { + &hf_dap_ServiceControlOptions_preferChaining, + &hf_dap_ServiceControlOptions_chainingProhibited, + &hf_dap_ServiceControlOptions_localScope, + &hf_dap_ServiceControlOptions_dontUseCopy, + &hf_dap_ServiceControlOptions_dontDereferenceAliases, + &hf_dap_ServiceControlOptions_subentries, + &hf_dap_ServiceControlOptions_copyShallDo, + &hf_dap_ServiceControlOptions_partialNameResolution, + &hf_dap_ServiceControlOptions_manageDSAIT, + &hf_dap_ServiceControlOptions_noSubtypeMatch, + &hf_dap_ServiceControlOptions_noSubtypeSelection, + &hf_dap_ServiceControlOptions_countFamily, + &hf_dap_ServiceControlOptions_dontSelectFriends, + &hf_dap_ServiceControlOptions_dontMatchFriends, + NULL }; int dissect_dap_ServiceControlOptions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - ServiceControlOptions_bits, hf_index, ett_dap_ServiceControlOptions, + ServiceControlOptions_bits, 14, hf_index, ett_dap_ServiceControlOptions, NULL); return offset; @@ -1640,7 +1640,7 @@ dissect_dap_Time(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a static int dissect_dap_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -1856,7 +1856,7 @@ dissect_dap_SEQUENCE_SIZE_1_MAX_OF_AlgorithmIdentifier(gboolean implicit_tag _U_ static int dissect_dap_BindKeyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - NULL, hf_index, -1, + NULL, 0, hf_index, -1, NULL); return offset; @@ -2013,16 +2013,16 @@ dissect_dap_Credentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset } -static const asn_namedbit Versions_bits[] = { - { 0, &hf_dap_Versions_v1, -1, -1, "v1", NULL }, - { 1, &hf_dap_Versions_v2, -1, -1, "v2", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * Versions_bits[] = { + &hf_dap_Versions_v1, + &hf_dap_Versions_v2, + NULL }; static int dissect_dap_Versions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - Versions_bits, hf_index, ett_dap_Versions, + Versions_bits, 2, hf_index, ett_dap_Versions, NULL); return offset; @@ -2302,18 +2302,18 @@ dissect_dap_T_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, } -static const asn_namedbit T_permission_bits[] = { - { 0, &hf_dap_T_permission_add, -1, -1, "add", NULL }, - { 1, &hf_dap_T_permission_remove, -1, -1, "remove", NULL }, - { 2, &hf_dap_T_permission_rename, -1, -1, "rename", NULL }, - { 3, &hf_dap_T_permission_move, -1, -1, "move", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * T_permission_bits[] = { + &hf_dap_T_permission_add, + &hf_dap_T_permission_remove, + &hf_dap_T_permission_rename, + &hf_dap_T_permission_move, + NULL }; static int dissect_dap_T_permission(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - T_permission_bits, hf_index, ett_dap_T_permission, + T_permission_bits, 4, hf_index, ett_dap_T_permission, NULL); return offset; @@ -2979,50 +2979,50 @@ dissect_dap_T_subset(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U } -static const asn_namedbit HierarchySelections_bits[] = { - { 0, &hf_dap_HierarchySelections_self, -1, -1, "self", NULL }, - { 1, &hf_dap_HierarchySelections_children, -1, -1, "children", NULL }, - { 2, &hf_dap_HierarchySelections_parent, -1, -1, "parent", NULL }, - { 3, &hf_dap_HierarchySelections_hierarchy, -1, -1, "hierarchy", NULL }, - { 4, &hf_dap_HierarchySelections_top, -1, -1, "top", NULL }, - { 5, &hf_dap_HierarchySelections_subtree, -1, -1, "subtree", NULL }, - { 6, &hf_dap_HierarchySelections_siblings, -1, -1, "siblings", NULL }, - { 7, &hf_dap_HierarchySelections_siblingChildren, -1, -1, "siblingChildren", NULL }, - { 8, &hf_dap_HierarchySelections_siblingSubtree, -1, -1, "siblingSubtree", NULL }, - { 9, &hf_dap_HierarchySelections_all, -1, -1, "all", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * HierarchySelections_bits[] = { + &hf_dap_HierarchySelections_self, + &hf_dap_HierarchySelections_children, + &hf_dap_HierarchySelections_parent, + &hf_dap_HierarchySelections_hierarchy, + &hf_dap_HierarchySelections_top, + &hf_dap_HierarchySelections_subtree, + &hf_dap_HierarchySelections_siblings, + &hf_dap_HierarchySelections_siblingChildren, + &hf_dap_HierarchySelections_siblingSubtree, + &hf_dap_HierarchySelections_all, + NULL }; int dissect_dap_HierarchySelections(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - HierarchySelections_bits, hf_index, ett_dap_HierarchySelections, + HierarchySelections_bits, 10, hf_index, ett_dap_HierarchySelections, NULL); return offset; } -static const asn_namedbit SearchControlOptions_bits[] = { - { 0, &hf_dap_SearchControlOptions_searchAliases, -1, -1, "searchAliases", NULL }, - { 1, &hf_dap_SearchControlOptions_matchedValuesOnly, -1, -1, "matchedValuesOnly", NULL }, - { 2, &hf_dap_SearchControlOptions_checkOverspecified, -1, -1, "checkOverspecified", NULL }, - { 3, &hf_dap_SearchControlOptions_performExactly, -1, -1, "performExactly", NULL }, - { 4, &hf_dap_SearchControlOptions_includeAllAreas, -1, -1, "includeAllAreas", NULL }, - { 5, &hf_dap_SearchControlOptions_noSystemRelaxation, -1, -1, "noSystemRelaxation", NULL }, - { 6, &hf_dap_SearchControlOptions_dnAttribute, -1, -1, "dnAttribute", NULL }, - { 7, &hf_dap_SearchControlOptions_matchOnResidualName, -1, -1, "matchOnResidualName", NULL }, - { 8, &hf_dap_SearchControlOptions_entryCount, -1, -1, "entryCount", NULL }, - { 9, &hf_dap_SearchControlOptions_useSubset, -1, -1, "useSubset", NULL }, - { 10, &hf_dap_SearchControlOptions_separateFamilyMembers, -1, -1, "separateFamilyMembers", NULL }, - { 11, &hf_dap_SearchControlOptions_searchFamily, -1, -1, "searchFamily", NULL }, - { 0, NULL, 0, 0, NULL, NULL } +static const int * SearchControlOptions_bits[] = { + &hf_dap_SearchControlOptions_searchAliases, + &hf_dap_SearchControlOptions_matchedValuesOnly, + &hf_dap_SearchControlOptions_checkOverspecified, + &hf_dap_SearchControlOptions_performExactly, + &hf_dap_SearchControlOptions_includeAllAreas, + &hf_dap_SearchControlOptions_noSystemRelaxation, + &hf_dap_SearchControlOptions_dnAttribute, + &hf_dap_SearchControlOptions_matchOnResidualName, + &hf_dap_SearchControlOptions_entryCount, + &hf_dap_SearchControlOptions_useSubset, + &hf_dap_SearchControlOptions_separateFamilyMembers, + &hf_dap_SearchControlOptions_searchFamily, + NULL }; int dissect_dap_SearchControlOptions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - SearchControlOptions_bits, hf_index, ett_dap_SearchControlOptions, + SearchControlOptions_bits, 12, hf_index, ett_dap_SearchControlOptions, NULL); return offset; |