diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-07-21 21:12:09 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-07-21 21:12:09 +0000 |
| commit | 0ca30abe654cc8b33df71c98ba8dfed4f5ec3053 (patch) | |
| tree | 68fb52d6451f213d2aac83fac70ff15605ae509e /epan | |
| parent | 806b2b82b1894fe9a209b9e580375332e1489fb9 (diff) | |
change the symbol dissect_ber_CHOICE back into dissect_ber_choice
svn path=/trunk/; revision=14980
Diffstat (limited to 'epan')
29 files changed, 1587 insertions, 1146 deletions
diff --git a/epan/dissectors/packet-MAP_DialoguePDU.c b/epan/dissectors/packet-MAP_DialoguePDU.c index baee96ca6d..092d1c6847 100644 --- a/epan/dissectors/packet-MAP_DialoguePDU.c +++ b/epan/dissectors/packet-MAP_DialoguePDU.c @@ -99,10 +99,11 @@ static gint ett_MAP_DialoguePDU_MAP_ProviderAbortInfo = -1; + static int dissect_MAP_DialoguePDU_DestinationReference(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -111,10 +112,11 @@ static int dissect_destinationReference_impl(packet_info *pinfo, proto_tree *tre } + static int dissect_MAP_DialoguePDU_OriginationReference(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -180,7 +182,8 @@ static const value_string MAP_DialoguePDU_Reason_vals[] = { static int dissect_MAP_DialoguePDU_Reason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -229,7 +232,8 @@ static const value_string MAP_DialoguePDU_ResourceUnavailable_vals[] = { static int dissect_MAP_DialoguePDU_ResourceUnavailable(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -252,7 +256,8 @@ static const value_string MAP_DialoguePDU_ApplicationProcedureCancellation_vals[ static int dissect_MAP_DialoguePDU_ApplicationProcedureCancellation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -279,7 +284,7 @@ static const ber_choice_t MAP_UserAbortChoice_choice[] = { static int dissect_MAP_DialoguePDU_MAP_UserAbortChoice(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, MAP_UserAbortChoice_choice, hf_index, ett_MAP_DialoguePDU_MAP_UserAbortChoice, NULL); return offset; @@ -314,7 +319,8 @@ static const value_string MAP_DialoguePDU_MAP_ProviderAbortReason_vals[] = { static int dissect_MAP_DialoguePDU_MAP_ProviderAbortReason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -361,7 +367,7 @@ static const ber_choice_t MAP_DialoguePDU_choice[] = { static int dissect_MAP_DialoguePDU_MAP_DialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, MAP_DialoguePDU_choice, hf_index, ett_MAP_DialoguePDU_MAP_DialoguePDU, NULL); return offset; @@ -441,7 +447,8 @@ static const value_string MAP_DialoguePDU_ResourceUnavailableReason_vals[] = { static int dissect_MAP_DialoguePDU_ResourceUnavailableReason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -461,7 +468,8 @@ static const value_string MAP_DialoguePDU_ProcedureCancellationReason_vals[] = { static int dissect_MAP_DialoguePDU_ProcedureCancellationReason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index 7fa07a7483..d65e9396ef 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -423,7 +423,7 @@ static const ber_choice_t T_encoding_choice[] = { static int dissect_acse_T_encoding(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_encoding_choice, hf_index, ett_acse_T_encoding, NULL); return offset; @@ -566,7 +566,7 @@ static const ber_choice_t AP_title_choice[] = { int dissect_acse_AP_title(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, AP_title_choice, hf_index, ett_acse_AP_title, NULL); return offset; @@ -638,7 +638,7 @@ static const ber_choice_t ASO_qualifier_choice[] = { static int dissect_acse_ASO_qualifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ASO_qualifier_choice, hf_index, ett_acse_ASO_qualifier, NULL); return offset; @@ -817,7 +817,7 @@ static const ber_choice_t Authentication_value_choice[] = { static int dissect_acse_Authentication_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Authentication_value_choice, hf_index, ett_acse_Authentication_value, NULL); return offset; @@ -829,6 +829,7 @@ static int dissect_responding_authentication_value(packet_info *pinfo, proto_tre return dissect_acse_Authentication_value(FALSE, tvb, offset, pinfo, tree, hf_acse_responding_authentication_value); } + static const ber_sequence_t ASO_context_name_list_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ASO_context_name_list_item }, }; @@ -836,7 +837,7 @@ static const ber_sequence_t ASO_context_name_list_sequence_of[1] = { static int dissect_acse_ASO_context_name_list(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - ASO_context_name_list_sequence_of, hf_index, ett_acse_ASO_context_name_list); + ASO_context_name_list_sequence_of, hf_index, ett_acse_ASO_context_name_list); return offset; } @@ -908,6 +909,7 @@ static int dissect_transfer_syntax_name_impl(packet_info *pinfo, proto_tree *tre return dissect_acse_TransferSyntaxName(TRUE, tvb, offset, pinfo, tree, hf_acse_transfer_syntax_name); } + static const ber_sequence_t SEQUENCE_OF_TransferSyntaxName_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_transfer_syntaxes_item }, }; @@ -915,7 +917,7 @@ static const ber_sequence_t SEQUENCE_OF_TransferSyntaxName_sequence_of[1] = { static int dissect_acse_SEQUENCE_OF_TransferSyntaxName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_TransferSyntaxName_sequence_of, hf_index, ett_acse_SEQUENCE_OF_TransferSyntaxName); + SEQUENCE_OF_TransferSyntaxName_sequence_of, hf_index, ett_acse_SEQUENCE_OF_TransferSyntaxName); return offset; } @@ -941,6 +943,7 @@ static int dissect_Context_list_item(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_acse_Context_list_item(FALSE, tvb, offset, pinfo, tree, hf_acse_Context_list_item); } + static const ber_sequence_t Context_list_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Context_list_item }, }; @@ -948,7 +951,7 @@ static const ber_sequence_t Context_list_sequence_of[1] = { static int dissect_acse_Context_list(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - Context_list_sequence_of, hf_index, ett_acse_Context_list); + Context_list_sequence_of, hf_index, ett_acse_Context_list); return offset; } @@ -973,6 +976,7 @@ static int dissect_Default_Context_List_item(packet_info *pinfo, proto_tree *tre return dissect_acse_Default_Context_List_item(FALSE, tvb, offset, pinfo, tree, hf_acse_Default_Context_List_item); } + static const ber_sequence_t Default_Context_List_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Default_Context_List_item }, }; @@ -980,7 +984,7 @@ static const ber_sequence_t Default_Context_List_sequence_of[1] = { static int dissect_acse_Default_Context_List(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - Default_Context_List_sequence_of, hf_index, ett_acse_Default_Context_List); + Default_Context_List_sequence_of, hf_index, ett_acse_Default_Context_List); return offset; } @@ -1003,7 +1007,7 @@ static const ber_choice_t Syntactic_context_list_choice[] = { static int dissect_acse_Syntactic_context_list(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Syntactic_context_list_choice, hf_index, ett_acse_Syntactic_context_list, NULL); return offset; @@ -1045,6 +1049,7 @@ static int dissect_ASOI_tag_item(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_acse_ASOI_tag_item(FALSE, tvb, offset, pinfo, tree, hf_acse_ASOI_tag_item); } + static const ber_sequence_t ASOI_tag_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ASOI_tag_item }, }; @@ -1052,7 +1057,7 @@ static const ber_sequence_t ASOI_tag_sequence_of[1] = { static int dissect_acse_ASOI_tag(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - ASOI_tag_sequence_of, hf_index, ett_acse_ASOI_tag); + ASOI_tag_sequence_of, hf_index, ett_acse_ASOI_tag); return offset; } @@ -1063,6 +1068,7 @@ static int dissect_calling_asoi_tag_impl(packet_info *pinfo, proto_tree *tree, t return dissect_acse_ASOI_tag(TRUE, tvb, offset, pinfo, tree, hf_acse_calling_asoi_tag); } + static const ber_sequence_t Association_data_sequence_of[1] = { { BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_Association_data_item }, }; @@ -1070,7 +1076,7 @@ static const ber_sequence_t Association_data_sequence_of[1] = { static int dissect_acse_Association_data(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - Association_data_sequence_of, hf_index, ett_acse_Association_data); + Association_data_sequence_of, hf_index, ett_acse_Association_data); return offset; } @@ -1241,7 +1247,7 @@ static const ber_choice_t Associate_source_diagnostic_choice[] = { static int dissect_acse_Associate_source_diagnostic(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Associate_source_diagnostic_choice, hf_index, ett_acse_Associate_source_diagnostic, NULL); return offset; @@ -1320,6 +1326,7 @@ static int dissect_P_context_result_list_item(packet_info *pinfo, proto_tree *tr return dissect_acse_P_context_result_list_item(FALSE, tvb, offset, pinfo, tree, hf_acse_P_context_result_list_item); } + static const ber_sequence_t P_context_result_list_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_P_context_result_list_item }, }; @@ -1327,7 +1334,7 @@ static const ber_sequence_t P_context_result_list_sequence_of[1] = { static int dissect_acse_P_context_result_list(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - P_context_result_list_sequence_of, hf_index, ett_acse_P_context_result_list); + P_context_result_list_sequence_of, hf_index, ett_acse_P_context_result_list); return offset; } @@ -1564,7 +1571,7 @@ static const ber_choice_t T_presentation_data_values_choice[] = { static int dissect_acse_T_presentation_data_values(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_presentation_data_values_choice, hf_index, ett_acse_T_presentation_data_values, NULL); return offset; @@ -1608,7 +1615,7 @@ static const ber_choice_t User_Data_choice[] = { static int dissect_acse_User_Data(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, User_Data_choice, hf_index, ett_acse_User_Data, NULL); return offset; @@ -1738,7 +1745,7 @@ static const ber_choice_t ACSE_apdu_choice[] = { static int dissect_acse_ACSE_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ACSE_apdu_choice, hf_index, ett_acse_ACSE_apdu, NULL); return offset; @@ -1791,7 +1798,7 @@ static const ber_choice_t AE_title_choice[] = { static int dissect_acse_AE_title(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, AE_title_choice, hf_index, ett_acse_AE_title, NULL); return offset; @@ -2023,7 +2030,7 @@ void proto_register_acse(void) { "AARQ-apdu/calling-authentication-value", HFILL }}, { &hf_acse_aSO_context_name_list, { "aSO-context-name-list", "acse.aSO_context_name_list", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_acse_implementation_information, { "implementation-information", "acse.implementation_information", @@ -2035,15 +2042,15 @@ void proto_register_acse(void) { "", HFILL }}, { &hf_acse_called_asoi_tag, { "called-asoi-tag", "acse.called_asoi_tag", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_acse_calling_asoi_tag, { "calling-asoi-tag", "acse.calling_asoi_tag", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_acse_AARQ_user_information, { "user-information", "acse.user_information", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AARQ-apdu/user-information", HFILL }}, { &hf_acse_AARE_protocol_version, { "protocol-version", "acse.protocol_version", @@ -2087,11 +2094,11 @@ void proto_register_acse(void) { "AARE-apdu/responding-authentication-value", HFILL }}, { &hf_acse_p_context_result_list, { "p-context-result-list", "acse.p_context_result_list", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_acse_AARE_user_information, { "user-information", "acse.user_information", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AARE-apdu/user-information", HFILL }}, { &hf_acse_RLRQ_reason, { "reason", "acse.reason", @@ -2107,7 +2114,7 @@ void proto_register_acse(void) { "", HFILL }}, { &hf_acse_RLRQ_user_information, { "user-information", "acse.user_information", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RLRQ-apdu/user-information", HFILL }}, { &hf_acse_RLRE_reason, { "reason", "acse.reason", @@ -2115,7 +2122,7 @@ void proto_register_acse(void) { "RLRE-apdu/reason", HFILL }}, { &hf_acse_RLRE_user_information, { "user-information", "acse.user_information", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RLRE-apdu/user-information", HFILL }}, { &hf_acse_abort_source, { "abort-source", "acse.abort_source", @@ -2127,7 +2134,7 @@ void proto_register_acse(void) { "ABRT-apdu/abort-diagnostic", HFILL }}, { &hf_acse_ABRT_user_information, { "user-information", "acse.user_information", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ABRT-apdu/user-information", HFILL }}, { &hf_acse_a_user_data, { "a-user-data", "acse.a_user_data", @@ -2139,11 +2146,11 @@ void proto_register_acse(void) { "ACRQ-apdu/aSO-context-name", HFILL }}, { &hf_acse_user_information, { "user-information", "acse.user_information", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_acse_aSO_context_name, { "aSO-context-name", "acse.aSO_context_name", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ACRP-apdu/aSO-context-name", HFILL }}, { &hf_acse_ap_title_form1, { "ap-title-form1", "acse.ap_title_form1", @@ -2159,7 +2166,7 @@ void proto_register_acse(void) { "AP-title/ap-title-form3", HFILL }}, { &hf_acse_aso_qualifier_form1, { "aso-qualifier-form1", "acse.aso_qualifier_form1", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ASO-qualifier/aso-qualifier-form1", HFILL }}, { &hf_acse_aso_qualifier_form2, { "aso-qualifier-form2", "acse.aso_qualifier_form2", @@ -2195,11 +2202,11 @@ void proto_register_acse(void) { "ASO-context-name-list/_item", HFILL }}, { &hf_acse_context_list, { "context-list", "acse.context_list", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Syntactic-context-list/context-list", HFILL }}, { &hf_acse_default_contact_list, { "default-contact-list", "acse.default_contact_list", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Syntactic-context-list/default-contact-list", HFILL }}, { &hf_acse_Context_list_item, { "Item", "acse.Context_list_item", @@ -2215,7 +2222,7 @@ void proto_register_acse(void) { "Context-list/_item/abstract-syntax", HFILL }}, { &hf_acse_transfer_syntaxes, { "transfer-syntaxes", "acse.transfer_syntaxes", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Context-list/_item/transfer-syntaxes", HFILL }}, { &hf_acse_transfer_syntaxes_item, { "Item", "acse.transfer_syntaxes_item", diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index ad61ffe71e..39f8799e43 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -1075,7 +1075,7 @@ printf("SEQUENCE dissect_ber_sequence(%s) subdissector ate %d bytes\n",name,coun * in case it was a CHOICE { } OPTIONAL */ int -dissect_ber_CHOICE(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_choice_t *choice, gint hf_id, gint ett_id, gint *branch_taken) +dissect_ber_choice(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_choice_t *choice, gint hf_id, gint ett_id, gint *branch_taken) { gint8 class; gboolean pc, ind; @@ -1101,9 +1101,9 @@ name=hfinfo->name; name="unnamed"; } if(tvb_length_remaining(tvb,offset)>3){ -printf("CHOICE dissect_ber_CHOICE(%s) entered offset:%d len:%d %02x:%02x:%02x\n",name,offset,tvb_length_remaining(tvb,offset),tvb_get_guint8(tvb,offset),tvb_get_guint8(tvb,offset+1),tvb_get_guint8(tvb,offset+2)); +printf("CHOICE dissect_ber_choice(%s) entered offset:%d len:%d %02x:%02x:%02x\n",name,offset,tvb_length_remaining(tvb,offset),tvb_get_guint8(tvb,offset),tvb_get_guint8(tvb,offset+1),tvb_get_guint8(tvb,offset+2)); }else{ -printf("CHOICE dissect_ber_CHOICE(%s) entered len:%d\n",name,tvb_length_remaining(tvb,offset)); +printf("CHOICE dissect_ber_choice(%s) entered len:%d\n",name,tvb_length_remaining(tvb,offset)); } } #endif @@ -1135,8 +1135,8 @@ printf("CHOICE dissect_ber_CHOICE(%s) entered len:%d\n",name,tvb_length_remainin case FT_UINT32: break; default: - proto_tree_add_text(tree, tvb, offset, len,"dissect_ber_CHOICE(): Was passed a HF field that was not integer type : %s",hfinfo->abbrev); - fprintf(stderr,"dissect_ber_CHOICE(): frame:%d offset:%d Was passed a HF field that was not integer type : %s\n",pinfo->fd->num,offset,hfinfo->abbrev); + proto_tree_add_text(tree, tvb, offset, len,"dissect_ber_choice(): Was passed a HF field that was not integer type : %s",hfinfo->abbrev); + fprintf(stderr,"dissect_ber_choice(): frame:%d offset:%d Was passed a HF field that was not integer type : %s\n",pinfo->fd->num,offset,hfinfo->abbrev); return end_offset; } } @@ -1191,9 +1191,9 @@ name=hfinfo->name; name="unnamed"; } if(tvb_length_remaining(next_tvb,0)>3){ -printf("CHOICE dissect_ber_CHOICE(%s) calling subdissector start_offset:%d offset:%d len:%d %02x:%02x:%02x\n",name,start_offset,offset,tvb_length_remaining(next_tvb,0),tvb_get_guint8(next_tvb,0),tvb_get_guint8(next_tvb,1),tvb_get_guint8(next_tvb,2)); +printf("CHOICE dissect_ber_choice(%s) calling subdissector start_offset:%d offset:%d len:%d %02x:%02x:%02x\n",name,start_offset,offset,tvb_length_remaining(next_tvb,0),tvb_get_guint8(next_tvb,0),tvb_get_guint8(next_tvb,1),tvb_get_guint8(next_tvb,2)); }else{ -printf("CHOICE dissect_ber_CHOICE(%s) calling subdissector len:%d\n",name,tvb_length(next_tvb)); +printf("CHOICE dissect_ber_choice(%s) calling subdissector len:%d\n",name,tvb_length(next_tvb)); } } #endif @@ -1208,7 +1208,7 @@ name=hfinfo->name; } else { name="unnamed"; } -printf("CHOICE dissect_ber_CHOICE(%s) subdissector ate %d bytes\n",name,count); +printf("CHOICE dissect_ber_choice(%s) subdissector ate %d bytes\n",name,count); } #endif if((count==0)&&(ch->class==class)&&(ch->tag==-1)&&(ch->flags&BER_FLAGS_NOOWNTAG)){ diff --git a/epan/dissectors/packet-ber.h b/epan/dissectors/packet-ber.h index ed0337c136..6f749f2ea5 100644 --- a/epan/dissectors/packet-ber.h +++ b/epan/dissectors/packet-ber.h @@ -124,7 +124,7 @@ typedef struct _ber_choice_t { /* this function dissects a BER choice */ -extern int dissect_ber_CHOICE(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_choice_t *ch, gint hf_id, gint ett_id, gint *branch_taken); +extern int dissect_ber_choice(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_choice_t *ch, gint hf_id, gint ett_id, gint *branch_taken); /* this function dissects a BER strings diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index f60e87ad8e..e2d1ebebc9 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -817,10 +817,11 @@ dissect_camel_PBSGSNCapabilities(gboolean implicit_tag _U_, tvbuff_t *tvb, int o } + static int dissect_camel_OCTET_STRING_SIZE_0_3(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -868,10 +869,11 @@ static int dissect_o2ext(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in } + static int dissect_camel_OCTET_STRING_SIZE_0_19(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -896,10 +898,11 @@ dissect_camel_PBAddressString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs } + static int dissect_camel_OCTET_STRING_SIZE_0_8(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -924,10 +927,11 @@ dissect_camel_PBISDNAddressString(gboolean implicit_tag _U_, tvbuff_t *tvb, int } + static int dissect_camel_OCTET_STRING_SIZE_3(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -939,10 +943,11 @@ static int dissect_degreesOfLongitude(packet_info *pinfo, proto_tree *tree, tvbu } + static int dissect_camel_OCTET_STRING_SIZE_1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1008,10 +1013,11 @@ static int dissect_addressLength(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_camel_OCTET_STRING_SIZE_4_16(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1072,10 +1078,11 @@ dissect_camel_PBRedirectionInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, } + static int dissect_camel_OCTET_STRING_SIZE_0_16(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1121,10 +1128,11 @@ dissect_camel_PBCallingPartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int } + static int dissect_camel_OCTET_STRING_SIZE_1_10(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1151,10 +1159,11 @@ dissect_camel_PBRedirectingNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int } + static int dissect_camel_OCTET_STRING_SIZE_0_30(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1236,7 +1245,8 @@ static const value_string camel_T_typeOfNumber_vals[] = { static int dissect_camel_T_typeOfNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1245,10 +1255,11 @@ static int dissect_typeOfNumber(packet_info *pinfo, proto_tree *tree, tvbuff_t * } + static int dissect_camel_OCTET_STRING_SIZE_0_40(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1273,10 +1284,11 @@ dissect_camel_PBCalledPartyBCDNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, i } + static int dissect_camel_AccessPointName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1301,6 +1313,7 @@ static int dissect_tariffSwitchInterval1_impl(packet_info *pinfo, proto_tree *tr } + static int dissect_camel_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index); @@ -1379,7 +1392,7 @@ static const ber_choice_t Code_choice[] = { static int dissect_camel_Code(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Code_choice, hf_index, ett_camel_Code, NULL); return offset; @@ -1406,7 +1419,8 @@ static const value_string camel_CriticalityType_vals[] = { static int dissect_camel_CriticalityType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1490,7 +1504,7 @@ static const ber_choice_t SupportedExtensionsExtensionType_choice[] = { static int dissect_camel_SupportedExtensionsExtensionType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, SupportedExtensionsExtensionType_choice, hf_index, ett_camel_SupportedExtensionsExtensionType, NULL); return offset; @@ -1520,6 +1534,7 @@ static int dissect_ExtensionsArray_item(packet_info *pinfo, proto_tree *tree, tv return dissect_camel_ExtensionField(FALSE, tvb, offset, pinfo, tree, hf_camel_ExtensionsArray_item); } + static const ber_sequence_t ExtensionsArray_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ExtensionsArray_item }, }; @@ -1527,7 +1542,7 @@ static const ber_sequence_t ExtensionsArray_sequence_of[1] = { static int dissect_camel_ExtensionsArray(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - ExtensionsArray_sequence_of, hf_index, ett_camel_ExtensionsArray); + ExtensionsArray_sequence_of, hf_index, ett_camel_ExtensionsArray); return offset; } @@ -1568,7 +1583,7 @@ static const ber_choice_t AChBillingChargingCharacteristics_choice[] = { static int dissect_camel_AChBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, AChBillingChargingCharacteristics_choice, hf_index, ett_camel_AChBillingChargingCharacteristics, NULL); return offset; @@ -1578,10 +1593,11 @@ static int dissect_aChBillingChargingCharacteristics_impl(packet_info *pinfo, pr } + static int dissect_camel_Digits(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1610,10 +1626,11 @@ static int dissect_additionalCallingPartyNumber_impl(packet_info *pinfo, proto_t } + static int dissect_camel_AlertingPattern(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1741,7 +1758,8 @@ static const value_string camel_AppendFreeFormatData_vals[] = { static int dissect_camel_AppendFreeFormatData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1872,7 +1890,7 @@ static const ber_choice_t BasicGapCriteria_choice[] = { static int dissect_camel_BasicGapCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, BasicGapCriteria_choice, hf_index, ett_camel_BasicGapCriteria, NULL); return offset; @@ -1906,7 +1924,8 @@ static const value_string camel_EventTypeBCSM_vals[] = { static int dissect_camel_EventTypeBCSM(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1925,7 +1944,8 @@ static const value_string camel_MonitorMode_vals[] = { static int dissect_camel_MonitorMode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1934,10 +1954,11 @@ static int dissect_monitorMode_impl(packet_info *pinfo, proto_tree *tree, tvbuff } + static int dissect_camel_LegType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1963,7 +1984,7 @@ static const ber_choice_t LegID_choice[] = { static int dissect_camel_LegID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, LegID_choice, hf_index, ett_camel_LegID, NULL); return offset; @@ -1985,7 +2006,7 @@ static const ber_choice_t DpSpecificCriteria_choice[] = { static int dissect_camel_DpSpecificCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, DpSpecificCriteria_choice, hf_index, ett_camel_DpSpecificCriteria, NULL); return offset; @@ -2014,10 +2035,11 @@ static int dissect_BCSMEventArray_item(packet_info *pinfo, proto_tree *tree, tvb } + static int dissect_camel_OCTET_STRING_SIZE_2_cAPSpecificBoundSetmaxBearerCapabilityLength(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -2038,7 +2060,7 @@ static const ber_choice_t BearerCapability_choice[] = { static int dissect_camel_BearerCapability(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, BearerCapability_choice, hf_index, ett_camel_BearerCapability, NULL); return offset; @@ -2048,6 +2070,7 @@ static int dissect_bearerCapability_impl(packet_info *pinfo, proto_tree *tree, t } + static int dissect_camel_ISDN_AddressString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { @@ -2116,6 +2139,7 @@ static int dissect_calledPartyBCDNumber_impl(packet_info *pinfo, proto_tree *tre } + static int dissect_camel_CalledPartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { @@ -2146,6 +2170,7 @@ static int dissect_calledPartyNumber_impl(packet_info *pinfo, proto_tree *tree, } + static int dissect_camel_CallingPartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { @@ -2181,7 +2206,7 @@ static const ber_choice_t ReceivingSideID_choice[] = { static int dissect_camel_ReceivingSideID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ReceivingSideID_choice, hf_index, ett_camel_ReceivingSideID, NULL); return offset; @@ -2251,7 +2276,7 @@ static const ber_choice_t TimeInformation_choice[] = { static int dissect_camel_TimeInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, TimeInformation_choice, hf_index, ett_camel_TimeInformation, NULL); return offset; @@ -2293,7 +2318,7 @@ static const ber_choice_t CamelCallResult_choice[] = { static int dissect_camel_CamelCallResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, CamelCallResult_choice, hf_index, ett_camel_CamelCallResult, NULL); return offset; @@ -2340,17 +2365,18 @@ static const ber_choice_t CamelAChBillingChargingCharacteristics_choice[] = { static int dissect_camel_CamelAChBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, CamelAChBillingChargingCharacteristics_choice, hf_index, ett_camel_CamelAChBillingChargingCharacteristics, NULL); return offset; } + static int dissect_camel_FreeFormatData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -2371,7 +2397,7 @@ static const ber_choice_t SendingSideID_choice[] = { static int dissect_camel_SendingSideID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, SendingSideID_choice, hf_index, ett_camel_SendingSideID, NULL); return offset; @@ -2414,17 +2440,18 @@ static const ber_choice_t CamelFCIBillingChargingCharacteristics_choice[] = { static int dissect_camel_CamelFCIBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, CamelFCIBillingChargingCharacteristics_choice, hf_index, ett_camel_CamelFCIBillingChargingCharacteristics, NULL); return offset; } + static int dissect_camel_PDPId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -2496,7 +2523,7 @@ static const ber_choice_t CamelFCISMSBillingChargingCharacteristics_choice[] = { static int dissect_camel_CamelFCISMSBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, CamelFCISMSBillingChargingCharacteristics_choice, hf_index, ett_camel_CamelFCISMSBillingChargingCharacteristics, NULL); return offset; @@ -2517,7 +2544,7 @@ static const ber_choice_t CamelSCIBillingChargingCharacteristics_choice[] = { static int dissect_camel_CamelSCIBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, CamelSCIBillingChargingCharacteristics_choice, hf_index, ett_camel_CamelSCIBillingChargingCharacteristics, NULL); return offset; @@ -2538,10 +2565,11 @@ dissect_camel_CamelSCIGPRSBillingChargingCharacteristics(gboolean implicit_tag _ } + static int dissect_camel_Carrier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -2560,7 +2588,8 @@ static const value_string camel_CGEncountered_vals[] = { static int dissect_camel_CGEncountered(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -2569,10 +2598,11 @@ static int dissect_cGEncountered_impl(packet_info *pinfo, proto_tree *tree, tvbu } + static int dissect_camel_LocationNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -2619,7 +2649,7 @@ static const ber_choice_t ChargingCharacteristics_choice[] = { static int dissect_camel_ChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ChargingCharacteristics_choice, hf_index, ett_camel_ChargingCharacteristics, NULL); return offset; @@ -2679,7 +2709,7 @@ static const ber_choice_t TransferredVolume_choice[] = { static int dissect_camel_TransferredVolume(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, TransferredVolume_choice, hf_index, ett_camel_TransferredVolume, NULL); return offset; @@ -2739,7 +2769,7 @@ static const ber_choice_t ElapsedTime_choice[] = { static int dissect_camel_ElapsedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ElapsedTime_choice, hf_index, ett_camel_ElapsedTime, NULL); return offset; @@ -2763,7 +2793,7 @@ static const ber_choice_t ChargingResult_choice[] = { static int dissect_camel_ChargingResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ChargingResult_choice, hf_index, ett_camel_ChargingResult, NULL); return offset; @@ -2835,7 +2865,7 @@ static const ber_choice_t TransferredVolumeRollOver_choice[] = { static int dissect_camel_TransferredVolumeRollOver(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, TransferredVolumeRollOver_choice, hf_index, ett_camel_TransferredVolumeRollOver, NULL); return offset; @@ -2876,7 +2906,7 @@ static const ber_choice_t ElapsedTimeRollOver_choice[] = { static int dissect_camel_ElapsedTimeRollOver(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ElapsedTimeRollOver_choice, hf_index, ett_camel_ElapsedTimeRollOver, NULL); return offset; @@ -2900,7 +2930,7 @@ static const ber_choice_t ChargingRollOver_choice[] = { static int dissect_camel_ChargingRollOver(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ChargingRollOver_choice, hf_index, ett_camel_ChargingRollOver, NULL); return offset; @@ -2926,10 +2956,11 @@ static int dissect_maximumNbOfDigits_impl(packet_info *pinfo, proto_tree *tree, } + static int dissect_camel_OCTET_STRING_SIZE_1_2(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -2973,7 +3004,8 @@ static const value_string camel_ErrorTreatment_vals[] = { static int dissect_camel_ErrorTreatment(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -3020,7 +3052,7 @@ static const ber_choice_t CollectedInfo_choice[] = { static int dissect_camel_CollectedInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, CollectedInfo_choice, hf_index, ett_camel_CollectedInfo, NULL); return offset; @@ -3041,7 +3073,8 @@ static const value_string camel_ConnectedNumberTreatmentInd_vals[] = { static int dissect_camel_ConnectedNumberTreatmentInd(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -3059,7 +3092,8 @@ static const value_string camel_ControlType_vals[] = { static int dissect_camel_ControlType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -3068,10 +3102,11 @@ static int dissect_controlType_impl(packet_info *pinfo, proto_tree *tree, tvbuff } + static int dissect_camel_ScfID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -3108,6 +3143,7 @@ static int dissect_correlationID_impl(packet_info *pinfo, proto_tree *tree, tvbu } + static int dissect_camel_DateAndTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { @@ -3208,6 +3244,7 @@ static int dissect_callStopTimeValue_impl(packet_info *pinfo, proto_tree *tree, return dissect_camel_DateAndTime(TRUE, tvb, offset, pinfo, tree, hf_camel_callStopTimeValue); } + static const ber_sequence_t DestinationRoutingAddress_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_DestinationRoutingAddress_item }, }; @@ -3215,7 +3252,7 @@ static const ber_sequence_t DestinationRoutingAddress_sequence_of[1] = { static int dissect_camel_DestinationRoutingAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - DestinationRoutingAddress_sequence_of, hf_index, ett_camel_DestinationRoutingAddress); + DestinationRoutingAddress_sequence_of, hf_index, ett_camel_DestinationRoutingAddress); return offset; } @@ -3224,10 +3261,11 @@ static int dissect_destinationRoutingAddress_impl(packet_info *pinfo, proto_tree } + static int dissect_camel_OCTET_STRING_SIZE_1_63(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -3251,10 +3289,11 @@ dissect_camel_EndUserAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse } + static int dissect_camel_Cause(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -3453,7 +3492,7 @@ static const ber_choice_t EventSpecificInformationBCSM_choice[] = { static int dissect_camel_EventSpecificInformationBCSM(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, EventSpecificInformationBCSM_choice, hf_index, ett_camel_EventSpecificInformationBCSM, NULL); return offset; @@ -3475,7 +3514,8 @@ static const value_string camel_SMSCause_vals[] = { static int dissect_camel_SMSCause(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -3530,7 +3570,7 @@ static const ber_choice_t EventSpecificInformationSMS_choice[] = { static int dissect_camel_EventSpecificInformationSMS(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, EventSpecificInformationSMS_choice, hf_index, ett_camel_EventSpecificInformationSMS, NULL); return offset; @@ -3550,7 +3590,8 @@ static const value_string camel_EventTypeSMS_vals[] = { static int dissect_camel_EventTypeSMS(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -3558,6 +3599,7 @@ static int dissect_eventTypeSMS_impl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_camel_EventTypeSMS(TRUE, tvb, offset, pinfo, tree, hf_camel_eventTypeSMS); } + static const ber_sequence_t Extensions_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Extensions_item }, }; @@ -3565,7 +3607,7 @@ static const ber_sequence_t Extensions_sequence_of[1] = { static int dissect_camel_Extensions(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - Extensions_sequence_of, hf_index, ett_camel_Extensions); + Extensions_sequence_of, hf_index, ett_camel_Extensions); return offset; } @@ -3587,10 +3629,11 @@ dissect_camel_FCIGPRSBillingChargingCharacteristics(gboolean implicit_tag _U_, t } + static int dissect_camel_FCISMSBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -3628,7 +3671,7 @@ static const ber_choice_t GapCriteria_choice[] = { static int dissect_camel_GapCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, GapCriteria_choice, hf_index, ett_camel_GapCriteria, NULL); return offset; @@ -3717,7 +3760,7 @@ static int dissect_originationReference(packet_info *pinfo, proto_tree *tree, tv static int dissect_camel_IA5String_SIZE_1_127(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_restricted_string(implicit_tag, 0, + offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_IA5String, pinfo, tree, tvb, offset, hf_index, NULL); @@ -3728,10 +3771,11 @@ static int dissect_messageContent_impl(packet_info *pinfo, proto_tree *tree, tvb } + static int dissect_camel_OCTET_STRING_SIZE_2_10(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -3756,6 +3800,7 @@ static int dissect_text_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_camel_T_text(TRUE, tvb, offset, pinfo, tree, hf_camel_text); } + static const ber_sequence_t SEQUENCE_SIZE_1_16_OF_Integer4_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_elementaryMessageIDs_item }, }; @@ -3763,7 +3808,7 @@ static const ber_sequence_t SEQUENCE_SIZE_1_16_OF_Integer4_sequence_of[1] = { static int dissect_camel_SEQUENCE_SIZE_1_16_OF_Integer4(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_SIZE_1_16_OF_Integer4_sequence_of, hf_index, ett_camel_SEQUENCE_SIZE_1_16_OF_Integer4); + SEQUENCE_SIZE_1_16_OF_Integer4_sequence_of, hf_index, ett_camel_SEQUENCE_SIZE_1_16_OF_Integer4); return offset; } @@ -3772,10 +3817,11 @@ static int dissect_elementaryMessageIDs_impl(packet_info *pinfo, proto_tree *tre } + static int dissect_camel_OCTET_STRING_SIZE_2(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -3784,10 +3830,11 @@ static int dissect_time_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb } + static int dissect_camel_OCTET_STRING_SIZE_4(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -3819,7 +3866,7 @@ static const ber_choice_t VariablePart_choice[] = { static int dissect_camel_VariablePart(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, VariablePart_choice, hf_index, ett_camel_VariablePart, NULL); return offset; @@ -3828,6 +3875,7 @@ static int dissect_VariablePartsArray_item(packet_info *pinfo, proto_tree *tree, return dissect_camel_VariablePart(FALSE, tvb, offset, pinfo, tree, hf_camel_VariablePartsArray_item); } + static const ber_sequence_t VariablePartsArray_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_VariablePartsArray_item }, }; @@ -3835,7 +3883,7 @@ static const ber_sequence_t VariablePartsArray_sequence_of[1] = { static int dissect_camel_VariablePartsArray(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - VariablePartsArray_sequence_of, hf_index, ett_camel_VariablePartsArray); + VariablePartsArray_sequence_of, hf_index, ett_camel_VariablePartsArray); return offset; } @@ -3879,7 +3927,7 @@ static const ber_choice_t MessageID_choice[] = { static int dissect_camel_MessageID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, MessageID_choice, hf_index, ett_camel_MessageID, NULL); return offset; @@ -3955,7 +4003,7 @@ static const ber_choice_t InformationToSend_choice[] = { static int dissect_camel_InformationToSend(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, InformationToSend_choice, hf_index, ett_camel_InformationToSend, NULL); return offset; @@ -3979,7 +4027,7 @@ static const ber_choice_t GapTreatment_choice[] = { static int dissect_camel_GapTreatment(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, GapTreatment_choice, hf_index, ett_camel_GapTreatment, NULL); return offset; @@ -3989,10 +4037,11 @@ static int dissect_gapTreatment_impl(packet_info *pinfo, proto_tree *tree, tvbuf } + static int dissect_camel_GenericNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -4000,6 +4049,7 @@ static int dissect_GenericNumbers_item(packet_info *pinfo, proto_tree *tree, tvb return dissect_camel_GenericNumber(FALSE, tvb, offset, pinfo, tree, hf_camel_GenericNumbers_item); } + static const ber_sequence_t GenericNumbers_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_GenericNumbers_item }, }; @@ -4007,7 +4057,7 @@ static const ber_sequence_t GenericNumbers_set_of[1] = { static int dissect_camel_GenericNumbers(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - GenericNumbers_set_of, hf_index, ett_camel_GenericNumbers); + GenericNumbers_set_of, hf_index, ett_camel_GenericNumbers); return offset; } @@ -4016,10 +4066,11 @@ static int dissect_genericNumbers_impl(packet_info *pinfo, proto_tree *tree, tvb } + static int dissect_camel_QoS_Subscribed(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -4028,10 +4079,11 @@ static int dissect_short_QoS_format_impl(packet_info *pinfo, proto_tree *tree, t } + static int dissect_camel_Ext_QoS_Subscribed(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -4054,7 +4106,7 @@ static const ber_choice_t GPRS_QoS_choice[] = { static int dissect_camel_GPRS_QoS(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, GPRS_QoS_choice, hf_index, ett_camel_GPRS_QoS, NULL); return offset; @@ -4070,10 +4122,11 @@ static int dissect_negotiated_QoS_impl(packet_info *pinfo, proto_tree *tree, tvb } + static int dissect_camel_GPRSCause(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -4085,10 +4138,11 @@ static int dissect_gprsCause_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_camel_GPRSChargingID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -4111,7 +4165,8 @@ static const value_string camel_GPRSEventType_vals[] = { static int dissect_camel_GPRSEventType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -4137,10 +4192,11 @@ static int dissect_GPRSEventArray_item(packet_info *pinfo, proto_tree *tree, tvb } + static int dissect_camel_CellGlobalIdOrServiceAreaIdOrLAI(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -4149,10 +4205,11 @@ static int dissect_cellGlobalIdOrServiceAreaIdOrLAI_impl(packet_info *pinfo, pro } + static int dissect_camel_RAIdentity(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -4161,10 +4218,11 @@ static int dissect_routeingAreaIdentity_impl(packet_info *pinfo, proto_tree *tre } + static int dissect_camel_GeographicalInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -4173,10 +4231,11 @@ static int dissect_geographicalInformation_impl(packet_info *pinfo, proto_tree * } + static int dissect_camel_LSAIdentity(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -4216,6 +4275,7 @@ static int dissect_PrivateExtensionList_item(packet_info *pinfo, proto_tree *tre return dissect_camel_PrivateExtension(FALSE, tvb, offset, pinfo, tree, hf_camel_PrivateExtensionList_item); } + static const ber_sequence_t PrivateExtensionList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PrivateExtensionList_item }, }; @@ -4223,7 +4283,7 @@ static const ber_sequence_t PrivateExtensionList_sequence_of[1] = { static int dissect_camel_PrivateExtensionList(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - PrivateExtensionList_sequence_of, hf_index, ett_camel_PrivateExtensionList); + PrivateExtensionList_sequence_of, hf_index, ett_camel_PrivateExtensionList); return offset; } @@ -4339,10 +4399,11 @@ static int dissect_qualityOfService_impl(packet_info *pinfo, proto_tree *tree, t } + static int dissect_camel_TimeAndTimezone(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -4354,10 +4415,11 @@ static int dissect_timeAndTimezone_impl(packet_info *pinfo, proto_tree *tree, tv } + static int dissect_camel_GSNAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -4399,7 +4461,8 @@ static const value_string camel_InitiatingEntity_vals[] = { static int dissect_camel_InitiatingEntity(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -4451,7 +4514,8 @@ static const value_string camel_PDPInitiationType_vals[] = { static int dissect_camel_PDPInitiationType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -4526,7 +4590,7 @@ static const ber_choice_t GPRSEventSpecificInformation_choice[] = { static int dissect_camel_GPRSEventSpecificInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, GPRSEventSpecificInformation_choice, hf_index, ett_camel_GPRSEventSpecificInformation, NULL); return offset; @@ -4536,10 +4600,11 @@ static int dissect_gPRSEventSpecificInformation_impl(packet_info *pinfo, proto_t } + static int dissect_camel_MSNetworkCapability(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -4548,10 +4613,11 @@ static int dissect_mSNetworkCapability_impl(packet_info *pinfo, proto_tree *tree } + static int dissect_camel_MSRadioAccessCapability(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -4612,10 +4678,11 @@ static int dissect_ipRoutingAddress_impl(packet_info *pinfo, proto_tree *tree, t } + static int dissect_camel_IPSSPCapabilities(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -4624,10 +4691,11 @@ static int dissect_iPSSPCapabilities_impl(packet_info *pinfo, proto_tree *tree, } + static int dissect_camel_NAOliInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -4636,10 +4704,11 @@ static int dissect_naOliInfo_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_camel_OriginalCalledPartyID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -4660,10 +4729,11 @@ static int dissect_oCSIApplicable_impl(packet_info *pinfo, proto_tree *tree, tvb } + static int dissect_camel_RedirectingPartyID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -4683,7 +4753,8 @@ static const value_string camel_RequestedInformationType_vals[] = { static int dissect_camel_RequestedInformationType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -4713,7 +4784,7 @@ static const ber_choice_t RequestedInformationValue_choice[] = { static int dissect_camel_RequestedInformationValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, RequestedInformationValue_choice, hf_index, ett_camel_RequestedInformationValue, NULL); return offset; @@ -4739,6 +4810,7 @@ static int dissect_RequestedInformationList_item(packet_info *pinfo, proto_tree return dissect_camel_RequestedInformation(FALSE, tvb, offset, pinfo, tree, hf_camel_RequestedInformationList_item); } + static const ber_sequence_t RequestedInformationList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RequestedInformationList_item }, }; @@ -4746,7 +4818,7 @@ static const ber_sequence_t RequestedInformationList_sequence_of[1] = { static int dissect_camel_RequestedInformationList(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - RequestedInformationList_sequence_of, hf_index, ett_camel_RequestedInformationList); + RequestedInformationList_sequence_of, hf_index, ett_camel_RequestedInformationList); return offset; } @@ -4754,6 +4826,7 @@ static int dissect_requestedInformationList_impl(packet_info *pinfo, proto_tree return dissect_camel_RequestedInformationList(TRUE, tvb, offset, pinfo, tree, hf_camel_requestedInformationList); } + static const ber_sequence_t RequestedInformationTypeList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_RequestedInformationTypeList_item }, }; @@ -4761,7 +4834,7 @@ static const ber_sequence_t RequestedInformationTypeList_sequence_of[1] = { static int dissect_camel_RequestedInformationTypeList(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - RequestedInformationTypeList_sequence_of, hf_index, ett_camel_RequestedInformationTypeList); + RequestedInformationTypeList_sequence_of, hf_index, ett_camel_RequestedInformationTypeList); return offset; } @@ -4770,19 +4843,21 @@ static int dissect_requestedInformationTypeList_impl(packet_info *pinfo, proto_t } + static int dissect_camel_RPCause(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } + static int dissect_camel_SCIBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -4791,10 +4866,11 @@ static int dissect_sCIBillingChargingCharacteristics_impl(packet_info *pinfo, pr } + static int dissect_camel_SCIGPRSBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -4812,7 +4888,8 @@ static const value_string camel_BothwayThroughConnectionInd_vals[] = { static int dissect_camel_BothwayThroughConnectionInd(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -4844,10 +4921,11 @@ static int dissect_serviceInteractionIndicatorsTwo_impl(packet_info *pinfo, prot } + static int dissect_camel_SGSNCapabilities(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -4881,7 +4959,8 @@ static const value_string camel_TimerID_vals[] = { static int dissect_camel_TimerID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -4901,10 +4980,11 @@ static int dissect_timervalue_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ } + static int dissect_camel_TPDataCodingScheme(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -4913,10 +4993,11 @@ static int dissect_tPDataCodingScheme_impl(packet_info *pinfo, proto_tree *tree, } + static int dissect_camel_TPProtocolIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -4925,10 +5006,11 @@ static int dissect_tPProtocolIdentifier_impl(packet_info *pinfo, proto_tree *tre } + static int dissect_camel_TPShortMessageSubmissionInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -4937,10 +5019,11 @@ static int dissect_tPShortMessageSubmissionSpecificInfo_impl(packet_info *pinfo, } + static int dissect_camel_TPValidityPeriod(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -4961,7 +5044,8 @@ static const value_string camel_UnavailableNetworkResource_vals[] = { static int dissect_camel_UnavailableNetworkResource(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -4986,10 +5070,11 @@ dissect_camel_Priority(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac } + static int dissect_camel_CUG_Interlock(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -5011,10 +5096,11 @@ static int dissect_cug_Index_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_camel_CallReferenceNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -5049,7 +5135,8 @@ static const value_string camel_NotReachableReason_vals[] = { static int dissect_camel_NotReachableReason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -5071,19 +5158,21 @@ static int dissect_ageOfLocationInformation(packet_info *pinfo, proto_tree *tree } + static int dissect_camel_AddressString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } + static int dissect_camel_CellIdFixedLength(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -5092,10 +5181,11 @@ static int dissect_cellIdFixedLength_impl(packet_info *pinfo, proto_tree *tree, } + static int dissect_camel_LAIFixedLength(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -5104,10 +5194,11 @@ static int dissect_laiFixedLength_impl(packet_info *pinfo, proto_tree *tree, tvb } + static int dissect_camel_Ext_TeleserviceCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -5116,10 +5207,11 @@ static int dissect_ext_Teleservice_impl(packet_info *pinfo, proto_tree *tree, tv } + static int dissect_camel_Ext_BearerServiceCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -5128,6 +5220,7 @@ static int dissect_ext_BearerService_impl(packet_info *pinfo, proto_tree *tree, } + static int dissect_camel_Imsi(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { @@ -5151,10 +5244,11 @@ static int dissect_iMSI_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb } + static int dissect_camel_CallingPartysCategory(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -5163,10 +5257,11 @@ static int dissect_callingPartysCategory_impl(packet_info *pinfo, proto_tree *tr } + static int dissect_camel_RedirectionInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -5175,10 +5270,11 @@ static int dissect_redirectionInformation_impl(packet_info *pinfo, proto_tree *t } + static int dissect_camel_HighLayerCompatibility(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -5196,7 +5292,8 @@ static const value_string camel_T_messageType_vals[] = { static int dissect_camel_T_messageType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -5224,6 +5321,7 @@ static int dissect_miscCallInfo_impl(packet_info *pinfo, proto_tree *tree, tvbuf } + static int dissect_camel_CallresultoctetPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { tvbuff_t *parameter_tvb; @@ -5269,7 +5367,7 @@ static const ber_choice_t CancelArg_choice[] = { static int dissect_camel_CancelArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, CancelArg_choice, hf_index, ett_camel_CancelArg, NULL); return offset; @@ -5284,6 +5382,7 @@ dissect_camel_FurnishChargingInformationArg(gboolean implicit_tag _U_, tvbuff_t } + static int dissect_camel_Q850Cause(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { @@ -5320,17 +5419,18 @@ static const ber_choice_t ReceivedInformationArg_choice[] = { static int dissect_camel_ReceivedInformationArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ReceivedInformationArg_choice, hf_index, ett_camel_ReceivedInformationArg, NULL); return offset; } + static int dissect_camel_FurnishChargingInformationSMSArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -5385,6 +5485,7 @@ dissect_camel_ReleaseGPRSArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse return offset; } + static const ber_sequence_t GPRSEventArray_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_GPRSEventArray_item }, }; @@ -5392,7 +5493,7 @@ static const ber_sequence_t GPRSEventArray_sequence_of[1] = { static int dissect_camel_GPRSEventArray(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - GPRSEventArray_sequence_of, hf_index, ett_camel_GPRSEventArray); + GPRSEventArray_sequence_of, hf_index, ett_camel_GPRSEventArray); return offset; } @@ -5446,7 +5547,7 @@ static const ber_choice_t SubscriberState_choice[] = { static int dissect_camel_SubscriberState(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, SubscriberState_choice, hf_index, ett_camel_SubscriberState, NULL); return offset; @@ -5470,7 +5571,7 @@ static const ber_choice_t CellIdOrLAI_choice[] = { static int dissect_camel_CellIdOrLAI(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, CellIdOrLAI_choice, hf_index, ett_camel_CellIdOrLAI, NULL); return offset; @@ -5494,7 +5595,7 @@ static const ber_choice_t Ext_BasicServiceCode_choice[] = { static int dissect_camel_Ext_BasicServiceCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Ext_BasicServiceCode_choice, hf_index, ett_camel_Ext_BasicServiceCode, NULL); return offset; @@ -5520,10 +5621,11 @@ static int dissect_initialDPArgExtension_impl(packet_info *pinfo, proto_tree *tr } + static int dissect_camel_GeodeticInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -5664,7 +5766,7 @@ static const ber_choice_t T_resourceAddress_choice[] = { static int dissect_camel_T_resourceAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_resourceAddress_choice, hf_index, ett_camel_T_resourceAddress, NULL); return offset; @@ -5808,6 +5910,7 @@ dissect_camel_EventReportSMSArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int of return offset; } + static const ber_sequence_t SMSEventArray_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SMSEventArray_item }, }; @@ -5815,7 +5918,7 @@ static const ber_sequence_t SMSEventArray_sequence_of[1] = { static int dissect_camel_SMSEventArray(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SMSEventArray_sequence_of, hf_index, ett_camel_SMSEventArray); + SMSEventArray_sequence_of, hf_index, ett_camel_SMSEventArray); return offset; } @@ -5852,6 +5955,7 @@ dissect_camel_ResetTimerSMSArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int off return offset; } + static const ber_sequence_t BCSMEventArray_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_BCSMEventArray_item }, }; @@ -5859,7 +5963,7 @@ static const ber_sequence_t BCSMEventArray_sequence_of[1] = { static int dissect_camel_BCSMEventArray(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - BCSMEventArray_sequence_of, hf_index, ett_camel_BCSMEventArray); + BCSMEventArray_sequence_of, hf_index, ett_camel_BCSMEventArray); return offset; } @@ -6063,10 +6167,11 @@ dissect_camel_InitialDPSMSArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs } + static int dissect_camel_ReleaseSMSArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -6154,7 +6259,8 @@ static const value_string camel_T_problem_vals[] = { static int dissect_camel_T_problem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -6186,7 +6292,8 @@ static const value_string camel_RequestedInfoErrorPARAM_vals[] = { static int dissect_camel_RequestedInfoErrorPARAM(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -6202,7 +6309,8 @@ static const value_string camel_TaskRefusedPARAM_vals[] = { static int dissect_camel_TaskRefusedPARAM(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -6470,7 +6578,7 @@ static const ber_choice_t InvokeId_choice[] = { static int dissect_camel_InvokeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, InvokeId_choice, hf_index, ett_camel_InvokeId, NULL); return offset; @@ -6573,7 +6681,7 @@ dissect_camel_camelPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac col_append_fstr(pinfo->cinfo, COL_INFO, val_to_str(camel_pdu_type, camelPDU_vals, "Unknown Camel (%u)")); } - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, camelPDU_choice, hf_index, ett_camel_camelPDU, NULL); return offset; @@ -6896,7 +7004,7 @@ void proto_register_camel(void) { "", HFILL }}, { &hf_camel_extensions, { "extensions", "camel.extensions", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_camel_aOCInitial, { "aOCInitial", "camel.aOCInitial", @@ -7460,7 +7568,7 @@ void proto_register_camel(void) { "MessageID/text/attributes", HFILL }}, { &hf_camel_elementaryMessageIDs, { "elementaryMessageIDs", "camel.elementaryMessageIDs", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MessageID/elementaryMessageIDs", HFILL }}, { &hf_camel_elementaryMessageIDs_item, { "Item", "camel.elementaryMessageIDs_item", @@ -7472,7 +7580,7 @@ void proto_register_camel(void) { "MessageID/variableMessage", HFILL }}, { &hf_camel_variableParts, { "variableParts", "camel.variableParts", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MessageID/variableMessage/variableParts", HFILL }}, { &hf_camel_requested_QoS, { "requested-QoS", "camel.requested_QoS", @@ -7688,7 +7796,7 @@ void proto_register_camel(void) { "ReleaseGPRSArg/gprsCause", HFILL }}, { &hf_camel_gPRSEvent, { "gPRSEvent", "camel.gPRSEvent", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RequestReportGPRSEventArg/gPRSEvent", HFILL }}, { &hf_camel_GPRSEventArray_item, { "Item", "camel.GPRSEventArray_item", @@ -7812,7 +7920,7 @@ void proto_register_camel(void) { "", HFILL }}, { &hf_camel_requestedInformationTypeList, { "requestedInformationTypeList", "camel.requestedInformationTypeList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CallInformationRequestArg/requestedInformationTypeList", HFILL }}, { &hf_camel_legID1, { "legID", "camel.legID", @@ -7820,7 +7928,7 @@ void proto_register_camel(void) { "CallInformationRequestArg/legID", HFILL }}, { &hf_camel_destinationRoutingAddress, { "destinationRoutingAddress", "camel.destinationRoutingAddress", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ConnectArg/destinationRoutingAddress", HFILL }}, { &hf_camel_alertingPattern, { "alertingPattern", "camel.alertingPattern", @@ -7848,7 +7956,7 @@ void proto_register_camel(void) { "", HFILL }}, { &hf_camel_genericNumbers, { "genericNumbers", "camel.genericNumbers", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_camel_serviceInteractionIndicatorsTwo, { "serviceInteractionIndicatorsTwo", "camel.serviceInteractionIndicatorsTwo", @@ -7932,7 +8040,7 @@ void proto_register_camel(void) { "EventReportSMSArg/eventSpecificInformationSMS", HFILL }}, { &hf_camel_sMSEvents, { "sMSEvents", "camel.sMSEvents", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RequestReportSMSEventArg/sMSEvents", HFILL }}, { &hf_camel_SMSEventArray_item, { "Item", "camel.SMSEventArray_item", @@ -7940,7 +8048,7 @@ void proto_register_camel(void) { "SMSEventArray/_item", HFILL }}, { &hf_camel_bcsmEvents, { "bcsmEvents", "camel.bcsmEvents", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RequestReportBCSMEventArg/bcsmEvents", HFILL }}, { &hf_camel_BCSMEventArray_item, { "Item", "camel.BCSMEventArray_item", @@ -7960,7 +8068,7 @@ void proto_register_camel(void) { "", HFILL }}, { &hf_camel_requestedInformationList, { "requestedInformationList", "camel.requestedInformationList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CallInformationReportArg/requestedInformationList", HFILL }}, { &hf_camel_disconnectFromIPForbidden, { "disconnectFromIPForbidden", "camel.disconnectFromIPForbidden", @@ -8108,7 +8216,7 @@ void proto_register_camel(void) { "InitialDPSMSArg/sgsnNumber", HFILL }}, { &hf_camel_privateExtensionList, { "privateExtensionList", "camel.privateExtensionList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ExtensionContainer/privateExtensionList", HFILL }}, { &hf_camel_pcs_Extensions, { "pcs-Extensions", "camel.pcs_Extensions", diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index 392b272fd3..d7bb4b8aa7 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -441,7 +441,7 @@ static const ber_choice_t ObjectClass_choice[] = { static int dissect_cmip_ObjectClass(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ObjectClass_choice, hf_index, ett_cmip_ObjectClass, NULL); return offset; @@ -454,10 +454,11 @@ static int dissect_baseManagedObjectClass(packet_info *pinfo, proto_tree *tree, } + static int dissect_cmip_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -482,7 +483,7 @@ static const ber_choice_t ObjectInstance_choice[] = { static int dissect_cmip_ObjectInstance(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ObjectInstance_choice, hf_index, ett_cmip_ObjectInstance, NULL); return offset; @@ -524,7 +525,8 @@ static const value_string cmip_T_errorStatus_vals[] = { static int dissect_cmip_T_errorStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -576,7 +578,7 @@ static const ber_choice_t AttributeId_choice[] = { static int dissect_cmip_AttributeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, AttributeId_choice, hf_index, ett_cmip_AttributeId, NULL); return offset; @@ -689,7 +691,7 @@ static const ber_choice_t GetInfoStatus_choice[] = { static int dissect_cmip_GetInfoStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, GetInfoStatus_choice, hf_index, ett_cmip_GetInfoStatus, NULL); return offset; @@ -698,6 +700,7 @@ static int dissect_getInfoList_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_cmip_GetInfoStatus(FALSE, tvb, offset, pinfo, tree, hf_cmip_getInfoList_item); } + static const ber_sequence_t SET_OF_GetInfoStatus_set_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_getInfoList_item }, }; @@ -705,7 +708,7 @@ static const ber_sequence_t SET_OF_GetInfoStatus_set_of[1] = { static int dissect_cmip_SET_OF_GetInfoStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - SET_OF_GetInfoStatus_set_of, hf_index, ett_cmip_SET_OF_GetInfoStatus); + SET_OF_GetInfoStatus_set_of, hf_index, ett_cmip_SET_OF_GetInfoStatus); return offset; } @@ -745,7 +748,8 @@ static const value_string cmip_T_errorStatus2_vals[] = { static int dissect_cmip_T_errorStatus2(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -815,7 +819,7 @@ static const ber_choice_t SetInfoStatus_choice[] = { static int dissect_cmip_SetInfoStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, SetInfoStatus_choice, hf_index, ett_cmip_SetInfoStatus, NULL); return offset; @@ -824,6 +828,7 @@ static int dissect_setInfoList_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_cmip_SetInfoStatus(FALSE, tvb, offset, pinfo, tree, hf_cmip_setInfoList_item); } + static const ber_sequence_t SET_OF_SetInfoStatus_set_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_setInfoList_item }, }; @@ -831,7 +836,7 @@ static const ber_sequence_t SET_OF_SetInfoStatus_set_of[1] = { static int dissect_cmip_SET_OF_SetInfoStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - SET_OF_SetInfoStatus_set_of, hf_index, ett_cmip_SET_OF_SetInfoStatus); + SET_OF_SetInfoStatus_set_of, hf_index, ett_cmip_SET_OF_SetInfoStatus); return offset; } @@ -870,7 +875,8 @@ static const value_string cmip_T_errorStatus1_vals[] = { static int dissect_cmip_T_errorStatus1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -969,7 +975,7 @@ static const ber_choice_t NoSuchArgument_choice[] = { static int dissect_cmip_NoSuchArgument(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, NoSuchArgument_choice, hf_index, ett_cmip_NoSuchArgument, NULL); return offset; @@ -1085,7 +1091,7 @@ static const ber_choice_t InvalidArgumentValue_choice[] = { static int dissect_cmip_InvalidArgumentValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, InvalidArgumentValue_choice, hf_index, ett_cmip_InvalidArgumentValue, NULL); return offset; @@ -1111,7 +1117,7 @@ static const ber_choice_t ErrorInfo_choice[] = { static int dissect_cmip_ErrorInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ErrorInfo_choice, hf_index, ett_cmip_ErrorInfo, NULL); return offset; @@ -1227,7 +1233,8 @@ static const value_string cmip_T_deleteErrorInfo_vals[] = { static int dissect_cmip_T_deleteErrorInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1254,6 +1261,7 @@ static int dissect_deleteError_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_cmip_DeleteError(TRUE, tvb, offset, pinfo, tree, hf_cmip_deleteError); } + static const ber_sequence_t SET_OF_Attribute_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeList_item }, }; @@ -1261,7 +1269,7 @@ static const ber_sequence_t SET_OF_Attribute_set_of[1] = { static int dissect_cmip_SET_OF_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - SET_OF_Attribute_set_of, hf_index, ett_cmip_SET_OF_Attribute); + SET_OF_Attribute_set_of, hf_index, ett_cmip_SET_OF_Attribute); return offset; } @@ -1309,7 +1317,8 @@ static const value_string cmip_CMISSync_vals[] = { static int dissect_cmip_CMISSync(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1370,7 +1379,7 @@ static const ber_choice_t Scope_choice[] = { static int dissect_cmip_Scope(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Scope_choice, hf_index, ett_cmip_Scope, NULL); return offset; @@ -1396,7 +1405,7 @@ static const ber_choice_t T_substrings_item_choice[] = { static int dissect_cmip_T_substrings_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_substrings_item_choice, hf_index, ett_cmip_T_substrings_item, NULL); return offset; @@ -1405,6 +1414,7 @@ static int dissect_substrings_item(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_cmip_T_substrings_item(FALSE, tvb, offset, pinfo, tree, hf_cmip_substrings_item); } + static const ber_sequence_t T_substrings_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_substrings_item }, }; @@ -1412,7 +1422,7 @@ static const ber_sequence_t T_substrings_sequence_of[1] = { static int dissect_cmip_T_substrings(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_substrings_sequence_of, hf_index, ett_cmip_T_substrings); + T_substrings_sequence_of, hf_index, ett_cmip_T_substrings); return offset; } @@ -1447,7 +1457,7 @@ static const ber_choice_t FilterItem_choice[] = { static int dissect_cmip_FilterItem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, FilterItem_choice, hf_index, ett_cmip_FilterItem, NULL); return offset; @@ -1456,6 +1466,7 @@ static int dissect_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_cmip_FilterItem(FALSE, tvb, offset, pinfo, tree, hf_cmip_item); } + static const ber_sequence_t SET_OF_CMISFilter_set_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item }, }; @@ -1463,7 +1474,7 @@ static const ber_sequence_t SET_OF_CMISFilter_set_of[1] = { static int dissect_cmip_SET_OF_CMISFilter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - SET_OF_CMISFilter_set_of, hf_index, ett_cmip_SET_OF_CMISFilter); + SET_OF_CMISFilter_set_of, hf_index, ett_cmip_SET_OF_CMISFilter); return offset; } @@ -1493,12 +1504,13 @@ static const ber_choice_t CMISFilter_choice[] = { static int dissect_cmip_CMISFilter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, CMISFilter_choice, hf_index, ett_cmip_CMISFilter, NULL); return offset; } + static const ber_sequence_t SET_OF_ModificationItem_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_modificationList_item }, }; @@ -1506,7 +1518,7 @@ static const ber_sequence_t SET_OF_ModificationItem_set_of[1] = { static int dissect_cmip_SET_OF_ModificationItem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - SET_OF_ModificationItem_set_of, hf_index, ett_cmip_SET_OF_ModificationItem); + SET_OF_ModificationItem_set_of, hf_index, ett_cmip_SET_OF_ModificationItem); return offset; } @@ -1662,7 +1674,7 @@ static const ber_choice_t LinkedReplyArgument_choice[] = { static int dissect_cmip_LinkedReplyArgument(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, LinkedReplyArgument_choice, hf_index, ett_cmip_LinkedReplyArgument, NULL); return offset; @@ -1806,7 +1818,7 @@ static const ber_choice_t T_managedOrSuperiorObjectInstance_choice[] = { static int dissect_cmip_T_managedOrSuperiorObjectInstance(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_managedOrSuperiorObjectInstance_choice, hf_index, ett_cmip_T_managedOrSuperiorObjectInstance, NULL); return offset; @@ -1881,6 +1893,7 @@ dissect_cmip_BaseManagedObjectId(gboolean implicit_tag _U_, tvbuff_t *tvb, int o return offset; } + static const ber_sequence_t SET_OF_AttributeId_set_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_attributeIdList_item }, }; @@ -1888,7 +1901,7 @@ static const ber_sequence_t SET_OF_AttributeId_set_of[1] = { static int dissect_cmip_SET_OF_AttributeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - SET_OF_AttributeId_set_of, hf_index, ett_cmip_SET_OF_AttributeId); + SET_OF_AttributeId_set_of, hf_index, ett_cmip_SET_OF_AttributeId); return offset; } @@ -2089,7 +2102,7 @@ static const ber_choice_t InvokeId_choice[] = { static int dissect_cmip_InvokeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, InvokeId_choice, hf_index, ett_cmip_InvokeId, NULL); return offset; @@ -2116,7 +2129,7 @@ static const ber_choice_t InvokeLinkedId_choice[] = { static int dissect_cmip_InvokeLinkedId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, InvokeLinkedId_choice, hf_index, ett_cmip_InvokeLinkedId, NULL); return offset; @@ -2336,7 +2349,7 @@ static const ber_choice_t RejectProb_choice[] = { static int dissect_cmip_RejectProb(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, RejectProb_choice, hf_index, ett_cmip_RejectProb, NULL); return offset; @@ -2385,7 +2398,7 @@ static const ber_choice_t ROS_choice[] = { int dissect_cmip_ROS(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ROS_choice, hf_index, ett_cmip_ROS, NULL); return offset; @@ -2597,7 +2610,7 @@ void proto_register_cmip(void) { "", HFILL }}, { &hf_cmip_getInfoList, { "getInfoList", "cmip.getInfoList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "GetListError/getInfoList", HFILL }}, { &hf_cmip_getInfoList_item, { "Item", "cmip.getInfoList_item", @@ -2621,7 +2634,7 @@ void proto_register_cmip(void) { "AttributeIdError/attributeId", HFILL }}, { &hf_cmip_setInfoList, { "setInfoList", "cmip.setInfoList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "SetListError/setInfoList", HFILL }}, { &hf_cmip_setInfoList_item, { "Item", "cmip.setInfoList_item", @@ -2717,7 +2730,7 @@ void proto_register_cmip(void) { "AttributeError/attributeValue", HFILL }}, { &hf_cmip_attributeList, { "attributeList", "cmip.attributeList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_cmip_attributeList_item, { "Item", "cmip.attributeList_item", @@ -2749,7 +2762,7 @@ void proto_register_cmip(void) { "", HFILL }}, { &hf_cmip_modificationList, { "modificationList", "cmip.modificationList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "SetArgument/modificationList", HFILL }}, { &hf_cmip_modificationList_item, { "Item", "cmip.modificationList_item", @@ -2861,7 +2874,7 @@ void proto_register_cmip(void) { "ObjectClass/oclocalForm", HFILL }}, { &hf_cmip_distinguishedName, { "distinguishedName", "cmip.distinguishedName", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ObjectInstance/distinguishedName", HFILL }}, { &hf_cmip_nonSpecificForm, { "nonSpecificForm", "cmip.nonSpecificForm", @@ -2869,7 +2882,7 @@ void proto_register_cmip(void) { "ObjectInstance/nonSpecificForm", HFILL }}, { &hf_cmip_localDistinguishedName, { "localDistinguishedName", "cmip.localDistinguishedName", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ObjectInstance/localDistinguishedName", HFILL }}, { &hf_cmip_globalForm, { "globalForm", "cmip.globalForm", @@ -2893,7 +2906,7 @@ void proto_register_cmip(void) { "FilterItem/equality", HFILL }}, { &hf_cmip_substrings, { "substrings", "cmip.substrings", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "FilterItem/substrings", HFILL }}, { &hf_cmip_substrings_item, { "Item", "cmip.substrings_item", @@ -2941,7 +2954,7 @@ void proto_register_cmip(void) { "CMISFilter/item", HFILL }}, { &hf_cmip_and, { "and", "cmip.and", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CMISFilter/and", HFILL }}, { &hf_cmip_and_item, { "Item", "cmip.and_item", @@ -2949,7 +2962,7 @@ void proto_register_cmip(void) { "CMISFilter/and/_item", HFILL }}, { &hf_cmip_or, { "or", "cmip.or", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CMISFilter/or", HFILL }}, { &hf_cmip_or_item, { "Item", "cmip.or_item", @@ -2973,7 +2986,7 @@ void proto_register_cmip(void) { "Scope/baseToNthLevel", HFILL }}, { &hf_cmip_attributeIdList, { "attributeIdList", "cmip.attributeIdList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "GetArgument/attributeIdList", HFILL }}, { &hf_cmip_attributeIdList_item, { "Item", "cmip.attributeIdList_item", diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index 3f48f45a89..b8fb8dceb1 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -321,10 +321,11 @@ static int dissect_CRLAnnContent_item(packet_info *pinfo, proto_tree *tree, tvbu } + static int dissect_cmp_KeyIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -371,10 +372,11 @@ static int dissect_willBeRevokedAt(packet_info *pinfo, proto_tree *tree, tvbuff_ } + static int dissect_cmp_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -413,6 +415,7 @@ static int dissect_PKIFreeText_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_cmp_UTF8String(FALSE, tvb, offset, pinfo, tree, hf_cmp_PKIFreeText_item); } + static const ber_sequence_t PKIFreeText_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_UTF8String, BER_FLAGS_NOOWNTAG, dissect_PKIFreeText_item }, }; @@ -420,7 +423,7 @@ static const ber_sequence_t PKIFreeText_sequence_of[1] = { int dissect_cmp_PKIFreeText(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - PKIFreeText_sequence_of, hf_index, ett_cmp_PKIFreeText); + PKIFreeText_sequence_of, hf_index, ett_cmp_PKIFreeText); return offset; } @@ -484,6 +487,7 @@ static int dissect_GenRepContent_item(packet_info *pinfo, proto_tree *tree, tvbu return dissect_cmp_InfoTypeAndValue(FALSE, tvb, offset, pinfo, tree, hf_cmp_GenRepContent_item); } + static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_generalInfo_item }, }; @@ -491,7 +495,7 @@ static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue_sequence_of[ static int dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue); + SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue); return offset; } @@ -526,6 +530,7 @@ static int dissect_header(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_cmp_PKIHeader(FALSE, tvb, offset, pinfo, tree, hf_cmp_header); } + static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_Certificate_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_extraCerts_item }, }; @@ -533,7 +538,7 @@ static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_Certificate_sequence_of[1] = static int dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_Certificate(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_SIZE_1_MAX_OF_Certificate_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_Certificate); + SEQUENCE_SIZE_1_MAX_OF_Certificate_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_Certificate); return offset; } @@ -658,7 +663,7 @@ static const ber_choice_t CertOrEncCert_choice[] = { int dissect_cmp_CertOrEncCert(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, CertOrEncCert_choice, hf_index, ett_cmp_CertOrEncCert, NULL); return offset; @@ -707,6 +712,7 @@ static int dissect_response_item(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_cmp_CertResponse(FALSE, tvb, offset, pinfo, tree, hf_cmp_response_item); } + static const ber_sequence_t SEQUENCE_OF_CertResponse_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_response_item }, }; @@ -714,7 +720,7 @@ static const ber_sequence_t SEQUENCE_OF_CertResponse_sequence_of[1] = { static int dissect_cmp_SEQUENCE_OF_CertResponse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_CertResponse_sequence_of, hf_index, ett_cmp_SEQUENCE_OF_CertResponse); + SEQUENCE_OF_CertResponse_sequence_of, hf_index, ett_cmp_SEQUENCE_OF_CertResponse); return offset; } @@ -766,6 +772,7 @@ static int dissect_POPODecKeyChallContent_item(packet_info *pinfo, proto_tree *t return dissect_cmp_Challenge(FALSE, tvb, offset, pinfo, tree, hf_cmp_POPODecKeyChallContent_item); } + static const ber_sequence_t POPODecKeyChallContent_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_POPODecKeyChallContent_item }, }; @@ -773,7 +780,7 @@ static const ber_sequence_t POPODecKeyChallContent_sequence_of[1] = { int dissect_cmp_POPODecKeyChallContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - POPODecKeyChallContent_sequence_of, hf_index, ett_cmp_POPODecKeyChallContent); + POPODecKeyChallContent_sequence_of, hf_index, ett_cmp_POPODecKeyChallContent); return offset; } @@ -781,6 +788,7 @@ static int dissect_popdecc(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_cmp_POPODecKeyChallContent(FALSE, tvb, offset, pinfo, tree, hf_cmp_popdecc); } + static const ber_sequence_t POPODecKeyRespContent_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_POPODecKeyRespContent_item }, }; @@ -788,7 +796,7 @@ static const ber_sequence_t POPODecKeyRespContent_sequence_of[1] = { int dissect_cmp_POPODecKeyRespContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - POPODecKeyRespContent_sequence_of, hf_index, ett_cmp_POPODecKeyRespContent); + POPODecKeyRespContent_sequence_of, hf_index, ett_cmp_POPODecKeyRespContent); return offset; } @@ -796,6 +804,7 @@ static int dissect_popdecr(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_cmp_POPODecKeyRespContent(FALSE, tvb, offset, pinfo, tree, hf_cmp_popdecr); } + static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_keyPairHist_item }, }; @@ -803,7 +812,7 @@ static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair_sequence_of[ static int dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair); + SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair); return offset; } @@ -849,6 +858,7 @@ static int dissect_RevReqContent_item(packet_info *pinfo, proto_tree *tree, tvbu return dissect_cmp_RevDetails(FALSE, tvb, offset, pinfo, tree, hf_cmp_RevReqContent_item); } + static const ber_sequence_t RevReqContent_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RevReqContent_item }, }; @@ -856,7 +866,7 @@ static const ber_sequence_t RevReqContent_sequence_of[1] = { int dissect_cmp_RevReqContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - RevReqContent_sequence_of, hf_index, ett_cmp_RevReqContent); + RevReqContent_sequence_of, hf_index, ett_cmp_RevReqContent); return offset; } @@ -864,6 +874,7 @@ static int dissect_rr(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o return dissect_cmp_RevReqContent(FALSE, tvb, offset, pinfo, tree, hf_cmp_rr); } + static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_status_item }, }; @@ -871,7 +882,7 @@ static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo_sequence_of[1] static int dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo); + SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo); return offset; } @@ -879,6 +890,7 @@ static int dissect_status2(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo(FALSE, tvb, offset, pinfo, tree, hf_cmp_status2); } + static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_CertId_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_revCerts_item }, }; @@ -886,7 +898,7 @@ static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_CertId_sequence_of[1] = { static int dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_CertId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_SIZE_1_MAX_OF_CertId_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertId); + SEQUENCE_SIZE_1_MAX_OF_CertId_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertId); return offset; } @@ -894,6 +906,7 @@ static int dissect_revCerts(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_CertId(FALSE, tvb, offset, pinfo, tree, hf_cmp_revCerts); } + static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_CertificateList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_crls_item }, }; @@ -901,7 +914,7 @@ static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_CertificateList_sequence_of[1 static int dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_CertificateList(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_SIZE_1_MAX_OF_CertificateList_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertificateList); + SEQUENCE_SIZE_1_MAX_OF_CertificateList_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertificateList); return offset; } @@ -976,6 +989,7 @@ static int dissect_rann(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_cmp_RevAnnContent(FALSE, tvb, offset, pinfo, tree, hf_cmp_rann); } + static const ber_sequence_t CRLAnnContent_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CRLAnnContent_item }, }; @@ -983,7 +997,7 @@ static const ber_sequence_t CRLAnnContent_sequence_of[1] = { int dissect_cmp_CRLAnnContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - CRLAnnContent_sequence_of, hf_index, ett_cmp_CRLAnnContent); + CRLAnnContent_sequence_of, hf_index, ett_cmp_CRLAnnContent); return offset; } @@ -1014,6 +1028,7 @@ static int dissect_nested(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_cmp_NestedMessageContent(FALSE, tvb, offset, pinfo, tree, hf_cmp_nested); } + static const ber_sequence_t GenMsgContent_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_GenMsgContent_item }, }; @@ -1021,7 +1036,7 @@ static const ber_sequence_t GenMsgContent_sequence_of[1] = { int dissect_cmp_GenMsgContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - GenMsgContent_sequence_of, hf_index, ett_cmp_GenMsgContent); + GenMsgContent_sequence_of, hf_index, ett_cmp_GenMsgContent); return offset; } @@ -1029,6 +1044,7 @@ static int dissect_genm(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_cmp_GenMsgContent(FALSE, tvb, offset, pinfo, tree, hf_cmp_genm); } + static const ber_sequence_t GenRepContent_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_GenRepContent_item }, }; @@ -1036,7 +1052,7 @@ static const ber_sequence_t GenRepContent_sequence_of[1] = { int dissect_cmp_GenRepContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - GenRepContent_sequence_of, hf_index, ett_cmp_GenRepContent); + GenRepContent_sequence_of, hf_index, ett_cmp_GenRepContent); return offset; } @@ -1119,7 +1135,7 @@ static const ber_choice_t PKIBody_choice[] = { int dissect_cmp_PKIBody(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, PKIBody_choice, hf_index, ett_cmp_PKIBody, NULL); return offset; @@ -1311,7 +1327,7 @@ void proto_register_cmp(void) { "PKIMessage/protection", HFILL }}, { &hf_cmp_extraCerts, { "extraCerts", "cmp.extraCerts", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PKIMessage/extraCerts", HFILL }}, { &hf_cmp_extraCerts_item, { "Item", "cmp.extraCerts_item", @@ -1359,11 +1375,11 @@ void proto_register_cmp(void) { "PKIHeader/recipNonce", HFILL }}, { &hf_cmp_freeText, { "freeText", "cmp.freeText", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PKIHeader/freeText", HFILL }}, { &hf_cmp_generalInfo, { "generalInfo", "cmp.generalInfo", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PKIHeader/generalInfo", HFILL }}, { &hf_cmp_generalInfo_item, { "Item", "cmp.generalInfo_item", @@ -1391,11 +1407,11 @@ void proto_register_cmp(void) { "PKIBody/cp", HFILL }}, { &hf_cmp_popdecc, { "popdecc", "cmp.popdecc", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PKIBody/popdecc", HFILL }}, { &hf_cmp_popdecr, { "popdecr", "cmp.popdecr", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PKIBody/popdecr", HFILL }}, { &hf_cmp_kur, { "kur", "cmp.kur", @@ -1415,7 +1431,7 @@ void proto_register_cmp(void) { "PKIBody/krp", HFILL }}, { &hf_cmp_rr, { "rr", "cmp.rr", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PKIBody/rr", HFILL }}, { &hf_cmp_rp, { "rp", "cmp.rp", @@ -1443,7 +1459,7 @@ void proto_register_cmp(void) { "PKIBody/rann", HFILL }}, { &hf_cmp_crlann, { "crlann", "cmp.crlann", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PKIBody/crlann", HFILL }}, { &hf_cmp_conf, { "conf", "cmp.conf", @@ -1455,11 +1471,11 @@ void proto_register_cmp(void) { "PKIBody/nested", HFILL }}, { &hf_cmp_genm, { "genm", "cmp.genm", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PKIBody/genm", HFILL }}, { &hf_cmp_genp, { "genp", "cmp.genp", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PKIBody/genp", HFILL }}, { &hf_cmp_error, { "error", "cmp.error", @@ -1487,7 +1503,7 @@ void proto_register_cmp(void) { "", HFILL }}, { &hf_cmp_statusString, { "statusString", "cmp.statusString", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PKIStatusInfo/statusString", HFILL }}, { &hf_cmp_failInfo, { "failInfo", "cmp.failInfo", @@ -1523,7 +1539,7 @@ void proto_register_cmp(void) { "POPODecKeyRespContent/_item", HFILL }}, { &hf_cmp_caPubs, { "caPubs", "cmp.caPubs", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CertRepMessage/caPubs", HFILL }}, { &hf_cmp_caPubs_item, { "Item", "cmp.caPubs_item", @@ -1531,7 +1547,7 @@ void proto_register_cmp(void) { "CertRepMessage/caPubs/_item", HFILL }}, { &hf_cmp_response, { "response", "cmp.response", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CertRepMessage/response", HFILL }}, { &hf_cmp_response_item, { "Item", "cmp.response_item", @@ -1579,7 +1595,7 @@ void proto_register_cmp(void) { "KeyRecRepContent/newSigCert", HFILL }}, { &hf_cmp_caCerts, { "caCerts", "cmp.caCerts", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "KeyRecRepContent/caCerts", HFILL }}, { &hf_cmp_caCerts_item, { "Item", "cmp.caCerts_item", @@ -1587,7 +1603,7 @@ void proto_register_cmp(void) { "KeyRecRepContent/caCerts/_item", HFILL }}, { &hf_cmp_keyPairHist, { "keyPairHist", "cmp.keyPairHist", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "KeyRecRepContent/keyPairHist", HFILL }}, { &hf_cmp_keyPairHist_item, { "Item", "cmp.keyPairHist_item", @@ -1615,7 +1631,7 @@ void proto_register_cmp(void) { "RevDetails/crlEntryDetails", HFILL }}, { &hf_cmp_status2, { "status", "cmp.status", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RevRepContent/status", HFILL }}, { &hf_cmp_status_item, { "Item", "cmp.status_item", @@ -1623,7 +1639,7 @@ void proto_register_cmp(void) { "RevRepContent/status/_item", HFILL }}, { &hf_cmp_revCerts, { "revCerts", "cmp.revCerts", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RevRepContent/revCerts", HFILL }}, { &hf_cmp_revCerts_item, { "Item", "cmp.revCerts_item", @@ -1631,7 +1647,7 @@ void proto_register_cmp(void) { "RevRepContent/revCerts/_item", HFILL }}, { &hf_cmp_crls, { "crls", "cmp.crls", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RevRepContent/crls", HFILL }}, { &hf_cmp_crls_item, { "Item", "cmp.crls_item", @@ -1687,7 +1703,7 @@ void proto_register_cmp(void) { "ErrorMsgContent/errorCode", HFILL }}, { &hf_cmp_errorDetails, { "errorDetails", "cmp.errorDetails", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ErrorMsgContent/errorDetails", HFILL }}, { &hf_cmp_PKIFailureInfo_badAlg, { "badAlg", "cmp.badAlg", diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index 850ae51b7e..3511cb7296 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -304,6 +304,7 @@ static int dissect_digestAlgorithm_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_cms_DigestAlgorithmIdentifier(TRUE, tvb, offset, pinfo, tree, hf_cms_digestAlgorithm); } + static const ber_sequence_t DigestAlgorithmIdentifiers_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_DigestAlgorithmIdentifiers_item }, }; @@ -311,7 +312,7 @@ static const ber_sequence_t DigestAlgorithmIdentifiers_set_of[1] = { int dissect_cms_DigestAlgorithmIdentifiers(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - DigestAlgorithmIdentifiers_set_of, hf_index, ett_cms_DigestAlgorithmIdentifiers); + DigestAlgorithmIdentifiers_set_of, hf_index, ett_cms_DigestAlgorithmIdentifiers); return offset; } @@ -414,6 +415,7 @@ static int dissect_UnauthAttributes_item(packet_info *pinfo, proto_tree *tree, t return dissect_cms_Attribute(FALSE, tvb, offset, pinfo, tree, hf_cms_UnauthAttributes_item); } + static const ber_sequence_t UnauthAttributes_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_UnauthAttributes_item }, }; @@ -421,7 +423,7 @@ static const ber_sequence_t UnauthAttributes_set_of[1] = { static int dissect_cms_UnauthAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - UnauthAttributes_set_of, hf_index, ett_cms_UnauthAttributes); + UnauthAttributes_set_of, hf_index, ett_cms_UnauthAttributes); return offset; } @@ -509,7 +511,7 @@ static const ber_choice_t CertificateChoices_choice[] = { static int dissect_cms_CertificateChoices(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, CertificateChoices_choice, hf_index, ett_cms_CertificateChoices, NULL); return offset; @@ -518,6 +520,7 @@ static int dissect_CertificateSet_item(packet_info *pinfo, proto_tree *tree, tvb return dissect_cms_CertificateChoices(FALSE, tvb, offset, pinfo, tree, hf_cms_CertificateSet_item); } + static const ber_sequence_t CertificateSet_set_of[1] = { { -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_CertificateSet_item }, }; @@ -525,7 +528,7 @@ static const ber_sequence_t CertificateSet_set_of[1] = { static int dissect_cms_CertificateSet(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - CertificateSet_set_of, hf_index, ett_cms_CertificateSet); + CertificateSet_set_of, hf_index, ett_cms_CertificateSet); return offset; } @@ -536,6 +539,7 @@ static int dissect_certs_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_cms_CertificateSet(TRUE, tvb, offset, pinfo, tree, hf_cms_certs); } + static const ber_sequence_t CertificateRevocationLists_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CertificateRevocationLists_item }, }; @@ -543,7 +547,7 @@ static const ber_sequence_t CertificateRevocationLists_set_of[1] = { static int dissect_cms_CertificateRevocationLists(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - CertificateRevocationLists_set_of, hf_index, ett_cms_CertificateRevocationLists); + CertificateRevocationLists_set_of, hf_index, ett_cms_CertificateRevocationLists); return offset; } @@ -599,7 +603,7 @@ static const ber_choice_t SignerIdentifier_choice[] = { int dissect_cms_SignerIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, SignerIdentifier_choice, hf_index, ett_cms_SignerIdentifier, NULL); return offset; @@ -608,6 +612,7 @@ static int dissect_sid(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_cms_SignerIdentifier(FALSE, tvb, offset, pinfo, tree, hf_cms_sid); } + static const ber_sequence_t SignedAttributes_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SignedAttributes_item }, }; @@ -615,7 +620,7 @@ static const ber_sequence_t SignedAttributes_set_of[1] = { int dissect_cms_SignedAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - SignedAttributes_set_of, hf_index, ett_cms_SignedAttributes); + SignedAttributes_set_of, hf_index, ett_cms_SignedAttributes); return offset; } @@ -636,6 +641,7 @@ static int dissect_signatureValue(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_cms_SignatureValue(FALSE, tvb, offset, pinfo, tree, hf_cms_signatureValue); } + static const ber_sequence_t UnsignedAttributes_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_UnsignedAttributes_item }, }; @@ -643,7 +649,7 @@ static const ber_sequence_t UnsignedAttributes_set_of[1] = { int dissect_cms_UnsignedAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - UnsignedAttributes_set_of, hf_index, ett_cms_UnsignedAttributes); + UnsignedAttributes_set_of, hf_index, ett_cms_UnsignedAttributes); return offset; } @@ -673,6 +679,7 @@ static int dissect_SignerInfos_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_cms_SignerInfo(FALSE, tvb, offset, pinfo, tree, hf_cms_SignerInfos_item); } + static const ber_sequence_t SignerInfos_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SignerInfos_item }, }; @@ -680,7 +687,7 @@ static const ber_sequence_t SignerInfos_set_of[1] = { int dissect_cms_SignerInfos(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - SignerInfos_set_of, hf_index, ett_cms_SignerInfos); + SignerInfos_set_of, hf_index, ett_cms_SignerInfos); return offset; } @@ -738,7 +745,7 @@ static const ber_choice_t RecipientIdentifier_choice[] = { static int dissect_cms_RecipientIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, RecipientIdentifier_choice, hf_index, ett_cms_RecipientIdentifier, NULL); return offset; @@ -837,7 +844,7 @@ static const ber_choice_t OriginatorIdentifierOrKey_choice[] = { static int dissect_cms_OriginatorIdentifierOrKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, OriginatorIdentifierOrKey_choice, hf_index, ett_cms_OriginatorIdentifierOrKey, NULL); return offset; @@ -947,7 +954,7 @@ static const ber_choice_t KeyAgreeRecipientIdentifier_choice[] = { static int dissect_cms_KeyAgreeRecipientIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, KeyAgreeRecipientIdentifier_choice, hf_index, ett_cms_KeyAgreeRecipientIdentifier, NULL); return offset; @@ -973,6 +980,7 @@ static int dissect_RecipientEncryptedKeys_item(packet_info *pinfo, proto_tree *t return dissect_cms_RecipientEncryptedKey(FALSE, tvb, offset, pinfo, tree, hf_cms_RecipientEncryptedKeys_item); } + static const ber_sequence_t RecipientEncryptedKeys_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RecipientEncryptedKeys_item }, }; @@ -980,7 +988,7 @@ static const ber_sequence_t RecipientEncryptedKeys_sequence_of[1] = { static int dissect_cms_RecipientEncryptedKeys(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - RecipientEncryptedKeys_sequence_of, hf_index, ett_cms_RecipientEncryptedKeys); + RecipientEncryptedKeys_sequence_of, hf_index, ett_cms_RecipientEncryptedKeys); return offset; } @@ -1075,7 +1083,7 @@ static const ber_choice_t RecipientInfo_choice[] = { static int dissect_cms_RecipientInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, RecipientInfo_choice, hf_index, ett_cms_RecipientInfo, NULL); return offset; @@ -1084,6 +1092,7 @@ static int dissect_RecipientInfos_item(packet_info *pinfo, proto_tree *tree, tvb return dissect_cms_RecipientInfo(FALSE, tvb, offset, pinfo, tree, hf_cms_RecipientInfos_item); } + static const ber_sequence_t RecipientInfos_set_of[1] = { { -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_RecipientInfos_item }, }; @@ -1091,7 +1100,7 @@ static const ber_sequence_t RecipientInfos_set_of[1] = { static int dissect_cms_RecipientInfos(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - RecipientInfos_set_of, hf_index, ett_cms_RecipientInfos); + RecipientInfos_set_of, hf_index, ett_cms_RecipientInfos); return offset; } @@ -1141,6 +1150,7 @@ static int dissect_encryptedContentInfo(packet_info *pinfo, proto_tree *tree, tv return dissect_cms_EncryptedContentInfo(FALSE, tvb, offset, pinfo, tree, hf_cms_encryptedContentInfo); } + static const ber_sequence_t UnprotectedAttributes_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_UnprotectedAttributes_item }, }; @@ -1148,7 +1158,7 @@ static const ber_sequence_t UnprotectedAttributes_set_of[1] = { static int dissect_cms_UnprotectedAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - UnprotectedAttributes_set_of, hf_index, ett_cms_UnprotectedAttributes); + UnprotectedAttributes_set_of, hf_index, ett_cms_UnprotectedAttributes); return offset; } @@ -1228,6 +1238,7 @@ static int dissect_macAlgorithm(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_cms_MessageAuthenticationCodeAlgorithm(FALSE, tvb, offset, pinfo, tree, hf_cms_macAlgorithm); } + static const ber_sequence_t AuthAttributes_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AuthAttributes_item }, }; @@ -1235,7 +1246,7 @@ static const ber_sequence_t AuthAttributes_set_of[1] = { static int dissect_cms_AuthAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - AuthAttributes_set_of, hf_index, ett_cms_AuthAttributes); + AuthAttributes_set_of, hf_index, ett_cms_AuthAttributes); return offset; } @@ -1354,7 +1365,7 @@ void proto_register_cms(void) { "", HFILL }}, { &hf_cms_digestAlgorithms, { "digestAlgorithms", "cms.digestAlgorithms", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "SignedData/digestAlgorithms", HFILL }}, { &hf_cms_encapContentInfo, { "encapContentInfo", "cms.encapContentInfo", @@ -1362,15 +1373,15 @@ void proto_register_cms(void) { "", HFILL }}, { &hf_cms_certificates, { "certificates", "cms.certificates", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "SignedData/certificates", HFILL }}, { &hf_cms_crls, { "crls", "cms.crls", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_cms_signerInfos, { "signerInfos", "cms.signerInfos", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "SignedData/signerInfos", HFILL }}, { &hf_cms_DigestAlgorithmIdentifiers_item, { "Item", "cms.DigestAlgorithmIdentifiers_item", @@ -1398,7 +1409,7 @@ void proto_register_cms(void) { "", HFILL }}, { &hf_cms_signedAttrs, { "signedAttrs", "cms.signedAttrs", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "SignerInfo/signedAttrs", HFILL }}, { &hf_cms_signatureAlgorithm, { "signatureAlgorithm", "cms.signatureAlgorithm", @@ -1410,7 +1421,7 @@ void proto_register_cms(void) { "SignerInfo/signature", HFILL }}, { &hf_cms_unsignedAttrs, { "unsignedAttrs", "cms.unsignedAttrs", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "SignerInfo/unsignedAttrs", HFILL }}, { &hf_cms_issuerAndSerialNumber, { "issuerAndSerialNumber", "cms.issuerAndSerialNumber", @@ -1438,7 +1449,7 @@ void proto_register_cms(void) { "", HFILL }}, { &hf_cms_recipientInfos, { "recipientInfos", "cms.recipientInfos", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_cms_encryptedContentInfo, { "encryptedContentInfo", "cms.encryptedContentInfo", @@ -1446,11 +1457,11 @@ void proto_register_cms(void) { "", HFILL }}, { &hf_cms_unprotectedAttrs, { "unprotectedAttrs", "cms.unprotectedAttrs", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_cms_certs, { "certs", "cms.certs", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "OriginatorInfo/certs", HFILL }}, { &hf_cms_RecipientInfos_item, { "Item", "cms.RecipientInfos_item", @@ -1506,7 +1517,7 @@ void proto_register_cms(void) { "KeyAgreeRecipientInfo/ukm", HFILL }}, { &hf_cms_recipientEncryptedKeys, { "recipientEncryptedKeys", "cms.recipientEncryptedKeys", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "KeyAgreeRecipientInfo/recipientEncryptedKeys", HFILL }}, { &hf_cms_originatorKey, { "originatorKey", "cms.originatorKey", @@ -1558,7 +1569,7 @@ void proto_register_cms(void) { "AuthenticatedData/macAlgorithm", HFILL }}, { &hf_cms_authenticatedAttributes, { "authenticatedAttributes", "cms.authenticatedAttributes", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AuthenticatedData/authenticatedAttributes", HFILL }}, { &hf_cms_mac, { "mac", "cms.mac", @@ -1566,7 +1577,7 @@ void proto_register_cms(void) { "AuthenticatedData/mac", HFILL }}, { &hf_cms_unauthenticatedAttributes, { "unauthenticatedAttributes", "cms.unauthenticatedAttributes", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AuthenticatedData/unauthenticatedAttributes", HFILL }}, { &hf_cms_AuthAttributes_item, { "Item", "cms.AuthAttributes_item", @@ -1622,7 +1633,7 @@ void proto_register_cms(void) { "ExtendedCertificate/signature", HFILL }}, { &hf_cms_attributes, { "attributes", "cms.attributes", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ExtendedCertificateInfo/attributes", HFILL }}, /*--- End of included file: packet-cms-hfarr.c ---*/ diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c index bfaa8c09ed..62278b0b1f 100644 --- a/epan/dissectors/packet-crmf.c +++ b/epan/dissectors/packet-crmf.c @@ -287,7 +287,7 @@ static const ber_choice_t Time_choice[] = { static int dissect_crmf_Time(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Time_choice, hf_index, ett_crmf_Time, NULL); return offset; @@ -410,6 +410,7 @@ static int dissect_Controls_item(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_crmf_AttributeTypeAndValue(FALSE, tvb, offset, pinfo, tree, hf_crmf_Controls_item); } + static const ber_sequence_t Controls_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Controls_item }, }; @@ -417,7 +418,7 @@ static const ber_sequence_t Controls_sequence_of[1] = { int dissect_crmf_Controls(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - Controls_sequence_of, hf_index, ett_crmf_Controls); + Controls_sequence_of, hf_index, ett_crmf_Controls); return offset; } @@ -515,7 +516,7 @@ static const ber_choice_t T_authInfo_choice[] = { static int dissect_crmf_T_authInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_authInfo_choice, hf_index, ett_crmf_T_authInfo, NULL); return offset; @@ -595,7 +596,7 @@ static const ber_choice_t POPOPrivKey_choice[] = { int dissect_crmf_POPOPrivKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, POPOPrivKey_choice, hf_index, ett_crmf_POPOPrivKey, NULL); return offset; @@ -626,7 +627,7 @@ static const ber_choice_t ProofOfPossession_choice[] = { int dissect_crmf_ProofOfPossession(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ProofOfPossession_choice, hf_index, ett_crmf_ProofOfPossession, NULL); return offset; @@ -635,6 +636,7 @@ static int dissect_pop(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_crmf_ProofOfPossession(FALSE, tvb, offset, pinfo, tree, hf_crmf_pop); } + static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_regInfo_item }, }; @@ -642,7 +644,7 @@ static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue_sequenc static int dissect_crmf_SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue_sequence_of, hf_index, ett_crmf_SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue); + SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue_sequence_of, hf_index, ett_crmf_SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue); return offset; } @@ -668,6 +670,7 @@ static int dissect_CertReqMessages_item(packet_info *pinfo, proto_tree *tree, tv return dissect_crmf_CertReqMsg(FALSE, tvb, offset, pinfo, tree, hf_crmf_CertReqMessages_item); } + static const ber_sequence_t CertReqMessages_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CertReqMessages_item }, }; @@ -675,16 +678,17 @@ static const ber_sequence_t CertReqMessages_sequence_of[1] = { int dissect_crmf_CertReqMessages(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - CertReqMessages_sequence_of, hf_index, ett_crmf_CertReqMessages); + CertReqMessages_sequence_of, hf_index, ett_crmf_CertReqMessages); return offset; } + static int dissect_crmf_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -788,6 +792,7 @@ static int dissect_pubInfos_item(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_crmf_SinglePubInfo(FALSE, tvb, offset, pinfo, tree, hf_crmf_pubInfos_item); } + static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_pubInfos_item }, }; @@ -795,7 +800,7 @@ static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo_sequence_of[1] static int dissect_crmf_SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo_sequence_of, hf_index, ett_crmf_SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo); + SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo_sequence_of, hf_index, ett_crmf_SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo); return offset; } @@ -853,7 +858,7 @@ static const ber_choice_t EncryptedKey_choice[] = { int dissect_crmf_EncryptedKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, EncryptedKey_choice, hf_index, ett_crmf_EncryptedKey, NULL); return offset; @@ -863,10 +868,11 @@ static int dissect_encryptedPrivKey_impl(packet_info *pinfo, proto_tree *tree, t } + int dissect_crmf_KeyGenParameters(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -875,6 +881,7 @@ static int dissect_keyGenParameters_impl(packet_info *pinfo, proto_tree *tree, t } + static int dissect_crmf_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index); @@ -902,7 +909,7 @@ static const ber_choice_t PKIArchiveOptions_choice[] = { int dissect_crmf_PKIArchiveOptions(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, PKIArchiveOptions_choice, hf_index, ett_crmf_PKIArchiveOptions, NULL); return offset; @@ -995,7 +1002,7 @@ void proto_register_crmf(void) { "CertReqMsg/pop", HFILL }}, { &hf_crmf_regInfo, { "regInfo", "crmf.regInfo", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CertReqMsg/regInfo", HFILL }}, { &hf_crmf_regInfo_item, { "Item", "crmf.regInfo_item", @@ -1011,7 +1018,7 @@ void proto_register_crmf(void) { "CertRequest/certTemplate", HFILL }}, { &hf_crmf_controls, { "controls", "crmf.controls", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CertRequest/controls", HFILL }}, { &hf_crmf_version, { "version", "crmf.version", @@ -1155,7 +1162,7 @@ void proto_register_crmf(void) { "PKIPublicationInfo/action", HFILL }}, { &hf_crmf_pubInfos, { "pubInfos", "crmf.pubInfos", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PKIPublicationInfo/pubInfos", HFILL }}, { &hf_crmf_pubInfos_item, { "Item", "crmf.pubInfos_item", diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c index ad40ed76af..8da379d1d9 100644 --- a/epan/dissectors/packet-ess.c +++ b/epan/dissectors/packet-ess.c @@ -168,10 +168,11 @@ static int dissect_serialNumber(packet_info *pinfo, proto_tree *tree, tvbuff_t * } + static int dissect_ess_ContentIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -198,6 +199,7 @@ static int dissect_allOrFirstTier_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_ess_AllOrFirstTier(TRUE, tvb, offset, pinfo, tree, hf_ess_allOrFirstTier); } + static const ber_sequence_t SEQUENCE_OF_GeneralNames_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_receiptsTo_item }, }; @@ -205,7 +207,7 @@ static const ber_sequence_t SEQUENCE_OF_GeneralNames_sequence_of[1] = { static int dissect_ess_SEQUENCE_OF_GeneralNames(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_GeneralNames_sequence_of, hf_index, ett_ess_SEQUENCE_OF_GeneralNames); + SEQUENCE_OF_GeneralNames_sequence_of, hf_index, ett_ess_SEQUENCE_OF_GeneralNames); return offset; } @@ -237,7 +239,7 @@ static const ber_choice_t ReceiptsFrom_choice[] = { static int dissect_ess_ReceiptsFrom(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ReceiptsFrom_choice, hf_index, ett_ess_ReceiptsFrom, NULL); return offset; @@ -280,10 +282,11 @@ static int dissect_version(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, } + static int dissect_ess_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -338,10 +341,11 @@ dissect_ess_ContentHints(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p } + static int dissect_ess_MsgSigDigest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -419,7 +423,7 @@ static const ber_choice_t ESSPrivacyMark_choice[] = { static int dissect_ess_ESSPrivacyMark(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ESSPrivacyMark_choice, hf_index, ett_ess_ESSPrivacyMark, NULL); return offset; @@ -469,6 +473,7 @@ static int dissect_SecurityCategories_item(packet_info *pinfo, proto_tree *tree, return dissect_ess_SecurityCategory(FALSE, tvb, offset, pinfo, tree, hf_ess_SecurityCategories_item); } + static const ber_sequence_t SecurityCategories_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SecurityCategories_item }, }; @@ -476,7 +481,7 @@ static const ber_sequence_t SecurityCategories_set_of[1] = { static int dissect_ess_SecurityCategories(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - SecurityCategories_set_of, hf_index, ett_ess_SecurityCategories); + SecurityCategories_set_of, hf_index, ett_ess_SecurityCategories); return offset; } @@ -496,7 +501,7 @@ static const ber_choice_t EntityIdentifier_choice[] = { static int dissect_ess_EntityIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, EntityIdentifier_choice, hf_index, ett_ess_EntityIdentifier, NULL); return offset; @@ -545,7 +550,7 @@ static const ber_choice_t MLReceiptPolicy_choice[] = { static int dissect_ess_MLReceiptPolicy(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, MLReceiptPolicy_choice, hf_index, ett_ess_MLReceiptPolicy, NULL); return offset; @@ -572,6 +577,7 @@ static int dissect_MLExpansionHistory_item(packet_info *pinfo, proto_tree *tree, return dissect_ess_MLData(FALSE, tvb, offset, pinfo, tree, hf_ess_MLExpansionHistory_item); } + static const ber_sequence_t MLExpansionHistory_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_MLExpansionHistory_item }, }; @@ -579,16 +585,17 @@ static const ber_sequence_t MLExpansionHistory_sequence_of[1] = { static int dissect_ess_MLExpansionHistory(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - MLExpansionHistory_sequence_of, hf_index, ett_ess_MLExpansionHistory); + MLExpansionHistory_sequence_of, hf_index, ett_ess_MLExpansionHistory); return offset; } + static int dissect_ess_Hash(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -630,6 +637,7 @@ static int dissect_certs_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_ess_ESSCertID(FALSE, tvb, offset, pinfo, tree, hf_ess_certs_item); } + static const ber_sequence_t SEQUENCE_OF_ESSCertID_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certs_item }, }; @@ -637,7 +645,7 @@ static const ber_sequence_t SEQUENCE_OF_ESSCertID_sequence_of[1] = { static int dissect_ess_SEQUENCE_OF_ESSCertID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_ESSCertID_sequence_of, hf_index, ett_ess_SEQUENCE_OF_ESSCertID); + SEQUENCE_OF_ESSCertID_sequence_of, hf_index, ett_ess_SEQUENCE_OF_ESSCertID); return offset; } @@ -645,6 +653,7 @@ static int dissect_certs(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in return dissect_ess_SEQUENCE_OF_ESSCertID(FALSE, tvb, offset, pinfo, tree, hf_ess_certs); } + static const ber_sequence_t SEQUENCE_OF_PolicyInformation_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_policies_item }, }; @@ -652,7 +661,7 @@ static const ber_sequence_t SEQUENCE_OF_PolicyInformation_sequence_of[1] = { static int dissect_ess_SEQUENCE_OF_PolicyInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_PolicyInformation_sequence_of, hf_index, ett_ess_SEQUENCE_OF_PolicyInformation); + SEQUENCE_OF_PolicyInformation_sequence_of, hf_index, ett_ess_SEQUENCE_OF_PolicyInformation); return offset; } @@ -743,7 +752,7 @@ void proto_register_ess(void) { "ContentReference", HFILL }}, { &hf_ess_MLExpansionHistory_PDU, { "MLExpansionHistory", "ess.MLExpansionHistory", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MLExpansionHistory", HFILL }}, { &hf_ess_SigningCertificate_PDU, { "SigningCertificate", "ess.SigningCertificate", @@ -759,11 +768,11 @@ void proto_register_ess(void) { "ReceiptRequest/receiptsFrom", HFILL }}, { &hf_ess_receiptsTo, { "receiptsTo", "ess.receiptsTo", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ReceiptRequest/receiptsTo", HFILL }}, { &hf_ess_receiptsTo_item, { "Item", "ess.receiptsTo_item", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ReceiptRequest/receiptsTo/_item", HFILL }}, { &hf_ess_allOrFirstTier, { "allOrFirstTier", "ess.allOrFirstTier", @@ -771,11 +780,11 @@ void proto_register_ess(void) { "ReceiptsFrom/allOrFirstTier", HFILL }}, { &hf_ess_receiptList, { "receiptList", "ess.receiptList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ReceiptsFrom/receiptList", HFILL }}, { &hf_ess_receiptList_item, { "Item", "ess.receiptList_item", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ReceiptsFrom/receiptList/_item", HFILL }}, { &hf_ess_version, { "version", "ess.version", @@ -843,23 +852,23 @@ void proto_register_ess(void) { "MLReceiptPolicy/none", HFILL }}, { &hf_ess_insteadOf, { "insteadOf", "ess.insteadOf", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MLReceiptPolicy/insteadOf", HFILL }}, { &hf_ess_insteadOf_item, { "Item", "ess.insteadOf_item", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MLReceiptPolicy/insteadOf/_item", HFILL }}, { &hf_ess_inAdditionTo, { "inAdditionTo", "ess.inAdditionTo", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MLReceiptPolicy/inAdditionTo", HFILL }}, { &hf_ess_inAdditionTo_item, { "Item", "ess.inAdditionTo_item", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MLReceiptPolicy/inAdditionTo/_item", HFILL }}, { &hf_ess_certs, { "certs", "ess.certs", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "SigningCertificate/certs", HFILL }}, { &hf_ess_certs_item, { "Item", "ess.certs_item", @@ -867,7 +876,7 @@ void proto_register_ess(void) { "SigningCertificate/certs/_item", HFILL }}, { &hf_ess_policies, { "policies", "ess.policies", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "SigningCertificate/policies", HFILL }}, { &hf_ess_policies_item, { "Item", "ess.policies_item", @@ -883,7 +892,7 @@ void proto_register_ess(void) { "ESSCertID/issuerSerial", HFILL }}, { &hf_ess_issuer, { "issuer", "ess.issuer", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "IssuerSerial/issuer", HFILL }}, { &hf_ess_serialNumber, { "serialNumber", "ess.serialNumber", @@ -937,14 +946,14 @@ void proto_reg_handoff_ess(void) { /*--- Included file: packet-ess-dis-tab.c ---*/ - register_ber_oid_dissector("1.2.840.113549.1.9.16.2.1", dissect_ReceiptRequest_PDU, proto_ess, "id-aa-receiptRequest"); - register_ber_oid_dissector("1.2.840.113549.1.9.16.2.7", dissect_ContentIdentifier_PDU, proto_ess, "id-aa-contentIdentifier"); - register_ber_oid_dissector("1.2.840.113549.1.9.16.1.1", dissect_Receipt_PDU, proto_ess, "id-ct-receipt"); - register_ber_oid_dissector("1.2.840.113549.1.9.16.2.4", dissect_ContentHints_PDU, proto_ess, "id-aa-contentHint"); - register_ber_oid_dissector("1.2.840.113549.1.9.16.2.5", dissect_MsgSigDigest_PDU, proto_ess, "id-aa-msgSigDigest"); - register_ber_oid_dissector("1.2.840.113549.1.9.16.2.10", dissect_ContentReference_PDU, proto_ess, "id-aa-contentReference"); - register_ber_oid_dissector("1.2.840.113549.1.9.16.2.3", dissect_MLExpansionHistory_PDU, proto_ess, "id-aa-mlExpandHistory"); - register_ber_oid_dissector("1.2.840.113549.1.9.16.2.12", dissect_SigningCertificate_PDU, proto_ess, "id-aa-signingCertificate"); + register_ber_oid_dissector("1.2.840.113549.1.9.16.2.1", dissect_ReceiptRequest_PDU, proto_ess, "id-aa-receiptRequest"); + register_ber_oid_dissector("1.2.840.113549.1.9.16.2.7", dissect_ContentIdentifier_PDU, proto_ess, "id-aa-contentIdentifier"); + register_ber_oid_dissector("1.2.840.113549.1.9.16.1.1", dissect_Receipt_PDU, proto_ess, "id-ct-receipt"); + register_ber_oid_dissector("1.2.840.113549.1.9.16.2.4", dissect_ContentHints_PDU, proto_ess, "id-aa-contentHint"); + register_ber_oid_dissector("1.2.840.113549.1.9.16.2.5", dissect_MsgSigDigest_PDU, proto_ess, "id-aa-msgSigDigest"); + register_ber_oid_dissector("1.2.840.113549.1.9.16.2.10", dissect_ContentReference_PDU, proto_ess, "id-aa-contentReference"); + register_ber_oid_dissector("1.2.840.113549.1.9.16.2.3", dissect_MLExpansionHistory_PDU, proto_ess, "id-aa-mlExpandHistory"); + register_ber_oid_dissector("1.2.840.113549.1.9.16.2.12", dissect_SigningCertificate_PDU, proto_ess, "id-aa-signingCertificate"); /*--- End of included file: packet-ess-dis-tab.c ---*/ diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index b758d8b1f1..1108321b7e 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -988,7 +988,7 @@ static const ber_choice_t Contents_Type_List_item_choice[] = { static int dissect_ftam_Contents_Type_List_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Contents_Type_List_item_choice, hf_index, ett_ftam_Contents_Type_List_item, NULL); return offset; @@ -997,6 +997,7 @@ static int dissect_Contents_Type_List_item(packet_info *pinfo, proto_tree *tree, return dissect_ftam_Contents_Type_List_item(FALSE, tvb, offset, pinfo, tree, hf_ftam_Contents_Type_List_item); } + static const ber_sequence_t Contents_Type_List_sequence_of[1] = { { BER_CLASS_APP, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_Contents_Type_List_item }, }; @@ -1159,7 +1160,7 @@ dissect_ftam_Password(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pack offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); } - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Password_choice, hf_index, ett_ftam_Password, NULL); @@ -1473,6 +1474,7 @@ static int dissect_Diagnostic_item(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_ftam_Diagnostic_item(FALSE, tvb, offset, pinfo, tree, hf_ftam_Diagnostic_item); } + static const ber_sequence_t Diagnostic_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Diagnostic_item }, }; @@ -1564,6 +1566,7 @@ static int dissect_Charging_item(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_ftam_Charging_item(FALSE, tvb, offset, pinfo, tree, hf_ftam_Charging_item); } + static const ber_sequence_t Charging_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Charging_item }, }; @@ -1669,7 +1672,7 @@ static int dissect_ftam_FTAM_Regime_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { gint branch_taken; - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, FTAM_Regime_PDU_choice, hf_index, ett_ftam_FTAM_Regime_PDU, &branch_taken); if( (branch_taken!=-1) && ftam_FTAM_Regime_PDU_vals[branch_taken].strptr ){ @@ -1685,6 +1688,7 @@ static int dissect_fTAM_Regime_PDU(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_ftam_FTAM_Regime_PDU(FALSE, tvb, offset, pinfo, tree, hf_ftam_fTAM_Regime_PDU); } + static const ber_sequence_t Pathname_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_GraphicString, BER_FLAGS_NOOWNTAG, dissect_Pathname_item }, }; @@ -1692,7 +1696,7 @@ static const ber_sequence_t Pathname_sequence_of[1] = { static int dissect_ftam_Pathname(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - Pathname_sequence_of, hf_index, ett_ftam_Pathname); + Pathname_sequence_of, hf_index, ett_ftam_Pathname); return offset; } @@ -1721,7 +1725,7 @@ static const ber_choice_t Pathname_Attribute_choice[] = { static int dissect_ftam_Pathname_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Pathname_Attribute_choice, hf_index, ett_ftam_Pathname_Attribute, NULL); return offset; @@ -1813,6 +1817,7 @@ static int dissect_action_list_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_ftam_Access_Request(TRUE, tvb, offset, pinfo, tree, hf_ftam_action_list); } + static const ber_sequence_t Pass_Passwords_sequence_of[1] = { { BER_CLASS_APP, 17, BER_FLAGS_NOOWNTAG, dissect_Pass_Passwords_item }, }; @@ -1820,7 +1825,7 @@ static const ber_sequence_t Pass_Passwords_sequence_of[1] = { static int dissect_ftam_Pass_Passwords(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - Pass_Passwords_sequence_of, hf_index, ett_ftam_Pass_Passwords); + Pass_Passwords_sequence_of, hf_index, ett_ftam_Pass_Passwords); return offset; } @@ -1894,6 +1899,7 @@ static int dissect_Path_Access_Passwords_item(packet_info *pinfo, proto_tree *tr return dissect_ftam_Path_Access_Passwords_item(FALSE, tvb, offset, pinfo, tree, hf_ftam_Path_Access_Passwords_item); } + static const ber_sequence_t Path_Access_Passwords_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Path_Access_Passwords_item }, }; @@ -2262,7 +2268,7 @@ static const ber_choice_t Contents_Type_Attribute_choice[] = { static int dissect_ftam_Contents_Type_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Contents_Type_Attribute_choice, hf_index, ett_ftam_Contents_Type_Attribute, NULL); return offset; @@ -2310,7 +2316,7 @@ static const ber_choice_t Account_Attribute_choice[] = { static int dissect_ftam_Account_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Account_Attribute_choice, hf_index, ett_ftam_Account_Attribute, NULL); return offset; @@ -2353,7 +2359,7 @@ static const ber_choice_t Object_Availability_Attribute_choice[] = { static int dissect_ftam_Object_Availability_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Object_Availability_Attribute_choice, hf_index, ett_ftam_Object_Availability_Attribute, NULL); return offset; @@ -2377,7 +2383,7 @@ static const ber_choice_t Object_Size_Attribute_choice[] = { static int dissect_ftam_Object_Size_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Object_Size_Attribute_choice, hf_index, ett_ftam_Object_Size_Attribute, NULL); return offset; @@ -2529,6 +2535,7 @@ static int dissect_delete_values_item(packet_info *pinfo, proto_tree *tree, tvbu return dissect_ftam_Access_Control_Element(FALSE, tvb, offset, pinfo, tree, hf_ftam_delete_values_item); } + static const ber_sequence_t SET_OF_Access_Control_Element_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_actual_values_item }, }; @@ -2536,7 +2543,7 @@ static const ber_sequence_t SET_OF_Access_Control_Element_set_of[1] = { static int dissect_ftam_SET_OF_Access_Control_Element(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - SET_OF_Access_Control_Element_set_of, hf_index, ett_ftam_SET_OF_Access_Control_Element); + SET_OF_Access_Control_Element_set_of, hf_index, ett_ftam_SET_OF_Access_Control_Element); return offset; } @@ -2565,7 +2572,7 @@ static const ber_choice_t Access_Control_Attribute_choice[] = { static int dissect_ftam_Access_Control_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Access_Control_Attribute_choice, hf_index, ett_ftam_Access_Control_Attribute, NULL); return offset; @@ -2595,7 +2602,7 @@ static const ber_choice_t Legal_Qualification_Attribute_choice[] = { static int dissect_ftam_Legal_Qualification_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Legal_Qualification_Attribute_choice, hf_index, ett_ftam_Legal_Qualification_Attribute, NULL); return offset; @@ -2621,7 +2628,7 @@ static const ber_choice_t Private_Use_Attribute_choice[] = { static int dissect_ftam_Private_Use_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Private_Use_Attribute_choice, hf_index, ett_ftam_Private_Use_Attribute, NULL); return offset; @@ -2687,6 +2694,7 @@ static int dissect_extension_set_attributes_item(packet_info *pinfo, proto_tree return dissect_ftam_Extension_Attribute(FALSE, tvb, offset, pinfo, tree, hf_ftam_extension_set_attributes_item); } + static const ber_sequence_t SEQUENCE_OF_Extension_Attribute_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_extension_set_attributes_item }, }; @@ -2694,7 +2702,7 @@ static const ber_sequence_t SEQUENCE_OF_Extension_Attribute_sequence_of[1] = { static int dissect_ftam_SEQUENCE_OF_Extension_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_Extension_Attribute_sequence_of, hf_index, ett_ftam_SEQUENCE_OF_Extension_Attribute); + SEQUENCE_OF_Extension_Attribute_sequence_of, hf_index, ett_ftam_SEQUENCE_OF_Extension_Attribute); return offset; } @@ -2719,6 +2727,7 @@ static int dissect_Attribute_Extensions_item(packet_info *pinfo, proto_tree *tre return dissect_ftam_Attribute_Extension_Set(FALSE, tvb, offset, pinfo, tree, hf_ftam_Attribute_Extensions_item); } + static const ber_sequence_t Attribute_Extensions_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Attribute_Extensions_item }, }; @@ -2726,7 +2735,7 @@ static const ber_sequence_t Attribute_Extensions_sequence_of[1] = { static int dissect_ftam_Attribute_Extensions(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - Attribute_Extensions_sequence_of, hf_index, ett_ftam_Attribute_Extensions); + Attribute_Extensions_sequence_of, hf_index, ett_ftam_Attribute_Extensions); return offset; } @@ -2905,6 +2914,7 @@ static int dissect_extension_attribute_names_item(packet_info *pinfo, proto_tree return dissect_ftam_Extension_Attribute_identifier(FALSE, tvb, offset, pinfo, tree, hf_ftam_extension_attribute_names_item); } + static const ber_sequence_t SEQUENCE_OF_Extension_Attribute_identifier_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_extension_attribute_names_item }, }; @@ -2912,7 +2922,7 @@ static const ber_sequence_t SEQUENCE_OF_Extension_Attribute_identifier_sequence_ static int dissect_ftam_SEQUENCE_OF_Extension_Attribute_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_Extension_Attribute_identifier_sequence_of, hf_index, ett_ftam_SEQUENCE_OF_Extension_Attribute_identifier); + SEQUENCE_OF_Extension_Attribute_identifier_sequence_of, hf_index, ett_ftam_SEQUENCE_OF_Extension_Attribute_identifier); return offset; } @@ -2937,6 +2947,7 @@ static int dissect_Attribute_Extension_Names_item(packet_info *pinfo, proto_tree return dissect_ftam_Attribute_Extension_Set_Name(FALSE, tvb, offset, pinfo, tree, hf_ftam_Attribute_Extension_Names_item); } + static const ber_sequence_t Attribute_Extension_Names_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Attribute_Extension_Names_item }, }; @@ -2944,7 +2955,7 @@ static const ber_sequence_t Attribute_Extension_Names_sequence_of[1] = { static int dissect_ftam_Attribute_Extension_Names(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - Attribute_Extension_Names_sequence_of, hf_index, ett_ftam_Attribute_Extension_Names); + Attribute_Extension_Names_sequence_of, hf_index, ett_ftam_Attribute_Extension_Names); return offset; } @@ -2969,6 +2980,7 @@ static int dissect_f_read_attrib_request_impl(packet_info *pinfo, proto_tree *tr return dissect_ftam_F_READ_ATTRIB_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_read_attrib_request); } + static const ber_sequence_t Child_Objects_Attribute_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_GraphicString, BER_FLAGS_NOOWNTAG, dissect_Child_Objects_Attribute_item }, }; @@ -2976,7 +2988,7 @@ static const ber_sequence_t Child_Objects_Attribute_set_of[1] = { static int dissect_ftam_Child_Objects_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - Child_Objects_Attribute_set_of, hf_index, ett_ftam_Child_Objects_Attribute); + Child_Objects_Attribute_set_of, hf_index, ett_ftam_Child_Objects_Attribute); return offset; } @@ -3013,7 +3025,7 @@ static const ber_choice_t Date_and_Time_Attribute_choice[] = { static int dissect_ftam_Date_and_Time_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Date_and_Time_Attribute_choice, hf_index, ett_ftam_Date_and_Time_Attribute, NULL); return offset; @@ -3046,7 +3058,7 @@ static const ber_choice_t User_Identity_Attribute_choice[] = { static int dissect_ftam_User_Identity_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, User_Identity_Attribute_choice, hf_index, ett_ftam_User_Identity_Attribute, NULL); return offset; @@ -3175,7 +3187,7 @@ static const ber_choice_t Access_Control_Change_Attribute_choice[] = { static int dissect_ftam_Access_Control_Change_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Access_Control_Change_Attribute_choice, hf_index, ett_ftam_Access_Control_Change_Attribute, NULL); return offset; @@ -3295,7 +3307,7 @@ static const ber_choice_t T_contents_type_choice[] = { static int dissect_ftam_T_contents_type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_contents_type_choice, hf_index, ett_ftam_T_contents_type, NULL); return offset; @@ -3350,6 +3362,7 @@ static int dissect_request_recovery_mode_impl(packet_info *pinfo, proto_tree *tr return dissect_ftam_T_request_recovery_mode(TRUE, tvb, offset, pinfo, tree, hf_ftam_request_recovery_mode); } + static const ber_sequence_t SET_OF_Abstract_Syntax_Name_set_of[1] = { { BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_remove_contexts_item }, }; @@ -3357,7 +3370,7 @@ static const ber_sequence_t SET_OF_Abstract_Syntax_Name_set_of[1] = { static int dissect_ftam_SET_OF_Abstract_Syntax_Name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - SET_OF_Abstract_Syntax_Name_set_of, hf_index, ett_ftam_SET_OF_Abstract_Syntax_Name); + SET_OF_Abstract_Syntax_Name_set_of, hf_index, ett_ftam_SET_OF_Abstract_Syntax_Name); return offset; } @@ -3691,6 +3704,7 @@ static int dissect_name_list_item(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_ftam_Node_Name(FALSE, tvb, offset, pinfo, tree, hf_ftam_name_list_item); } + static const ber_sequence_t SEQUENCE_OF_Node_Name_sequence_of[1] = { { BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_name_list_item }, }; @@ -3698,7 +3712,7 @@ static const ber_sequence_t SEQUENCE_OF_Node_Name_sequence_of[1] = { static int dissect_ftam_SEQUENCE_OF_Node_Name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_Node_Name_sequence_of, hf_index, ett_ftam_SEQUENCE_OF_Node_Name); + SEQUENCE_OF_Node_Name_sequence_of, hf_index, ett_ftam_SEQUENCE_OF_Node_Name); return offset; } @@ -3741,7 +3755,7 @@ dissect_ftam_FADU_Identity(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); } - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, FADU_Identity_choice, hf_index, ett_ftam_FADU_Identity, NULL); @@ -3916,7 +3930,7 @@ static int dissect_ftam_File_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { gint branch_taken; - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, File_PDU_choice, hf_index, ett_ftam_File_PDU, &branch_taken); if( (branch_taken!=-1) && ftam_File_PDU_vals[branch_taken].strptr ){ @@ -4256,7 +4270,7 @@ static int dissect_ftam_Bulk_Data_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { gint branch_taken; - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Bulk_Data_PDU_choice, hf_index, ett_ftam_Bulk_Data_PDU, &branch_taken); if( (branch_taken!=-1) && ftam_Bulk_Data_PDU_vals[branch_taken].strptr ){ @@ -4358,7 +4372,7 @@ static const ber_choice_t T_string_value_item_choice[] = { static int dissect_ftam_T_string_value_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_string_value_item_choice, hf_index, ett_ftam_T_string_value_item, NULL); return offset; @@ -4367,6 +4381,7 @@ static int dissect_string_value_item(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_ftam_T_string_value_item(FALSE, tvb, offset, pinfo, tree, hf_ftam_string_value_item); } + static const ber_sequence_t T_string_value_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_string_value_item }, }; @@ -4374,7 +4389,7 @@ static const ber_sequence_t T_string_value_sequence_of[1] = { static int dissect_ftam_T_string_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_string_value_sequence_of, hf_index, ett_ftam_T_string_value); + T_string_value_sequence_of, hf_index, ett_ftam_T_string_value); return offset; } @@ -4420,7 +4435,7 @@ static const ber_choice_t T_pathname_value_item_choice[] = { static int dissect_ftam_T_pathname_value_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_pathname_value_item_choice, hf_index, ett_ftam_T_pathname_value_item, NULL); return offset; @@ -4429,6 +4444,7 @@ static int dissect_pathname_value_item(packet_info *pinfo, proto_tree *tree, tvb return dissect_ftam_T_pathname_value_item(FALSE, tvb, offset, pinfo, tree, hf_ftam_pathname_value_item); } + static const ber_sequence_t T_pathname_value_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_pathname_value_item }, }; @@ -4436,7 +4452,7 @@ static const ber_sequence_t T_pathname_value_sequence_of[1] = { static int dissect_ftam_T_pathname_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_pathname_value_sequence_of, hf_index, ett_ftam_T_pathname_value); + T_pathname_value_sequence_of, hf_index, ett_ftam_T_pathname_value); return offset; } @@ -4618,7 +4634,7 @@ static const ber_choice_t Contents_Type_Pattern_choice[] = { static int dissect_ftam_Contents_Type_Pattern(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Contents_Type_Pattern_choice, hf_index, ett_ftam_Contents_Type_Pattern, NULL); return offset; @@ -4720,6 +4736,7 @@ static int dissect_extension_set_attribute_Patterns_item(packet_info *pinfo, pro return dissect_ftam_T_extension_set_attribute_Patterns_item(FALSE, tvb, offset, pinfo, tree, hf_ftam_extension_set_attribute_Patterns_item); } + static const ber_sequence_t T_extension_set_attribute_Patterns_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_extension_set_attribute_Patterns_item }, }; @@ -4727,7 +4744,7 @@ static const ber_sequence_t T_extension_set_attribute_Patterns_sequence_of[1] = static int dissect_ftam_T_extension_set_attribute_Patterns(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_extension_set_attribute_Patterns_sequence_of, hf_index, ett_ftam_T_extension_set_attribute_Patterns); + T_extension_set_attribute_Patterns_sequence_of, hf_index, ett_ftam_T_extension_set_attribute_Patterns); return offset; } @@ -4752,6 +4769,7 @@ static int dissect_Attribute_Extensions_Pattern_item(packet_info *pinfo, proto_t return dissect_ftam_Attribute_Extensions_Pattern_item(FALSE, tvb, offset, pinfo, tree, hf_ftam_Attribute_Extensions_Pattern_item); } + static const ber_sequence_t Attribute_Extensions_Pattern_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Attribute_Extensions_Pattern_item }, }; @@ -4759,7 +4777,7 @@ static const ber_sequence_t Attribute_Extensions_Pattern_sequence_of[1] = { static int dissect_ftam_Attribute_Extensions_Pattern(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - Attribute_Extensions_Pattern_sequence_of, hf_index, ett_ftam_Attribute_Extensions_Pattern); + Attribute_Extensions_Pattern_sequence_of, hf_index, ett_ftam_Attribute_Extensions_Pattern); return offset; } @@ -4820,7 +4838,7 @@ static const ber_choice_t AND_Set_item_choice[] = { static int dissect_ftam_AND_Set_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, AND_Set_item_choice, hf_index, ett_ftam_AND_Set_item, NULL); return offset; @@ -4829,6 +4847,7 @@ static int dissect_AND_Set_item(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_ftam_AND_Set_item(FALSE, tvb, offset, pinfo, tree, hf_ftam_AND_Set_item); } + static const ber_sequence_t AND_Set_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_AND_Set_item }, }; @@ -4836,7 +4855,7 @@ static const ber_sequence_t AND_Set_sequence_of[1] = { static int dissect_ftam_AND_Set(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - AND_Set_sequence_of, hf_index, ett_ftam_AND_Set); + AND_Set_sequence_of, hf_index, ett_ftam_AND_Set); return offset; } @@ -4847,6 +4866,7 @@ static int dissect_Attribute_Value_Assertions_item(packet_info *pinfo, proto_tre return dissect_ftam_AND_Set(FALSE, tvb, offset, pinfo, tree, hf_ftam_Attribute_Value_Assertions_item); } + static const ber_sequence_t Attribute_Value_Assertions_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Attribute_Value_Assertions_item }, }; @@ -4913,6 +4933,7 @@ static int dissect_Scope_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_ftam_Scope_item(FALSE, tvb, offset, pinfo, tree, hf_ftam_Scope_item); } + static const ber_sequence_t Scope_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Scope_item }, }; @@ -4962,6 +4983,7 @@ static int dissect_f_list_request_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_ftam_F_LIST_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_list_request); } + static const ber_sequence_t Objects_Attributes_List_sequence_of[1] = { { BER_CLASS_APP, 18, BER_FLAGS_NOOWNTAG, dissect_Objects_Attributes_List_item }, }; @@ -5100,6 +5122,7 @@ static int dissect_f_group_delete_request_impl(packet_info *pinfo, proto_tree *t return dissect_ftam_F_GROUP_DELETE_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_group_delete_request); } + static const ber_sequence_t SEQUENCE_OF_Pathname_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_success_Object_names_item }, }; @@ -5107,7 +5130,7 @@ static const ber_sequence_t SEQUENCE_OF_Pathname_sequence_of[1] = { static int dissect_ftam_SEQUENCE_OF_Pathname(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_Pathname_sequence_of, hf_index, ett_ftam_SEQUENCE_OF_Pathname); + SEQUENCE_OF_Pathname_sequence_of, hf_index, ett_ftam_SEQUENCE_OF_Pathname); return offset; } @@ -5142,7 +5165,7 @@ dissect_ftam_Operation_Result(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); } - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Operation_Result_choice, hf_index, ett_ftam_Operation_Result, NULL); @@ -5731,7 +5754,7 @@ static int dissect_ftam_FSM_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { gint branch_taken; - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, FSM_PDU_choice, hf_index, ett_ftam_FSM_PDU, &branch_taken); if( (branch_taken!=-1) && ftam_FSM_PDU_vals[branch_taken].strptr ){ @@ -5767,7 +5790,7 @@ static const ber_choice_t PDU_choice[] = { static int dissect_ftam_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, PDU_choice, hf_index, ett_ftam_PDU, NULL); return offset; @@ -5801,6 +5824,7 @@ dissect_ftam_F_CHECK_response(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs return offset; } + static const ber_sequence_t OR_Set_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_OR_Set_item }, }; @@ -5808,7 +5832,7 @@ static const ber_sequence_t OR_Set_sequence_of[1] = { static int dissect_ftam_OR_Set(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - OR_Set_sequence_of, hf_index, ett_ftam_OR_Set); + OR_Set_sequence_of, hf_index, ett_ftam_OR_Set); return offset; } @@ -5944,7 +5968,7 @@ void proto_register_ftam(void) { "", HFILL }}, { &hf_ftam_contents_type_list, { "contents-type-list", "ftam.contents_type_list", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_ftam_initiator_identity, { "initiator-identity", "ftam.initiator_identity", @@ -5972,7 +5996,7 @@ void proto_register_ftam(void) { "", HFILL }}, { &hf_ftam_diagnostic, { "diagnostic", "ftam.diagnostic", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_ftam_Contents_Type_List_item, { "Item", "ftam.Contents_Type_List_item", @@ -5988,7 +6012,7 @@ void proto_register_ftam(void) { "", HFILL }}, { &hf_ftam_charging, { "charging", "ftam.charging", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_ftam_f_select_request, { "f-select-request", "ftam.f_select_request", @@ -6108,7 +6132,7 @@ void proto_register_ftam(void) { "", HFILL }}, { &hf_ftam_path_access_passwords, { "path-access-passwords", "ftam.path_access_passwords", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_ftam_concurrency_control, { "concurrency-control", "ftam.concurrency_control", @@ -6136,7 +6160,7 @@ void proto_register_ftam(void) { "", HFILL }}, { &hf_ftam_attribute_extension_names, { "attribute-extension-names", "ftam.attribute_extension_names", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_ftam_read_attributes, { "attributes", "ftam.attributes", @@ -6176,7 +6200,7 @@ void proto_register_ftam(void) { "F-OPEN-request/recovery-mode", HFILL }}, { &hf_ftam_remove_contexts, { "remove-contexts", "ftam.remove_contexts", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_ftam_remove_contexts_item, { "Item", "ftam.remove_contexts_item", @@ -6184,7 +6208,7 @@ void proto_register_ftam(void) { "", HFILL }}, { &hf_ftam_define_contexts, { "define-contexts", "ftam.define_contexts", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_ftam_define_contexts_item, { "Item", "ftam.define_contexts_item", @@ -6356,7 +6380,7 @@ void proto_register_ftam(void) { "", HFILL }}, { &hf_ftam_pass_passwords, { "pass-passwords", "ftam.pass_passwords", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_ftam_link_password, { "link-password", "ftam.link_password", @@ -6396,7 +6420,7 @@ void proto_register_ftam(void) { "", HFILL }}, { &hf_ftam_attribute_extensions, { "attribute-extensions", "ftam.attribute_extensions", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_ftam_Charging_item, { "Item", "ftam.Charging_item", @@ -6508,7 +6532,7 @@ void proto_register_ftam(void) { "FADU-Identity/single-name", HFILL }}, { &hf_ftam_name_list, { "name-list", "ftam.name_list", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "FADU-Identity/name-list", HFILL }}, { &hf_ftam_name_list_item, { "Item", "ftam.name_list_item", @@ -6532,7 +6556,7 @@ void proto_register_ftam(void) { "Read-Attributes/linked-Object", HFILL }}, { &hf_ftam_child_objects, { "child-objects", "ftam.child_objects", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Read-Attributes/child-objects", HFILL }}, { &hf_ftam_primaty_pathname, { "primaty-pathname", "ftam.primaty_pathname", @@ -6584,7 +6608,7 @@ void proto_register_ftam(void) { "", HFILL }}, { &hf_ftam_actual_values3, { "actual-values", "ftam.actual_values", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Access-Control-Attribute/actual-values", HFILL }}, { &hf_ftam_actual_values_item, { "Item", "ftam.actual_values_item", @@ -6596,7 +6620,7 @@ void proto_register_ftam(void) { "Access-Control-Change-Attribute/actual-values", HFILL }}, { &hf_ftam_insert_values, { "insert-values", "ftam.insert_values", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Access-Control-Change-Attribute/actual-values/insert-values", HFILL }}, { &hf_ftam_insert_values_item, { "Item", "ftam.insert_values_item", @@ -6604,7 +6628,7 @@ void proto_register_ftam(void) { "Access-Control-Change-Attribute/actual-values/insert-values/_item", HFILL }}, { &hf_ftam_delete_values, { "delete-values", "ftam.delete_values", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Access-Control-Change-Attribute/actual-values/delete-values", HFILL }}, { &hf_ftam_delete_values_item, { "Item", "ftam.delete_values_item", @@ -6692,11 +6716,11 @@ void proto_register_ftam(void) { "Object-Availability-Attribute/actual-values", HFILL }}, { &hf_ftam_incomplete_pathname, { "incomplete-pathname", "ftam.incomplete_pathname", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Pathname-Attribute/incomplete-pathname", HFILL }}, { &hf_ftam_complete_pathname, { "complete-pathname", "ftam.complete_pathname", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Pathname-Attribute/complete-pathname", HFILL }}, { &hf_ftam_actual_values7, { "actual-values", "ftam.actual_values", @@ -6860,19 +6884,19 @@ void proto_register_ftam(void) { "", HFILL }}, { &hf_ftam_attribute_value_asset_tions, { "attribute-value-asset-tions", "ftam.attribute_value_asset_tions", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "F-LIST-request/attribute-value-asset-tions", HFILL }}, { &hf_ftam_scope, { "scope", "ftam.scope", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_ftam_objects_attributes_list, { "objects-attributes-list", "ftam.objects_attributes_list", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_ftam_attribute_value_assertions, { "attribute-value-assertions", "ftam.attribute_value_assertions", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "F-GROUP-SELECT-request/attribute-value-assertions", HFILL }}, { &hf_ftam_maximum_set_size, { "maximum-set-size", "ftam.maximum_set_size", @@ -6920,7 +6944,7 @@ void proto_register_ftam(void) { "", HFILL }}, { &hf_ftam_extension_attribute_names, { "extension-attribute-names", "ftam.extension_attribute_names", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Attribute-Extension-Set-Name/extension-attribute-names", HFILL }}, { &hf_ftam_extension_attribute_names_item, { "Item", "ftam.extension_attribute_names_item", @@ -6932,7 +6956,7 @@ void proto_register_ftam(void) { "Attribute-Extensions/_item", HFILL }}, { &hf_ftam_extension_set_attributes, { "extension-set-attributes", "ftam.extension_set_attributes", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Attribute-Extension-Set/extension-set-attributes", HFILL }}, { &hf_ftam_extension_set_attributes_item, { "Item", "ftam.extension_set_attributes_item", @@ -6960,7 +6984,7 @@ void proto_register_ftam(void) { "Scope/_item/retrieval-scope", HFILL }}, { &hf_ftam_OR_Set_item, { "Item", "ftam.OR_Set_item", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "OR-Set/_item", HFILL }}, { &hf_ftam_AND_Set_item, { "Item", "ftam.AND_Set_item", @@ -7048,7 +7072,7 @@ void proto_register_ftam(void) { "AND-Set/_item/legal-quailfication-Pattern", HFILL }}, { &hf_ftam_attribute_extensions_pattern, { "attribute-extensions-pattern", "ftam.attribute_extensions_pattern", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AND-Set/_item/attribute-extensions-pattern", HFILL }}, { &hf_ftam_equality_comparision, { "equality-comparision", "ftam.equality_comparision", @@ -7056,7 +7080,7 @@ void proto_register_ftam(void) { "", HFILL }}, { &hf_ftam_pathname_value, { "pathname-value", "ftam.pathname_value", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Pathname-Pattern/pathname-value", HFILL }}, { &hf_ftam_pathname_value_item, { "Item", "ftam.pathname_value_item", @@ -7072,7 +7096,7 @@ void proto_register_ftam(void) { "", HFILL }}, { &hf_ftam_string_value, { "string-value", "ftam.string_value", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "String-Pattern/string-value", HFILL }}, { &hf_ftam_string_value_item, { "Item", "ftam.string_value_item", @@ -7140,7 +7164,7 @@ void proto_register_ftam(void) { "Attribute-Extensions-Pattern/_item", HFILL }}, { &hf_ftam_extension_set_attribute_Patterns, { "extension-set-attribute-Patterns", "ftam.extension_set_attribute_Patterns", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Attribute-Extensions-Pattern/_item/extension-set-attribute-Patterns", HFILL }}, { &hf_ftam_extension_set_attribute_Patterns_item, { "Item", "ftam.extension_set_attribute_Patterns_item", @@ -7164,11 +7188,11 @@ void proto_register_ftam(void) { "Operation-Result/success-Object-count", HFILL }}, { &hf_ftam_success_Object_names, { "success-Object-names", "ftam.success_Object_names", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Operation-Result/success-Object-names", HFILL }}, { &hf_ftam_success_Object_names_item, { "Item", "ftam.success_Object_names_item", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Operation-Result/success-Object-names/_item", HFILL }}, { &hf_ftam_Pathname_item, { "Item", "ftam.Pathname_item", @@ -7192,7 +7216,7 @@ void proto_register_ftam(void) { "AE-title/ae", HFILL }}, { &hf_ftam_Attribute_Value_Assertions_item, { "Item", "ftam.Attribute_Value_Assertions_item", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Attribute-Value-Assertions/_item", HFILL }}, { &hf_ftam_Protocol_Version_version_1, { "version-1", "ftam.version-1", diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index 01578a0a4b..e5b5161bb4 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-gsm_map.c */ +/* ./packet-gsm_map.c */ /* ../../tools/asn2eth.py -X -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn */ /* Input file: packet-gsm_map-template.c */ @@ -2166,7 +2166,7 @@ static const ber_choice_t SuperChargerInfo_choice[] = { static int dissect_gsm_map_SuperChargerInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, SuperChargerInfo_choice, hf_index, ett_gsm_map_SuperChargerInfo, NULL); return offset; @@ -2481,7 +2481,7 @@ static const ber_choice_t Identity_choice[] = { static int dissect_gsm_map_Identity(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Identity_choice, hf_index, ett_gsm_map_Identity, NULL); return offset; @@ -2821,7 +2821,7 @@ static const ber_choice_t AuthenticationSetList_choice[] = { static int dissect_gsm_map_AuthenticationSetList(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, AuthenticationSetList_choice, hf_index, ett_gsm_map_AuthenticationSetList, NULL); return offset; @@ -2906,7 +2906,7 @@ static const ber_choice_t CurrentSecurityContext_choice[] = { static int dissect_gsm_map_CurrentSecurityContext(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, CurrentSecurityContext_choice, hf_index, ett_gsm_map_CurrentSecurityContext, NULL); return offset; @@ -4097,7 +4097,7 @@ static const ber_choice_t BasicService_choice[] = { static int dissect_gsm_map_BasicService(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, BasicService_choice, hf_index, ett_gsm_map_BasicService, NULL); return offset; @@ -4529,7 +4529,7 @@ static const ber_choice_t Ext_BasicServiceCode_choice[] = { static int dissect_gsm_map_Ext_BasicServiceCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Ext_BasicServiceCode_choice, hf_index, ett_gsm_map_Ext_BasicServiceCode, NULL); return offset; @@ -5018,7 +5018,7 @@ static const ber_choice_t SS_SubscriptionOption_choice[] = { static int dissect_gsm_map_SS_SubscriptionOption(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, SS_SubscriptionOption_choice, hf_index, ett_gsm_map_SS_SubscriptionOption, NULL); return offset; @@ -5111,7 +5111,7 @@ static const ber_choice_t Ext_SS_Info_choice[] = { static int dissect_gsm_map_Ext_SS_Info(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Ext_SS_Info_choice, hf_index, ett_gsm_map_Ext_SS_Info, NULL); return offset; @@ -7056,7 +7056,7 @@ static const ber_choice_t GPRSSubscriptionDataWithdraw_choice[] = { static int dissect_gsm_map_GPRSSubscriptionDataWithdraw(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, GPRSSubscriptionDataWithdraw_choice, hf_index, ett_gsm_map_GPRSSubscriptionDataWithdraw, NULL); return offset; @@ -7096,7 +7096,7 @@ static const ber_choice_t LSAInformationWithdraw_choice[] = { static int dissect_gsm_map_LSAInformationWithdraw(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, LSAInformationWithdraw_choice, hf_index, ett_gsm_map_LSAInformationWithdraw, NULL); return offset; @@ -7255,7 +7255,7 @@ static const ber_choice_t BasicServiceCode_choice[] = { static int dissect_gsm_map_BasicServiceCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, BasicServiceCode_choice, hf_index, ett_gsm_map_BasicServiceCode, NULL); return offset; @@ -7928,7 +7928,7 @@ static const ber_choice_t RoutingInfo_choice[] = { static int dissect_gsm_map_RoutingInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, RoutingInfo_choice, hf_index, ett_gsm_map_RoutingInfo, NULL); return offset; @@ -7994,7 +7994,7 @@ static const ber_choice_t ExtendedRoutingInfo_choice[] = { static int dissect_gsm_map_ExtendedRoutingInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ExtendedRoutingInfo_choice, hf_index, ett_gsm_map_ExtendedRoutingInfo, NULL); return offset; @@ -8076,7 +8076,7 @@ static const ber_choice_t CellGlobalIdOrServiceAreaIdOrLAI_choice[] = { static int dissect_gsm_map_CellGlobalIdOrServiceAreaIdOrLAI(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, CellGlobalIdOrServiceAreaIdOrLAI_choice, hf_index, ett_gsm_map_CellGlobalIdOrServiceAreaIdOrLAI, NULL); return offset; @@ -8150,7 +8150,7 @@ static const ber_choice_t SubscriberState_choice[] = { static int dissect_gsm_map_SubscriberState(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, SubscriberState_choice, hf_index, ett_gsm_map_SubscriberState, NULL); return offset; @@ -8356,7 +8356,7 @@ static const ber_choice_t PS_SubscriberState_choice[] = { static int dissect_gsm_map_PS_SubscriberState(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, PS_SubscriberState_choice, hf_index, ett_gsm_map_PS_SubscriberState, NULL); return offset; @@ -8610,7 +8610,7 @@ static const ber_choice_t SubscriberId_choice[] = { static int dissect_gsm_map_SubscriberId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, SubscriberId_choice, hf_index, ett_gsm_map_SubscriberId, NULL); return offset; @@ -8631,7 +8631,7 @@ static const ber_choice_t SubscriberIdentity_choice[] = { static int dissect_gsm_map_SubscriberIdentity(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, SubscriberIdentity_choice, hf_index, ett_gsm_map_SubscriberIdentity, NULL); return offset; @@ -9367,7 +9367,7 @@ static const ber_choice_t SS_Info_choice[] = { static int dissect_gsm_map_SS_Info(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, SS_Info_choice, hf_index, ett_gsm_map_SS_Info, NULL); return offset; @@ -9441,7 +9441,7 @@ static const ber_choice_t InterrogateSS_Res_choice[] = { static int dissect_gsm_map_InterrogateSS_Res(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, InterrogateSS_Res_choice, hf_index, ett_gsm_map_InterrogateSS_Res, NULL); return offset; @@ -9831,7 +9831,7 @@ static const ber_choice_t Additional_Number_choice[] = { static int dissect_gsm_map_Additional_Number(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Additional_Number_choice, hf_index, ett_gsm_map_Additional_Number, NULL); return offset; @@ -9894,7 +9894,7 @@ static const ber_choice_t Sm_RP_DA_choice[] = { static int dissect_gsm_map_Sm_RP_DA(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Sm_RP_DA_choice, hf_index, ett_gsm_map_Sm_RP_DA, NULL); return offset; @@ -9920,7 +9920,7 @@ static const ber_choice_t Sm_RP_OA_choice[] = { static int dissect_gsm_map_Sm_RP_OA(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Sm_RP_OA_choice, hf_index, ett_gsm_map_Sm_RP_OA, NULL); return offset; @@ -10774,7 +10774,7 @@ static const ber_choice_t Ext_SS_InfoFor_CSE_choice[] = { static int dissect_gsm_map_Ext_SS_InfoFor_CSE(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Ext_SS_InfoFor_CSE_choice, hf_index, ett_gsm_map_Ext_SS_InfoFor_CSE, NULL); return offset; @@ -11895,7 +11895,7 @@ static const ber_choice_t TargetMS_choice[] = { static int dissect_gsm_map_TargetMS(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, TargetMS_choice, hf_index, ett_gsm_map_TargetMS, NULL); return offset; @@ -12112,7 +12112,7 @@ static const ber_choice_t OperationCode_choice[] = { static int dissect_gsm_map_OperationCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, OperationCode_choice, hf_index, ett_gsm_map_OperationCode, NULL); return offset; @@ -12136,7 +12136,7 @@ static const ber_choice_t ErrorCode_choice[] = { static int dissect_gsm_map_ErrorCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ErrorCode_choice, hf_index, ett_gsm_map_ErrorCode, NULL); return offset; @@ -12162,7 +12162,7 @@ static const ber_choice_t OriginalComponentIdentifier_choice[] = { static int dissect_gsm_map_OriginalComponentIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, OriginalComponentIdentifier_choice, hf_index, ett_gsm_map_OriginalComponentIdentifier, NULL); return offset; @@ -12300,7 +12300,7 @@ static const ber_choice_t SystemFailureParam_choice[] = { static int dissect_gsm_map_SystemFailureParam(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, SystemFailureParam_choice, hf_index, ett_gsm_map_SystemFailureParam, NULL); return offset; @@ -12655,7 +12655,7 @@ static const ber_choice_t CallBarredParam_choice[] = { static int dissect_gsm_map_CallBarredParam(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, CallBarredParam_choice, hf_index, ett_gsm_map_CallBarredParam, NULL); return offset; @@ -13739,7 +13739,7 @@ static const ber_choice_t InvokeId_choice[] = { static int dissect_gsm_map_InvokeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, InvokeId_choice, hf_index, ett_gsm_map_InvokeId, NULL); return offset; @@ -13817,7 +13817,7 @@ static const ber_choice_t ReturnError_result_choice[] = { static int dissect_ReturnError_result(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ReturnError_result_choice, hf_gsm_map_returnError_result, ett_gsm_map_ReturnError_result, NULL); return offset; @@ -13885,7 +13885,7 @@ dissect_gsm_map_GSMMAPPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, col_set_str(pinfo->cinfo, COL_INFO, val_to_str(gsmmap_pdu_type, GSMMAPPDU_vals, "Unknown GSM-MAP PDU (%u)")); } - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, GSMMAPPDU_choice, hf_index, ett_gsm_map_GSMMAPPDU, NULL); diff --git a/epan/dissectors/packet-gsm_map.h b/epan/dissectors/packet-gsm_map.h index 6a257f3535..49a863319a 100644 --- a/epan/dissectors/packet-gsm_map.h +++ b/epan/dissectors/packet-gsm_map.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-gsm_map.h */ +/* ./packet-gsm_map.h */ /* ../../tools/asn2eth.py -X -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn */ /* Input file: packet-gsm_map-template.h */ diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index 1056152d23..700c560785 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -1120,10 +1120,11 @@ dissect_h248_MtpAddress(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet + static int dissect_h248_SecurityParmIndex(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1132,10 +1133,11 @@ static int dissect_secParmIndex_impl(packet_info *pinfo, proto_tree *tree, tvbuf } + static int dissect_h248_SequenceNum(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1144,10 +1146,11 @@ static int dissect_seqNum_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t } + static int dissect_h248_AuthData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1205,10 +1208,11 @@ static int dissect_serviceChangeVersion_impl(packet_info *pinfo, proto_tree *tre } + static int dissect_h248_OCTET_STRING_SIZE_4(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1259,10 +1263,11 @@ static int dissect_ip4Address_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ } + static int dissect_h248_OCTET_STRING_SIZE_16(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1290,7 +1295,7 @@ static int dissect_ip6Address_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ static int dissect_h248_IA5String(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_restricted_string(implicit_tag, 0, + offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_IA5String, pinfo, tree, tvb, offset, hf_index, NULL); @@ -1358,7 +1363,7 @@ static const ber_choice_t MId_choice[] = { static int dissect_h248_MId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, MId_choice, hf_index, ett_h248_MId, NULL); return offset; @@ -1475,6 +1480,7 @@ static int dissect_priority_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_h248_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index); @@ -1501,12 +1507,13 @@ static int dissect_keepActive_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ } + static int dissect_h248_WildcardField(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { if (check_col(pinfo->cinfo, COL_INFO) && command_string != NULL ) col_append_str(pinfo->cinfo, COL_INFO, "*"); it_is_wildcard = TRUE; offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1514,6 +1521,7 @@ static int dissect_wildcard_item(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_h248_WildcardField(FALSE, tvb, offset, pinfo, tree, hf_h248_wildcard_item); } + static const ber_sequence_t SEQUENCE_OF_WildcardField_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_wildcard_item }, }; @@ -1521,7 +1529,7 @@ static const ber_sequence_t SEQUENCE_OF_WildcardField_sequence_of[1] = { static int dissect_h248_SEQUENCE_OF_WildcardField(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_WildcardField_sequence_of, hf_index, ett_h248_SEQUENCE_OF_WildcardField); + SEQUENCE_OF_WildcardField_sequence_of, hf_index, ett_h248_SEQUENCE_OF_WildcardField); return offset; } @@ -1530,6 +1538,7 @@ static int dissect_wildcard_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_h248_T_id(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { tvbuff_t* new_tvb; @@ -1593,7 +1602,8 @@ static const value_string h248_T_topologyDirection_vals[] = { static int dissect_h248_T_topologyDirection(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1633,6 +1643,7 @@ static int dissect_topologyReq_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_h248_TopologyRequest(FALSE, tvb, offset, pinfo, tree, hf_h248_topologyReq_item); } + static const ber_sequence_t SEQUENCE_OF_TopologyRequest_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_topologyReq_item }, }; @@ -1640,7 +1651,7 @@ static const ber_sequence_t SEQUENCE_OF_TopologyRequest_sequence_of[1] = { static int dissect_h248_SEQUENCE_OF_TopologyRequest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_TopologyRequest_sequence_of, hf_index, ett_h248_SEQUENCE_OF_TopologyRequest); + SEQUENCE_OF_TopologyRequest_sequence_of, hf_index, ett_h248_SEQUENCE_OF_TopologyRequest); return offset; } @@ -1729,6 +1740,7 @@ static int dissect_contextAttrAuditReq_impl(packet_info *pinfo, proto_tree *tree return dissect_h248_ContextAttrAuditRequest(TRUE, tvb, offset, pinfo, tree, hf_h248_contextAttrAuditReq); } + static const ber_sequence_t TerminationIDList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_TerminationIDList_item }, }; @@ -1736,7 +1748,7 @@ static const ber_sequence_t TerminationIDList_sequence_of[1] = { static int dissect_h248_TerminationIDList(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - TerminationIDList_sequence_of, hf_index, ett_h248_TerminationIDList); + TerminationIDList_sequence_of, hf_index, ett_h248_TerminationIDList); return offset; } @@ -1770,6 +1782,7 @@ static int dissect_value_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_h248_PropertyID(FALSE, tvb, offset, pinfo, tree, hf_h248_value_item); } + static const ber_sequence_t SEQUENCE_OF_PropertyID_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_value_item }, }; @@ -1777,7 +1790,7 @@ static const ber_sequence_t SEQUENCE_OF_PropertyID_sequence_of[1] = { static int dissect_h248_SEQUENCE_OF_PropertyID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_PropertyID_sequence_of, hf_index, ett_h248_SEQUENCE_OF_PropertyID); + SEQUENCE_OF_PropertyID_sequence_of, hf_index, ett_h248_SEQUENCE_OF_PropertyID); return offset; } @@ -1796,7 +1809,8 @@ static const value_string h248_Relation_vals[] = { static int dissect_h248_Relation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1821,7 +1835,7 @@ static const ber_choice_t ExtraInfo_choice[] = { static int dissect_h248_ExtraInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ExtraInfo_choice, hf_index, ett_h248_ExtraInfo, NULL); return offset; @@ -1851,6 +1865,7 @@ static int dissect_PropertyGroup_item(packet_info *pinfo, proto_tree *tree, tvbu return dissect_h248_PropertyParm(FALSE, tvb, offset, pinfo, tree, hf_h248_PropertyGroup_item); } + static const ber_sequence_t PropertyParms_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PropertyParms_item }, }; @@ -1858,7 +1873,7 @@ static const ber_sequence_t PropertyParms_sequence_of[1] = { static int dissect_h248_PropertyParms(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - PropertyParms_sequence_of, hf_index, ett_h248_PropertyParms); + PropertyParms_sequence_of, hf_index, ett_h248_PropertyParms); return offset; } @@ -1879,7 +1894,8 @@ static const value_string h248_EventBufferControl_vals[] = { static int dissect_h248_EventBufferControl(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1898,7 +1914,8 @@ static const value_string h248_ServiceState_vals[] = { static int dissect_h248_ServiceState(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1937,7 +1954,8 @@ static const value_string h248_StreamMode_vals[] = { static int dissect_h248_StreamMode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1964,6 +1982,7 @@ static int dissect_localControlDescriptor_impl(packet_info *pinfo, proto_tree *t return dissect_h248_LocalControlDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_localControlDescriptor); } + static const ber_sequence_t PropertyGroup_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PropertyGroup_item }, }; @@ -1971,7 +1990,7 @@ static const ber_sequence_t PropertyGroup_sequence_of[1] = { static int dissect_h248_PropertyGroup(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - PropertyGroup_sequence_of, hf_index, ett_h248_PropertyGroup); + PropertyGroup_sequence_of, hf_index, ett_h248_PropertyGroup); return offset; } @@ -1979,6 +1998,7 @@ static int dissect_propGrps_item(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_h248_PropertyGroup(FALSE, tvb, offset, pinfo, tree, hf_h248_propGrps_item); } + static const ber_sequence_t SEQUENCE_OF_PropertyGroup_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_propGrps_item }, }; @@ -1986,7 +2006,7 @@ static const ber_sequence_t SEQUENCE_OF_PropertyGroup_sequence_of[1] = { static int dissect_h248_SEQUENCE_OF_PropertyGroup(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_PropertyGroup_sequence_of, hf_index, ett_h248_SEQUENCE_OF_PropertyGroup); + SEQUENCE_OF_PropertyGroup_sequence_of, hf_index, ett_h248_SEQUENCE_OF_PropertyGroup); return offset; } @@ -2051,6 +2071,7 @@ static int dissect_mediaDescriptorMultiStream_item(packet_info *pinfo, proto_tre return dissect_h248_StreamDescriptor(FALSE, tvb, offset, pinfo, tree, hf_h248_mediaDescriptorMultiStream_item); } + static const ber_sequence_t SEQUENCE_OF_StreamDescriptor_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mediaDescriptorMultiStream_item }, }; @@ -2058,7 +2079,7 @@ static const ber_sequence_t SEQUENCE_OF_StreamDescriptor_sequence_of[1] = { static int dissect_h248_SEQUENCE_OF_StreamDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_StreamDescriptor_sequence_of, hf_index, ett_h248_SEQUENCE_OF_StreamDescriptor); + SEQUENCE_OF_StreamDescriptor_sequence_of, hf_index, ett_h248_SEQUENCE_OF_StreamDescriptor); return offset; } @@ -2081,7 +2102,7 @@ static const ber_choice_t T_streams_choice[] = { static int dissect_h248_T_streams(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_streams_choice, hf_index, ett_h248_T_streams, NULL); return offset; @@ -2124,7 +2145,8 @@ static const value_string h248_ModemType_vals[] = { static int dissect_h248_ModemType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -2132,6 +2154,7 @@ static int dissect_mtl_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_h248_ModemType(FALSE, tvb, offset, pinfo, tree, hf_h248_mtl_item); } + static const ber_sequence_t SEQUENCE_OF_ModemType_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_mtl_item }, }; @@ -2139,7 +2162,7 @@ static const ber_sequence_t SEQUENCE_OF_ModemType_sequence_of[1] = { static int dissect_h248_SEQUENCE_OF_ModemType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_ModemType_sequence_of, hf_index, ett_h248_SEQUENCE_OF_ModemType); + SEQUENCE_OF_ModemType_sequence_of, hf_index, ett_h248_SEQUENCE_OF_ModemType); return offset; } @@ -2201,7 +2224,7 @@ static int dissect_h221NonStandard_impl(packet_info *pinfo, proto_tree *tree, tv static int dissect_h248_IA5String_SIZE_8(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_restricted_string(implicit_tag, 2, + offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_IA5String, pinfo, tree, tvb, offset, hf_index, NULL); @@ -2234,7 +2257,7 @@ static const ber_choice_t NonStandardIdentifier_choice[] = { static int dissect_h248_NonStandardIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, NonStandardIdentifier_choice, hf_index, ett_h248_NonStandardIdentifier, NULL); return offset; @@ -2244,10 +2267,11 @@ static int dissect_nonStandardIdentifier(packet_info *pinfo, proto_tree *tree, t } + static int dissect_h248_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -2306,7 +2330,8 @@ static const value_string h248_MuxType_vals[] = { static int dissect_h248_MuxType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -2314,6 +2339,7 @@ static int dissect_muxType_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_h248_MuxType(TRUE, tvb, offset, pinfo, tree, hf_h248_muxType); } + static const ber_sequence_t SEQUENCE_OF_TerminationID_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_termList_item }, }; @@ -2321,7 +2347,7 @@ static const ber_sequence_t SEQUENCE_OF_TerminationID_sequence_of[1] = { static int dissect_h248_SEQUENCE_OF_TerminationID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_TerminationID_sequence_of, hf_index, ett_h248_SEQUENCE_OF_TerminationID); + SEQUENCE_OF_TerminationID_sequence_of, hf_index, ett_h248_SEQUENCE_OF_TerminationID); return offset; } @@ -2371,10 +2397,11 @@ static int dissect_pkgdName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_h248_Name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -2434,7 +2461,7 @@ static const ber_choice_t EventDM_choice[] = { static int dissect_h248_EventDM(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, EventDM_choice, hf_index, ett_h248_EventDM, NULL); return offset; @@ -2458,7 +2485,8 @@ static const value_string h248_SignalType_vals[] = { static int dissect_h248_SignalType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -2486,6 +2514,7 @@ static int dissect_notifyCompletion_impl(packet_info *pinfo, proto_tree *tree, t return dissect_h248_NotifyCompletion(TRUE, tvb, offset, pinfo, tree, hf_h248_notifyCompletion); } + static const ber_sequence_t Value_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_Value_item }, }; @@ -2493,7 +2522,7 @@ static const ber_sequence_t Value_sequence_of[1] = { static int dissect_h248_Value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - Value_sequence_of, hf_index, ett_h248_Value); + Value_sequence_of, hf_index, ett_h248_Value); return offset; } @@ -2525,6 +2554,7 @@ static int dissect_sigParList_item(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_h248_SigParameter(FALSE, tvb, offset, pinfo, tree, hf_h248_sigParList_item); } + static const ber_sequence_t SEQUENCE_OF_SigParameter_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_sigParList_item }, }; @@ -2532,7 +2562,7 @@ static const ber_sequence_t SEQUENCE_OF_SigParameter_sequence_of[1] = { static int dissect_h248_SEQUENCE_OF_SigParameter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_SigParameter_sequence_of, hf_index, ett_h248_SEQUENCE_OF_SigParameter); + SEQUENCE_OF_SigParameter_sequence_of, hf_index, ett_h248_SEQUENCE_OF_SigParameter); return offset; } @@ -2565,6 +2595,7 @@ static int dissect_signalList_item(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_h248_Signal(FALSE, tvb, offset, pinfo, tree, hf_h248_signalList_item); } + static const ber_sequence_t SEQUENCE_OF_Signal_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signalList_item }, }; @@ -2572,7 +2603,7 @@ static const ber_sequence_t SEQUENCE_OF_Signal_sequence_of[1] = { static int dissect_h248_SEQUENCE_OF_Signal(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_Signal_sequence_of, hf_index, ett_h248_SEQUENCE_OF_Signal); + SEQUENCE_OF_Signal_sequence_of, hf_index, ett_h248_SEQUENCE_OF_Signal); return offset; } @@ -2612,7 +2643,7 @@ static const ber_choice_t SignalRequest_choice[] = { static int dissect_h248_SignalRequest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, SignalRequest_choice, hf_index, ett_h248_SignalRequest, NULL); return offset; @@ -2621,6 +2652,7 @@ static int dissect_SignalsDescriptor_item(packet_info *pinfo, proto_tree *tree, return dissect_h248_SignalRequest(FALSE, tvb, offset, pinfo, tree, hf_h248_SignalsDescriptor_item); } + static const ber_sequence_t SignalsDescriptor_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_SignalsDescriptor_item }, }; @@ -2628,7 +2660,7 @@ static const ber_sequence_t SignalsDescriptor_sequence_of[1] = { static int dissect_h248_SignalsDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SignalsDescriptor_sequence_of, hf_index, ett_h248_SignalsDescriptor); + SignalsDescriptor_sequence_of, hf_index, ett_h248_SignalsDescriptor); return offset; } @@ -2672,6 +2704,7 @@ static int dissect_EventParameters_item(packet_info *pinfo, proto_tree *tree, tv return dissect_h248_EventParameter(FALSE, tvb, offset, pinfo, tree, hf_h248_EventParameters_item); } + static const ber_sequence_t EventParameters_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_EventParameters_item }, }; @@ -2679,7 +2712,7 @@ static const ber_sequence_t EventParameters_sequence_of[1] = { static int dissect_h248_EventParameters(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - EventParameters_sequence_of, hf_index, ett_h248_EventParameters); + EventParameters_sequence_of, hf_index, ett_h248_EventParameters); return offset; } @@ -2709,6 +2742,7 @@ static int dissect_eventList_item(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_h248_SecondRequestedEvent(FALSE, tvb, offset, pinfo, tree, hf_h248_eventList_item); } + static const ber_sequence_t SEQUENCE_OF_SecondRequestedEvent_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_eventList_item }, }; @@ -2716,7 +2750,7 @@ static const ber_sequence_t SEQUENCE_OF_SecondRequestedEvent_sequence_of[1] = { static int dissect_h248_SEQUENCE_OF_SecondRequestedEvent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_SecondRequestedEvent_sequence_of, hf_index, ett_h248_SEQUENCE_OF_SecondRequestedEvent); + SEQUENCE_OF_SecondRequestedEvent_sequence_of, hf_index, ett_h248_SEQUENCE_OF_SecondRequestedEvent); return offset; } @@ -2779,6 +2813,7 @@ static int dissect_RequestedEvents_item(packet_info *pinfo, proto_tree *tree, tv return dissect_h248_RequestedEvent(FALSE, tvb, offset, pinfo, tree, hf_h248_RequestedEvents_item); } + static const ber_sequence_t RequestedEvents_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RequestedEvents_item }, }; @@ -2786,7 +2821,7 @@ static const ber_sequence_t RequestedEvents_sequence_of[1] = { static int dissect_h248_RequestedEvents(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - RequestedEvents_sequence_of, hf_index, ett_h248_RequestedEvents); + RequestedEvents_sequence_of, hf_index, ett_h248_RequestedEvents); return offset; } @@ -2829,6 +2864,7 @@ static int dissect_EventBufferDescriptor_item(packet_info *pinfo, proto_tree *tr return dissect_h248_EventSpec(FALSE, tvb, offset, pinfo, tree, hf_h248_EventBufferDescriptor_item); } + static const ber_sequence_t EventBufferDescriptor_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_EventBufferDescriptor_item }, }; @@ -2836,7 +2872,7 @@ static const ber_sequence_t EventBufferDescriptor_sequence_of[1] = { static int dissect_h248_EventBufferDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - EventBufferDescriptor_sequence_of, hf_index, ett_h248_EventBufferDescriptor); + EventBufferDescriptor_sequence_of, hf_index, ett_h248_EventBufferDescriptor); return offset; } @@ -2906,6 +2942,7 @@ static int dissect_IndAudPropertyGroup_item(packet_info *pinfo, proto_tree *tree return dissect_h248_IndAudPropertyParm(FALSE, tvb, offset, pinfo, tree, hf_h248_IndAudPropertyGroup_item); } + static const ber_sequence_t IndAudPropertyParms_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_IndAudPropertyParms_item }, }; @@ -2913,7 +2950,7 @@ static const ber_sequence_t IndAudPropertyParms_sequence_of[1] = { static int dissect_h248_IndAudPropertyParms(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - IndAudPropertyParms_sequence_of, hf_index, ett_h248_IndAudPropertyParms); + IndAudPropertyParms_sequence_of, hf_index, ett_h248_IndAudPropertyParms); return offset; } @@ -2958,6 +2995,7 @@ static int dissect_iASPLocalControlDescriptor_impl(packet_info *pinfo, proto_tre return dissect_h248_IndAudLocalControlDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_iASPLocalControlDescriptor); } + static const ber_sequence_t IndAudPropertyGroup_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_IndAudPropertyGroup_item }, }; @@ -2965,7 +3003,7 @@ static const ber_sequence_t IndAudPropertyGroup_sequence_of[1] = { static int dissect_h248_IndAudPropertyGroup(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - IndAudPropertyGroup_sequence_of, hf_index, ett_h248_IndAudPropertyGroup); + IndAudPropertyGroup_sequence_of, hf_index, ett_h248_IndAudPropertyGroup); return offset; } @@ -3031,6 +3069,7 @@ static int dissect_multiStream_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_h248_IndAudStreamDescriptor(FALSE, tvb, offset, pinfo, tree, hf_h248_multiStream_item); } + static const ber_sequence_t SEQUENCE_OF_IndAudStreamDescriptor_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_multiStream_item }, }; @@ -3038,7 +3077,7 @@ static const ber_sequence_t SEQUENCE_OF_IndAudStreamDescriptor_sequence_of[1] = static int dissect_h248_SEQUENCE_OF_IndAudStreamDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_IndAudStreamDescriptor_sequence_of, hf_index, ett_h248_SEQUENCE_OF_IndAudStreamDescriptor); + SEQUENCE_OF_IndAudStreamDescriptor_sequence_of, hf_index, ett_h248_SEQUENCE_OF_IndAudStreamDescriptor); return offset; } @@ -3061,7 +3100,7 @@ static const ber_choice_t indAudMediaDescriptorStreams_choice[] = { static int dissect_h248_indAudMediaDescriptorStreams(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, indAudMediaDescriptorStreams_choice, hf_index, ett_h248_indAudMediaDescriptorStreams, NULL); return offset; @@ -3174,7 +3213,7 @@ static const ber_choice_t IndAudSignalsDescriptor_choice[] = { static int dissect_h248_IndAudSignalsDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, IndAudSignalsDescriptor_choice, hf_index, ett_h248_IndAudSignalsDescriptor, NULL); return offset; @@ -3257,7 +3296,7 @@ static const ber_choice_t IndAuditParameter_choice[] = { static int dissect_h248_IndAuditParameter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, IndAuditParameter_choice, hf_index, ett_h248_IndAuditParameter, NULL); return offset; @@ -3266,6 +3305,7 @@ static int dissect_auditPropertyToken_item(packet_info *pinfo, proto_tree *tree, return dissect_h248_IndAuditParameter(FALSE, tvb, offset, pinfo, tree, hf_h248_auditPropertyToken_item); } + static const ber_sequence_t SEQUENCE_OF_IndAuditParameter_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_auditPropertyToken_item }, }; @@ -3273,7 +3313,7 @@ static const ber_sequence_t SEQUENCE_OF_IndAuditParameter_sequence_of[1] = { static int dissect_h248_SEQUENCE_OF_IndAuditParameter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_IndAuditParameter_sequence_of, hf_index, ett_h248_SEQUENCE_OF_IndAuditParameter); + SEQUENCE_OF_IndAuditParameter_sequence_of, hf_index, ett_h248_SEQUENCE_OF_IndAuditParameter); return offset; } @@ -3331,7 +3371,7 @@ static const ber_choice_t AmmDescriptor_choice[] = { static int dissect_h248_AmmDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, AmmDescriptor_choice, hf_index, ett_h248_AmmDescriptor, NULL); return offset; @@ -3340,6 +3380,7 @@ static int dissect_descriptors_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_h248_AmmDescriptor(FALSE, tvb, offset, pinfo, tree, hf_h248_descriptors_item); } + static const ber_sequence_t SEQUENCE_OF_AmmDescriptor_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_descriptors_item }, }; @@ -3347,7 +3388,7 @@ static const ber_sequence_t SEQUENCE_OF_AmmDescriptor_sequence_of[1] = { static int dissect_h248_SEQUENCE_OF_AmmDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_AmmDescriptor_sequence_of, hf_index, ett_h248_SEQUENCE_OF_AmmDescriptor); + SEQUENCE_OF_AmmDescriptor_sequence_of, hf_index, ett_h248_SEQUENCE_OF_AmmDescriptor); return offset; } @@ -3511,6 +3552,7 @@ static int dissect_observedEventLst_item(packet_info *pinfo, proto_tree *tree, t return dissect_h248_ObservedEvent(FALSE, tvb, offset, pinfo, tree, hf_h248_observedEventLst_item); } + static const ber_sequence_t SEQUENCE_OF_ObservedEvent_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_observedEventLst_item }, }; @@ -3518,7 +3560,7 @@ static const ber_sequence_t SEQUENCE_OF_ObservedEvent_sequence_of[1] = { static int dissect_h248_SEQUENCE_OF_ObservedEvent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_ObservedEvent_sequence_of, hf_index, ett_h248_SEQUENCE_OF_ObservedEvent); + SEQUENCE_OF_ObservedEvent_sequence_of, hf_index, ett_h248_SEQUENCE_OF_ObservedEvent); return offset; } @@ -3584,7 +3626,8 @@ static const value_string h248_ServiceChangeMethod_vals[] = { static int dissect_h248_ServiceChangeMethod(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -3615,7 +3658,7 @@ static const ber_choice_t ServiceChangeAddress_choice[] = { static int dissect_h248_ServiceChangeAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ServiceChangeAddress_choice, hf_index, ett_h248_ServiceChangeAddress, NULL); return offset; @@ -3627,7 +3670,7 @@ static int dissect_serviceChangeAddress(packet_info *pinfo, proto_tree *tree, tv static int dissect_h248_IA5String_SIZE_1_67(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_restricted_string(implicit_tag, 0, + offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_IA5String, pinfo, tree, tvb, offset, hf_index, NULL); @@ -3735,7 +3778,7 @@ static const ber_choice_t Command_choice[] = { static int dissect_h248_Command(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Command_choice, hf_index, ett_h248_Command, NULL); return offset; @@ -3762,6 +3805,7 @@ static int dissect_commandRequests_item(packet_info *pinfo, proto_tree *tree, tv return dissect_h248_CommandRequest(FALSE, tvb, offset, pinfo, tree, hf_h248_commandRequests_item); } + static const ber_sequence_t SEQUENCE_OF_CommandRequest_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_commandRequests_item }, }; @@ -3769,7 +3813,7 @@ static const ber_sequence_t SEQUENCE_OF_CommandRequest_sequence_of[1] = { static int dissect_h248_SEQUENCE_OF_CommandRequest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_CommandRequest_sequence_of, hf_index, ett_h248_SEQUENCE_OF_CommandRequest); + SEQUENCE_OF_CommandRequest_sequence_of, hf_index, ett_h248_SEQUENCE_OF_CommandRequest); return offset; } @@ -3796,6 +3840,7 @@ static int dissect_actions_item(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_h248_ActionRequest(FALSE, tvb, offset, pinfo, tree, hf_h248_actions_item); } + static const ber_sequence_t SEQUENCE_OF_ActionRequest_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_actions_item }, }; @@ -3803,7 +3848,7 @@ static const ber_sequence_t SEQUENCE_OF_ActionRequest_sequence_of[1] = { static int dissect_h248_SEQUENCE_OF_ActionRequest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_ActionRequest_sequence_of, hf_index, ett_h248_SEQUENCE_OF_ActionRequest); + SEQUENCE_OF_ActionRequest_sequence_of, hf_index, ett_h248_SEQUENCE_OF_ActionRequest); return offset; } @@ -3863,6 +3908,7 @@ static int dissect_StatisticsDescriptor_item(packet_info *pinfo, proto_tree *tre return dissect_h248_StatisticsParameter(FALSE, tvb, offset, pinfo, tree, hf_h248_StatisticsDescriptor_item); } + static const ber_sequence_t StatisticsDescriptor_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_StatisticsDescriptor_item }, }; @@ -3870,7 +3916,7 @@ static const ber_sequence_t StatisticsDescriptor_sequence_of[1] = { static int dissect_h248_StatisticsDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - StatisticsDescriptor_sequence_of, hf_index, ett_h248_StatisticsDescriptor); + StatisticsDescriptor_sequence_of, hf_index, ett_h248_StatisticsDescriptor); return offset; } @@ -3895,6 +3941,7 @@ static int dissect_PackagesDescriptor_item(packet_info *pinfo, proto_tree *tree, return dissect_h248_PackagesItem(FALSE, tvb, offset, pinfo, tree, hf_h248_PackagesDescriptor_item); } + static const ber_sequence_t PackagesDescriptor_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PackagesDescriptor_item }, }; @@ -3902,7 +3949,7 @@ static const ber_sequence_t PackagesDescriptor_sequence_of[1] = { static int dissect_h248_PackagesDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - PackagesDescriptor_sequence_of, hf_index, ett_h248_PackagesDescriptor); + PackagesDescriptor_sequence_of, hf_index, ett_h248_PackagesDescriptor); return offset; } @@ -3945,7 +3992,7 @@ static const ber_choice_t AuditReturnParameter_choice[] = { static int dissect_h248_AuditReturnParameter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, AuditReturnParameter_choice, hf_index, ett_h248_AuditReturnParameter, NULL); return offset; @@ -3954,6 +4001,7 @@ static int dissect_TerminationAudit_item(packet_info *pinfo, proto_tree *tree, t return dissect_h248_AuditReturnParameter(FALSE, tvb, offset, pinfo, tree, hf_h248_TerminationAudit_item); } + static const ber_sequence_t TerminationAudit_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_TerminationAudit_item }, }; @@ -3961,7 +4009,7 @@ static const ber_sequence_t TerminationAudit_sequence_of[1] = { static int dissect_h248_TerminationAudit(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - TerminationAudit_sequence_of, hf_index, ett_h248_TerminationAudit); + TerminationAudit_sequence_of, hf_index, ett_h248_TerminationAudit); return offset; } @@ -4069,7 +4117,7 @@ static const ber_choice_t AuditReply_choice[] = { static int dissect_h248_AuditReply(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, AuditReply_choice, hf_index, ett_h248_AuditReply, NULL); return offset; @@ -4160,7 +4208,7 @@ static const ber_choice_t ServiceChangeResult_choice[] = { static int dissect_h248_ServiceChangeResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ServiceChangeResult_choice, hf_index, ett_h248_ServiceChangeResult, NULL); return offset; @@ -4213,7 +4261,7 @@ static const ber_choice_t CommandReply_choice[] = { static int dissect_h248_CommandReply(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, CommandReply_choice, hf_index, ett_h248_CommandReply, NULL); return offset; @@ -4222,6 +4270,7 @@ static int dissect_commandReply_item(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_h248_CommandReply(FALSE, tvb, offset, pinfo, tree, hf_h248_commandReply_item); } + static const ber_sequence_t SEQUENCE_OF_CommandReply_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_commandReply_item }, }; @@ -4229,7 +4278,7 @@ static const ber_sequence_t SEQUENCE_OF_CommandReply_sequence_of[1] = { static int dissect_h248_SEQUENCE_OF_CommandReply(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_CommandReply_sequence_of, hf_index, ett_h248_SEQUENCE_OF_CommandReply); + SEQUENCE_OF_CommandReply_sequence_of, hf_index, ett_h248_SEQUENCE_OF_CommandReply); return offset; } @@ -4256,6 +4305,7 @@ static int dissect_actionReplies_item(packet_info *pinfo, proto_tree *tree, tvbu return dissect_h248_ActionReply(FALSE, tvb, offset, pinfo, tree, hf_h248_actionReplies_item); } + static const ber_sequence_t SEQUENCE_OF_ActionReply_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_actionReplies_item }, }; @@ -4263,7 +4313,7 @@ static const ber_sequence_t SEQUENCE_OF_ActionReply_sequence_of[1] = { static int dissect_h248_SEQUENCE_OF_ActionReply(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_ActionReply_sequence_of, hf_index, ett_h248_SEQUENCE_OF_ActionReply); + SEQUENCE_OF_ActionReply_sequence_of, hf_index, ett_h248_SEQUENCE_OF_ActionReply); return offset; } @@ -4286,7 +4336,7 @@ static const ber_choice_t T_transactionResult_choice[] = { static int dissect_h248_T_transactionResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_transactionResult_choice, hf_index, ett_h248_T_transactionResult, NULL); return offset; @@ -4331,6 +4381,7 @@ static int dissect_TransactionResponseAck_item(packet_info *pinfo, proto_tree *t return dissect_h248_TransactionAck(FALSE, tvb, offset, pinfo, tree, hf_h248_TransactionResponseAck_item); } + static const ber_sequence_t TransactionResponseAck_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_TransactionResponseAck_item }, }; @@ -4338,7 +4389,7 @@ static const ber_sequence_t TransactionResponseAck_sequence_of[1] = { static int dissect_h248_TransactionResponseAck(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - TransactionResponseAck_sequence_of, hf_index, ett_h248_TransactionResponseAck); + TransactionResponseAck_sequence_of, hf_index, ett_h248_TransactionResponseAck); return offset; } @@ -4365,7 +4416,7 @@ static const ber_choice_t Transaction_choice[] = { static int dissect_h248_Transaction(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Transaction_choice, hf_index, ett_h248_Transaction, NULL); return offset; @@ -4374,6 +4425,7 @@ static int dissect_transactions_item(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_h248_Transaction(FALSE, tvb, offset, pinfo, tree, hf_h248_transactions_item); } + static const ber_sequence_t SEQUENCE_OF_Transaction_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_transactions_item }, }; @@ -4381,7 +4433,7 @@ static const ber_sequence_t SEQUENCE_OF_Transaction_sequence_of[1] = { static int dissect_h248_SEQUENCE_OF_Transaction(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_Transaction_sequence_of, hf_index, ett_h248_SEQUENCE_OF_Transaction); + SEQUENCE_OF_Transaction_sequence_of, hf_index, ett_h248_SEQUENCE_OF_Transaction); return offset; } @@ -4404,7 +4456,7 @@ static const ber_choice_t T_messageBody_choice[] = { static int dissect_h248_T_messageBody(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_messageBody_choice, hf_index, ett_h248_T_messageBody, NULL); return offset; @@ -4595,7 +4647,7 @@ void proto_register_h248(void) { "Message/messageBody/messageError", HFILL }}, { &hf_h248_transactions, { "transactions", "h248.transactions", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Message/messageBody/transactions", HFILL }}, { &hf_h248_transactions_item, { "Item", "h248.transactions_item", @@ -4651,7 +4703,7 @@ void proto_register_h248(void) { "Transaction/transactionReply", HFILL }}, { &hf_h248_transactionResponseAck, { "transactionResponseAck", "h248.transactionResponseAck", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Transaction/transactionResponseAck", HFILL }}, { &hf_h248_transactionId, { "transactionId", "h248.transactionId", @@ -4659,7 +4711,7 @@ void proto_register_h248(void) { "", HFILL }}, { &hf_h248_actions, { "actions", "h248.actions", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "TransactionRequest/actions", HFILL }}, { &hf_h248_actions_item, { "Item", "h248.actions_item", @@ -4679,7 +4731,7 @@ void proto_register_h248(void) { "TransactionReply/transactionResult/transactionError", HFILL }}, { &hf_h248_actionReplies, { "actionReplies", "h248.actionReplies", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "TransactionReply/transactionResult/actionReplies", HFILL }}, { &hf_h248_actionReplies_item, { "Item", "h248.actionReplies_item", @@ -4719,7 +4771,7 @@ void proto_register_h248(void) { "ActionRequest/contextAttrAuditReq", HFILL }}, { &hf_h248_commandRequests, { "commandRequests", "h248.commandRequests", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ActionRequest/commandRequests", HFILL }}, { &hf_h248_commandRequests_item, { "Item", "h248.commandRequests_item", @@ -4735,7 +4787,7 @@ void proto_register_h248(void) { "ActionReply/contextReply", HFILL }}, { &hf_h248_commandReply, { "commandReply", "h248.commandReply", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ActionReply/commandReply", HFILL }}, { &hf_h248_commandReply_item, { "Item", "h248.commandReply_item", @@ -4751,7 +4803,7 @@ void proto_register_h248(void) { "ContextRequest/emergency", HFILL }}, { &hf_h248_topologyReq, { "topologyReq", "h248.topologyReq", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ContextRequest/topologyReq", HFILL }}, { &hf_h248_topologyReq_item, { "Item", "h248.topologyReq_item", @@ -4863,11 +4915,11 @@ void proto_register_h248(void) { "", HFILL }}, { &hf_h248_terminationIDList, { "terminationID", "h248.terminationID", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h248_descriptors, { "descriptors", "h248.descriptors", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AmmRequest/descriptors", HFILL }}, { &hf_h248_descriptors_item, { "Item", "h248.descriptors_item", @@ -4891,11 +4943,11 @@ void proto_register_h248(void) { "", HFILL }}, { &hf_h248_eventBufferDescriptor, { "eventBufferDescriptor", "h248.eventBufferDescriptor", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h248_signalsDescriptor, { "signalsDescriptor", "h248.signalsDescriptor", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h248_digitMapDescriptor, { "digitMapDescriptor", "h248.digitMapDescriptor", @@ -4907,7 +4959,7 @@ void proto_register_h248(void) { "", HFILL }}, { &hf_h248_terminationAudit, { "terminationAudit", "h248.terminationAudit", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AmmsReply/terminationAudit", HFILL }}, { &hf_h248_terminationID, { "terminationID", "h248.terminationID", @@ -4915,7 +4967,7 @@ void proto_register_h248(void) { "", HFILL }}, { &hf_h248_contextAuditResult, { "contextAuditResult", "h248.contextAuditResult", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AuditReply/contextAuditResult", HFILL }}, { &hf_h248_error, { "error", "h248.error", @@ -4927,7 +4979,7 @@ void proto_register_h248(void) { "AuditReply/auditResult", HFILL }}, { &hf_h248_terminationAuditResult, { "terminationAuditResult", "h248.terminationAuditResult", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AuditResult/terminationAuditResult", HFILL }}, { &hf_h248_TerminationAudit_item, { "Item", "h248.TerminationAudit_item", @@ -4939,11 +4991,11 @@ void proto_register_h248(void) { "", HFILL }}, { &hf_h248_statisticsDescriptor, { "statisticsDescriptor", "h248.statisticsDescriptor", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AuditReturnParameter/statisticsDescriptor", HFILL }}, { &hf_h248_packagesDescriptor, { "packagesDescriptor", "h248.packagesDescriptor", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AuditReturnParameter/packagesDescriptor", HFILL }}, { &hf_h248_emptyDescriptors, { "emptyDescriptors", "h248.emptyDescriptors", @@ -4955,7 +5007,7 @@ void proto_register_h248(void) { "AuditDescriptor/auditToken", HFILL }}, { &hf_h248_auditPropertyToken, { "auditPropertyToken", "h248.auditPropertyToken", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AuditDescriptor/auditPropertyToken", HFILL }}, { &hf_h248_auditPropertyToken_item, { "Item", "h248.auditPropertyToken_item", @@ -5003,7 +5055,7 @@ void proto_register_h248(void) { "IndAudMediaDescriptor/streams/oneStream", HFILL }}, { &hf_h248_multiStream, { "multiStream", "h248.multiStream", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "IndAudMediaDescriptor/streams/multiStream", HFILL }}, { &hf_h248_multiStream_item, { "Item", "h248.multiStream_item", @@ -5039,7 +5091,7 @@ void proto_register_h248(void) { "IndAudLocalControlDescriptor/reserveGroup", HFILL }}, { &hf_h248_indAudPropertyParms, { "propertyParms", "h248.propertyParms", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h248_name, { "name", "h248.name", @@ -5055,7 +5107,7 @@ void proto_register_h248(void) { "IndAudLocalRemoteDescriptor/propGroupID", HFILL }}, { &hf_h248_iAPropertyGroup, { "propGrps", "h248.propGrps", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "IndAudLocalRemoteDescriptor/propGrps", HFILL }}, { &hf_h248_IndAudPropertyGroup_item, { "Item", "h248.IndAudPropertyGroup_item", @@ -5123,7 +5175,7 @@ void proto_register_h248(void) { "ObservedEventsDescriptor/requestId", HFILL }}, { &hf_h248_observedEventLst, { "observedEventLst", "h248.observedEventLst", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ObservedEventsDescriptor/observedEventLst", HFILL }}, { &hf_h248_observedEventLst_item, { "Item", "h248.observedEventLst_item", @@ -5135,7 +5187,7 @@ void proto_register_h248(void) { "", HFILL }}, { &hf_h248_eventParList, { "eventParList", "h248.eventParList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h248_timeNotation, { "timeNotation", "h248.timeNotation", @@ -5159,7 +5211,7 @@ void proto_register_h248(void) { "EventParameter/eventParameterName", HFILL }}, { &hf_h248_value, { "value", "h248.value", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h248_extraInfo, { "extraInfo", "h248.extraInfo", @@ -5183,7 +5235,7 @@ void proto_register_h248(void) { "ServiceChangeResult/serviceChangeResParms", HFILL }}, { &hf_h248_wildcard, { "wildcard", "h248.wildcard", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "TerminationID/wildcard", HFILL }}, { &hf_h248_wildcard_item, { "Item", "h248.wildcard_item", @@ -5211,7 +5263,7 @@ void proto_register_h248(void) { "MediaDescriptor/streams/oneStream", HFILL }}, { &hf_h248_mediaDescriptorMultiStream, { "multiStream", "h248.multiStream", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MediaDescriptor/streams/multiStream", HFILL }}, { &hf_h248_mediaDescriptorMultiStream_item, { "Item", "h248.multiStream_item", @@ -5247,7 +5299,7 @@ void proto_register_h248(void) { "LocalControlDescriptor/reserveGroup", HFILL }}, { &hf_h248_propertyParms, { "propertyParms", "h248.propertyParms", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h248_propertyName, { "propertyName", "h248.propertyName", @@ -5255,7 +5307,7 @@ void proto_register_h248(void) { "PropertyParm/propertyName", HFILL }}, { &hf_h248_propertyParamValue, { "value", "h248.value", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PropertyParm/value", HFILL }}, { &hf_h248_value_item, { "Item", "h248.value_item", @@ -5267,11 +5319,11 @@ void proto_register_h248(void) { "PropertyParms/_item", HFILL }}, { &hf_h248_propGrps, { "propGrps", "h248.propGrps", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "LocalRemoteDescriptor/propGrps", HFILL }}, { &hf_h248_propGrps_item, { "Item", "h248.propGrps_item", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "LocalRemoteDescriptor/propGrps/_item", HFILL }}, { &hf_h248_PropertyGroup_item, { "Item", "h248.PropertyGroup_item", @@ -5291,7 +5343,7 @@ void proto_register_h248(void) { "MuxDescriptor/muxType", HFILL }}, { &hf_h248_termList, { "termList", "h248.termList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MuxDescriptor/termList", HFILL }}, { &hf_h248_termList_item, { "Item", "h248.termList_item", @@ -5303,7 +5355,7 @@ void proto_register_h248(void) { "", HFILL }}, { &hf_h248_eventList, { "eventList", "h248.eventList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "EventsDescriptor/eventList", HFILL }}, { &hf_h248_pkgdName, { "pkgdName", "h248.pkgdName", @@ -5315,7 +5367,7 @@ void proto_register_h248(void) { "RequestedEvent/eventAction", HFILL }}, { &hf_h248_evParList, { "evParList", "h248.evParList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_h248_RequestedEvents_item, { "Item", "h248.RequestedEvents_item", @@ -5339,7 +5391,7 @@ void proto_register_h248(void) { "", HFILL }}, { &hf_h248_secondaryEventList, { "eventList", "h248.eventList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "SecondEventsDescriptor/eventList", HFILL }}, { &hf_h248_eventList_item, { "Item", "h248.eventList_item", @@ -5367,7 +5419,7 @@ void proto_register_h248(void) { "SignalRequest/seqSigList", HFILL }}, { &hf_h248_signalList, { "signalList", "h248.signalList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "SeqSigList/signalList", HFILL }}, { &hf_h248_signalList_item, { "Item", "h248.signalList_item", @@ -5391,7 +5443,7 @@ void proto_register_h248(void) { "Signal/notifyCompletion", HFILL }}, { &hf_h248_sigParList, { "sigParList", "h248.sigParList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Signal/sigParList", HFILL }}, { &hf_h248_sigParList_item, { "Item", "h248.sigParList_item", @@ -5403,7 +5455,7 @@ void proto_register_h248(void) { "SigParameter/sigParameterName", HFILL }}, { &hf_h248_mtl, { "mtl", "h248.mtl", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ModemDescriptor/mtl", HFILL }}, { &hf_h248_mtl_item, { "Item", "h248.mtl_item", @@ -5411,7 +5463,7 @@ void proto_register_h248(void) { "ModemDescriptor/mtl/_item", HFILL }}, { &hf_h248_mpl, { "mpl", "h248.mpl", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ModemDescriptor/mpl", HFILL }}, { &hf_h248_startTimer, { "startTimer", "h248.startTimer", @@ -5451,7 +5503,7 @@ void proto_register_h248(void) { "", HFILL }}, { &hf_h248_serviceChangeReason, { "serviceChangeReason", "h248.serviceChangeReason", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ServiceChangeParm/serviceChangeReason", HFILL }}, { &hf_h248_serviceChangeDelay, { "serviceChangeDelay", "h248.serviceChangeDelay", @@ -5487,7 +5539,7 @@ void proto_register_h248(void) { "StatisticsDescriptor/_item", HFILL }}, { &hf_h248_statValue, { "statValue", "h248.statValue", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "StatisticsParameter/statValue", HFILL }}, { &hf_h248_nonStandardIdentifier, { "nonStandardIdentifier", "h248.nonStandardIdentifier", diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c index 71f6999666..3d8fc9305a 100644 --- a/epan/dissectors/packet-inap.c +++ b/epan/dissectors/packet-inap.c @@ -489,10 +489,11 @@ dissect_inap_AddPartyArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p } + static int dissect_inap_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -680,10 +681,11 @@ dissect_inap_AttachArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac } + static int dissect_inap_OCTET_STRING_SIZE_1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -718,7 +720,7 @@ static const ber_choice_t LegID_choice[] = { static int dissect_inap_LegID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, LegID_choice, hf_index, ett_inap_LegID, NULL); return offset; @@ -745,7 +747,8 @@ static const value_string inap_LegStatus_vals[] = { static int dissect_inap_LegStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -770,6 +773,7 @@ static int dissect_CallPartyHandlingResultsArg_item(packet_info *pinfo, proto_tr return dissect_inap_LegInformation(FALSE, tvb, offset, pinfo, tree, hf_inap_CallPartyHandlingResultsArg_item); } + static const ber_sequence_t CallPartyHandlingResultsArg_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CallPartyHandlingResultsArg_item }, }; @@ -777,7 +781,7 @@ static const ber_sequence_t CallPartyHandlingResultsArg_sequence_of[1] = { static int dissect_inap_CallPartyHandlingResultsArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - CallPartyHandlingResultsArg_sequence_of, hf_index, ett_inap_CallPartyHandlingResultsArg); + CallPartyHandlingResultsArg_sequence_of, hf_index, ett_inap_CallPartyHandlingResultsArg); return offset; } @@ -840,10 +844,11 @@ dissect_inap_ReconnectArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, } + static int dissect_inap_Cause(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -936,7 +941,7 @@ static const ber_choice_t VariableParts_item_choice[] = { static int dissect_inap_VariableParts_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, VariableParts_item_choice, hf_index, ett_inap_VariableParts_item, NULL); return offset; @@ -945,6 +950,7 @@ static int dissect_VariableParts_item(packet_info *pinfo, proto_tree *tree, tvbu return dissect_inap_VariableParts_item(FALSE, tvb, offset, pinfo, tree, hf_inap_VariableParts_item); } + static const ber_sequence_t VariableParts_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_VariableParts_item }, }; @@ -952,7 +958,7 @@ static const ber_sequence_t VariableParts_sequence_of[1] = { static int dissect_inap_VariableParts(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - VariableParts_sequence_of, hf_index, ett_inap_VariableParts); + VariableParts_sequence_of, hf_index, ett_inap_VariableParts); return offset; } @@ -1004,7 +1010,8 @@ static const value_string inap_TriggerType_vals[] = { static int dissect_inap_TriggerType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1032,7 +1039,7 @@ static int dissect_tone_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb static int dissect_inap_IA5String(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_restricted_string(implicit_tag, 0, + offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_IA5String, pinfo, tree, tvb, offset, hf_index, NULL); @@ -1065,6 +1072,7 @@ static int dissect_text_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_inap_Text(TRUE, tvb, offset, pinfo, tree, hf_inap_text); } + static const ber_sequence_t T_elementaryMessageIDs_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_elementaryMessageIDs_item }, }; @@ -1072,7 +1080,7 @@ static const ber_sequence_t T_elementaryMessageIDs_sequence_of[1] = { static int dissect_inap_T_elementaryMessageIDs(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_elementaryMessageIDs_sequence_of, hf_index, ett_inap_T_elementaryMessageIDs); + T_elementaryMessageIDs_sequence_of, hf_index, ett_inap_T_elementaryMessageIDs); return offset; } @@ -1099,7 +1107,7 @@ static const ber_choice_t MessageID_choice[] = { static int dissect_inap_MessageID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, MessageID_choice, hf_index, ett_inap_MessageID, NULL); return offset; @@ -1185,7 +1193,7 @@ static const ber_choice_t InformationToSend_choice[] = { static int dissect_inap_InformationToSend(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, InformationToSend_choice, hf_index, ett_inap_InformationToSend, NULL); return offset; @@ -1232,7 +1240,7 @@ static const ber_choice_t FilteringCriteria_choice[] = { static int dissect_inap_FilteringCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, FilteringCriteria_choice, hf_index, ett_inap_FilteringCriteria, NULL); return offset; @@ -1282,7 +1290,8 @@ static const value_string inap_T_criticality_vals[] = { static int dissect_inap_T_criticality(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1308,6 +1317,7 @@ static int dissect_Extensions_item(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_inap_Extensions_item(FALSE, tvb, offset, pinfo, tree, hf_inap_Extensions_item); } + static const ber_sequence_t Extensions_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Extensions_item }, }; @@ -1315,7 +1325,7 @@ static const ber_sequence_t Extensions_sequence_of[1] = { static int dissect_inap_Extensions(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - Extensions_sequence_of, hf_index, ett_inap_Extensions); + Extensions_sequence_of, hf_index, ett_inap_Extensions); return offset; } @@ -1357,7 +1367,7 @@ static const ber_choice_t T_filteringCharacteristics_choice[] = { static int dissect_inap_T_filteringCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_filteringCharacteristics_choice, hf_index, ett_inap_T_filteringCharacteristics, NULL); return offset; @@ -1386,10 +1396,11 @@ static int dissect_monitorDuration_impl(packet_info *pinfo, proto_tree *tree, tv } + static int dissect_inap_OCTET_STRING_SIZE_6(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1418,7 +1429,7 @@ static const ber_choice_t T_filteringTimeOut_choice[] = { static int dissect_inap_T_filteringTimeOut(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_filteringTimeOut_choice, hf_index, ett_inap_T_filteringTimeOut, NULL); return offset; @@ -1455,7 +1466,8 @@ static const value_string inap_T_messageType_vals[] = { static int dissect_inap_T_messageType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1474,7 +1486,8 @@ static const value_string inap_T_dpAssignment_vals[] = { static int dissect_inap_T_dpAssignment(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1531,7 +1544,8 @@ static const value_string inap_TerminalType_vals[] = { static int dissect_inap_TerminalType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1539,6 +1553,7 @@ static int dissect_terminalType_impl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_inap_TerminalType(TRUE, tvb, offset, pinfo, tree, hf_inap_terminalType); } + static const ber_sequence_t RouteList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_RouteList_item }, }; @@ -1546,7 +1561,7 @@ static const ber_sequence_t RouteList_sequence_of[1] = { static int dissect_inap_RouteList(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - RouteList_sequence_of, hf_index, ett_inap_RouteList); + RouteList_sequence_of, hf_index, ett_inap_RouteList); return offset; } @@ -1565,7 +1580,8 @@ static const value_string inap_CGEncountered_vals[] = { static int dissect_inap_CGEncountered(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1588,7 +1604,7 @@ static const ber_choice_t BearerCapability_choice[] = { static int dissect_inap_BearerCapability(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, BearerCapability_choice, hf_index, ett_inap_BearerCapability, NULL); return offset; @@ -1646,7 +1662,7 @@ static const ber_choice_t CallingFacilityGroup_choice[] = { static int dissect_inap_CallingFacilityGroup(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, CallingFacilityGroup_choice, hf_index, ett_inap_CallingFacilityGroup, NULL); return offset; @@ -1656,10 +1672,11 @@ static int dissect_callingFacilityGroup_impl(packet_info *pinfo, proto_tree *tre } + static int dissect_inap_OCTET_STRING_SIZE_2(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1702,10 +1719,11 @@ dissect_inap_AnalysedInformationarg(gboolean implicit_tag _U_, tvbuff_t *tvb, in } + static int dissect_inap_DestinationAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1713,6 +1731,7 @@ static int dissect_destinationRoutingAddress_item(packet_info *pinfo, proto_tree return dissect_inap_DestinationAddress(FALSE, tvb, offset, pinfo, tree, hf_inap_destinationRoutingAddress_item); } + static const ber_sequence_t SEQUENCE_SIZE_1_3_OF_DestinationAddress_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_destinationRoutingAddress_item }, }; @@ -1720,7 +1739,7 @@ static const ber_sequence_t SEQUENCE_SIZE_1_3_OF_DestinationAddress_sequence_of[ static int dissect_inap_SEQUENCE_SIZE_1_3_OF_DestinationAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_SIZE_1_3_OF_DestinationAddress_sequence_of, hf_index, ett_inap_SEQUENCE_SIZE_1_3_OF_DestinationAddress); + SEQUENCE_SIZE_1_3_OF_DestinationAddress_sequence_of, hf_index, ett_inap_SEQUENCE_SIZE_1_3_OF_DestinationAddress); return offset; } @@ -1729,10 +1748,11 @@ static int dissect_destinationRoutingAddress_impl(packet_info *pinfo, proto_tree } + static int dissect_inap_OCTET_STRING_SIZE_3(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1778,7 +1798,7 @@ static const ber_choice_t PartyToCharge_choice[] = { static int dissect_inap_PartyToCharge(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, PartyToCharge_choice, hf_index, ett_inap_PartyToCharge, NULL); return offset; @@ -1803,10 +1823,11 @@ dissect_inap_ApplyChargingarg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs } + static int dissect_inap_ApplyChargingReportarg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1852,7 +1873,8 @@ static const value_string inap_T_dpCriteria_vals[] = { static int dissect_inap_T_dpCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1931,7 +1953,7 @@ static const ber_choice_t T_gapCriteria_choice[] = { static int dissect_inap_T_gapCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_gapCriteria_choice, hf_index, ett_inap_T_gapCriteria, NULL); return offset; @@ -1981,7 +2003,8 @@ static const value_string inap_T_controlType_vals[] = { static int dissect_inap_T_controlType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -2023,7 +2046,7 @@ static const ber_choice_t T_gapTreatment_choice[] = { static int dissect_inap_T_gapTreatment(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_gapTreatment_choice, hf_index, ett_inap_T_gapTreatment, NULL); return offset; @@ -2062,7 +2085,8 @@ static const value_string inap_T_requestedInformationType_vals[] = { static int dissect_inap_T_requestedInformationType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -2104,7 +2128,7 @@ static const ber_choice_t T_requestedInformationValue_choice[] = { static int dissect_inap_T_requestedInformationValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_requestedInformationValue_choice, hf_index, ett_inap_T_requestedInformationValue, NULL); return offset; @@ -2130,6 +2154,7 @@ static int dissect_requestedInformationList_item(packet_info *pinfo, proto_tree return dissect_inap_T_requestedInformationList_item(FALSE, tvb, offset, pinfo, tree, hf_inap_requestedInformationList_item); } + static const ber_sequence_t T_requestedInformationList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_requestedInformationList_item }, }; @@ -2137,7 +2162,7 @@ static const ber_sequence_t T_requestedInformationList_sequence_of[1] = { static int dissect_inap_T_requestedInformationList(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_requestedInformationList_sequence_of, hf_index, ett_inap_T_requestedInformationList); + T_requestedInformationList_sequence_of, hf_index, ett_inap_T_requestedInformationList); return offset; } @@ -2173,7 +2198,8 @@ static const value_string inap_T_requestedInformationTypeList_item_vals[] = { static int dissect_inap_T_requestedInformationTypeList_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -2181,6 +2207,7 @@ static int dissect_requestedInformationTypeList_item(packet_info *pinfo, proto_t return dissect_inap_T_requestedInformationTypeList_item(FALSE, tvb, offset, pinfo, tree, hf_inap_requestedInformationTypeList_item); } + static const ber_sequence_t T_requestedInformationTypeList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_requestedInformationTypeList_item }, }; @@ -2188,7 +2215,7 @@ static const ber_sequence_t T_requestedInformationTypeList_sequence_of[1] = { static int dissect_inap_T_requestedInformationTypeList(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_requestedInformationTypeList_sequence_of, hf_index, ett_inap_T_requestedInformationTypeList); + T_requestedInformationTypeList_sequence_of, hf_index, ett_inap_T_requestedInformationTypeList); return offset; } @@ -2264,7 +2291,7 @@ static const ber_choice_t Cancelarg_choice[] = { static int dissect_inap_Cancelarg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Cancelarg_choice, hf_index, ett_inap_Cancelarg, NULL); return offset; @@ -2289,7 +2316,7 @@ static const ber_choice_t FacilityGroupID_choice[] = { static int dissect_inap_FacilityGroupID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, FacilityGroupID_choice, hf_index, ett_inap_FacilityGroupID, NULL); return offset; @@ -2317,7 +2344,7 @@ static const ber_choice_t ResourceID_choice[] = { static int dissect_inap_ResourceID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ResourceID_choice, hf_index, ett_inap_ResourceID, NULL); return offset; @@ -2409,7 +2436,8 @@ static const value_string inap_T_forwardingCondition_vals[] = { static int dissect_inap_T_forwardingCondition(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -2465,7 +2493,7 @@ static const ber_choice_t T_resourceAddress_choice[] = { static int dissect_inap_T_resourceAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_resourceAddress_choice, hf_index, ett_inap_T_resourceAddress, NULL); return offset; @@ -2519,7 +2547,8 @@ static const value_string inap_MonitorMode_vals[] = { static int dissect_inap_MonitorMode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -2569,7 +2598,8 @@ static const value_string inap_EventTypeBCSM_vals[] = { static int dissect_inap_EventTypeBCSM(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -2610,10 +2640,11 @@ static int dissect_analyzedInfoSpecificInfo_impl(packet_info *pinfo, proto_tree } + static int dissect_inap_OCTET_STRING_SIZE_2_10(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -2835,7 +2866,7 @@ static const ber_choice_t T_eventSpecificInformationBCSM_choice[] = { static int dissect_inap_T_eventSpecificInformationBCSM(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_eventSpecificInformationBCSM_choice, hf_index, ett_inap_T_eventSpecificInformationBCSM, NULL); return offset; @@ -2863,10 +2894,11 @@ dissect_inap_EventReportBCSM(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse } + static int dissect_inap_FurnishChargingInformationarg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -2886,7 +2918,7 @@ static const ber_choice_t HoldCallInNetworkarg_choice[] = { static int dissect_inap_HoldCallInNetworkarg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, HoldCallInNetworkarg_choice, hf_index, ett_inap_HoldCallInNetworkarg, NULL); return offset; @@ -3032,7 +3064,8 @@ static const value_string inap_FeatureRequestIndicator_vals[] = { static int dissect_inap_FeatureRequestIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -3107,6 +3140,7 @@ dissect_inap_OriginationAttemptAuthorized(gboolean implicit_tag _U_, tvbuff_t *t } + static int dissect_inap_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index); @@ -3149,10 +3183,11 @@ dissect_inap_PlayAnnouncement(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs } + static int dissect_inap_OCTET_STRING_SIZE_1_2(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -3177,7 +3212,8 @@ static const value_string inap_T_errorTreatment_vals[] = { static int dissect_inap_T_errorTreatment(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -3226,7 +3262,7 @@ static const ber_choice_t T_collectedInfo_choice[] = { static int dissect_inap_T_collectedInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_collectedInfo_choice, hf_index, ett_inap_T_collectedInfo, NULL); return offset; @@ -3266,7 +3302,7 @@ static const ber_choice_t PromptAndCollectUserInformationres_choice[] = { static int dissect_inap_PromptAndCollectUserInformationres(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, PromptAndCollectUserInformationres_choice, hf_index, ett_inap_PromptAndCollectUserInformationres, NULL); return offset; @@ -3282,7 +3318,8 @@ static const value_string inap_ResourceStatus_vals[] = { static int dissect_inap_ResourceStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -3291,10 +3328,11 @@ static int dissect_resourceStatus_impl(packet_info *pinfo, proto_tree *tree, tvb } + static int dissect_inap_ReleaseCall(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -3330,7 +3368,7 @@ static const ber_choice_t ReleaseCallArg_choice[] = { static int dissect_inap_ReleaseCallArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ReleaseCallArg_choice, hf_index, ett_inap_ReleaseCallArg, NULL); return offset; @@ -3355,7 +3393,7 @@ static const ber_choice_t RequestCurrentStatusReportarg_choice[] = { static int dissect_inap_RequestCurrentStatusReportarg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, RequestCurrentStatusReportarg_choice, hf_index, ett_inap_RequestCurrentStatusReportarg, NULL); return offset; @@ -3428,6 +3466,7 @@ static int dissect_RequestNotificationChargingEvent_item(packet_info *pinfo, pro return dissect_inap_RequestNotificationChargingEvent_item(FALSE, tvb, offset, pinfo, tree, hf_inap_RequestNotificationChargingEvent_item); } + static const ber_sequence_t RequestNotificationChargingEvent_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RequestNotificationChargingEvent_item }, }; @@ -3435,7 +3474,7 @@ static const ber_sequence_t RequestNotificationChargingEvent_sequence_of[1] = { static int dissect_inap_RequestNotificationChargingEvent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - RequestNotificationChargingEvent_sequence_of, hf_index, ett_inap_RequestNotificationChargingEvent); + RequestNotificationChargingEvent_sequence_of, hf_index, ett_inap_RequestNotificationChargingEvent); return offset; } @@ -3481,7 +3520,7 @@ static const ber_choice_t T_dpSpecificCriteria_choice[] = { static int dissect_inap_T_dpSpecificCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_dpSpecificCriteria_choice, hf_index, ett_inap_T_dpSpecificCriteria, NULL); return offset; @@ -3509,6 +3548,7 @@ static int dissect_bcsmEvents_item(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_inap_T_bcsmEvents_item(FALSE, tvb, offset, pinfo, tree, hf_inap_bcsmEvents_item); } + static const ber_sequence_t T_bcsmEvents_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_bcsmEvents_item }, }; @@ -3516,7 +3556,7 @@ static const ber_sequence_t T_bcsmEvents_sequence_of[1] = { static int dissect_inap_T_bcsmEvents(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_bcsmEvents_sequence_of, hf_index, ett_inap_T_bcsmEvents); + T_bcsmEvents_sequence_of, hf_index, ett_inap_T_bcsmEvents); return offset; } @@ -3548,7 +3588,8 @@ static const value_string inap_T_timerID_vals[] = { static int dissect_inap_T_timerID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -3617,7 +3658,7 @@ static const ber_choice_t CalledFacilityGroup_choice[] = { static int dissect_inap_CalledFacilityGroup(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, CalledFacilityGroup_choice, hf_index, ett_inap_CalledFacilityGroup, NULL); return offset; @@ -3712,6 +3753,7 @@ static int dissect_countersValue_item(packet_info *pinfo, proto_tree *tree, tvbu return dissect_inap_T_countersValue_item(FALSE, tvb, offset, pinfo, tree, hf_inap_countersValue_item); } + static const ber_sequence_t T_countersValue_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_countersValue_item }, }; @@ -3719,7 +3761,7 @@ static const ber_sequence_t T_countersValue_sequence_of[1] = { static int dissect_inap_T_countersValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_countersValue_sequence_of, hf_index, ett_inap_T_countersValue); + T_countersValue_sequence_of, hf_index, ett_inap_T_countersValue); return offset; } @@ -3737,7 +3779,8 @@ static const value_string inap_T_responseCondition_vals[] = { static int dissect_inap_T_responseCondition(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -3772,7 +3815,8 @@ static const value_string inap_T_reportCondition_vals[] = { static int dissect_inap_T_reportCondition(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -3932,7 +3976,8 @@ static const value_string inap_T_problem_vals[] = { static int dissect_inap_T_problem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -3964,7 +4009,8 @@ static const value_string inap_RequestedInfoError_vals[] = { static int dissect_inap_RequestedInfoError(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -3982,7 +4028,8 @@ static const value_string inap_SystemFailure_vals[] = { static int dissect_inap_SystemFailure(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -3998,7 +4045,8 @@ static const value_string inap_TaskRefused_vals[] = { static int dissect_inap_TaskRefused(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -4031,7 +4079,7 @@ static const ber_choice_t T_rinvokeID_choice[] = { static int dissect_inap_T_rinvokeID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_rinvokeID_choice, hf_index, ett_inap_T_rinvokeID, NULL); return offset; @@ -4146,7 +4194,7 @@ static const ber_choice_t T_rproblem_choice[] = { static int dissect_inap_T_rproblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_rproblem_choice, hf_index, ett_inap_T_rproblem, NULL); return offset; @@ -4356,7 +4404,7 @@ static const ber_choice_t InvokeId_choice[] = { static int dissect_inap_InvokeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, InvokeId_choice, hf_index, ett_inap_InvokeId, NULL); return offset; @@ -4465,7 +4513,7 @@ dissect_inap_INAPPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packe /* Get the length and add 2 */ inap_pdu_size = tvb_get_guint8(tvb, offset+1)+2; - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, INAPPDU_choice, hf_index, ett_inap_INAPPDU, NULL); if (check_col(pinfo->cinfo, COL_INFO)){ @@ -4654,7 +4702,7 @@ void proto_register_inap(void) { "", HFILL }}, { &hf_inap_variableParts, { "variableParts", "inap.variableParts", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "VariableMessage/variableParts", HFILL }}, { &hf_inap_toneID, { "toneID", "inap.toneID", @@ -4678,7 +4726,7 @@ void proto_register_inap(void) { "MessageID/text", HFILL }}, { &hf_inap_elementaryMessageIDs, { "elementaryMessageIDs", "inap.elementaryMessageIDs", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MessageID/elementaryMessageIDs", HFILL }}, { &hf_inap_elementaryMessageIDs_item, { "Item", "inap.elementaryMessageIDs_item", @@ -4806,7 +4854,7 @@ void proto_register_inap(void) { "ActivateServiceFilteringarg/startTime", HFILL }}, { &hf_inap_extensions, { "extensions", "inap.extensions", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_inap_messageType, { "messageType", "inap.messageType", @@ -4946,7 +4994,7 @@ void proto_register_inap(void) { "", HFILL }}, { &hf_inap_routeList, { "routeList", "inap.routeList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_inap_travellingClassMark, { "travellingClassMark", "inap.travellingClassMark", @@ -4966,7 +5014,7 @@ void proto_register_inap(void) { "", HFILL }}, { &hf_inap_destinationRoutingAddress, { "destinationRoutingAddress", "inap.destinationRoutingAddress", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_inap_destinationRoutingAddress_item, { "Item", "inap.destinationRoutingAddress_item", @@ -5034,7 +5082,7 @@ void proto_register_inap(void) { "", HFILL }}, { &hf_inap_requestedInformationList, { "requestedInformationList", "inap.requestedInformationList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CallInformationReportarg/requestedInformationList", HFILL }}, { &hf_inap_requestedInformationList_item, { "Item", "inap.requestedInformationList_item", @@ -5066,7 +5114,7 @@ void proto_register_inap(void) { "CallInformationReportarg/requestedInformationList/_item/requestedInformationValue/releaseCauseValue", HFILL }}, { &hf_inap_requestedInformationTypeList, { "requestedInformationTypeList", "inap.requestedInformationTypeList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CallInformationRequestarg/requestedInformationTypeList", HFILL }}, { &hf_inap_requestedInformationTypeList_item, { "Item", "inap.requestedInformationTypeList_item", @@ -5350,7 +5398,7 @@ void proto_register_inap(void) { "RequestNotificationChargingEvent/_item", HFILL }}, { &hf_inap_bcsmEvents, { "bcsmEvents", "inap.bcsmEvents", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RequestReportBCSMEvent/bcsmEvents", HFILL }}, { &hf_inap_bcsmEvents_item, { "Item", "inap.bcsmEvents_item", @@ -5394,7 +5442,7 @@ void proto_register_inap(void) { "SendChargingInformation/sCIBillingChargingCharacteristics", HFILL }}, { &hf_inap_countersValue, { "countersValue", "inap.countersValue", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ServiceFilteringResponse/countersValue", HFILL }}, { &hf_inap_countersValue_item, { "Item", "inap.countersValue_item", diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index ac13c12b4a..71b68c6036 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -1336,7 +1336,7 @@ static const ber_choice_t kerberos_applications_choice[] = { static int dissect_krb5_application_choice(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - offset=dissect_ber_CHOICE(pinfo, tree, tvb, offset, kerberos_applications_choice, -1, -1, NULL); + offset=dissect_ber_choice(pinfo, tree, tvb, offset, kerberos_applications_choice, -1, -1, NULL); return offset; } @@ -2914,7 +2914,7 @@ dissect_krb5_decrypt_PRIV (packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, /* Add the decrypted data to the data source list. */ add_new_data_source(pinfo, next_tvb, "Decrypted Krb5"); - offset=dissect_ber_CHOICE(pinfo, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL); + offset=dissect_ber_choice(pinfo, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL); } return offset; @@ -3184,7 +3184,7 @@ dissect_krb5_decrypt_authenticator_data (packet_info *pinfo, proto_tree *tree, t add_new_data_source(pinfo, next_tvb, "Decrypted Krb5"); - offset=dissect_ber_CHOICE(pinfo, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL); + offset=dissect_ber_choice(pinfo, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL); } return offset; @@ -3261,7 +3261,7 @@ dissect_krb5_decrypt_Ticket_data (packet_info *pinfo, proto_tree *tree, tvbuff_t add_new_data_source(pinfo, next_tvb, "Decrypted Krb5"); - offset=dissect_ber_CHOICE(pinfo, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL); + offset=dissect_ber_choice(pinfo, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL); } return offset; @@ -3324,7 +3324,7 @@ static const ber_choice_t Ticket_choice[] = { static int dissect_krb5_Ticket(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - offset=dissect_ber_CHOICE(pinfo, tree, tvb, offset, Ticket_choice, -1, -1, NULL); + offset=dissect_ber_choice(pinfo, tree, tvb, offset, Ticket_choice, -1, -1, NULL); return offset; } @@ -3395,7 +3395,7 @@ dissect_krb5_decrypt_AP_REP_data(packet_info *pinfo, proto_tree *tree, tvbuff_t add_new_data_source(pinfo, next_tvb, "Decrypted Krb5"); - offset=dissect_ber_CHOICE(pinfo, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL); + offset=dissect_ber_choice(pinfo, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL); } return offset; @@ -3508,7 +3508,7 @@ dissect_krb5_decrypt_KDC_REP_data (packet_info *pinfo, proto_tree *tree, tvbuff_ add_new_data_source(pinfo, next_tvb, "Decrypted Krb5"); - offset=dissect_ber_CHOICE(pinfo, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL); + offset=dissect_ber_choice(pinfo, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL); } return offset; @@ -3837,7 +3837,7 @@ dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 4; } - offset=dissect_ber_CHOICE(pinfo, kerberos_tree, tvb, offset, kerberos_applications_choice, -1, -1, NULL); + offset=dissect_ber_choice(pinfo, kerberos_tree, tvb, offset, kerberos_applications_choice, -1, -1, NULL); proto_item_set_len(item, offset); pinfo->private_data=saved_private_data; diff --git a/epan/dissectors/packet-logotypecertextn.c b/epan/dissectors/packet-logotypecertextn.c index 9a2af76554..c93ac65c07 100644 --- a/epan/dissectors/packet-logotypecertextn.c +++ b/epan/dissectors/packet-logotypecertextn.c @@ -158,10 +158,11 @@ static int dissect_refStructURI_item(packet_info *pinfo, proto_tree *tree, tvbuf } + static int dissect_logotypecertextn_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -189,6 +190,7 @@ static int dissect_refStructHash_item(packet_info *pinfo, proto_tree *tree, tvbu return dissect_logotypecertextn_HashAlgAndValue(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_refStructHash_item); } + static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_logotypeHash_item }, }; @@ -196,7 +198,7 @@ static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue_sequence_of[1 static int dissect_logotypecertextn_SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue); + SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue); return offset; } @@ -207,6 +209,7 @@ static int dissect_refStructHash(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_logotypecertextn_SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_refStructHash); } + static const ber_sequence_t T_logotypeURI_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_logotypeURI_item }, }; @@ -214,7 +217,7 @@ static const ber_sequence_t T_logotypeURI_sequence_of[1] = { static int dissect_logotypecertextn_T_logotypeURI(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_logotypeURI_sequence_of, hf_index, ett_logotypecertextn_T_logotypeURI); + T_logotypeURI_sequence_of, hf_index, ett_logotypecertextn_T_logotypeURI); return offset; } @@ -311,7 +314,7 @@ static const ber_choice_t LogotypeImageResolution_choice[] = { static int dissect_logotypecertextn_LogotypeImageResolution(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, LogotypeImageResolution_choice, hf_index, ett_logotypecertextn_LogotypeImageResolution, NULL); return offset; @@ -358,6 +361,7 @@ static int dissect_image_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_logotypecertextn_LogotypeImage(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_image_item); } + static const ber_sequence_t SEQUENCE_OF_LogotypeImage_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_image_item }, }; @@ -365,7 +369,7 @@ static const ber_sequence_t SEQUENCE_OF_LogotypeImage_sequence_of[1] = { static int dissect_logotypecertextn_SEQUENCE_OF_LogotypeImage(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_LogotypeImage_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_LogotypeImage); + SEQUENCE_OF_LogotypeImage_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_LogotypeImage); return offset; } @@ -410,6 +414,7 @@ static int dissect_audio_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_logotypecertextn_LogotypeAudio(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_audio_item); } + static const ber_sequence_t SEQUENCE_OF_LogotypeAudio_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_audio_item }, }; @@ -417,7 +422,7 @@ static const ber_sequence_t SEQUENCE_OF_LogotypeAudio_sequence_of[1] = { static int dissect_logotypecertextn_SEQUENCE_OF_LogotypeAudio(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_LogotypeAudio_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_LogotypeAudio); + SEQUENCE_OF_LogotypeAudio_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_LogotypeAudio); return offset; } @@ -442,6 +447,7 @@ static int dissect_direct_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_logotypecertextn_LogotypeData(TRUE, tvb, offset, pinfo, tree, hf_logotypecertextn_direct); } + static const ber_sequence_t T_refStructURI_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_refStructURI_item }, }; @@ -449,7 +455,7 @@ static const ber_sequence_t T_refStructURI_sequence_of[1] = { static int dissect_logotypecertextn_T_refStructURI(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_refStructURI_sequence_of, hf_index, ett_logotypecertextn_T_refStructURI); + T_refStructURI_sequence_of, hf_index, ett_logotypecertextn_T_refStructURI); return offset; } @@ -489,7 +495,7 @@ static const ber_choice_t LogotypeInfo_choice[] = { static int dissect_logotypecertextn_LogotypeInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, LogotypeInfo_choice, hf_index, ett_logotypecertextn_LogotypeInfo, NULL); return offset; @@ -507,6 +513,7 @@ static int dissect_info(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_logotypecertextn_LogotypeInfo(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_info); } + static const ber_sequence_t SEQUENCE_OF_LogotypeInfo_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_communityLogos_item }, }; @@ -514,7 +521,7 @@ static const ber_sequence_t SEQUENCE_OF_LogotypeInfo_sequence_of[1] = { static int dissect_logotypecertextn_SEQUENCE_OF_LogotypeInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_LogotypeInfo_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_LogotypeInfo); + SEQUENCE_OF_LogotypeInfo_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_LogotypeInfo); return offset; } @@ -552,6 +559,7 @@ static int dissect_otherLogos_item(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_logotypecertextn_OtherLogotypeInfo(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_otherLogos_item); } + static const ber_sequence_t SEQUENCE_OF_OtherLogotypeInfo_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_otherLogos_item }, }; @@ -559,7 +567,7 @@ static const ber_sequence_t SEQUENCE_OF_OtherLogotypeInfo_sequence_of[1] = { static int dissect_logotypecertextn_SEQUENCE_OF_OtherLogotypeInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_OtherLogotypeInfo_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_OtherLogotypeInfo); + SEQUENCE_OF_OtherLogotypeInfo_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_OtherLogotypeInfo); return offset; } @@ -608,7 +616,7 @@ void proto_register_logotypecertextn(void) { "LogotypeExtn", HFILL }}, { &hf_logotypecertextn_communityLogos, { "communityLogos", "logotypecertextn.communityLogos", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "LogotypeExtn/communityLogos", HFILL }}, { &hf_logotypecertextn_communityLogos_item, { "Item", "logotypecertextn.communityLogos_item", @@ -624,7 +632,7 @@ void proto_register_logotypecertextn(void) { "LogotypeExtn/subjectLogo", HFILL }}, { &hf_logotypecertextn_otherLogos, { "otherLogos", "logotypecertextn.otherLogos", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "LogotypeExtn/otherLogos", HFILL }}, { &hf_logotypecertextn_otherLogos_item, { "Item", "logotypecertextn.otherLogos_item", @@ -640,7 +648,7 @@ void proto_register_logotypecertextn(void) { "LogotypeInfo/indirect", HFILL }}, { &hf_logotypecertextn_image, { "image", "logotypecertextn.image", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "LogotypeData/image", HFILL }}, { &hf_logotypecertextn_image_item, { "Item", "logotypecertextn.image_item", @@ -648,7 +656,7 @@ void proto_register_logotypecertextn(void) { "LogotypeData/image/_item", HFILL }}, { &hf_logotypecertextn_audio, { "audio", "logotypecertextn.audio", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "LogotypeData/audio", HFILL }}, { &hf_logotypecertextn_audio_item, { "Item", "logotypecertextn.audio_item", @@ -676,7 +684,7 @@ void proto_register_logotypecertextn(void) { "LogotypeDetails/mediaType", HFILL }}, { &hf_logotypecertextn_logotypeHash, { "logotypeHash", "logotypecertextn.logotypeHash", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "LogotypeDetails/logotypeHash", HFILL }}, { &hf_logotypecertextn_logotypeHash_item, { "Item", "logotypecertextn.logotypeHash_item", @@ -684,7 +692,7 @@ void proto_register_logotypecertextn(void) { "LogotypeDetails/logotypeHash/_item", HFILL }}, { &hf_logotypecertextn_logotypeURI, { "logotypeURI", "logotypecertextn.logotypeURI", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "LogotypeDetails/logotypeURI", HFILL }}, { &hf_logotypecertextn_logotypeURI_item, { "Item", "logotypecertextn.logotypeURI_item", @@ -744,7 +752,7 @@ void proto_register_logotypecertextn(void) { "OtherLogotypeInfo/info", HFILL }}, { &hf_logotypecertextn_refStructHash, { "refStructHash", "logotypecertextn.refStructHash", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "LogotypeReference/refStructHash", HFILL }}, { &hf_logotypecertextn_refStructHash_item, { "Item", "logotypecertextn.refStructHash_item", @@ -752,7 +760,7 @@ void proto_register_logotypecertextn(void) { "LogotypeReference/refStructHash/_item", HFILL }}, { &hf_logotypecertextn_refStructURI, { "refStructURI", "logotypecertextn.refStructURI", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "LogotypeReference/refStructURI", HFILL }}, { &hf_logotypecertextn_refStructURI_item, { "Item", "logotypecertextn.refStructURI_item", @@ -815,9 +823,9 @@ void proto_reg_handoff_logotypecertextn(void) { /*--- Included file: packet-logotypecertextn-dis-tab.c ---*/ - register_ber_oid_dissector("1.3.6.1.5.5.7.1.12", dissect_LogotypeExtn_PDU, proto_logotypecertextn, "id-pe-logotype"); - register_ber_oid_dissector("1.3.6.1.5.5.7.20.1", dissect_LogotypeExtn_PDU, proto_logotypecertextn, "id-pe-logo-loyalty"); - register_ber_oid_dissector("1.3.6.1.5.5.7.20.2", dissect_LogotypeExtn_PDU, proto_logotypecertextn, "id-pe-logo-background"); + register_ber_oid_dissector("1.3.6.1.5.5.7.1.12", dissect_LogotypeExtn_PDU, proto_logotypecertextn, "id-pe-logotype"); + register_ber_oid_dissector("1.3.6.1.5.5.7.20.1", dissect_LogotypeExtn_PDU, proto_logotypecertextn, "id-pe-logo-loyalty"); + register_ber_oid_dissector("1.3.6.1.5.5.7.20.2", dissect_LogotypeExtn_PDU, proto_logotypecertextn, "id-pe-logo-background"); /*--- End of included file: packet-logotypecertextn-dis-tab.c ---*/ diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c index ea3a2fda05..b733ffb18a 100644 --- a/epan/dissectors/packet-mms.c +++ b/epan/dissectors/packet-mms.c @@ -1179,7 +1179,7 @@ static const ber_choice_t ObjectName_choice[] = { static int dissect_mms_ObjectName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ObjectName_choice, hf_index, ett_mms_ObjectName, NULL); return offset; @@ -1342,6 +1342,7 @@ static int dissect_prio_rity_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_mms_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index); @@ -1440,7 +1441,7 @@ static const ber_choice_t Modifier_choice[] = { static int dissect_mms_Modifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Modifier_choice, hf_index, ett_mms_Modifier, NULL); return offset; @@ -1449,6 +1450,7 @@ static int dissect_listOfModifier_item(packet_info *pinfo, proto_tree *tree, tvb return dissect_mms_Modifier(FALSE, tvb, offset, pinfo, tree, hf_mms_listOfModifier_item); } + static const ber_sequence_t SEQUENCE_OF_Modifier_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_listOfModifier_item }, }; @@ -1456,7 +1458,7 @@ static const ber_sequence_t SEQUENCE_OF_Modifier_sequence_of[1] = { static int dissect_mms_SEQUENCE_OF_Modifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_Modifier_sequence_of, hf_index, ett_mms_SEQUENCE_OF_Modifier); + SEQUENCE_OF_Modifier_sequence_of, hf_index, ett_mms_SEQUENCE_OF_Modifier); return offset; } @@ -1468,6 +1470,7 @@ static int dissect_listOfModifier_impl(packet_info *pinfo, proto_tree *tree, tvb } + static int dissect_mms_Status_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index); @@ -1520,7 +1523,7 @@ static const ber_choice_t T_extendedObjectClass_choice[] = { static int dissect_mms_T_extendedObjectClass(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_extendedObjectClass_choice, hf_index, ett_mms_T_extendedObjectClass, NULL); return offset; @@ -1591,7 +1594,7 @@ static const ber_choice_t T_objectScope_choice[] = { static int dissect_mms_T_objectScope(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_objectScope_choice, hf_index, ett_mms_T_objectScope, NULL); return offset; @@ -1672,7 +1675,7 @@ static const ber_choice_t T_extendedObjectClass1_choice[] = { static int dissect_mms_T_extendedObjectClass1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_extendedObjectClass1_choice, hf_index, ett_mms_T_extendedObjectClass1, NULL); return offset; @@ -1755,10 +1758,11 @@ static int dissect_annotation_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ } + static int dissect_mms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -1810,7 +1814,7 @@ static const ber_choice_t Address_choice[] = { static int dissect_mms_Address(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Address_choice, hf_index, ett_mms_Address, NULL); return offset; @@ -1854,6 +1858,7 @@ static int dissect_components_item(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_mms_T_components_item(FALSE, tvb, offset, pinfo, tree, hf_mms_components_item); } + static const ber_sequence_t T_components_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_components_item }, }; @@ -1861,7 +1866,7 @@ static const ber_sequence_t T_components_sequence_of[1] = { static int dissect_mms_T_components(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_components_sequence_of, hf_index, ett_mms_T_components); + T_components_sequence_of, hf_index, ett_mms_T_components); return offset; } @@ -1957,7 +1962,7 @@ static const ber_choice_t TypeSpecification_choice[] = { static int dissect_mms_TypeSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, TypeSpecification_choice, hf_index, ett_mms_TypeSpecification, NULL); return offset; @@ -2016,7 +2021,7 @@ static const ber_choice_t T_selectAccess_choice[] = { static int dissect_mms_T_selectAccess(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_selectAccess_choice, hf_index, ett_mms_T_selectAccess, NULL); return offset; @@ -2038,7 +2043,7 @@ static const ber_choice_t AlternateAccessSelection_choice[] = { static int dissect_mms_AlternateAccessSelection(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, AlternateAccessSelection_choice, hf_index, ett_mms_AlternateAccessSelection, NULL); return offset; @@ -2082,7 +2087,7 @@ static const ber_choice_t AlternateAccess_item_choice[] = { static int dissect_mms_AlternateAccess_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, AlternateAccess_item_choice, hf_index, ett_mms_AlternateAccess_item, NULL); return offset; @@ -2091,6 +2096,7 @@ static int dissect_AlternateAccess_item(packet_info *pinfo, proto_tree *tree, tv return dissect_mms_AlternateAccess_item(FALSE, tvb, offset, pinfo, tree, hf_mms_AlternateAccess_item); } + static const ber_sequence_t AlternateAccess_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_AlternateAccess_item }, }; @@ -2098,7 +2104,7 @@ static const ber_sequence_t AlternateAccess_sequence_of[1] = { static int dissect_mms_AlternateAccess(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - AlternateAccess_sequence_of, hf_index, ett_mms_AlternateAccess); + AlternateAccess_sequence_of, hf_index, ett_mms_AlternateAccess); return offset; } @@ -2124,6 +2130,7 @@ static int dissect_ScatteredAccessDescription_item(packet_info *pinfo, proto_tre return dissect_mms_ScatteredAccessDescription_item(FALSE, tvb, offset, pinfo, tree, hf_mms_ScatteredAccessDescription_item); } + static const ber_sequence_t ScatteredAccessDescription_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ScatteredAccessDescription_item }, }; @@ -2131,7 +2138,7 @@ static const ber_sequence_t ScatteredAccessDescription_sequence_of[1] = { static int dissect_mms_ScatteredAccessDescription(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - ScatteredAccessDescription_sequence_of, hf_index, ett_mms_ScatteredAccessDescription); + ScatteredAccessDescription_sequence_of, hf_index, ett_mms_ScatteredAccessDescription); return offset; } @@ -2160,7 +2167,7 @@ static const ber_choice_t VariableSpecification_choice[] = { static int dissect_mms_VariableSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, VariableSpecification_choice, hf_index, ett_mms_VariableSpecification, NULL); return offset; @@ -2183,6 +2190,7 @@ static int dissect_listOfVariable_item2(packet_info *pinfo, proto_tree *tree, tv return dissect_mms_T_listOfVariable_item2(FALSE, tvb, offset, pinfo, tree, hf_mms_listOfVariable_item2); } + static const ber_sequence_t T_listOfVariable2_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfVariable_item2 }, }; @@ -2190,7 +2198,7 @@ static const ber_sequence_t T_listOfVariable2_sequence_of[1] = { static int dissect_mms_T_listOfVariable2(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_listOfVariable2_sequence_of, hf_index, ett_mms_T_listOfVariable2); + T_listOfVariable2_sequence_of, hf_index, ett_mms_T_listOfVariable2); return offset; } @@ -2213,7 +2221,7 @@ static const ber_choice_t VariableAccessSpecification_choice[] = { static int dissect_mms_VariableAccessSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, VariableAccessSpecification_choice, hf_index, ett_mms_VariableAccessSpecification, NULL); return offset; @@ -2242,6 +2250,7 @@ static int dissect_read_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_mms_Read_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_read); } + static const ber_sequence_t SEQUENCE_OF_Data_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_listOfData_item }, }; @@ -2249,7 +2258,7 @@ static const ber_sequence_t SEQUENCE_OF_Data_sequence_of[1] = { static int dissect_mms_SEQUENCE_OF_Data(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_Data_sequence_of, hf_index, ett_mms_SEQUENCE_OF_Data); + SEQUENCE_OF_Data_sequence_of, hf_index, ett_mms_SEQUENCE_OF_Data); return offset; } @@ -2308,10 +2317,11 @@ static int dissect_bcd1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb } + static int dissect_mms_FloatingPoint(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -2320,10 +2330,11 @@ static int dissect_floating_point_impl(packet_info *pinfo, proto_tree *tree, tvb } + static int dissect_mms_TimeOfDay(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -2384,7 +2395,7 @@ static const ber_choice_t Data_choice[] = { static int dissect_mms_Data(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Data_choice, hf_index, ett_mms_Data, NULL); return offset; @@ -2422,7 +2433,7 @@ static const ber_choice_t GetVariableAccessAttributes_Request_choice[] = { static int dissect_mms_GetVariableAccessAttributes_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, GetVariableAccessAttributes_Request_choice, hf_index, ett_mms_GetVariableAccessAttributes_Request, NULL); return offset; @@ -2498,6 +2509,7 @@ static int dissect_scopeOfDelete_impl(packet_info *pinfo, proto_tree *tree, tvbu return dissect_mms_T_scopeOfDelete(TRUE, tvb, offset, pinfo, tree, hf_mms_scopeOfDelete); } + static const ber_sequence_t SEQUENCE_OF_ObjectName_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_listOfName_item }, }; @@ -2505,7 +2517,7 @@ static const ber_sequence_t SEQUENCE_OF_ObjectName_sequence_of[1] = { static int dissect_mms_SEQUENCE_OF_ObjectName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_ObjectName_sequence_of, hf_index, ett_mms_SEQUENCE_OF_ObjectName); + SEQUENCE_OF_ObjectName_sequence_of, hf_index, ett_mms_SEQUENCE_OF_ObjectName); return offset; } @@ -2560,6 +2572,7 @@ static int dissect_listOfVariable_item(packet_info *pinfo, proto_tree *tree, tvb return dissect_mms_T_listOfVariable_item(FALSE, tvb, offset, pinfo, tree, hf_mms_listOfVariable_item); } + static const ber_sequence_t T_listOfVariable_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfVariable_item }, }; @@ -2567,7 +2580,7 @@ static const ber_sequence_t T_listOfVariable_sequence_of[1] = { static int dissect_mms_T_listOfVariable(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_listOfVariable_sequence_of, hf_index, ett_mms_T_listOfVariable); + T_listOfVariable_sequence_of, hf_index, ett_mms_T_listOfVariable); return offset; } @@ -2709,6 +2722,7 @@ static int dissect_deleteNamedType_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_mms_DeleteNamedType_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_deleteNamedType); } + static const ber_sequence_t T_listOfPromptData_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfPromptData_item }, }; @@ -2716,7 +2730,7 @@ static const ber_sequence_t T_listOfPromptData_sequence_of[1] = { static int dissect_mms_T_listOfPromptData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_listOfPromptData_sequence_of, hf_index, ett_mms_T_listOfPromptData); + T_listOfPromptData_sequence_of, hf_index, ett_mms_T_listOfPromptData); return offset; } @@ -2743,6 +2757,7 @@ static int dissect_input_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_mms_Input_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_input); } + static const ber_sequence_t T_listOfOutputData_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfOutputData_item }, }; @@ -2750,7 +2765,7 @@ static const ber_sequence_t T_listOfOutputData_sequence_of[1] = { static int dissect_mms_T_listOfOutputData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_listOfOutputData_sequence_of, hf_index, ett_mms_T_listOfOutputData); + T_listOfOutputData_sequence_of, hf_index, ett_mms_T_listOfOutputData); return offset; } @@ -3012,6 +3027,7 @@ static int dissect_reportSemaphoreEntryStatus_impl(packet_info *pinfo, proto_tre return dissect_mms_ReportSemaphoreEntryStatus_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_reportSemaphoreEntryStatus); } + static const ber_sequence_t T_listOfCapabilities1_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfCapabilities_item }, }; @@ -3019,7 +3035,7 @@ static const ber_sequence_t T_listOfCapabilities1_sequence_of[1] = { static int dissect_mms_T_listOfCapabilities1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_listOfCapabilities1_sequence_of, hf_index, ett_mms_T_listOfCapabilities1); + T_listOfCapabilities1_sequence_of, hf_index, ett_mms_T_listOfCapabilities1); return offset; } @@ -3360,7 +3376,7 @@ static const ber_choice_t T_errorClass_choice[] = { static int dissect_mms_T_errorClass(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_errorClass_choice, hf_index, ett_mms_T_errorClass, NULL); return offset; @@ -3552,7 +3568,7 @@ static const ber_choice_t T_serviceSpecificInformation_choice[] = { static int dissect_mms_T_serviceSpecificInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_serviceSpecificInformation_choice, hf_index, ett_mms_T_serviceSpecificInformation, NULL); return offset; @@ -3636,6 +3652,7 @@ static int dissect_terminateUploadSequence_impl(packet_info *pinfo, proto_tree * return dissect_mms_TerminateUploadSequence_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_terminateUploadSequence); } + static const ber_sequence_t T_listOfCapabilities3_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfCapabilities_item }, }; @@ -3643,7 +3660,7 @@ static const ber_sequence_t T_listOfCapabilities3_sequence_of[1] = { static int dissect_mms_T_listOfCapabilities3(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_listOfCapabilities3_sequence_of, hf_index, ett_mms_T_listOfCapabilities3); + T_listOfCapabilities3_sequence_of, hf_index, ett_mms_T_listOfCapabilities3); return offset; } @@ -3664,6 +3681,7 @@ static int dissect_FileName_item(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_mms_GraphicString(FALSE, tvb, offset, pinfo, tree, hf_mms_FileName_item); } + static const ber_sequence_t FileName_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_GraphicString, BER_FLAGS_NOOWNTAG, dissect_FileName_item }, }; @@ -3671,7 +3689,7 @@ static const ber_sequence_t FileName_sequence_of[1] = { static int dissect_mms_FileName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - FileName_sequence_of, hf_index, ett_mms_FileName); + FileName_sequence_of, hf_index, ett_mms_FileName); return offset; } @@ -3739,6 +3757,7 @@ static int dissect_requestDomainUpload_impl(packet_info *pinfo, proto_tree *tree return dissect_mms_RequestDomainUpload_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_requestDomainUpload); } + static const ber_sequence_t T_listOfCapabilities4_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfCapabilities_item }, }; @@ -3746,7 +3765,7 @@ static const ber_sequence_t T_listOfCapabilities4_sequence_of[1] = { static int dissect_mms_T_listOfCapabilities4(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_listOfCapabilities4_sequence_of, hf_index, ett_mms_T_listOfCapabilities4); + T_listOfCapabilities4_sequence_of, hf_index, ett_mms_T_listOfCapabilities4); return offset; } @@ -3814,6 +3833,7 @@ static int dissect_getDomainAttributes_impl(packet_info *pinfo, proto_tree *tree return dissect_mms_GetDomainAttributes_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_getDomainAttributes); } + static const ber_sequence_t SEQUENCE_OF_Identifier_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfIdentifier_item }, }; @@ -3821,7 +3841,7 @@ static const ber_sequence_t SEQUENCE_OF_Identifier_sequence_of[1] = { static int dissect_mms_SEQUENCE_OF_Identifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_Identifier_sequence_of, hf_index, ett_mms_SEQUENCE_OF_Identifier); + SEQUENCE_OF_Identifier_sequence_of, hf_index, ett_mms_SEQUENCE_OF_Identifier); return offset; } @@ -3883,7 +3903,7 @@ static const ber_choice_t T_executionArgument_choice[] = { static int dissect_mms_T_executionArgument(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_executionArgument_choice, hf_index, ett_mms_T_executionArgument, NULL); return offset; @@ -3940,7 +3960,7 @@ static const ber_choice_t T_executionArgument1_choice[] = { static int dissect_mms_T_executionArgument1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_executionArgument1_choice, hf_index, ett_mms_T_executionArgument1, NULL); return offset; @@ -4087,7 +4107,7 @@ static const ber_choice_t DeleteEventCondition_Request_choice[] = { static int dissect_mms_DeleteEventCondition_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, DeleteEventCondition_Request_choice, hf_index, ett_mms_DeleteEventCondition_Request, NULL); return offset; @@ -4191,7 +4211,7 @@ static const ber_choice_t DeleteEventAction_Request_choice[] = { static int dissect_mms_DeleteEventAction_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, DeleteEventAction_Request_choice, hf_index, ett_mms_DeleteEventAction_Request, NULL); return offset; @@ -4284,7 +4304,7 @@ static const ber_choice_t DeleteEventEnrollment_Request_choice[] = { static int dissect_mms_DeleteEventEnrollment_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, DeleteEventEnrollment_Request_choice, hf_index, ett_mms_DeleteEventEnrollment_Request, NULL); return offset; @@ -4402,7 +4422,7 @@ static const ber_choice_t EventTime_choice[] = { static int dissect_mms_EventTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, EventTime_choice, hf_index, ett_mms_EventTime, NULL); return offset; @@ -4573,7 +4593,7 @@ static const ber_choice_t T_rangeStartSpecification_choice[] = { static int dissect_mms_T_rangeStartSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_rangeStartSpecification_choice, hf_index, ett_mms_T_rangeStartSpecification, NULL); return offset; @@ -4597,7 +4617,7 @@ static const ber_choice_t T_rangeStopSpecification_choice[] = { static int dissect_mms_T_rangeStopSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_rangeStopSpecification_choice, hf_index, ett_mms_T_rangeStopSpecification, NULL); return offset; @@ -4606,6 +4626,7 @@ static int dissect_rangeStopSpecification(packet_info *pinfo, proto_tree *tree, return dissect_mms_T_rangeStopSpecification(FALSE, tvb, offset, pinfo, tree, hf_mms_rangeStopSpecification); } + static const ber_sequence_t T_listOfVariables_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfVariables_item }, }; @@ -4613,7 +4634,7 @@ static const ber_sequence_t T_listOfVariables_sequence_of[1] = { static int dissect_mms_T_listOfVariables(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_listOfVariables_sequence_of, hf_index, ett_mms_T_listOfVariables); + T_listOfVariables_sequence_of, hf_index, ett_mms_T_listOfVariables); return offset; } @@ -4704,6 +4725,7 @@ static int dissect_listOfVariables_item1(packet_info *pinfo, proto_tree *tree, t return dissect_mms_T_listOfVariables_item(FALSE, tvb, offset, pinfo, tree, hf_mms_listOfVariables_item1); } + static const ber_sequence_t T_listOfVariables1_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfVariables_item1 }, }; @@ -4711,7 +4733,7 @@ static const ber_sequence_t T_listOfVariables1_sequence_of[1] = { static int dissect_mms_T_listOfVariables1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_listOfVariables1_sequence_of, hf_index, ett_mms_T_listOfVariables1); + T_listOfVariables1_sequence_of, hf_index, ett_mms_T_listOfVariables1); return offset; } @@ -4751,7 +4773,7 @@ static const ber_choice_t T_entryForm_choice[] = { static int dissect_mms_T_entryForm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_entryForm_choice, hf_index, ett_mms_T_entryForm, NULL); return offset; @@ -4781,6 +4803,7 @@ static int dissect_listOfJournalEntry_item1(packet_info *pinfo, proto_tree *tree return dissect_mms_EntryContent(FALSE, tvb, offset, pinfo, tree, hf_mms_listOfJournalEntry_item1); } + static const ber_sequence_t SEQUENCE_OF_EntryContent_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfJournalEntry_item1 }, }; @@ -4788,7 +4811,7 @@ static const ber_sequence_t SEQUENCE_OF_EntryContent_sequence_of[1] = { static int dissect_mms_SEQUENCE_OF_EntryContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_EntryContent_sequence_of, hf_index, ett_mms_SEQUENCE_OF_EntryContent); + SEQUENCE_OF_EntryContent_sequence_of, hf_index, ett_mms_SEQUENCE_OF_EntryContent); return offset; } @@ -5157,7 +5180,7 @@ static const ber_choice_t ConfirmedServiceRequest_choice[] = { static int dissect_mms_ConfirmedServiceRequest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ConfirmedServiceRequest_choice, hf_index, ett_mms_ConfirmedServiceRequest, NULL); return offset; @@ -5179,7 +5202,7 @@ static const ber_choice_t CS_Request_Detail_choice[] = { static int dissect_mms_CS_Request_Detail(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, CS_Request_Detail_choice, hf_index, ett_mms_CS_Request_Detail, NULL); return offset; @@ -5310,6 +5333,7 @@ static int dissect_listOfAbstractSyntaxes_item(packet_info *pinfo, proto_tree *t return dissect_mms_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_mms_listOfAbstractSyntaxes_item); } + static const ber_sequence_t T_listOfAbstractSyntaxes_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_listOfAbstractSyntaxes_item }, }; @@ -5317,7 +5341,7 @@ static const ber_sequence_t T_listOfAbstractSyntaxes_sequence_of[1] = { static int dissect_mms_T_listOfAbstractSyntaxes(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_listOfAbstractSyntaxes_sequence_of, hf_index, ett_mms_T_listOfAbstractSyntaxes); + T_listOfAbstractSyntaxes_sequence_of, hf_index, ett_mms_T_listOfAbstractSyntaxes); return offset; } @@ -5399,7 +5423,7 @@ static const ber_choice_t AccessResult_choice[] = { static int dissect_mms_AccessResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, AccessResult_choice, hf_index, ett_mms_AccessResult, NULL); return offset; @@ -5408,6 +5432,7 @@ static int dissect_listOfAccessResult_item(packet_info *pinfo, proto_tree *tree, return dissect_mms_AccessResult(FALSE, tvb, offset, pinfo, tree, hf_mms_listOfAccessResult_item); } + static const ber_sequence_t SEQUENCE_OF_AccessResult_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_listOfAccessResult_item }, }; @@ -5415,7 +5440,7 @@ static const ber_sequence_t SEQUENCE_OF_AccessResult_sequence_of[1] = { static int dissect_mms_SEQUENCE_OF_AccessResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_AccessResult_sequence_of, hf_index, ett_mms_SEQUENCE_OF_AccessResult); + SEQUENCE_OF_AccessResult_sequence_of, hf_index, ett_mms_SEQUENCE_OF_AccessResult); return offset; } @@ -5455,7 +5480,7 @@ static const ber_choice_t Write_Response_item_choice[] = { static int dissect_mms_Write_Response_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Write_Response_item_choice, hf_index, ett_mms_Write_Response_item, NULL); return offset; @@ -5464,6 +5489,7 @@ static int dissect_Write_Response_item(packet_info *pinfo, proto_tree *tree, tvb return dissect_mms_Write_Response_item(FALSE, tvb, offset, pinfo, tree, hf_mms_Write_Response_item); } + static const ber_sequence_t Write_Response_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_Write_Response_item }, }; @@ -5471,7 +5497,7 @@ static const ber_sequence_t Write_Response_sequence_of[1] = { static int dissect_mms_Write_Response(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - Write_Response_sequence_of, hf_index, ett_mms_Write_Response); + Write_Response_sequence_of, hf_index, ett_mms_Write_Response); return offset; } @@ -5584,6 +5610,7 @@ static int dissect_listOfVariable_item1(packet_info *pinfo, proto_tree *tree, tv return dissect_mms_T_listOfVariable_item1(FALSE, tvb, offset, pinfo, tree, hf_mms_listOfVariable_item1); } + static const ber_sequence_t T_listOfVariable1_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfVariable_item1 }, }; @@ -5591,7 +5618,7 @@ static const ber_sequence_t T_listOfVariable1_sequence_of[1] = { static int dissect_mms_T_listOfVariable1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_listOfVariable1_sequence_of, hf_index, ett_mms_T_listOfVariable1); + T_listOfVariable1_sequence_of, hf_index, ett_mms_T_listOfVariable1); return offset; } @@ -5719,7 +5746,7 @@ static const ber_choice_t TakeControl_Response_choice[] = { static int dissect_mms_TakeControl_Response(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, TakeControl_Response_choice, hf_index, ett_mms_TakeControl_Response, NULL); return offset; @@ -5820,7 +5847,7 @@ static const ber_choice_t T_listOfNamedTokens_item_choice[] = { static int dissect_mms_T_listOfNamedTokens_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_listOfNamedTokens_item_choice, hf_index, ett_mms_T_listOfNamedTokens_item, NULL); return offset; @@ -5829,6 +5856,7 @@ static int dissect_listOfNamedTokens_item(packet_info *pinfo, proto_tree *tree, return dissect_mms_T_listOfNamedTokens_item(FALSE, tvb, offset, pinfo, tree, hf_mms_listOfNamedTokens_item); } + static const ber_sequence_t T_listOfNamedTokens_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_listOfNamedTokens_item }, }; @@ -5836,7 +5864,7 @@ static const ber_sequence_t T_listOfNamedTokens_sequence_of[1] = { static int dissect_mms_T_listOfNamedTokens(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_listOfNamedTokens_sequence_of, hf_index, ett_mms_T_listOfNamedTokens); + T_listOfNamedTokens_sequence_of, hf_index, ett_mms_T_listOfNamedTokens); return offset; } @@ -5903,6 +5931,7 @@ static int dissect_listOfSemaphoreEntry_item(packet_info *pinfo, proto_tree *tre return dissect_mms_SemaphoreEntry(FALSE, tvb, offset, pinfo, tree, hf_mms_listOfSemaphoreEntry_item); } + static const ber_sequence_t SEQUENCE_OF_SemaphoreEntry_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfSemaphoreEntry_item }, }; @@ -5910,7 +5939,7 @@ static const ber_sequence_t SEQUENCE_OF_SemaphoreEntry_sequence_of[1] = { static int dissect_mms_SEQUENCE_OF_SemaphoreEntry(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_SemaphoreEntry_sequence_of, hf_index, ett_mms_SEQUENCE_OF_SemaphoreEntry); + SEQUENCE_OF_SemaphoreEntry_sequence_of, hf_index, ett_mms_SEQUENCE_OF_SemaphoreEntry); return offset; } @@ -5962,7 +5991,7 @@ static const ber_choice_t T_loadData_choice[] = { static int dissect_mms_T_loadData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_loadData_choice, hf_index, ett_mms_T_loadData, NULL); return offset; @@ -6000,6 +6029,7 @@ static int dissect_terminateDownloadSequence1_impl(packet_info *pinfo, proto_tre return dissect_mms_TerminateDownloadSequence_Response(TRUE, tvb, offset, pinfo, tree, hf_mms_terminateDownloadSequence1); } + static const ber_sequence_t T_listOfCapabilities2_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfCapabilities_item }, }; @@ -6007,7 +6037,7 @@ static const ber_sequence_t T_listOfCapabilities2_sequence_of[1] = { static int dissect_mms_T_listOfCapabilities2(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_listOfCapabilities2_sequence_of, hf_index, ett_mms_T_listOfCapabilities2); + T_listOfCapabilities2_sequence_of, hf_index, ett_mms_T_listOfCapabilities2); return offset; } @@ -6047,7 +6077,7 @@ static const ber_choice_t T_loadData1_choice[] = { static int dissect_mms_T_loadData1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_loadData1_choice, hf_index, ett_mms_T_loadData1, NULL); return offset; @@ -6145,6 +6175,7 @@ static int dissect_deleteDomain1_impl(packet_info *pinfo, proto_tree *tree, tvbu return dissect_mms_DeleteDomain_Response(TRUE, tvb, offset, pinfo, tree, hf_mms_deleteDomain1); } + static const ber_sequence_t T_listOfCapabilities5_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfCapabilities_item }, }; @@ -6152,7 +6183,7 @@ static const ber_sequence_t T_listOfCapabilities5_sequence_of[1] = { static int dissect_mms_T_listOfCapabilities5(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_listOfCapabilities5_sequence_of, hf_index, ett_mms_T_listOfCapabilities5); + T_listOfCapabilities5_sequence_of, hf_index, ett_mms_T_listOfCapabilities5); return offset; } @@ -6331,7 +6362,7 @@ static const ber_choice_t T_executionArgument2_choice[] = { static int dissect_mms_T_executionArgument2(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_executionArgument2_choice, hf_index, ett_mms_T_executionArgument2, NULL); return offset; @@ -6457,7 +6488,7 @@ static const ber_choice_t T_monitoredVariable_choice[] = { static int dissect_mms_T_monitoredVariable(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_monitoredVariable_choice, hf_index, ett_mms_T_monitoredVariable, NULL); return offset; @@ -6652,7 +6683,7 @@ static const ber_choice_t T_currentState_choice[] = { static int dissect_mms_T_currentState(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_currentState_choice, hf_index, ett_mms_T_currentState, NULL); return offset; @@ -6732,7 +6763,7 @@ static const ber_choice_t T_eventConditionName_choice[] = { static int dissect_mms_T_eventConditionName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_eventConditionName_choice, hf_index, ett_mms_T_eventConditionName, NULL); return offset; @@ -6756,7 +6787,7 @@ static const ber_choice_t T_eventActionName_choice[] = { static int dissect_mms_T_eventActionName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_eventActionName_choice, hf_index, ett_mms_T_eventActionName, NULL); return offset; @@ -6808,6 +6839,7 @@ static int dissect_listOfEventEnrollment_item(packet_info *pinfo, proto_tree *tr return dissect_mms_EventEnrollment(FALSE, tvb, offset, pinfo, tree, hf_mms_listOfEventEnrollment_item); } + static const ber_sequence_t SEQUENCE_OF_EventEnrollment_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfEventEnrollment_item }, }; @@ -6815,7 +6847,7 @@ static const ber_sequence_t SEQUENCE_OF_EventEnrollment_sequence_of[1] = { static int dissect_mms_SEQUENCE_OF_EventEnrollment(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_EventEnrollment_sequence_of, hf_index, ett_mms_SEQUENCE_OF_EventEnrollment); + SEQUENCE_OF_EventEnrollment_sequence_of, hf_index, ett_mms_SEQUENCE_OF_EventEnrollment); return offset; } @@ -6894,6 +6926,7 @@ static int dissect_listOfAlarmSummary_item(packet_info *pinfo, proto_tree *tree, return dissect_mms_AlarmSummary(FALSE, tvb, offset, pinfo, tree, hf_mms_listOfAlarmSummary_item); } + static const ber_sequence_t SEQUENCE_OF_AlarmSummary_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfAlarmSummary_item }, }; @@ -6901,7 +6934,7 @@ static const ber_sequence_t SEQUENCE_OF_AlarmSummary_sequence_of[1] = { static int dissect_mms_SEQUENCE_OF_AlarmSummary(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_AlarmSummary_sequence_of, hf_index, ett_mms_SEQUENCE_OF_AlarmSummary); + SEQUENCE_OF_AlarmSummary_sequence_of, hf_index, ett_mms_SEQUENCE_OF_AlarmSummary); return offset; } @@ -6952,6 +6985,7 @@ static int dissect_listOfAlarmEnrollmentSummary_item(packet_info *pinfo, proto_t return dissect_mms_AlarmEnrollmentSummary(FALSE, tvb, offset, pinfo, tree, hf_mms_listOfAlarmEnrollmentSummary_item); } + static const ber_sequence_t SEQUENCE_OF_AlarmEnrollmentSummary_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfAlarmEnrollmentSummary_item }, }; @@ -6959,7 +6993,7 @@ static const ber_sequence_t SEQUENCE_OF_AlarmEnrollmentSummary_sequence_of[1] = static int dissect_mms_SEQUENCE_OF_AlarmEnrollmentSummary(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_AlarmEnrollmentSummary_sequence_of, hf_index, ett_mms_SEQUENCE_OF_AlarmEnrollmentSummary); + SEQUENCE_OF_AlarmEnrollmentSummary_sequence_of, hf_index, ett_mms_SEQUENCE_OF_AlarmEnrollmentSummary); return offset; } @@ -7002,6 +7036,7 @@ static int dissect_listOfJournalEntry_item(packet_info *pinfo, proto_tree *tree, return dissect_mms_JournalEntry(FALSE, tvb, offset, pinfo, tree, hf_mms_listOfJournalEntry_item); } + static const ber_sequence_t SEQUENCE_OF_JournalEntry_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfJournalEntry_item }, }; @@ -7009,7 +7044,7 @@ static const ber_sequence_t SEQUENCE_OF_JournalEntry_sequence_of[1] = { static int dissect_mms_SEQUENCE_OF_JournalEntry(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_JournalEntry_sequence_of, hf_index, ett_mms_SEQUENCE_OF_JournalEntry); + SEQUENCE_OF_JournalEntry_sequence_of, hf_index, ett_mms_SEQUENCE_OF_JournalEntry); return offset; } @@ -7098,6 +7133,7 @@ static int dissect_deleteJournal1_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_mms_DeleteJournal_Response(TRUE, tvb, offset, pinfo, tree, hf_mms_deleteJournal1); } + static const ber_sequence_t T_listOfCapabilities_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_listOfCapabilities_item }, }; @@ -7105,7 +7141,7 @@ static const ber_sequence_t T_listOfCapabilities_sequence_of[1] = { static int dissect_mms_T_listOfCapabilities(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_listOfCapabilities_sequence_of, hf_index, ett_mms_T_listOfCapabilities); + T_listOfCapabilities_sequence_of, hf_index, ett_mms_T_listOfCapabilities); return offset; } @@ -7200,6 +7236,7 @@ static int dissect_listOfDirectoryEntry_item(packet_info *pinfo, proto_tree *tre return dissect_mms_DirectoryEntry(FALSE, tvb, offset, pinfo, tree, hf_mms_listOfDirectoryEntry_item); } + static const ber_sequence_t SEQUENCE_OF_DirectoryEntry_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_listOfDirectoryEntry_item }, }; @@ -7207,7 +7244,7 @@ static const ber_sequence_t SEQUENCE_OF_DirectoryEntry_sequence_of[1] = { static int dissect_mms_SEQUENCE_OF_DirectoryEntry(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_DirectoryEntry_sequence_of, hf_index, ett_mms_SEQUENCE_OF_DirectoryEntry); + SEQUENCE_OF_DirectoryEntry_sequence_of, hf_index, ett_mms_SEQUENCE_OF_DirectoryEntry); return offset; } @@ -7399,7 +7436,7 @@ static const ber_choice_t ConfirmedServiceResponse_choice[] = { static int dissect_mms_ConfirmedServiceResponse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ConfirmedServiceResponse_choice, hf_index, ett_mms_ConfirmedServiceResponse, NULL); return offset; @@ -7490,7 +7527,7 @@ static const ber_choice_t T_eventConditionName1_choice[] = { static int dissect_mms_T_eventConditionName1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_eventConditionName1_choice, hf_index, ett_mms_T_eventConditionName1, NULL); return offset; @@ -7514,7 +7551,7 @@ static const ber_choice_t T_eventActionResult_choice[] = { static int dissect_mms_T_eventActionResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_eventActionResult_choice, hf_index, ett_mms_T_eventActionResult, NULL); return offset; @@ -7580,7 +7617,7 @@ static const ber_choice_t UnconfirmedService_choice[] = { static int dissect_mms_UnconfirmedService(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, UnconfirmedService_choice, hf_index, ett_mms_UnconfirmedService, NULL); return offset; @@ -7869,7 +7906,7 @@ static const ber_choice_t T_rejectReason_choice[] = { static int dissect_mms_T_rejectReason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_rejectReason_choice, hf_index, ett_mms_T_rejectReason, NULL); return offset; @@ -8256,7 +8293,7 @@ static const ber_choice_t MMSpdu_choice[] = { int dissect_mms_MMSpdu(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, MMSpdu_choice, hf_index, ett_mms_MMSpdu, NULL); return offset; @@ -8369,7 +8406,7 @@ void proto_register_mms(void) { "", HFILL }}, { &hf_mms_listOfModifier, { "listOfModifier", "mms.listOfModifier", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_mms_listOfModifier_item, { "Item", "mms.listOfModifier_item", @@ -8725,7 +8762,7 @@ void proto_register_mms(void) { "ConfirmedServiceRequest/fileRename", HFILL }}, { &hf_mms_fileDelete, { "fileDelete", "mms.fileDelete", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ConfirmedServiceRequest/fileDelete", HFILL }}, { &hf_mms_fileDirectory, { "fileDirectory", "mms.fileDirectory", @@ -8757,7 +8794,7 @@ void proto_register_mms(void) { "ConfirmedServiceResponse/read", HFILL }}, { &hf_mms_write1, { "write", "mms.write", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ConfirmedServiceResponse/write", HFILL }}, { &hf_mms_getVariableAccessAttributes1, { "getVariableAccessAttributes", "mms.getVariableAccessAttributes", @@ -9353,7 +9390,7 @@ void proto_register_mms(void) { "GetNameList-Request/continueAfter", HFILL }}, { &hf_mms_listOfIdentifier, { "listOfIdentifier", "mms.listOfIdentifier", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "GetNameList-Response/listOfIdentifier", HFILL }}, { &hf_mms_listOfIdentifier_item, { "Item", "mms.listOfIdentifier_item", @@ -9377,7 +9414,7 @@ void proto_register_mms(void) { "Identify-Response/revision", HFILL }}, { &hf_mms_listOfAbstractSyntaxes, { "listOfAbstractSyntaxes", "mms.listOfAbstractSyntaxes", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Identify-Response/listOfAbstractSyntaxes", HFILL }}, { &hf_mms_listOfAbstractSyntaxes_item, { "Item", "mms.listOfAbstractSyntaxes_item", @@ -9405,7 +9442,7 @@ void proto_register_mms(void) { "GetCapabilityList-Request/continueAfter", HFILL }}, { &hf_mms_listOfCapabilities, { "listOfCapabilities", "mms.listOfCapabilities", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "GetCapabilityList-Response/listOfCapabilities", HFILL }}, { &hf_mms_listOfCapabilities_item, { "Item", "mms.listOfCapabilities_item", @@ -9417,7 +9454,7 @@ void proto_register_mms(void) { "", HFILL }}, { &hf_mms_listOfCapabilities1, { "listOfCapabilities", "mms.listOfCapabilities", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "InitiateDownloadSequence-Request/listOfCapabilities", HFILL }}, { &hf_mms_sharable, { "sharable", "mms.sharable", @@ -9445,7 +9482,7 @@ void proto_register_mms(void) { "InitiateUploadSequence-Response/ulsmID", HFILL }}, { &hf_mms_listOfCapabilities2, { "listOfCapabilities", "mms.listOfCapabilities", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "InitiateUploadSequence-Response/listOfCapabilities", HFILL }}, { &hf_mms_loadData1, { "loadData", "mms.loadData", @@ -9453,15 +9490,15 @@ void proto_register_mms(void) { "UploadSegment-Response/loadData", HFILL }}, { &hf_mms_listOfCapabilities3, { "listOfCapabilities", "mms.listOfCapabilities", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RequestDomainDownload-Request/listOfCapabilities", HFILL }}, { &hf_mms_fileName, { "fileName", "mms.fileName", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_mms_listOfCapabilities4, { "listOfCapabilities", "mms.listOfCapabilities", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "LoadDomainContent-Request/listOfCapabilities", HFILL }}, { &hf_mms_thirdParty, { "thirdParty", "mms.thirdParty", @@ -9469,11 +9506,11 @@ void proto_register_mms(void) { "", HFILL }}, { &hf_mms_filenName, { "filenName", "mms.filenName", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "StoreDomainContent-Request/filenName", HFILL }}, { &hf_mms_listOfCapabilities5, { "listOfCapabilities", "mms.listOfCapabilities", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "GetDomainAttributes-Response/listOfCapabilities", HFILL }}, { &hf_mms_state, { "state", "mms.state", @@ -9485,7 +9522,7 @@ void proto_register_mms(void) { "", HFILL }}, { &hf_mms_listOfProgramInvocations, { "listOfProgramInvocations", "mms.listOfProgramInvocations", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "GetDomainAttributes-Response/listOfProgramInvocations", HFILL }}, { &hf_mms_listOfProgramInvocations_item, { "Item", "mms.listOfProgramInvocations_item", @@ -9501,7 +9538,7 @@ void proto_register_mms(void) { "", HFILL }}, { &hf_mms_listOfDomainName, { "listOfDomainName", "mms.listOfDomainName", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CreateProgramInvocation-Request/listOfDomainName", HFILL }}, { &hf_mms_listOfDomainName_item, { "Item", "mms.listOfDomainName_item", @@ -9537,7 +9574,7 @@ void proto_register_mms(void) { "GetProgramInvocationAttributes-Response/state", HFILL }}, { &hf_mms_listOfDomainNames, { "listOfDomainNames", "mms.listOfDomainNames", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "GetProgramInvocationAttributes-Response/listOfDomainNames", HFILL }}, { &hf_mms_listOfDomainNames_item, { "Item", "mms.listOfDomainNames_item", @@ -9581,7 +9618,7 @@ void proto_register_mms(void) { "TypeSpecification/structure", HFILL }}, { &hf_mms_components, { "components", "mms.components", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "TypeSpecification/structure/components", HFILL }}, { &hf_mms_components_item, { "Item", "mms.components_item", @@ -9685,7 +9722,7 @@ void proto_register_mms(void) { "", HFILL }}, { &hf_mms_listOfAccessResult, { "listOfAccessResult", "mms.listOfAccessResult", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_mms_listOfAccessResult_item, { "Item", "mms.listOfAccessResult_item", @@ -9693,7 +9730,7 @@ void proto_register_mms(void) { "", HFILL }}, { &hf_mms_listOfData, { "listOfData", "mms.listOfData", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Write-Request/listOfData", HFILL }}, { &hf_mms_listOfData_item, { "Item", "mms.listOfData_item", @@ -9737,7 +9774,7 @@ void proto_register_mms(void) { "DefineScatteredAccess-Request/scatteredAccessName", HFILL }}, { &hf_mms_scatteredAccessDescription, { "scatteredAccessDescription", "mms.scatteredAccessDescription", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_mms_scopeOfDelete, { "scopeOfDelete", "mms.scopeOfDelete", @@ -9745,7 +9782,7 @@ void proto_register_mms(void) { "DeleteVariableAccess-Request/scopeOfDelete", HFILL }}, { &hf_mms_listOfName, { "listOfName", "mms.listOfName", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "DeleteVariableAccess-Request/listOfName", HFILL }}, { &hf_mms_listOfName_item, { "Item", "mms.listOfName_item", @@ -9765,7 +9802,7 @@ void proto_register_mms(void) { "", HFILL }}, { &hf_mms_listOfVariable, { "listOfVariable", "mms.listOfVariable", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "DefineNamedVariableList-Request/listOfVariable", HFILL }}, { &hf_mms_listOfVariable_item, { "Item", "mms.listOfVariable_item", @@ -9777,11 +9814,11 @@ void proto_register_mms(void) { "", HFILL }}, { &hf_mms_alternateAccess, { "alternateAccess", "mms.alternateAccess", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_mms_listOfVariable1, { "listOfVariable", "mms.listOfVariable", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "GetNamedVariableListAttributes-Response/listOfVariable", HFILL }}, { &hf_mms_listOfVariable_item1, { "Item", "mms.listOfVariable_item", @@ -9793,7 +9830,7 @@ void proto_register_mms(void) { "DeleteNamedVariableList-Request/scopeOfDelete", HFILL }}, { &hf_mms_listOfVariableListName, { "listOfVariableListName", "mms.listOfVariableListName", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "DeleteNamedVariableList-Request/listOfVariableListName", HFILL }}, { &hf_mms_listOfVariableListName_item, { "Item", "mms.listOfVariableListName_item", @@ -9805,7 +9842,7 @@ void proto_register_mms(void) { "DeleteNamedType-Request/scopeOfDelete", HFILL }}, { &hf_mms_listOfTypeName, { "listOfTypeName", "mms.listOfTypeName", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "DeleteNamedType-Request/listOfTypeName", HFILL }}, { &hf_mms_listOfTypeName_item, { "Item", "mms.listOfTypeName_item", @@ -9817,7 +9854,7 @@ void proto_register_mms(void) { "AccessResult/success", HFILL }}, { &hf_mms_array1, { "array", "mms.array", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Data/array", HFILL }}, { &hf_mms_array_item, { "Item", "mms.array_item", @@ -9825,7 +9862,7 @@ void proto_register_mms(void) { "Data/array/_item", HFILL }}, { &hf_mms_structure1, { "structure", "mms.structure", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Data/structure", HFILL }}, { &hf_mms_structure_item, { "Item", "mms.structure_item", @@ -9873,7 +9910,7 @@ void proto_register_mms(void) { "Data/booleanArray", HFILL }}, { &hf_mms_listOfVariable2, { "listOfVariable", "mms.listOfVariable", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "VariableAccessSpecification/listOfVariable", HFILL }}, { &hf_mms_listOfVariable_item2, { "Item", "mms.listOfVariable_item", @@ -9965,7 +10002,7 @@ void proto_register_mms(void) { "ReportPoolSemaphoreStatus-Request/nameToStartAfter", HFILL }}, { &hf_mms_listOfNamedTokens, { "listOfNamedTokens", "mms.listOfNamedTokens", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ReportPoolSemaphoreStatus-Response/listOfNamedTokens", HFILL }}, { &hf_mms_listOfNamedTokens_item, { "Item", "mms.listOfNamedTokens_item", @@ -9993,7 +10030,7 @@ void proto_register_mms(void) { "ReportSemaphoreEntryStatus-Request/entryIdToStartAfter", HFILL }}, { &hf_mms_listOfSemaphoreEntry, { "listOfSemaphoreEntry", "mms.listOfSemaphoreEntry", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ReportSemaphoreEntryStatus-Response/listOfSemaphoreEntry", HFILL }}, { &hf_mms_listOfSemaphoreEntry_item, { "Item", "mms.listOfSemaphoreEntry_item", @@ -10025,7 +10062,7 @@ void proto_register_mms(void) { "Input-Request/echo", HFILL }}, { &hf_mms_listOfPromptData, { "listOfPromptData", "mms.listOfPromptData", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Input-Request/listOfPromptData", HFILL }}, { &hf_mms_listOfPromptData_item, { "Item", "mms.listOfPromptData_item", @@ -10037,7 +10074,7 @@ void proto_register_mms(void) { "Input-Request/inputTimeOut", HFILL }}, { &hf_mms_listOfOutputData, { "listOfOutputData", "mms.listOfOutputData", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Output-Request/listOfOutputData", HFILL }}, { &hf_mms_listOfOutputData_item, { "Item", "mms.listOfOutputData_item", @@ -10073,7 +10110,7 @@ void proto_register_mms(void) { "", HFILL }}, { &hf_mms_specific, { "specific", "mms.specific", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_mms_specific_item, { "Item", "mms.specific_item", @@ -10157,7 +10194,7 @@ void proto_register_mms(void) { "GetEventEnrollmentAttributes-Request/scopeOfRequest", HFILL }}, { &hf_mms_eventEnrollmentNames, { "eventEnrollmentNames", "mms.eventEnrollmentNames", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "GetEventEnrollmentAttributes-Request/eventEnrollmentNames", HFILL }}, { &hf_mms_eventEnrollmentNames_item, { "Item", "mms.eventEnrollmentNames_item", @@ -10197,7 +10234,7 @@ void proto_register_mms(void) { "EventEnrollment/remainingAcceptableDelay", HFILL }}, { &hf_mms_listOfEventEnrollment, { "listOfEventEnrollment", "mms.listOfEventEnrollment", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "GetEventEnrollmentAttributes-Response/listOfEventEnrollment", HFILL }}, { &hf_mms_listOfEventEnrollment_item, { "Item", "mms.listOfEventEnrollment_item", @@ -10265,7 +10302,7 @@ void proto_register_mms(void) { "", HFILL }}, { &hf_mms_listOfAlarmSummary, { "listOfAlarmSummary", "mms.listOfAlarmSummary", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "GetAlarmSummary-Response/listOfAlarmSummary", HFILL }}, { &hf_mms_listOfAlarmSummary_item, { "Item", "mms.listOfAlarmSummary_item", @@ -10285,7 +10322,7 @@ void proto_register_mms(void) { "GetAlarmEnrollmentSummary-Request/severityFilter", HFILL }}, { &hf_mms_listOfAlarmEnrollmentSummary, { "listOfAlarmEnrollmentSummary", "mms.listOfAlarmEnrollmentSummary", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "GetAlarmEnrollmentSummary-Response/listOfAlarmEnrollmentSummary", HFILL }}, { &hf_mms_listOfAlarmEnrollmentSummary_item, { "Item", "mms.listOfAlarmEnrollmentSummary_item", @@ -10369,7 +10406,7 @@ void proto_register_mms(void) { "ReadJournal-Request/rangeStopSpecification/numberOfEntries", HFILL }}, { &hf_mms_listOfVariables, { "listOfVariables", "mms.listOfVariables", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ReadJournal-Request/listOfVariables", HFILL }}, { &hf_mms_listOfVariables_item, { "Item", "mms.listOfVariables_item", @@ -10389,7 +10426,7 @@ void proto_register_mms(void) { "ReadJournal-Request/entryToStartAfter/entrySpecification", HFILL }}, { &hf_mms_listOfJournalEntry, { "listOfJournalEntry", "mms.listOfJournalEntry", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ReadJournal-Response/listOfJournalEntry", HFILL }}, { &hf_mms_listOfJournalEntry_item, { "Item", "mms.listOfJournalEntry_item", @@ -10409,7 +10446,7 @@ void proto_register_mms(void) { "JournalEntry/entryContent", HFILL }}, { &hf_mms_listOfJournalEntry1, { "listOfJournalEntry", "mms.listOfJournalEntry", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "WriteJournal-Request/listOfJournalEntry", HFILL }}, { &hf_mms_listOfJournalEntry_item1, { "Item", "mms.listOfJournalEntry_item", @@ -10453,7 +10490,7 @@ void proto_register_mms(void) { "EntryContent/entryForm/data/event", HFILL }}, { &hf_mms_listOfVariables1, { "listOfVariables", "mms.listOfVariables", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "EntryContent/entryForm/data/listOfVariables", HFILL }}, { &hf_mms_listOfVariables_item1, { "Item", "mms.listOfVariables_item", @@ -10477,11 +10514,11 @@ void proto_register_mms(void) { "ObtainFile-Request/sourceFileServer", HFILL }}, { &hf_mms_sourceFile, { "sourceFile", "mms.sourceFile", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ObtainFile-Request/sourceFile", HFILL }}, { &hf_mms_destinationFile, { "destinationFile", "mms.destinationFile", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ObtainFile-Request/destinationFile", HFILL }}, { &hf_mms_initialPosition, { "initialPosition", "mms.initialPosition", @@ -10501,23 +10538,23 @@ void proto_register_mms(void) { "FileRead-Response/fileData", HFILL }}, { &hf_mms_currentFileName, { "currentFileName", "mms.currentFileName", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "FileRename-Request/currentFileName", HFILL }}, { &hf_mms_newFileName, { "newFileName", "mms.newFileName", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "FileRename-Request/newFileName", HFILL }}, { &hf_mms_fileSpecification, { "fileSpecification", "mms.fileSpecification", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "FileDirectory-Request/fileSpecification", HFILL }}, { &hf_mms_continueAfter3, { "continueAfter", "mms.continueAfter", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "FileDirectory-Request/continueAfter", HFILL }}, { &hf_mms_listOfDirectoryEntry, { "listOfDirectoryEntry", "mms.listOfDirectoryEntry", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "FileDirectory-Response/listOfDirectoryEntry", HFILL }}, { &hf_mms_listOfDirectoryEntry_item, { "Item", "mms.listOfDirectoryEntry_item", @@ -10525,7 +10562,7 @@ void proto_register_mms(void) { "FileDirectory-Response/listOfDirectoryEntry/_item", HFILL }}, { &hf_mms_filename, { "filename", "mms.filename", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "DirectoryEntry/filename", HFILL }}, { &hf_mms_sizeOfFile, { "sizeOfFile", "mms.sizeOfFile", diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c index 70f7ec85f0..22ee91ee32 100644 --- a/epan/dissectors/packet-ocsp.c +++ b/epan/dissectors/packet-ocsp.c @@ -260,6 +260,7 @@ static int dissect_requestList_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_ocsp_Request(FALSE, tvb, offset, pinfo, tree, hf_ocsp_requestList_item); } + static const ber_sequence_t SEQUENCE_OF_Request_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_requestList_item }, }; @@ -267,7 +268,7 @@ static const ber_sequence_t SEQUENCE_OF_Request_sequence_of[1] = { static int dissect_ocsp_SEQUENCE_OF_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_Request_sequence_of, hf_index, ett_ocsp_SEQUENCE_OF_Request); + SEQUENCE_OF_Request_sequence_of, hf_index, ett_ocsp_SEQUENCE_OF_Request); return offset; } @@ -307,6 +308,7 @@ static int dissect_signature(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_ocsp_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_ocsp_signature); } + static const ber_sequence_t SEQUENCE_OF_Certificate_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certs_item }, }; @@ -314,7 +316,7 @@ static const ber_sequence_t SEQUENCE_OF_Certificate_sequence_of[1] = { static int dissect_ocsp_SEQUENCE_OF_Certificate(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_Certificate_sequence_of, hf_index, ett_ocsp_SEQUENCE_OF_Certificate); + SEQUENCE_OF_Certificate_sequence_of, hf_index, ett_ocsp_SEQUENCE_OF_Certificate); return offset; } @@ -470,7 +472,7 @@ static const ber_choice_t ResponderID_choice[] = { static int dissect_ocsp_ResponderID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ResponderID_choice, hf_index, ett_ocsp_ResponderID, NULL); return offset; @@ -560,7 +562,7 @@ static const ber_choice_t CertStatus_choice[] = { static int dissect_ocsp_CertStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, CertStatus_choice, hf_index, ett_ocsp_CertStatus, NULL); return offset; @@ -589,6 +591,7 @@ static int dissect_responses_item(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_ocsp_SingleResponse(FALSE, tvb, offset, pinfo, tree, hf_ocsp_responses_item); } + static const ber_sequence_t SEQUENCE_OF_SingleResponse_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_responses_item }, }; @@ -596,7 +599,7 @@ static const ber_sequence_t SEQUENCE_OF_SingleResponse_sequence_of[1] = { static int dissect_ocsp_SEQUENCE_OF_SingleResponse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_SingleResponse_sequence_of, hf_index, ett_ocsp_SEQUENCE_OF_SingleResponse); + SEQUENCE_OF_SingleResponse_sequence_of, hf_index, ett_ocsp_SEQUENCE_OF_SingleResponse); return offset; } @@ -661,6 +664,7 @@ static int dissect_AcceptableResponses_item(packet_info *pinfo, proto_tree *tree return dissect_ocsp_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_ocsp_AcceptableResponses_item); } + static const ber_sequence_t AcceptableResponses_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_AcceptableResponses_item }, }; @@ -668,7 +672,7 @@ static const ber_sequence_t AcceptableResponses_sequence_of[1] = { static int dissect_ocsp_AcceptableResponses(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - AcceptableResponses_sequence_of, hf_index, ett_ocsp_AcceptableResponses); + AcceptableResponses_sequence_of, hf_index, ett_ocsp_AcceptableResponses); return offset; } @@ -822,7 +826,7 @@ void proto_register_ocsp(void) { "ArchiveCutoff", HFILL }}, { &hf_ocsp_AcceptableResponses_PDU, { "AcceptableResponses", "ocsp.AcceptableResponses", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AcceptableResponses", HFILL }}, { &hf_ocsp_ServiceLocator_PDU, { "ServiceLocator", "ocsp.ServiceLocator", @@ -850,7 +854,7 @@ void proto_register_ocsp(void) { "TBSRequest/requestorName", HFILL }}, { &hf_ocsp_requestList, { "requestList", "ocsp.requestList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "TBSRequest/requestList", HFILL }}, { &hf_ocsp_requestList_item, { "Item", "ocsp.requestList_item", @@ -858,7 +862,7 @@ void proto_register_ocsp(void) { "TBSRequest/requestList/_item", HFILL }}, { &hf_ocsp_requestExtensions, { "requestExtensions", "ocsp.requestExtensions", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "TBSRequest/requestExtensions", HFILL }}, { &hf_ocsp_signatureAlgorithm, { "signatureAlgorithm", "ocsp.signatureAlgorithm", @@ -870,7 +874,7 @@ void proto_register_ocsp(void) { "", HFILL }}, { &hf_ocsp_certs, { "certs", "ocsp.certs", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_ocsp_certs_item, { "Item", "ocsp.certs_item", @@ -882,7 +886,7 @@ void proto_register_ocsp(void) { "Request/reqCert", HFILL }}, { &hf_ocsp_singleRequestExtensions, { "singleRequestExtensions", "ocsp.singleRequestExtensions", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Request/singleRequestExtensions", HFILL }}, { &hf_ocsp_hashAlgorithm, { "hashAlgorithm", "ocsp.hashAlgorithm", @@ -930,7 +934,7 @@ void proto_register_ocsp(void) { "ResponseData/producedAt", HFILL }}, { &hf_ocsp_responses, { "responses", "ocsp.responses", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ResponseData/responses", HFILL }}, { &hf_ocsp_responses_item, { "Item", "ocsp.responses_item", @@ -938,7 +942,7 @@ void proto_register_ocsp(void) { "ResponseData/responses/_item", HFILL }}, { &hf_ocsp_responseExtensions, { "responseExtensions", "ocsp.responseExtensions", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ResponseData/responseExtensions", HFILL }}, { &hf_ocsp_byName, { "byName", "ocsp.byName", @@ -966,7 +970,7 @@ void proto_register_ocsp(void) { "SingleResponse/nextUpdate", HFILL }}, { &hf_ocsp_singleExtensions, { "singleExtensions", "ocsp.singleExtensions", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "SingleResponse/singleExtensions", HFILL }}, { &hf_ocsp_good, { "good", "ocsp.good", diff --git a/epan/dissectors/packet-pkinit.c b/epan/dissectors/packet-pkinit.c index 4c3c5a4de9..cec778a92e 100644 --- a/epan/dissectors/packet-pkinit.c +++ b/epan/dissectors/packet-pkinit.c @@ -154,7 +154,7 @@ static const ber_choice_t TrustedCA_choice[] = { static int dissect_pkinit_TrustedCA(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, TrustedCA_choice, hf_index, ett_pkinit_TrustedCA, NULL); return offset; @@ -163,6 +163,7 @@ static int dissect_trustedCertifiers_item(packet_info *pinfo, proto_tree *tree, return dissect_pkinit_TrustedCA(FALSE, tvb, offset, pinfo, tree, hf_pkinit_trustedCertifiers_item); } + static const ber_sequence_t SEQUENCE_OF_TrustedCA_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_trustedCertifiers_item }, }; @@ -170,7 +171,7 @@ static const ber_sequence_t SEQUENCE_OF_TrustedCA_sequence_of[1] = { static int dissect_pkinit_SEQUENCE_OF_TrustedCA(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_TrustedCA_sequence_of, hf_index, ett_pkinit_SEQUENCE_OF_TrustedCA); + SEQUENCE_OF_TrustedCA_sequence_of, hf_index, ett_pkinit_SEQUENCE_OF_TrustedCA); return offset; } @@ -241,6 +242,7 @@ static int dissect_pkAuthenticator(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_pkinit_PKAuthenticator(FALSE, tvb, offset, pinfo, tree, hf_pkinit_pkAuthenticator); } + static const ber_sequence_t SEQUENCE_OF_AlgorithmIdentifier_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_supportedCMSTypes_item }, }; @@ -248,7 +250,7 @@ static const ber_sequence_t SEQUENCE_OF_AlgorithmIdentifier_sequence_of[1] = { static int dissect_pkinit_SEQUENCE_OF_AlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_AlgorithmIdentifier_sequence_of, hf_index, ett_pkinit_SEQUENCE_OF_AlgorithmIdentifier); + SEQUENCE_OF_AlgorithmIdentifier_sequence_of, hf_index, ett_pkinit_SEQUENCE_OF_AlgorithmIdentifier); return offset; } @@ -286,7 +288,7 @@ static const ber_choice_t PaPkAsRep_choice[] = { static int dissect_pkinit_PaPkAsRep(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, PaPkAsRep_choice, hf_index, ett_pkinit_PaPkAsRep, NULL); return offset; @@ -380,7 +382,7 @@ void proto_register_pkinit(void) { "PaPkAsReq/signedAuthPack", HFILL }}, { &hf_pkinit_trustedCertifiers, { "trustedCertifiers", "pkinit.trustedCertifiers", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PaPkAsReq/trustedCertifiers", HFILL }}, { &hf_pkinit_trustedCertifiers_item, { "Item", "pkinit.trustedCertifiers_item", @@ -408,7 +410,7 @@ void proto_register_pkinit(void) { "AuthPack/clientPublicValue", HFILL }}, { &hf_pkinit_supportedCMSTypes, { "supportedCMSTypes", "pkinit.supportedCMSTypes", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AuthPack/supportedCMSTypes", HFILL }}, { &hf_pkinit_supportedCMSTypes_item, { "Item", "pkinit.supportedCMSTypes_item", @@ -488,8 +490,8 @@ void proto_reg_handoff_pkinit(void) { /*--- Included file: packet-pkinit-dis-tab.c ---*/ - register_ber_oid_dissector("1.3.6.1.5.2.3.1", dissect_AuthPack_PDU, proto_pkinit, "id-pkauthdata"); - register_ber_oid_dissector("1.3.6.1.5.2.3.2", dissect_KDCDHKeyInfo_PDU, proto_pkinit, "id-pkdhkeydata"); + register_ber_oid_dissector("1.3.6.1.5.2.3.1", dissect_AuthPack_PDU, proto_pkinit, "id-pkauthdata"); + register_ber_oid_dissector("1.3.6.1.5.2.3.2", dissect_KDCDHKeyInfo_PDU, proto_pkinit, "id-pkdhkeydata"); /*--- End of included file: packet-pkinit-dis-tab.c ---*/ diff --git a/epan/dissectors/packet-pkix1implicit.c b/epan/dissectors/packet-pkix1implicit.c index 03c9d296e8..6517cd20b0 100644 --- a/epan/dissectors/packet-pkix1implicit.c +++ b/epan/dissectors/packet-pkix1implicit.c @@ -170,6 +170,7 @@ static int dissect_AuthorityInfoAccessSyntax_item(packet_info *pinfo, proto_tree return dissect_pkix1implicit_AccessDescription(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_AuthorityInfoAccessSyntax_item); } + static const ber_sequence_t AuthorityInfoAccessSyntax_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AuthorityInfoAccessSyntax_item }, }; @@ -177,7 +178,7 @@ static const ber_sequence_t AuthorityInfoAccessSyntax_sequence_of[1] = { int dissect_pkix1implicit_AuthorityInfoAccessSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - AuthorityInfoAccessSyntax_sequence_of, hf_index, ett_pkix1implicit_AuthorityInfoAccessSyntax); + AuthorityInfoAccessSyntax_sequence_of, hf_index, ett_pkix1implicit_AuthorityInfoAccessSyntax); return offset; } @@ -238,7 +239,7 @@ static const ber_choice_t DisplayText_choice[] = { static int dissect_pkix1implicit_DisplayText(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, DisplayText_choice, hf_index, ett_pkix1implicit_DisplayText, NULL); return offset; @@ -263,6 +264,7 @@ static int dissect_noticeNumbers_item(packet_info *pinfo, proto_tree *tree, tvbu return dissect_pkix1implicit_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_noticeNumbers_item); } + static const ber_sequence_t T_noticeNumbers_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_noticeNumbers_item }, }; @@ -270,7 +272,7 @@ static const ber_sequence_t T_noticeNumbers_sequence_of[1] = { static int dissect_pkix1implicit_T_noticeNumbers(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_noticeNumbers_sequence_of, hf_index, ett_pkix1implicit_T_noticeNumbers); + T_noticeNumbers_sequence_of, hf_index, ett_pkix1implicit_T_noticeNumbers); return offset; } @@ -337,7 +339,7 @@ void proto_register_pkix1implicit(void) { "Dummy", HFILL }}, { &hf_pkix1implicit_AuthorityInfoAccessSyntax_PDU, { "AuthorityInfoAccessSyntax", "pkix1implicit.AuthorityInfoAccessSyntax", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AuthorityInfoAccessSyntax", HFILL }}, { &hf_pkix1implicit_nameAssigner, { "nameAssigner", "pkix1implicit.nameAssigner", @@ -373,7 +375,7 @@ void proto_register_pkix1implicit(void) { "NoticeReference/organization", HFILL }}, { &hf_pkix1implicit_noticeNumbers, { "noticeNumbers", "pkix1implicit.noticeNumbers", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "NoticeReference/noticeNumbers", HFILL }}, { &hf_pkix1implicit_noticeNumbers_item, { "Item", "pkix1implicit.noticeNumbers_item", @@ -428,16 +430,16 @@ void proto_reg_handoff_pkix1implicit(void) { /*--- Included file: packet-pkix1implicit-dis-tab.c ---*/ - register_ber_oid_dissector("1.3.6.1.5.5.7.1.1", dissect_AuthorityInfoAccessSyntax_PDU, proto_pkix1implicit, "id-pe-authorityInfoAccessSyntax"); - register_ber_oid_dissector("1.3.6.1.5.5.7.3.1", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-serverAuth"); - register_ber_oid_dissector("1.3.6.1.5.5.7.3.2", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-clientAuth"); - register_ber_oid_dissector("1.3.6.1.5.5.7.3.3", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-codeSigning"); - register_ber_oid_dissector("1.3.6.1.5.5.7.3.4", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-emailProtection"); - register_ber_oid_dissector("1.3.6.1.5.5.7.3.5", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-ip-kp-ipsecEndSystem"); - register_ber_oid_dissector("1.3.6.1.5.5.7.3.6", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-ipsecTunnel"); - register_ber_oid_dissector("1.3.6.1.5.5.7.3.7", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-ipsecUser"); - register_ber_oid_dissector("1.3.6.1.5.5.7.3.8", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-timeStamping"); - register_ber_oid_dissector("1.3.6.1.5.5.7.3.9", dissect_Dummy_PDU, proto_pkix1implicit, "OCSPSigning"); + register_ber_oid_dissector("1.3.6.1.5.5.7.1.1", dissect_AuthorityInfoAccessSyntax_PDU, proto_pkix1implicit, "id-pe-authorityInfoAccessSyntax"); + register_ber_oid_dissector("1.3.6.1.5.5.7.3.1", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-serverAuth"); + register_ber_oid_dissector("1.3.6.1.5.5.7.3.2", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-clientAuth"); + register_ber_oid_dissector("1.3.6.1.5.5.7.3.3", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-codeSigning"); + register_ber_oid_dissector("1.3.6.1.5.5.7.3.4", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-emailProtection"); + register_ber_oid_dissector("1.3.6.1.5.5.7.3.5", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-ip-kp-ipsecEndSystem"); + register_ber_oid_dissector("1.3.6.1.5.5.7.3.6", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-ipsecTunnel"); + register_ber_oid_dissector("1.3.6.1.5.5.7.3.7", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-ipsecUser"); + register_ber_oid_dissector("1.3.6.1.5.5.7.3.8", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-timeStamping"); + register_ber_oid_dissector("1.3.6.1.5.5.7.3.9", dissect_Dummy_PDU, proto_pkix1implicit, "OCSPSigning"); /*--- End of included file: packet-pkix1implicit-dis-tab.c ---*/ diff --git a/epan/dissectors/packet-pkixqualified.c b/epan/dissectors/packet-pkixqualified.c index b5d87e402e..9220a1c28b 100644 --- a/epan/dissectors/packet-pkixqualified.c +++ b/epan/dissectors/packet-pkixqualified.c @@ -184,7 +184,7 @@ static const ber_choice_t TypeOfBiometricData_choice[] = { static int dissect_pkixqualified_TypeOfBiometricData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, TypeOfBiometricData_choice, hf_index, ett_pkixqualified_TypeOfBiometricData, NULL); return offset; @@ -194,10 +194,11 @@ static int dissect_typeOfBiometricData(packet_info *pinfo, proto_tree *tree, tvb } + static int dissect_pkixqualified_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -237,6 +238,7 @@ static int dissect_BiometricSyntax_item(packet_info *pinfo, proto_tree *tree, tv return dissect_pkixqualified_BiometricData(FALSE, tvb, offset, pinfo, tree, hf_pkixqualified_BiometricSyntax_item); } + static const ber_sequence_t BiometricSyntax_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_BiometricSyntax_item }, }; @@ -244,7 +246,7 @@ static const ber_sequence_t BiometricSyntax_sequence_of[1] = { static int dissect_pkixqualified_BiometricSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - BiometricSyntax_sequence_of, hf_index, ett_pkixqualified_BiometricSyntax); + BiometricSyntax_sequence_of, hf_index, ett_pkixqualified_BiometricSyntax); return offset; } @@ -293,6 +295,7 @@ static int dissect_QCStatements_item(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_pkixqualified_QCStatement(FALSE, tvb, offset, pinfo, tree, hf_pkixqualified_QCStatements_item); } + static const ber_sequence_t QCStatements_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_QCStatements_item }, }; @@ -300,11 +303,12 @@ static const ber_sequence_t QCStatements_sequence_of[1] = { static int dissect_pkixqualified_QCStatements(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - QCStatements_sequence_of, hf_index, ett_pkixqualified_QCStatements); + QCStatements_sequence_of, hf_index, ett_pkixqualified_QCStatements); return offset; } + static const ber_sequence_t NameRegistrationAuthorities_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_NameRegistrationAuthorities_item }, }; @@ -312,7 +316,7 @@ static const ber_sequence_t NameRegistrationAuthorities_sequence_of[1] = { static int dissect_pkixqualified_NameRegistrationAuthorities(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - NameRegistrationAuthorities_sequence_of, hf_index, ett_pkixqualified_NameRegistrationAuthorities); + NameRegistrationAuthorities_sequence_of, hf_index, ett_pkixqualified_NameRegistrationAuthorities); return offset; } @@ -382,11 +386,11 @@ void proto_register_pkixqualified(void) { "Printablestring", HFILL }}, { &hf_pkixqualified_BiometricSyntax_PDU, { "BiometricSyntax", "pkixqualified.BiometricSyntax", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "BiometricSyntax", HFILL }}, { &hf_pkixqualified_QCStatements_PDU, { "QCStatements", "pkixqualified.QCStatements", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "QCStatements", HFILL }}, { &hf_pkixqualified_SemanticsInformation_PDU, { "SemanticsInformation", "pkixqualified.SemanticsInformation", @@ -438,7 +442,7 @@ void proto_register_pkixqualified(void) { "SemanticsInformation/semanticsIdentifier", HFILL }}, { &hf_pkixqualified_nameRegistrationAuthorities, { "nameRegistrationAuthorities", "pkixqualified.nameRegistrationAuthorities", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "SemanticsInformation/nameRegistrationAuthorities", HFILL }}, { &hf_pkixqualified_NameRegistrationAuthorities_item, { "Item", "pkixqualified.NameRegistrationAuthorities_item", @@ -481,15 +485,15 @@ void proto_reg_handoff_pkixqualified(void) { /*--- Included file: packet-pkixqualified-dis-tab.c ---*/ - register_ber_oid_dissector("1.3.6.1.5.5.7.1.2", dissect_BiometricSyntax_PDU, proto_pkixqualified, "id-pe-biometricInfo"); - register_ber_oid_dissector("1.3.6.1.5.5.7.1.3", dissect_QCStatements_PDU, proto_pkixqualified, "id-pe-qcStatements"); - register_ber_oid_dissector("1.3.6.1.5.5.7.11.1", dissect_SemanticsInformation_PDU, proto_pkixqualified, "id-qcs-pkixQCSyntax-v1"); - register_ber_oid_dissector("1.3.6.1.5.5.7.11.2", dissect_SemanticsInformation_PDU, proto_pkixqualified, "id-qcs-pkixQCSyntax-v2"); - register_ber_oid_dissector("1.3.6.1.5.5.7.9.1", dissect_Generalizedtime_PDU, proto_pkixqualified, "id-pda-dateOfBirth"); - register_ber_oid_dissector("1.3.6.1.5.5.7.9.2", dissect_Directorystring_PDU, proto_pkixqualified, "id-pda-placeOfBirth"); - register_ber_oid_dissector("1.3.6.1.5.5.7.9.3", dissect_Printablestring_PDU, proto_pkixqualified, "id-pda-gender"); - register_ber_oid_dissector("1.3.6.1.5.5.7.9.4", dissect_Printablestring_PDU, proto_pkixqualified, "id-pda-countryOfCitizenship"); - register_ber_oid_dissector("1.3.6.1.5.5.7.9.5", dissect_Printablestring_PDU, proto_pkixqualified, "id-pda-countryOfResidence"); + register_ber_oid_dissector("1.3.6.1.5.5.7.1.2", dissect_BiometricSyntax_PDU, proto_pkixqualified, "id-pe-biometricInfo"); + register_ber_oid_dissector("1.3.6.1.5.5.7.1.3", dissect_QCStatements_PDU, proto_pkixqualified, "id-pe-qcStatements"); + register_ber_oid_dissector("1.3.6.1.5.5.7.11.1", dissect_SemanticsInformation_PDU, proto_pkixqualified, "id-qcs-pkixQCSyntax-v1"); + register_ber_oid_dissector("1.3.6.1.5.5.7.11.2", dissect_SemanticsInformation_PDU, proto_pkixqualified, "id-qcs-pkixQCSyntax-v2"); + register_ber_oid_dissector("1.3.6.1.5.5.7.9.1", dissect_Generalizedtime_PDU, proto_pkixqualified, "id-pda-dateOfBirth"); + register_ber_oid_dissector("1.3.6.1.5.5.7.9.2", dissect_Directorystring_PDU, proto_pkixqualified, "id-pda-placeOfBirth"); + register_ber_oid_dissector("1.3.6.1.5.5.7.9.3", dissect_Printablestring_PDU, proto_pkixqualified, "id-pda-gender"); + register_ber_oid_dissector("1.3.6.1.5.5.7.9.4", dissect_Printablestring_PDU, proto_pkixqualified, "id-pda-countryOfCitizenship"); + register_ber_oid_dissector("1.3.6.1.5.5.7.9.5", dissect_Printablestring_PDU, proto_pkixqualified, "id-pda-countryOfResidence"); /*--- End of included file: packet-pkixqualified-dis-tab.c ---*/ diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c index 59782eabb6..4cd89ff306 100644 --- a/epan/dissectors/packet-smrse.c +++ b/epan/dissectors/packet-smrse.c @@ -222,7 +222,7 @@ static const ber_choice_t T_address_value_choice[] = { static int dissect_smrse_T_address_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_address_value_choice, hf_index, ett_smrse_T_address_value, NULL); return offset; diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index ab63ce0c83..c62374ac6c 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -449,7 +449,7 @@ static const ber_choice_t Associate_source_diagnostic_choice[] = { static int dissect_tcap_Associate_source_diagnostic(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Associate_source_diagnostic_choice, hf_index, ett_tcap_Associate_source_diagnostic, NULL); return offset; @@ -531,7 +531,7 @@ static const ber_choice_t DialoguePDU_choice[] = { static int dissect_tcap_DialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, DialoguePDU_choice, hf_index, ett_tcap_DialoguePDU, NULL); return offset; @@ -788,7 +788,7 @@ static const ber_choice_t UniDialoguePDU_choice[] = { static int dissect_tcap_UniDialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, UniDialoguePDU_choice, hf_index, ett_tcap_UniDialoguePDU, NULL); return offset; @@ -896,7 +896,7 @@ static const ber_choice_t OPERATION_choice[] = { static int dissect_tcap_OPERATION(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, OPERATION_choice, hf_index, ett_tcap_OPERATION, NULL); return offset; @@ -1020,7 +1020,7 @@ static const ber_choice_t ErrorCode_choice[] = { static int dissect_tcap_ErrorCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ErrorCode_choice, hf_index, ett_tcap_ErrorCode, NULL); return offset; @@ -1074,7 +1074,7 @@ static const ber_choice_t T_invokeIDRej_choice[] = { static int dissect_tcap_T_invokeIDRej(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_invokeIDRej_choice, hf_index, ett_tcap_T_invokeIDRej, NULL); return offset; @@ -1189,7 +1189,7 @@ static const ber_choice_t T_problem_choice[] = { static int dissect_tcap_T_problem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_problem_choice, hf_index, ett_tcap_T_problem, NULL); return offset; @@ -1255,13 +1255,13 @@ if (ber_oid_dissector_table && cur_oid){ if(!dissector_try_string(ber_oid_dissector_table, cur_oid, next_tvb, pinfo, tcap_top_tree)) { if (!dissector_try_port(tcap_itu_ssn_dissector_table, pinfo->match_port, next_tvb,pinfo, tcap_top_tree)) - dissect_ber_CHOICE(pinfo, tree, next_tvb, 0, + dissect_ber_choice(pinfo, tree, next_tvb, 0, Component_choice, hf_index, ett_tcap_Component, NULL); } } else if (!dissector_try_port(tcap_itu_ssn_dissector_table, pinfo->match_port, next_tvb, pinfo, tcap_top_tree)) - dissect_ber_CHOICE(pinfo, tree, next_tvb, 0, + dissect_ber_choice(pinfo, tree, next_tvb, 0, Component_choice, hf_index, ett_tcap_Component, NULL); offset+=len; @@ -1451,7 +1451,7 @@ static const ber_choice_t Reason_choice[] = { static int dissect_tcap_Reason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Reason_choice, hf_index, ett_tcap_Reason, NULL); return offset; @@ -1544,7 +1544,7 @@ static const ber_choice_t T_applicationContext_choice[] = { static int dissect_tcap_T_applicationContext(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_applicationContext_choice, hf_index, ett_tcap_T_applicationContext, NULL); return offset; @@ -1568,7 +1568,7 @@ static const ber_choice_t T_securityContext_choice[] = { static int dissect_tcap_T_securityContext(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_securityContext_choice, hf_index, ett_tcap_T_securityContext, NULL); return offset; @@ -1592,7 +1592,7 @@ static const ber_choice_t T_confidentialityId_choice[] = { static int dissect_tcap_T_confidentialityId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_confidentialityId_choice, hf_index, ett_tcap_T_confidentialityId, NULL); return offset; @@ -1664,7 +1664,7 @@ static const ber_choice_t OperationCode_choice[] = { static int dissect_tcap_OperationCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, OperationCode_choice, hf_index, ett_tcap_OperationCode, NULL); return offset; @@ -1941,7 +1941,7 @@ next_tvb = tvb_new_subset(tvb, offset, -1, -1); if (!dissector_try_port(tcap_ansi_ssn_dissector_table, pinfo->match_port, next_tvb, pinfo, tcap_top_tree)) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ComponentPDU_choice, hf_index, ett_tcap_ComponentPDU, NULL); } @@ -2074,7 +2074,7 @@ static const ber_choice_t T_causeInformation_choice[] = { static int dissect_tcap_T_causeInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_causeInformation_choice, hf_index, ett_tcap_T_causeInformation, NULL); return offset; @@ -2138,7 +2138,7 @@ static const ber_choice_t MessageType_choice[] = { static int dissect_tcap_MessageType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, MessageType_choice, hf_index, ett_tcap_MessageType, NULL); return offset; @@ -2159,7 +2159,7 @@ static const ber_choice_t ERROR_choice[] = { static int dissect_tcap_ERROR(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ERROR_choice, hf_index, ett_tcap_ERROR, NULL); return offset; diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index 1fac43c057..bf901da6ef 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -355,7 +355,7 @@ static const ber_choice_t Time_choice[] = { int dissect_x509af_Time(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Time_choice, hf_index, ett_x509af_Time, NULL); return offset; @@ -490,6 +490,7 @@ static int dissect_Extensions_item(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_x509af_Extension(FALSE, tvb, offset, pinfo, tree, hf_x509af_Extensions_item); } + static const ber_sequence_t Extensions_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Extensions_item }, }; @@ -497,7 +498,7 @@ static const ber_sequence_t Extensions_sequence_of[1] = { int dissect_x509af_Extensions(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - Extensions_sequence_of, hf_index, ett_x509af_Extensions); + Extensions_sequence_of, hf_index, ett_x509af_Extensions); return offset; } @@ -566,6 +567,7 @@ static int dissect_certificate(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_x509af_Certificate(FALSE, tvb, offset, pinfo, tree, hf_x509af_certificate); } + static const ber_sequence_t CrossCertificates_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CrossCertificates_item }, }; @@ -573,7 +575,7 @@ static const ber_sequence_t CrossCertificates_set_of[1] = { int dissect_x509af_CrossCertificates(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - CrossCertificates_set_of, hf_index, ett_x509af_CrossCertificates); + CrossCertificates_set_of, hf_index, ett_x509af_CrossCertificates); return offset; } @@ -581,6 +583,7 @@ static int dissect_ForwardCertificationPath_item(packet_info *pinfo, proto_tree return dissect_x509af_CrossCertificates(FALSE, tvb, offset, pinfo, tree, hf_x509af_ForwardCertificationPath_item); } + static const ber_sequence_t ForwardCertificationPath_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_ForwardCertificationPath_item }, }; @@ -588,7 +591,7 @@ static const ber_sequence_t ForwardCertificationPath_sequence_of[1] = { int dissect_x509af_ForwardCertificationPath(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - ForwardCertificationPath_sequence_of, hf_index, ett_x509af_ForwardCertificationPath); + ForwardCertificationPath_sequence_of, hf_index, ett_x509af_ForwardCertificationPath); return offset; } @@ -627,6 +630,7 @@ static int dissect_theCACertificates_item(packet_info *pinfo, proto_tree *tree, return dissect_x509af_CertificatePair(FALSE, tvb, offset, pinfo, tree, hf_x509af_theCACertificates_item); } + static const ber_sequence_t SEQUENCE_OF_CertificatePair_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_theCACertificates_item }, }; @@ -634,7 +638,7 @@ static const ber_sequence_t SEQUENCE_OF_CertificatePair_sequence_of[1] = { static int dissect_x509af_SEQUENCE_OF_CertificatePair(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_CertificatePair_sequence_of, hf_index, ett_x509af_SEQUENCE_OF_CertificatePair); + SEQUENCE_OF_CertificatePair_sequence_of, hf_index, ett_x509af_SEQUENCE_OF_CertificatePair); return offset; } @@ -674,6 +678,7 @@ static int dissect_revokedCertificates_item(packet_info *pinfo, proto_tree *tree return dissect_x509af_T_revokedCertificates_item(FALSE, tvb, offset, pinfo, tree, hf_x509af_revokedCertificates_item); } + static const ber_sequence_t T_revokedCertificates_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_revokedCertificates_item }, }; @@ -681,7 +686,7 @@ static const ber_sequence_t T_revokedCertificates_sequence_of[1] = { static int dissect_x509af_T_revokedCertificates(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_revokedCertificates_sequence_of, hf_index, ett_x509af_T_revokedCertificates); + T_revokedCertificates_sequence_of, hf_index, ett_x509af_T_revokedCertificates); return offset; } @@ -759,7 +764,7 @@ static const ber_choice_t InfoSubject_choice[] = { static int dissect_x509af_InfoSubject(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, InfoSubject_choice, hf_index, ett_x509af_InfoSubject, NULL); return offset; @@ -785,6 +790,7 @@ static int dissect_attCertValidityPeriod(packet_info *pinfo, proto_tree *tree, t return dissect_x509af_AttCertValidityPeriod(FALSE, tvb, offset, pinfo, tree, hf_x509af_attCertValidityPeriod); } + static const ber_sequence_t SEQUENCE_OF_Attribute_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributes_item }, }; @@ -792,7 +798,7 @@ static const ber_sequence_t SEQUENCE_OF_Attribute_sequence_of[1] = { static int dissect_x509af_SEQUENCE_OF_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_Attribute_sequence_of, hf_index, ett_x509af_SEQUENCE_OF_Attribute); + SEQUENCE_OF_Attribute_sequence_of, hf_index, ett_x509af_SEQUENCE_OF_Attribute); return offset; } @@ -859,6 +865,7 @@ static int dissect_acPath_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_x509af_ACPathData(FALSE, tvb, offset, pinfo, tree, hf_x509af_acPath_item); } + static const ber_sequence_t SEQUENCE_OF_ACPathData_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_acPath_item }, }; @@ -866,7 +873,7 @@ static const ber_sequence_t SEQUENCE_OF_ACPathData_sequence_of[1] = { static int dissect_x509af_SEQUENCE_OF_ACPathData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_ACPathData_sequence_of, hf_index, ett_x509af_SEQUENCE_OF_ACPathData); + SEQUENCE_OF_ACPathData_sequence_of, hf_index, ett_x509af_SEQUENCE_OF_ACPathData); return offset; } @@ -903,7 +910,7 @@ static const ber_choice_t AssertionSubject_choice[] = { static int dissect_x509af_AssertionSubject(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, AssertionSubject_choice, hf_index, ett_x509af_AssertionSubject, NULL); return offset; @@ -912,6 +919,7 @@ static int dissect_assertion_subject(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_x509af_AssertionSubject(FALSE, tvb, offset, pinfo, tree, hf_x509af_assertion_subject); } + static const ber_sequence_t SET_OF_AttributeType_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attType_item }, }; @@ -919,7 +927,7 @@ static const ber_sequence_t SET_OF_AttributeType_set_of[1] = { static int dissect_x509af_SET_OF_AttributeType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - SET_OF_AttributeType_set_of, hf_index, ett_x509af_SET_OF_AttributeType); + SET_OF_AttributeType_set_of, hf_index, ett_x509af_SET_OF_AttributeType); return offset; } @@ -1061,7 +1069,7 @@ void proto_register_x509af(void) { "Certificate/signedCertificate/subjectUniqueIdentifier", HFILL }}, { &hf_x509af_extensions, { "extensions", "x509af.extensions", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_x509af_algorithmIdentifier, { "algorithmIdentifier", "x509af.algorithmIdentifier", @@ -1125,11 +1133,11 @@ void proto_register_x509af(void) { "", HFILL }}, { &hf_x509af_certificationPath, { "certificationPath", "x509af.certificationPath", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Certificates/certificationPath", HFILL }}, { &hf_x509af_ForwardCertificationPath_item, { "Item", "x509af.ForwardCertificationPath_item", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ForwardCertificationPath/_item", HFILL }}, { &hf_x509af_CrossCertificates_item, { "Item", "x509af.CrossCertificates_item", @@ -1137,7 +1145,7 @@ void proto_register_x509af(void) { "CrossCertificates/_item", HFILL }}, { &hf_x509af_theCACertificates, { "theCACertificates", "x509af.theCACertificates", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CertificationPath/theCACertificates", HFILL }}, { &hf_x509af_theCACertificates_item, { "Item", "x509af.theCACertificates_item", @@ -1165,7 +1173,7 @@ void proto_register_x509af(void) { "CertificateList/signedCertificateList/nextUpdate", HFILL }}, { &hf_x509af_revokedCertificates, { "revokedCertificates", "x509af.revokedCertificates", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CertificateList/signedCertificateList/revokedCertificates", HFILL }}, { &hf_x509af_revokedCertificates_item, { "Item", "x509af.revokedCertificates_item", @@ -1181,11 +1189,11 @@ void proto_register_x509af(void) { "CertificateList/signedCertificateList/revokedCertificates/_item/revocationDate", HFILL }}, { &hf_x509af_crlEntryExtensions, { "crlEntryExtensions", "x509af.crlEntryExtensions", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CertificateList/signedCertificateList/revokedCertificates/_item/crlEntryExtensions", HFILL }}, { &hf_x509af_crlExtensions, { "crlExtensions", "x509af.crlExtensions", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CertificateList/signedCertificateList/crlExtensions", HFILL }}, { &hf_x509af_attributeCertificate, { "attributeCertificate", "x509af.attributeCertificate", @@ -1193,7 +1201,7 @@ void proto_register_x509af(void) { "", HFILL }}, { &hf_x509af_acPath, { "acPath", "x509af.acPath", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AttributeCertificationPath/acPath", HFILL }}, { &hf_x509af_acPath_item, { "Item", "x509af.acPath_item", @@ -1217,11 +1225,11 @@ void proto_register_x509af(void) { "", HFILL }}, { &hf_x509af_infoSubjectName, { "subjectName", "x509af.subjectName", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AttributeCertificateInfo/subject/subjectName", HFILL }}, { &hf_x509af_issuerName, { "issuer", "x509af.issuer", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_x509af_attCertValidityPeriod, { "attCertValidityPeriod", "x509af.attCertValidityPeriod", @@ -1229,7 +1237,7 @@ void proto_register_x509af(void) { "AttributeCertificateInfo/attCertValidityPeriod", HFILL }}, { &hf_x509af_attributes, { "attributes", "x509af.attributes", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AttributeCertificateInfo/attributes", HFILL }}, { &hf_x509af_attributes_item, { "Item", "x509af.attributes_item", @@ -1273,7 +1281,7 @@ void proto_register_x509af(void) { "AttributeCertificateAssertion/attCertValidity", HFILL }}, { &hf_x509af_attType, { "attType", "x509af.attType", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AttributeCertificateAssertion/attType", HFILL }}, { &hf_x509af_attType_item, { "Item", "x509af.attType_item", diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c index c4eb84ef59..33141a4f50 100644 --- a/epan/dissectors/packet-x509ce.c +++ b/epan/dissectors/packet-x509ce.c @@ -311,10 +311,11 @@ static int dissect_lastSubject(packet_info *pinfo, proto_tree *tree, tvbuff_t *t } + int dissect_x509ce_KeyIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -325,7 +326,7 @@ static int dissect_keyIdentifier_impl(packet_info *pinfo, proto_tree *tree, tvbu static int dissect_x509ce_IA5String(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_restricted_string(implicit_tag, 1, + offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_IA5String, pinfo, tree, tvb, offset, hf_index, NULL); @@ -359,6 +360,7 @@ static int dissect_ediPartyName_impl(packet_info *pinfo, proto_tree *tree, tvbuf } + static int dissect_x509ce_T_iPAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { proto_tree_add_item(tree, hf_x509ce_IPAddress, tvb, offset, 4, FALSE); @@ -415,7 +417,7 @@ static const ber_choice_t GeneralName_choice[] = { int dissect_x509ce_GeneralName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, GeneralName_choice, hf_index, ett_x509ce_GeneralName, NULL); return offset; @@ -439,6 +441,7 @@ static int dissect_deltaLocation(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_x509ce_GeneralName(FALSE, tvb, offset, pinfo, tree, hf_x509ce_deltaLocation); } + static const ber_sequence_t GeneralNames_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_GeneralNames_item }, }; @@ -446,7 +449,7 @@ static const ber_sequence_t GeneralNames_sequence_of[1] = { int dissect_x509ce_GeneralNames(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - GeneralNames_sequence_of, hf_index, ett_x509ce_GeneralNames); + GeneralNames_sequence_of, hf_index, ett_x509ce_GeneralNames); return offset; } @@ -530,6 +533,7 @@ static int dissect_KeyPurposeIDs_item(packet_info *pinfo, proto_tree *tree, tvbu return dissect_x509ce_KeyPurposeId(FALSE, tvb, offset, pinfo, tree, hf_x509ce_KeyPurposeIDs_item); } + static const ber_sequence_t KeyPurposeIDs_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_KeyPurposeIDs_item }, }; @@ -537,7 +541,7 @@ static const ber_sequence_t KeyPurposeIDs_sequence_of[1] = { int dissect_x509ce_KeyPurposeIDs(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - KeyPurposeIDs_sequence_of, hf_index, ett_x509ce_KeyPurposeIDs); + KeyPurposeIDs_sequence_of, hf_index, ett_x509ce_KeyPurposeIDs); return offset; } @@ -654,6 +658,7 @@ static int dissect_policyQualifiers_item(packet_info *pinfo, proto_tree *tree, t return dissect_x509ce_PolicyQualifierInfo(FALSE, tvb, offset, pinfo, tree, hf_x509ce_policyQualifiers_item); } + static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_policyQualifiers_item }, }; @@ -661,7 +666,7 @@ static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo_sequence_ static int dissect_x509ce_SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo_sequence_of, hf_index, ett_x509ce_SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo); + SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo_sequence_of, hf_index, ett_x509ce_SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo); return offset; } @@ -686,6 +691,7 @@ static int dissect_CertificatePoliciesSyntax_item(packet_info *pinfo, proto_tree return dissect_x509ce_PolicyInformation(FALSE, tvb, offset, pinfo, tree, hf_x509ce_CertificatePoliciesSyntax_item); } + static const ber_sequence_t CertificatePoliciesSyntax_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CertificatePoliciesSyntax_item }, }; @@ -693,7 +699,7 @@ static const ber_sequence_t CertificatePoliciesSyntax_sequence_of[1] = { int dissect_x509ce_CertificatePoliciesSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - CertificatePoliciesSyntax_sequence_of, hf_index, ett_x509ce_CertificatePoliciesSyntax); + CertificatePoliciesSyntax_sequence_of, hf_index, ett_x509ce_CertificatePoliciesSyntax); return offset; } @@ -715,6 +721,7 @@ static int dissect_PolicyMappingsSyntax_item(packet_info *pinfo, proto_tree *tre return dissect_x509ce_PolicyMappingsSyntax_item(FALSE, tvb, offset, pinfo, tree, hf_x509ce_PolicyMappingsSyntax_item); } + static const ber_sequence_t PolicyMappingsSyntax_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PolicyMappingsSyntax_item }, }; @@ -722,11 +729,12 @@ static const ber_sequence_t PolicyMappingsSyntax_sequence_of[1] = { int dissect_x509ce_PolicyMappingsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - PolicyMappingsSyntax_sequence_of, hf_index, ett_x509ce_PolicyMappingsSyntax); + PolicyMappingsSyntax_sequence_of, hf_index, ett_x509ce_PolicyMappingsSyntax); return offset; } + static const ber_sequence_t AttributesSyntax_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AttributesSyntax_item }, }; @@ -734,12 +742,13 @@ static const ber_sequence_t AttributesSyntax_sequence_of[1] = { int dissect_x509ce_AttributesSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - AttributesSyntax_sequence_of, hf_index, ett_x509ce_AttributesSyntax); + AttributesSyntax_sequence_of, hf_index, ett_x509ce_AttributesSyntax); return offset; } + static int dissect_x509ce_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index); @@ -838,6 +847,7 @@ static int dissect_GeneralSubtrees_item(packet_info *pinfo, proto_tree *tree, tv return dissect_x509ce_GeneralSubtree(FALSE, tvb, offset, pinfo, tree, hf_x509ce_GeneralSubtrees_item); } + static const ber_sequence_t GeneralSubtrees_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_GeneralSubtrees_item }, }; @@ -845,7 +855,7 @@ static const ber_sequence_t GeneralSubtrees_sequence_of[1] = { int dissect_x509ce_GeneralSubtrees(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - GeneralSubtrees_sequence_of, hf_index, ett_x509ce_GeneralSubtrees); + GeneralSubtrees_sequence_of, hf_index, ett_x509ce_GeneralSubtrees); return offset; } @@ -940,7 +950,8 @@ const value_string x509ce_CRLReason_vals[] = { int dissect_x509ce_CRLReason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -970,7 +981,7 @@ static const ber_choice_t DistributionPointName_choice[] = { int dissect_x509ce_DistributionPointName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, DistributionPointName_choice, hf_index, ett_x509ce_DistributionPointName, NULL); return offset; @@ -1109,6 +1120,7 @@ static int dissect_CRLScopeSyntax_item(packet_info *pinfo, proto_tree *tree, tvb return dissect_x509ce_PerAuthorityScope(FALSE, tvb, offset, pinfo, tree, hf_x509ce_CRLScopeSyntax_item); } + static const ber_sequence_t CRLScopeSyntax_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CRLScopeSyntax_item }, }; @@ -1116,7 +1128,7 @@ static const ber_sequence_t CRLScopeSyntax_sequence_of[1] = { int dissect_x509ce_CRLScopeSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - CRLScopeSyntax_sequence_of, hf_index, ett_x509ce_CRLScopeSyntax); + CRLScopeSyntax_sequence_of, hf_index, ett_x509ce_CRLScopeSyntax); return offset; } @@ -1175,7 +1187,7 @@ static const ber_choice_t StatusReferral_choice[] = { int dissect_x509ce_StatusReferral(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, StatusReferral_choice, hf_index, ett_x509ce_StatusReferral, NULL); return offset; @@ -1184,6 +1196,7 @@ static int dissect_StatusReferrals_item(packet_info *pinfo, proto_tree *tree, tv return dissect_x509ce_StatusReferral(FALSE, tvb, offset, pinfo, tree, hf_x509ce_StatusReferrals_item); } + static const ber_sequence_t StatusReferrals_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_StatusReferrals_item }, }; @@ -1191,7 +1204,7 @@ static const ber_sequence_t StatusReferrals_sequence_of[1] = { int dissect_x509ce_StatusReferrals(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - StatusReferrals_sequence_of, hf_index, ett_x509ce_StatusReferrals); + StatusReferrals_sequence_of, hf_index, ett_x509ce_StatusReferrals); return offset; } @@ -1206,7 +1219,8 @@ const value_string x509ce_OrderedListSyntax_vals[] = { int dissect_x509ce_OrderedListSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1243,6 +1257,7 @@ static int dissect_CRLDistPointsSyntax_item(packet_info *pinfo, proto_tree *tree return dissect_x509ce_DistributionPoint(FALSE, tvb, offset, pinfo, tree, hf_x509ce_CRLDistPointsSyntax_item); } + static const ber_sequence_t CRLDistPointsSyntax_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CRLDistPointsSyntax_item }, }; @@ -1250,7 +1265,7 @@ static const ber_sequence_t CRLDistPointsSyntax_sequence_of[1] = { int dissect_x509ce_CRLDistPointsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - CRLDistPointsSyntax_sequence_of, hf_index, ett_x509ce_CRLDistPointsSyntax); + CRLDistPointsSyntax_sequence_of, hf_index, ett_x509ce_CRLDistPointsSyntax); return offset; } @@ -1319,7 +1334,8 @@ static const value_string x509ce_T_builtinNameForm_vals[] = { static int dissect_x509ce_T_builtinNameForm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1342,7 +1358,7 @@ static const ber_choice_t AltNameType_choice[] = { int dissect_x509ce_AltNameType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, AltNameType_choice, hf_index, ett_x509ce_AltNameType, NULL); return offset; @@ -1351,6 +1367,7 @@ static int dissect_subjectAltName_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_x509ce_AltNameType(TRUE, tvb, offset, pinfo, tree, hf_x509ce_subjectAltName); } + static const ber_sequence_t CertPolicySet_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_CertPolicySet_item }, }; @@ -1358,7 +1375,7 @@ static const ber_sequence_t CertPolicySet_sequence_of[1] = { int dissect_x509ce_CertPolicySet(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - CertPolicySet_sequence_of, hf_index, ett_x509ce_CertPolicySet); + CertPolicySet_sequence_of, hf_index, ett_x509ce_CertPolicySet); return offset; } @@ -1599,7 +1616,7 @@ void proto_register_x509ce(void) { "KeyUsage", HFILL }}, { &hf_x509ce_KeyPurposeIDs_PDU, { "KeyPurposeIDs", "x509ce.KeyPurposeIDs", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "KeyPurposeIDs", HFILL }}, { &hf_x509ce_PrivateKeyUsagePeriod_PDU, { "PrivateKeyUsagePeriod", "x509ce.PrivateKeyUsagePeriod", @@ -1607,19 +1624,19 @@ void proto_register_x509ce(void) { "PrivateKeyUsagePeriod", HFILL }}, { &hf_x509ce_CertificatePoliciesSyntax_PDU, { "CertificatePoliciesSyntax", "x509ce.CertificatePoliciesSyntax", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CertificatePoliciesSyntax", HFILL }}, { &hf_x509ce_PolicyMappingsSyntax_PDU, { "PolicyMappingsSyntax", "x509ce.PolicyMappingsSyntax", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PolicyMappingsSyntax", HFILL }}, { &hf_x509ce_GeneralNames_PDU, { "GeneralNames", "x509ce.GeneralNames", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "GeneralNames", HFILL }}, { &hf_x509ce_AttributesSyntax_PDU, { "AttributesSyntax", "x509ce.AttributesSyntax", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AttributesSyntax", HFILL }}, { &hf_x509ce_BasicConstraintsSyntax_PDU, { "BasicConstraintsSyntax", "x509ce.BasicConstraintsSyntax", @@ -1651,11 +1668,11 @@ void proto_register_x509ce(void) { "HoldInstruction", HFILL }}, { &hf_x509ce_CRLScopeSyntax_PDU, { "CRLScopeSyntax", "x509ce.CRLScopeSyntax", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CRLScopeSyntax", HFILL }}, { &hf_x509ce_StatusReferrals_PDU, { "StatusReferrals", "x509ce.StatusReferrals", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "StatusReferrals", HFILL }}, { &hf_x509ce_CRLStreamIdentifier_PDU, { "CRLStreamIdentifier", "x509ce.CRLStreamIdentifier", @@ -1671,7 +1688,7 @@ void proto_register_x509ce(void) { "DeltaInformation", HFILL }}, { &hf_x509ce_CRLDistPointsSyntax_PDU, { "CRLDistPointsSyntax", "x509ce.CRLDistPointsSyntax", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CRLDistPointsSyntax", HFILL }}, { &hf_x509ce_IssuingDistPointSyntax_PDU, { "IssuingDistPointSyntax", "x509ce.IssuingDistPointSyntax", @@ -1687,7 +1704,7 @@ void proto_register_x509ce(void) { "AuthorityKeyIdentifier/keyIdentifier", HFILL }}, { &hf_x509ce_authorityCertIssuer, { "authorityCertIssuer", "x509ce.authorityCertIssuer", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AuthorityKeyIdentifier/authorityCertIssuer", HFILL }}, { &hf_x509ce_authorityCertSerialNumber, { "authorityCertSerialNumber", "x509ce.authorityCertSerialNumber", @@ -1715,7 +1732,7 @@ void proto_register_x509ce(void) { "PolicyInformation/policyIdentifier", HFILL }}, { &hf_x509ce_policyQualifiers, { "policyQualifiers", "x509ce.policyQualifiers", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PolicyInformation/policyQualifiers", HFILL }}, { &hf_x509ce_policyQualifiers_item, { "Item", "x509ce.policyQualifiers_item", @@ -1795,11 +1812,11 @@ void proto_register_x509ce(void) { "BasicConstraintsSyntax/pathLenConstraint", HFILL }}, { &hf_x509ce_permittedSubtrees, { "permittedSubtrees", "x509ce.permittedSubtrees", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "NameConstraintsSyntax/permittedSubtrees", HFILL }}, { &hf_x509ce_excludedSubtrees, { "excludedSubtrees", "x509ce.excludedSubtrees", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "NameConstraintsSyntax/excludedSubtrees", HFILL }}, { &hf_x509ce_GeneralSubtrees_item, { "Item", "x509ce.GeneralSubtrees_item", @@ -1855,7 +1872,7 @@ void proto_register_x509ce(void) { "PerAuthorityScope/subjectKeyIdRange", HFILL }}, { &hf_x509ce_nameSubtrees, { "nameSubtrees", "x509ce.nameSubtrees", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PerAuthorityScope/nameSubtrees", HFILL }}, { &hf_x509ce_baseRevocationInfo, { "baseRevocationInfo", "x509ce.baseRevocationInfo", @@ -1907,7 +1924,7 @@ void proto_register_x509ce(void) { "CRLReferral/deltaRefInfo", HFILL }}, { &hf_x509ce_cRLScope, { "cRLScope", "x509ce.cRLScope", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CRLReferral/cRLScope", HFILL }}, { &hf_x509ce_lastUpdate, { "lastUpdate", "x509ce.lastUpdate", @@ -1939,15 +1956,15 @@ void proto_register_x509ce(void) { "DistributionPoint/reasons", HFILL }}, { &hf_x509ce_cRLIssuer, { "cRLIssuer", "x509ce.cRLIssuer", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "DistributionPoint/cRLIssuer", HFILL }}, { &hf_x509ce_fullName, { "fullName", "x509ce.fullName", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "DistributionPointName/fullName", HFILL }}, { &hf_x509ce_nameRelativeToCRLIssuer, { "nameRelativeToCRLIssuer", "x509ce.nameRelativeToCRLIssuer", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "DistributionPointName/nameRelativeToCRLIssuer", HFILL }}, { &hf_x509ce_containsUserPublicKeyCerts, { "containsUserPublicKeyCerts", "x509ce.containsUserPublicKeyCerts", @@ -2007,7 +2024,7 @@ void proto_register_x509ce(void) { "CertificateAssertion/subjectAltName", HFILL }}, { &hf_x509ce_policy, { "policy", "x509ce.policy", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "CertificateAssertion/policy", HFILL }}, { &hf_x509ce_pathToName, { "pathToName", "x509ce.pathToName", @@ -2234,33 +2251,33 @@ void proto_reg_handoff_x509ce(void) { /*--- Included file: packet-x509ce-dis-tab.c ---*/ - register_ber_oid_dissector("2.5.29.9", dissect_AttributesSyntax_PDU, proto_x509ce, "id-ce-subjectDirectoryAttributes"); - register_ber_oid_dissector("2.5.29.14", dissect_SubjectKeyIdentifier_PDU, proto_x509ce, "id-ce-subjectKeyIdentifier"); - register_ber_oid_dissector("2.5.29.15", dissect_KeyUsage_PDU, proto_x509ce, "id-ce-keyUsage"); - register_ber_oid_dissector("2.5.29.16", dissect_PrivateKeyUsagePeriod_PDU, proto_x509ce, "id-ce-privateKeyUsagePeriod"); - register_ber_oid_dissector("2.5.29.17", dissect_GeneralNames_PDU, proto_x509ce, "id-ce-subjectAltName"); - register_ber_oid_dissector("2.5.29.18", dissect_GeneralNames_PDU, proto_x509ce, "id-ce-issuerAltName"); - register_ber_oid_dissector("2.5.29.19", dissect_BasicConstraintsSyntax_PDU, proto_x509ce, "id-ce-basicConstraints"); - register_ber_oid_dissector("2.5.29.20", dissect_CRLNumber_PDU, proto_x509ce, "id-ce-cRLNumber"); - register_ber_oid_dissector("2.5.29.21", dissect_CRLReason_PDU, proto_x509ce, "id-ce-reasonCode"); - register_ber_oid_dissector("2.5.29.23", dissect_HoldInstruction_PDU, proto_x509ce, "id-ce-instructionCode"); - register_ber_oid_dissector("2.5.29.27", dissect_BaseCRLNumber_PDU, proto_x509ce, "id-ce-deltaCRLIndicator"); - register_ber_oid_dissector("2.5.29.28", dissect_IssuingDistPointSyntax_PDU, proto_x509ce, "id-ce-issuingDistributionPoint"); - register_ber_oid_dissector("2.5.29.29", dissect_GeneralNames_PDU, proto_x509ce, "id-ce-certificateIssuer"); - register_ber_oid_dissector("2.5.29.30", dissect_NameConstraintsSyntax_PDU, proto_x509ce, "id-ce-nameConstraints"); - register_ber_oid_dissector("2.5.29.31", dissect_CRLDistPointsSyntax_PDU, proto_x509ce, "id-ce-cRLDistributionPoints"); - register_ber_oid_dissector("2.5.29.32", dissect_CertificatePoliciesSyntax_PDU, proto_x509ce, "id-ce-certificatePolicies"); - register_ber_oid_dissector("2.5.29.33", dissect_PolicyMappingsSyntax_PDU, proto_x509ce, "id-ce-policyMappings"); - register_ber_oid_dissector("2.5.29.35", dissect_AuthorityKeyIdentifier_PDU, proto_x509ce, "id-ce-authorityKeyIdentifier"); - register_ber_oid_dissector("2.5.29.36", dissect_PolicyConstraintsSyntax_PDU, proto_x509ce, "id-ce-policyConstraints"); - register_ber_oid_dissector("2.5.29.37", dissect_KeyPurposeIDs_PDU, proto_x509ce, "id-ce-extKeyUsage"); - register_ber_oid_dissector("2.5.29.40", dissect_CRLStreamIdentifier_PDU, proto_x509ce, "id-ce-cRLStreamIdentifier"); - register_ber_oid_dissector("2.5.29.44", dissect_CRLScopeSyntax_PDU, proto_x509ce, "id-ce-cRLScope"); - register_ber_oid_dissector("2.5.29.45", dissect_StatusReferrals_PDU, proto_x509ce, "id-ce-statusReferrals"); - register_ber_oid_dissector("2.5.29.46", dissect_CRLDistPointsSyntax_PDU, proto_x509ce, "id-ce-freshestCRL"); - register_ber_oid_dissector("2.5.29.47", dissect_OrderedListSyntax_PDU, proto_x509ce, "id-ce-orderedList"); - register_ber_oid_dissector("2.5.29.53", dissect_DeltaInformation_PDU, proto_x509ce, "id-ce-deltaInfo"); - register_ber_oid_dissector("2.5.29.54", dissect_SkipCerts_PDU, proto_x509ce, "id-ce-inhibitAnyPolicy"); + register_ber_oid_dissector("2.5.29.9", dissect_AttributesSyntax_PDU, proto_x509ce, "id-ce-subjectDirectoryAttributes"); + register_ber_oid_dissector("2.5.29.14", dissect_SubjectKeyIdentifier_PDU, proto_x509ce, "id-ce-subjectKeyIdentifier"); + register_ber_oid_dissector("2.5.29.15", dissect_KeyUsage_PDU, proto_x509ce, "id-ce-keyUsage"); + register_ber_oid_dissector("2.5.29.16", dissect_PrivateKeyUsagePeriod_PDU, proto_x509ce, "id-ce-privateKeyUsagePeriod"); + register_ber_oid_dissector("2.5.29.17", dissect_GeneralNames_PDU, proto_x509ce, "id-ce-subjectAltName"); + register_ber_oid_dissector("2.5.29.18", dissect_GeneralNames_PDU, proto_x509ce, "id-ce-issuerAltName"); + register_ber_oid_dissector("2.5.29.19", dissect_BasicConstraintsSyntax_PDU, proto_x509ce, "id-ce-basicConstraints"); + register_ber_oid_dissector("2.5.29.20", dissect_CRLNumber_PDU, proto_x509ce, "id-ce-cRLNumber"); + register_ber_oid_dissector("2.5.29.21", dissect_CRLReason_PDU, proto_x509ce, "id-ce-reasonCode"); + register_ber_oid_dissector("2.5.29.23", dissect_HoldInstruction_PDU, proto_x509ce, "id-ce-instructionCode"); + register_ber_oid_dissector("2.5.29.27", dissect_BaseCRLNumber_PDU, proto_x509ce, "id-ce-deltaCRLIndicator"); + register_ber_oid_dissector("2.5.29.28", dissect_IssuingDistPointSyntax_PDU, proto_x509ce, "id-ce-issuingDistributionPoint"); + register_ber_oid_dissector("2.5.29.29", dissect_GeneralNames_PDU, proto_x509ce, "id-ce-certificateIssuer"); + register_ber_oid_dissector("2.5.29.30", dissect_NameConstraintsSyntax_PDU, proto_x509ce, "id-ce-nameConstraints"); + register_ber_oid_dissector("2.5.29.31", dissect_CRLDistPointsSyntax_PDU, proto_x509ce, "id-ce-cRLDistributionPoints"); + register_ber_oid_dissector("2.5.29.32", dissect_CertificatePoliciesSyntax_PDU, proto_x509ce, "id-ce-certificatePolicies"); + register_ber_oid_dissector("2.5.29.33", dissect_PolicyMappingsSyntax_PDU, proto_x509ce, "id-ce-policyMappings"); + register_ber_oid_dissector("2.5.29.35", dissect_AuthorityKeyIdentifier_PDU, proto_x509ce, "id-ce-authorityKeyIdentifier"); + register_ber_oid_dissector("2.5.29.36", dissect_PolicyConstraintsSyntax_PDU, proto_x509ce, "id-ce-policyConstraints"); + register_ber_oid_dissector("2.5.29.37", dissect_KeyPurposeIDs_PDU, proto_x509ce, "id-ce-extKeyUsage"); + register_ber_oid_dissector("2.5.29.40", dissect_CRLStreamIdentifier_PDU, proto_x509ce, "id-ce-cRLStreamIdentifier"); + register_ber_oid_dissector("2.5.29.44", dissect_CRLScopeSyntax_PDU, proto_x509ce, "id-ce-cRLScope"); + register_ber_oid_dissector("2.5.29.45", dissect_StatusReferrals_PDU, proto_x509ce, "id-ce-statusReferrals"); + register_ber_oid_dissector("2.5.29.46", dissect_CRLDistPointsSyntax_PDU, proto_x509ce, "id-ce-freshestCRL"); + register_ber_oid_dissector("2.5.29.47", dissect_OrderedListSyntax_PDU, proto_x509ce, "id-ce-orderedList"); + register_ber_oid_dissector("2.5.29.53", dissect_DeltaInformation_PDU, proto_x509ce, "id-ce-deltaInfo"); + register_ber_oid_dissector("2.5.29.54", dissect_SkipCerts_PDU, proto_x509ce, "id-ce-inhibitAnyPolicy"); /*--- End of included file: packet-x509ce-dis-tab.c ---*/ diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index ad8656f0fc..36b4f1a286 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -422,6 +422,7 @@ static int dissect_distingAttrValue(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_x509if_ValuesWithContextValue(FALSE, tvb, offset, pinfo, tree, hf_x509if_distingAttrValue); } + static const ber_sequence_t SET_OF_AttributeValue_set_of[1] = { { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_values_item }, }; @@ -429,7 +430,7 @@ static const ber_sequence_t SET_OF_AttributeValue_set_of[1] = { static int dissect_x509if_SET_OF_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - SET_OF_AttributeValue_set_of, hf_index, ett_x509if_SET_OF_AttributeValue); + SET_OF_AttributeValue_set_of, hf_index, ett_x509if_SET_OF_AttributeValue); return offset; } @@ -441,6 +442,7 @@ static int dissect_contextValues(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_x509if_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index); @@ -478,6 +480,7 @@ static int dissect_contextList_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_x509if_Context(FALSE, tvb, offset, pinfo, tree, hf_x509if_contextList_item); } + static const ber_sequence_t SET_OF_Context_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_contextList_item }, }; @@ -485,7 +488,7 @@ static const ber_sequence_t SET_OF_Context_set_of[1] = { static int dissect_x509if_SET_OF_Context(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - SET_OF_Context_set_of, hf_index, ett_x509if_SET_OF_Context); + SET_OF_Context_set_of, hf_index, ett_x509if_SET_OF_Context); return offset; } @@ -510,6 +513,7 @@ static int dissect_valuesWithContext_item(packet_info *pinfo, proto_tree *tree, return dissect_x509if_T_valuesWithContext_item(FALSE, tvb, offset, pinfo, tree, hf_x509if_valuesWithContext_item); } + static const ber_sequence_t T_valuesWithContext_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_valuesWithContext_item }, }; @@ -517,7 +521,7 @@ static const ber_sequence_t T_valuesWithContext_set_of[1] = { static int dissect_x509if_T_valuesWithContext(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - T_valuesWithContext_set_of, hf_index, ett_x509if_T_valuesWithContext); + T_valuesWithContext_set_of, hf_index, ett_x509if_T_valuesWithContext); return offset; } @@ -596,6 +600,7 @@ static int dissect_ca_contextValues_item(packet_info *pinfo, proto_tree *tree, t return dissect_x509if_ContextValue(FALSE, tvb, offset, pinfo, tree, hf_x509if_ca_contextValues_item); } + static const ber_sequence_t SET_OF_ContextValue_set_of[1] = { { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_ca_contextValues_item }, }; @@ -603,7 +608,7 @@ static const ber_sequence_t SET_OF_ContextValue_set_of[1] = { static int dissect_x509if_SET_OF_ContextValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - SET_OF_ContextValue_set_of, hf_index, ett_x509if_SET_OF_ContextValue); + SET_OF_ContextValue_set_of, hf_index, ett_x509if_SET_OF_ContextValue); return offset; } @@ -631,6 +636,7 @@ static int dissect_assertedContexts_item(packet_info *pinfo, proto_tree *tree, t return dissect_x509if_ContextAssertion(FALSE, tvb, offset, pinfo, tree, hf_x509if_assertedContexts_item); } + static const ber_sequence_t SET_OF_ContextAssertion_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_selectedContexts_item }, }; @@ -638,7 +644,7 @@ static const ber_sequence_t SET_OF_ContextAssertion_set_of[1] = { static int dissect_x509if_SET_OF_ContextAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - SET_OF_ContextAssertion_set_of, hf_index, ett_x509if_SET_OF_ContextAssertion); + SET_OF_ContextAssertion_set_of, hf_index, ett_x509if_SET_OF_ContextAssertion); return offset; } @@ -661,7 +667,7 @@ static const ber_choice_t T_assertedContexts_choice[] = { static int dissect_x509if_T_assertedContexts(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_assertedContexts_choice, hf_index, ett_x509if_T_assertedContexts, NULL); return offset; @@ -685,6 +691,7 @@ dissect_x509if_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, return offset; } + static const ber_sequence_t SEQUENCE_OF_ContextAssertion_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_assertedContexts_item }, }; @@ -692,7 +699,7 @@ static const ber_sequence_t SEQUENCE_OF_ContextAssertion_sequence_of[1] = { static int dissect_x509if_SEQUENCE_OF_ContextAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_ContextAssertion_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ContextAssertion); + SEQUENCE_OF_ContextAssertion_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ContextAssertion); return offset; } @@ -731,6 +738,7 @@ static int dissect_valueswithContext_item(packet_info *pinfo, proto_tree *tree, return dissect_x509if_T_valWithContext_item(FALSE, tvb, offset, pinfo, tree, hf_x509if_valueswithContext_item); } + static const ber_sequence_t T_valWithContext_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_valueswithContext_item }, }; @@ -738,7 +746,7 @@ static const ber_sequence_t T_valWithContext_set_of[1] = { static int dissect_x509if_T_valWithContext(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - T_valWithContext_set_of, hf_index, ett_x509if_T_valWithContext); + T_valWithContext_set_of, hf_index, ett_x509if_T_valWithContext); return offset; } @@ -765,6 +773,7 @@ static int dissect_RelativeDistinguishedName_item(packet_info *pinfo, proto_tree return dissect_x509if_AttributeTypeAndDistinguishedValue(FALSE, tvb, offset, pinfo, tree, hf_x509if_RelativeDistinguishedName_item); } + static const ber_sequence_t RelativeDistinguishedName_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RelativeDistinguishedName_item }, }; @@ -772,7 +781,7 @@ static const ber_sequence_t RelativeDistinguishedName_set_of[1] = { int dissect_x509if_RelativeDistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - RelativeDistinguishedName_set_of, hf_index, ett_x509if_RelativeDistinguishedName); + RelativeDistinguishedName_set_of, hf_index, ett_x509if_RelativeDistinguishedName); return offset; } @@ -780,6 +789,7 @@ static int dissect_RDNSequence_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_x509if_RelativeDistinguishedName(FALSE, tvb, offset, pinfo, tree, hf_x509if_RDNSequence_item); } + static const ber_sequence_t RDNSequence_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_RDNSequence_item }, }; @@ -787,7 +797,7 @@ static const ber_sequence_t RDNSequence_sequence_of[1] = { int dissect_x509if_RDNSequence(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - RDNSequence_sequence_of, hf_index, ett_x509if_RDNSequence); + RDNSequence_sequence_of, hf_index, ett_x509if_RDNSequence); return offset; } @@ -808,7 +818,7 @@ static const ber_choice_t Name_choice[] = { int dissect_x509if_Name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Name_choice, hf_index, ett_x509if_Name, NULL); return offset; @@ -854,7 +864,7 @@ static const ber_choice_t T_specificExclusions_item_choice[] = { static int dissect_x509if_T_specificExclusions_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_specificExclusions_item_choice, hf_index, ett_x509if_T_specificExclusions_item, NULL); return offset; @@ -863,6 +873,7 @@ static int dissect_specificExclusions_item(packet_info *pinfo, proto_tree *tree, return dissect_x509if_T_specificExclusions_item(FALSE, tvb, offset, pinfo, tree, hf_x509if_specificExclusions_item); } + static const ber_sequence_t T_specificExclusions_set_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_specificExclusions_item }, }; @@ -870,7 +881,7 @@ static const ber_sequence_t T_specificExclusions_set_of[1] = { static int dissect_x509if_T_specificExclusions(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - T_specificExclusions_set_of, hf_index, ett_x509if_T_specificExclusions); + T_specificExclusions_set_of, hf_index, ett_x509if_T_specificExclusions); return offset; } @@ -940,6 +951,7 @@ static int dissect_newMatchingRule(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_x509if_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_x509if_newMatchingRule); } + static const ber_sequence_t SET_OF_Refinement_set_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_refinement_and_item }, }; @@ -947,7 +959,7 @@ static const ber_sequence_t SET_OF_Refinement_set_of[1] = { static int dissect_x509if_SET_OF_Refinement(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - SET_OF_Refinement_set_of, hf_index, ett_x509if_SET_OF_Refinement); + SET_OF_Refinement_set_of, hf_index, ett_x509if_SET_OF_Refinement); return offset; } @@ -977,7 +989,7 @@ static const ber_choice_t Refinement_choice[] = { int dissect_x509if_Refinement(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Refinement_choice, hf_index, ett_x509if_Refinement, NULL); return offset; @@ -1015,7 +1027,7 @@ static const ber_choice_t T_chopSpecificExclusions_item_choice[] = { static int dissect_x509if_T_chopSpecificExclusions_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_chopSpecificExclusions_item_choice, hf_index, ett_x509if_T_chopSpecificExclusions_item, NULL); return offset; @@ -1024,6 +1036,7 @@ static int dissect_chopSpecificExclusions_item(packet_info *pinfo, proto_tree *t return dissect_x509if_T_chopSpecificExclusions_item(FALSE, tvb, offset, pinfo, tree, hf_x509if_chopSpecificExclusions_item); } + static const ber_sequence_t T_chopSpecificExclusions_set_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_chopSpecificExclusions_item }, }; @@ -1031,7 +1044,7 @@ static const ber_sequence_t T_chopSpecificExclusions_set_of[1] = { static int dissect_x509if_T_chopSpecificExclusions(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - T_chopSpecificExclusions_set_of, hf_index, ett_x509if_T_chopSpecificExclusions); + T_chopSpecificExclusions_set_of, hf_index, ett_x509if_T_chopSpecificExclusions); return offset; } @@ -1065,7 +1078,8 @@ static const value_string x509if_ObjectClassKind_vals[] = { static int dissect_x509if_ObjectClassKind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1082,7 +1096,8 @@ const value_string x509if_AttributeUsage_vals[] = { int dissect_x509if_AttributeUsage(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1103,6 +1118,7 @@ static int dissect_superiorStructureRules_item(packet_info *pinfo, proto_tree *t return dissect_x509if_RuleIdentifier(FALSE, tvb, offset, pinfo, tree, hf_x509if_superiorStructureRules_item); } + static const ber_sequence_t SET_OF_RuleIdentifier_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_superiorStructureRules_item }, }; @@ -1110,7 +1126,7 @@ static const ber_sequence_t SET_OF_RuleIdentifier_set_of[1] = { static int dissect_x509if_SET_OF_RuleIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - SET_OF_RuleIdentifier_set_of, hf_index, ett_x509if_SET_OF_RuleIdentifier); + SET_OF_RuleIdentifier_set_of, hf_index, ett_x509if_SET_OF_RuleIdentifier); return offset; } @@ -1133,6 +1149,7 @@ dissect_x509if_DITStructureRule(gboolean implicit_tag _U_, tvbuff_t *tvb, int of return offset; } + static const ber_sequence_t T_auxiliaries_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_auxiliaries_item }, }; @@ -1140,7 +1157,7 @@ static const ber_sequence_t T_auxiliaries_set_of[1] = { static int dissect_x509if_T_auxiliaries(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - T_auxiliaries_set_of, hf_index, ett_x509if_T_auxiliaries); + T_auxiliaries_set_of, hf_index, ett_x509if_T_auxiliaries); return offset; } @@ -1148,6 +1165,7 @@ static int dissect_auxiliaries(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_x509if_T_auxiliaries(FALSE, tvb, offset, pinfo, tree, hf_x509if_auxiliaries); } + static const ber_sequence_t SET_SIZE_1_MAX_OF_AttributeId_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_mandatory_item }, }; @@ -1155,7 +1173,7 @@ static const ber_sequence_t SET_SIZE_1_MAX_OF_AttributeId_set_of[1] = { static int dissect_x509if_SET_SIZE_1_MAX_OF_AttributeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - SET_SIZE_1_MAX_OF_AttributeId_set_of, hf_index, ett_x509if_SET_SIZE_1_MAX_OF_AttributeId); + SET_SIZE_1_MAX_OF_AttributeId_set_of, hf_index, ett_x509if_SET_SIZE_1_MAX_OF_AttributeId); return offset; } @@ -1186,6 +1204,7 @@ dissect_x509if_DITContentRule(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs return offset; } + static const ber_sequence_t T_mandatoryContexts_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_mandatoryContexts_item }, }; @@ -1193,7 +1212,7 @@ static const ber_sequence_t T_mandatoryContexts_set_of[1] = { static int dissect_x509if_T_mandatoryContexts(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - T_mandatoryContexts_set_of, hf_index, ett_x509if_T_mandatoryContexts); + T_mandatoryContexts_set_of, hf_index, ett_x509if_T_mandatoryContexts); return offset; } @@ -1201,6 +1220,7 @@ static int dissect_mandatoryContexts(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_x509if_T_mandatoryContexts(FALSE, tvb, offset, pinfo, tree, hf_x509if_mandatoryContexts); } + static const ber_sequence_t T_optionalContexts_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_optionalContexts_item }, }; @@ -1208,7 +1228,7 @@ static const ber_sequence_t T_optionalContexts_set_of[1] = { static int dissect_x509if_T_optionalContexts(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - T_optionalContexts_set_of, hf_index, ett_x509if_T_optionalContexts); + T_optionalContexts_set_of, hf_index, ett_x509if_T_optionalContexts); return offset; } @@ -1275,6 +1295,7 @@ static int dissect_ra_selectedValues_item(packet_info *pinfo, proto_tree *tree, return dissect_x509if_SelectedValues(FALSE, tvb, offset, pinfo, tree, hf_x509if_ra_selectedValues_item); } + static const ber_sequence_t SEQUENCE_OF_SelectedValues_sequence_of[1] = { { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_ra_selectedValues_item }, }; @@ -1282,7 +1303,7 @@ static const ber_sequence_t SEQUENCE_OF_SelectedValues_sequence_of[1] = { static int dissect_x509if_SEQUENCE_OF_SelectedValues(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_SelectedValues_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_SelectedValues); + SEQUENCE_OF_SelectedValues_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_SelectedValues); return offset; } @@ -1317,6 +1338,7 @@ static int dissect_ra_values_item(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_x509if_DefaultValueValues(FALSE, tvb, offset, pinfo, tree, hf_x509if_ra_values_item); } + static const ber_sequence_t SEQUENCE_OF_DefaultValueValues_sequence_of[1] = { { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_ra_values_item }, }; @@ -1324,7 +1346,7 @@ static const ber_sequence_t SEQUENCE_OF_DefaultValueValues_sequence_of[1] = { static int dissect_x509if_SEQUENCE_OF_DefaultValueValues(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_DefaultValueValues_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_DefaultValueValues); + SEQUENCE_OF_DefaultValueValues_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_DefaultValueValues); return offset; } @@ -1349,6 +1371,7 @@ static int dissect_defaultValues_item(packet_info *pinfo, proto_tree *tree, tvbu return dissect_x509if_T_defaultValues_item(FALSE, tvb, offset, pinfo, tree, hf_x509if_defaultValues_item); } + static const ber_sequence_t T_defaultValues_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_defaultValues_item }, }; @@ -1356,7 +1379,7 @@ static const ber_sequence_t T_defaultValues_sequence_of[1] = { static int dissect_x509if_T_defaultValues(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - T_defaultValues_sequence_of, hf_index, ett_x509if_T_defaultValues); + T_defaultValues_sequence_of, hf_index, ett_x509if_T_defaultValues); return offset; } @@ -1364,6 +1387,7 @@ static int dissect_defaultValues(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_x509if_T_defaultValues(FALSE, tvb, offset, pinfo, tree, hf_x509if_defaultValues); } + static const ber_sequence_t SEQUENCE_OF_AttributeValue_sequence_of[1] = { { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_contextValue_item }, }; @@ -1371,7 +1395,7 @@ static const ber_sequence_t SEQUENCE_OF_AttributeValue_sequence_of[1] = { static int dissect_x509if_SEQUENCE_OF_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_AttributeValue_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_AttributeValue); + SEQUENCE_OF_AttributeValue_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_AttributeValue); return offset; } @@ -1399,6 +1423,7 @@ static int dissect_contexts_item(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_x509if_ContextProfile(FALSE, tvb, offset, pinfo, tree, hf_x509if_contexts_item); } + static const ber_sequence_t SEQUENCE_OF_ContextProfile_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_contexts_item }, }; @@ -1406,7 +1431,7 @@ static const ber_sequence_t SEQUENCE_OF_ContextProfile_sequence_of[1] = { static int dissect_x509if_SEQUENCE_OF_ContextProfile(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_ContextProfile_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ContextProfile); + SEQUENCE_OF_ContextProfile_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ContextProfile); return offset; } @@ -1414,6 +1439,7 @@ static int dissect_contexts(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_x509if_SEQUENCE_OF_ContextProfile(FALSE, tvb, offset, pinfo, tree, hf_x509if_contexts); } + static const ber_sequence_t SEQUENCE_OF_ContextCombination_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_contextcombination_and_item }, }; @@ -1421,7 +1447,7 @@ static const ber_sequence_t SEQUENCE_OF_ContextCombination_sequence_of[1] = { static int dissect_x509if_SEQUENCE_OF_ContextCombination(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_ContextCombination_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ContextCombination); + SEQUENCE_OF_ContextCombination_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ContextCombination); return offset; } @@ -1451,7 +1477,7 @@ static const ber_choice_t ContextCombination_choice[] = { int dissect_x509if_ContextCombination(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, ContextCombination_choice, hf_index, ett_x509if_ContextCombination, NULL); return offset; @@ -1474,6 +1500,7 @@ static int dissect_matchingUse_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_x509if_MatchingUse(FALSE, tvb, offset, pinfo, tree, hf_x509if_matchingUse_item); } + static const ber_sequence_t SEQUENCE_OF_MatchingUse_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_matchingUse_item }, }; @@ -1481,7 +1508,7 @@ static const ber_sequence_t SEQUENCE_OF_MatchingUse_sequence_of[1] = { static int dissect_x509if_SEQUENCE_OF_MatchingUse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_MatchingUse_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_MatchingUse); + SEQUENCE_OF_MatchingUse_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_MatchingUse); return offset; } @@ -1511,6 +1538,7 @@ static int dissect_inputAttributeTypes_item(packet_info *pinfo, proto_tree *tree return dissect_x509if_RequestAttribute(FALSE, tvb, offset, pinfo, tree, hf_x509if_inputAttributeTypes_item); } + static const ber_sequence_t SEQUENCE_OF_RequestAttribute_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_inputAttributeTypes_item }, }; @@ -1518,7 +1546,7 @@ static const ber_sequence_t SEQUENCE_OF_RequestAttribute_sequence_of[1] = { static int dissect_x509if_SEQUENCE_OF_RequestAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_RequestAttribute_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_RequestAttribute); + SEQUENCE_OF_RequestAttribute_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_RequestAttribute); return offset; } @@ -1526,6 +1554,7 @@ static int dissect_inputAttributeTypes(packet_info *pinfo, proto_tree *tree, tvb return dissect_x509if_SEQUENCE_OF_RequestAttribute(FALSE, tvb, offset, pinfo, tree, hf_x509if_inputAttributeTypes); } + static const ber_sequence_t SEQUENCE_OF_AttributeCombination_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item }, }; @@ -1533,7 +1562,7 @@ static const ber_sequence_t SEQUENCE_OF_AttributeCombination_sequence_of[1] = { static int dissect_x509if_SEQUENCE_OF_AttributeCombination(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_AttributeCombination_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_AttributeCombination); + SEQUENCE_OF_AttributeCombination_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_AttributeCombination); return offset; } @@ -1563,7 +1592,7 @@ static const ber_choice_t AttributeCombination_choice[] = { int dissect_x509if_AttributeCombination(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, AttributeCombination_choice, hf_index, ett_x509if_AttributeCombination, NULL); return offset; @@ -1584,7 +1613,7 @@ static const ber_choice_t T_outputValues_choice[] = { static int dissect_x509if_T_outputValues(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_outputValues_choice, hf_index, ett_x509if_T_outputValues, NULL); return offset; @@ -1611,6 +1640,7 @@ static int dissect_outputAttributeTypes_item(packet_info *pinfo, proto_tree *tre return dissect_x509if_ResultAttribute(FALSE, tvb, offset, pinfo, tree, hf_x509if_outputAttributeTypes_item); } + static const ber_sequence_t SEQUENCE_OF_ResultAttribute_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_outputAttributeTypes_item }, }; @@ -1618,7 +1648,7 @@ static const ber_sequence_t SEQUENCE_OF_ResultAttribute_sequence_of[1] = { static int dissect_x509if_SEQUENCE_OF_ResultAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_ResultAttribute_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ResultAttribute); + SEQUENCE_OF_ResultAttribute_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ResultAttribute); return offset; } @@ -1664,6 +1694,7 @@ static int dissect_mapping_item(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_x509if_Mapping(FALSE, tvb, offset, pinfo, tree, hf_x509if_mapping_item); } + static const ber_sequence_t SEQUENCE_OF_Mapping_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mapping_item }, }; @@ -1671,7 +1702,7 @@ static const ber_sequence_t SEQUENCE_OF_Mapping_sequence_of[1] = { static int dissect_x509if_SEQUENCE_OF_Mapping(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_Mapping_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_Mapping); + SEQUENCE_OF_Mapping_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_Mapping); return offset; } @@ -1697,6 +1728,7 @@ static int dissect_substitution_item(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_x509if_MRSubstitution(FALSE, tvb, offset, pinfo, tree, hf_x509if_substitution_item); } + static const ber_sequence_t SEQUENCE_OF_MRSubstitution_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_substitution_item }, }; @@ -1704,7 +1736,7 @@ static const ber_sequence_t SEQUENCE_OF_MRSubstitution_sequence_of[1] = { static int dissect_x509if_SEQUENCE_OF_MRSubstitution(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_MRSubstitution_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_MRSubstitution); + SEQUENCE_OF_MRSubstitution_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_MRSubstitution); return offset; } @@ -1735,6 +1767,7 @@ static int dissect_relaxations_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_x509if_MRMapping(FALSE, tvb, offset, pinfo, tree, hf_x509if_relaxations_item); } + static const ber_sequence_t SEQUENCE_OF_MRMapping_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_tightenings_item }, }; @@ -1742,7 +1775,7 @@ static const ber_sequence_t SEQUENCE_OF_MRMapping_sequence_of[1] = { static int dissect_x509if_SEQUENCE_OF_MRMapping(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_MRMapping_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_MRMapping); + SEQUENCE_OF_MRMapping_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_MRMapping); return offset; } @@ -1773,6 +1806,7 @@ static int dissect_relaxation(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_x509if_RelaxationPolicy(FALSE, tvb, offset, pinfo, tree, hf_x509if_relaxation); } + static const ber_sequence_t SEQUENCE_OF_AttributeType_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_additionalControl_item }, }; @@ -1780,7 +1814,7 @@ static const ber_sequence_t SEQUENCE_OF_AttributeType_sequence_of[1] = { static int dissect_x509if_SEQUENCE_OF_AttributeType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_AttributeType_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_AttributeType); + SEQUENCE_OF_AttributeType_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_AttributeType); return offset; } @@ -1818,7 +1852,8 @@ const value_string x509if_ImposedSubset_vals[] = { int dissect_x509if_ImposedSubset(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1843,6 +1878,7 @@ static int dissect_entryLimit(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_x509if_EntryLimit(FALSE, tvb, offset, pinfo, tree, hf_x509if_entryLimit); } + static const ber_sequence_t SET_OF_DirectoryString_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_name_item }, }; @@ -1850,7 +1886,7 @@ static const ber_sequence_t SET_OF_DirectoryString_set_of[1] = { static int dissect_x509if_SET_OF_DirectoryString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - SET_OF_DirectoryString_set_of, hf_index, ett_x509if_SET_OF_DirectoryString); + SET_OF_DirectoryString_set_of, hf_index, ett_x509if_SET_OF_DirectoryString); return offset; } @@ -1944,7 +1980,7 @@ static const ber_choice_t OutputValues_choice[] = { int dissect_x509if_OutputValues(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, OutputValues_choice, hf_index, ett_x509if_OutputValues, NULL); return offset; @@ -1973,7 +2009,7 @@ void proto_register_x509if(void) { "", HFILL }}, { &hf_x509if_values, { "values", "x509if.values", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Attribute/values", HFILL }}, { &hf_x509if_values_item, { "Item", "x509if.values_item", @@ -1981,7 +2017,7 @@ void proto_register_x509if(void) { "Attribute/values/_item", HFILL }}, { &hf_x509if_valuesWithContext, { "valuesWithContext", "x509if.valuesWithContext", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Attribute/valuesWithContext", HFILL }}, { &hf_x509if_valuesWithContext_item, { "Item", "x509if.valuesWithContext_item", @@ -1993,7 +2029,7 @@ void proto_register_x509if(void) { "Attribute/valuesWithContext/_item/value", HFILL }}, { &hf_x509if_contextList, { "contextList", "x509if.contextList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_x509if_contextList_item, { "Item", "x509if.contextList_item", @@ -2005,7 +2041,7 @@ void proto_register_x509if(void) { "", HFILL }}, { &hf_x509if_contextValues, { "contextValues", "x509if.contextValues", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Context/contextValues", HFILL }}, { &hf_x509if_contextValues_item, { "Item", "x509if.contextValues_item", @@ -2029,7 +2065,7 @@ void proto_register_x509if(void) { "AttributeValueAssertion/assertedContexts/allContexts", HFILL }}, { &hf_x509if_selectedContexts, { "selectedContexts", "x509if.selectedContexts", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AttributeValueAssertion/assertedContexts/selectedContexts", HFILL }}, { &hf_x509if_selectedContexts_item, { "Item", "x509if.selectedContexts_item", @@ -2041,7 +2077,7 @@ void proto_register_x509if(void) { "ContextAssertion/contextType", HFILL }}, { &hf_x509if_ca_contextValues, { "contextValues", "x509if.contextValues", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ContextAssertion/contextValues", HFILL }}, { &hf_x509if_ca_contextValues_item, { "Item", "x509if.contextValues_item", @@ -2049,7 +2085,7 @@ void proto_register_x509if(void) { "ContextAssertion/contextValues/_item", HFILL }}, { &hf_x509if_ata_assertedContexts, { "assertedContexts", "x509if.assertedContexts", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AttributeTypeAssertion/assertedContexts", HFILL }}, { &hf_x509if_assertedContexts_item, { "Item", "x509if.assertedContexts_item", @@ -2057,11 +2093,11 @@ void proto_register_x509if(void) { "AttributeTypeAssertion/assertedContexts/_item", HFILL }}, { &hf_x509if_rdnSequence, { "rdnSequence", "x509if.rdnSequence", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Name/rdnSequence", HFILL }}, { &hf_x509if_RDNSequence_item, { "Item", "x509if.RDNSequence_item", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RDNSequence/_item", HFILL }}, { &hf_x509if_RelativeDistinguishedName_item, { "Item", "x509if.RelativeDistinguishedName_item", @@ -2077,7 +2113,7 @@ void proto_register_x509if(void) { "AttributeTypeAndDistinguishedValue/primaryDistinguished", HFILL }}, { &hf_x509if_valueswithContext, { "valuesWithContext", "x509if.valuesWithContext", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AttributeTypeAndDistinguishedValue/valuesWithContext", HFILL }}, { &hf_x509if_valueswithContext_item, { "Item", "x509if.valuesWithContext_item", @@ -2089,11 +2125,11 @@ void proto_register_x509if(void) { "AttributeTypeAndDistinguishedValue/valuesWithContext/_item/distingAttrValue", HFILL }}, { &hf_x509if_base, { "base", "x509if.base", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "SubtreeSpecification/base", HFILL }}, { &hf_x509if_specificExclusions, { "specificExclusions", "x509if.specificExclusions", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "SubtreeSpecification/specificExclusions", HFILL }}, { &hf_x509if_specificExclusions_item, { "Item", "x509if.specificExclusions_item", @@ -2101,11 +2137,11 @@ void proto_register_x509if(void) { "SubtreeSpecification/specificExclusions/_item", HFILL }}, { &hf_x509if_chopBefore, { "chopBefore", "x509if.chopBefore", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_x509if_chopAfter, { "chopAfter", "x509if.chopAfter", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_x509if_minimum, { "minimum", "x509if.minimum", @@ -2121,7 +2157,7 @@ void proto_register_x509if(void) { "SubtreeSpecification/specificationFilter", HFILL }}, { &hf_x509if_chopSpecificExclusions, { "specificExclusions", "x509if.specificExclusions", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ChopSpecification/specificExclusions", HFILL }}, { &hf_x509if_chopSpecificExclusions_item, { "Item", "x509if.specificExclusions_item", @@ -2133,7 +2169,7 @@ void proto_register_x509if(void) { "Refinement/item", HFILL }}, { &hf_x509if_refinement_and, { "and", "x509if.and", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Refinement/and", HFILL }}, { &hf_x509if_refinement_and_item, { "Item", "x509if.and_item", @@ -2141,7 +2177,7 @@ void proto_register_x509if(void) { "Refinement/and/_item", HFILL }}, { &hf_x509if_refinement_or, { "or", "x509if.or", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Refinement/or", HFILL }}, { &hf_x509if_refinement_or_item, { "Item", "x509if.or_item", @@ -2161,7 +2197,7 @@ void proto_register_x509if(void) { "DITStructureRule/nameForm", HFILL }}, { &hf_x509if_superiorStructureRules, { "superiorStructureRules", "x509if.superiorStructureRules", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "DITStructureRule/superiorStructureRules", HFILL }}, { &hf_x509if_superiorStructureRules_item, { "Item", "x509if.superiorStructureRules_item", @@ -2173,7 +2209,7 @@ void proto_register_x509if(void) { "DITContentRule/structuralObjectClass", HFILL }}, { &hf_x509if_auxiliaries, { "auxiliaries", "x509if.auxiliaries", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "DITContentRule/auxiliaries", HFILL }}, { &hf_x509if_auxiliaries_item, { "Item", "x509if.auxiliaries_item", @@ -2181,7 +2217,7 @@ void proto_register_x509if(void) { "DITContentRule/auxiliaries/_item", HFILL }}, { &hf_x509if_mandatory, { "mandatory", "x509if.mandatory", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "DITContentRule/mandatory", HFILL }}, { &hf_x509if_mandatory_item, { "Item", "x509if.mandatory_item", @@ -2189,7 +2225,7 @@ void proto_register_x509if(void) { "DITContentRule/mandatory/_item", HFILL }}, { &hf_x509if_optional, { "optional", "x509if.optional", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "DITContentRule/optional", HFILL }}, { &hf_x509if_optional_item, { "Item", "x509if.optional_item", @@ -2197,7 +2233,7 @@ void proto_register_x509if(void) { "DITContentRule/optional/_item", HFILL }}, { &hf_x509if_precluded, { "precluded", "x509if.precluded", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "DITContentRule/precluded", HFILL }}, { &hf_x509if_precluded_item, { "Item", "x509if.precluded_item", @@ -2209,7 +2245,7 @@ void proto_register_x509if(void) { "", HFILL }}, { &hf_x509if_mandatoryContexts, { "mandatoryContexts", "x509if.mandatoryContexts", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "DITContextUse/mandatoryContexts", HFILL }}, { &hf_x509if_mandatoryContexts_item, { "Item", "x509if.mandatoryContexts_item", @@ -2217,7 +2253,7 @@ void proto_register_x509if(void) { "DITContextUse/mandatoryContexts/_item", HFILL }}, { &hf_x509if_optionalContexts, { "optionalContexts", "x509if.optionalContexts", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "DITContextUse/optionalContexts", HFILL }}, { &hf_x509if_optionalContexts_item, { "Item", "x509if.optionalContexts_item", @@ -2241,7 +2277,7 @@ void proto_register_x509if(void) { "", HFILL }}, { &hf_x509if_inputAttributeTypes, { "inputAttributeTypes", "x509if.inputAttributeTypes", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_x509if_inputAttributeTypes_item, { "Item", "x509if.inputAttributeTypes_item", @@ -2253,7 +2289,7 @@ void proto_register_x509if(void) { "", HFILL }}, { &hf_x509if_outputAttributeTypes, { "outputAttributeTypes", "x509if.outputAttributeTypes", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_x509if_outputAttributeTypes_item, { "Item", "x509if.outputAttributeTypes_item", @@ -2277,7 +2313,7 @@ void proto_register_x509if(void) { "", HFILL }}, { &hf_x509if_additionalControl, { "additionalControl", "x509if.additionalControl", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_x509if_additionalControl_item, { "Item", "x509if.additionalControl_item", @@ -2297,7 +2333,7 @@ void proto_register_x509if(void) { "", HFILL }}, { &hf_x509if_name, { "name", "x509if.name", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "SearchRuleDescription/name", HFILL }}, { &hf_x509if_name_item, { "Item", "x509if.name_item", @@ -2317,7 +2353,7 @@ void proto_register_x509if(void) { "RequestAttribute/includeSubtypes", HFILL }}, { &hf_x509if_ra_selectedValues, { "selectedValues", "x509if.selectedValues", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RequestAttribute/selectedValues", HFILL }}, { &hf_x509if_ra_selectedValues_item, { "Item", "x509if.selectedValues_item", @@ -2325,7 +2361,7 @@ void proto_register_x509if(void) { "RequestAttribute/selectedValues/_item", HFILL }}, { &hf_x509if_defaultValues, { "defaultValues", "x509if.defaultValues", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RequestAttribute/defaultValues", HFILL }}, { &hf_x509if_defaultValues_item, { "Item", "x509if.defaultValues_item", @@ -2337,7 +2373,7 @@ void proto_register_x509if(void) { "RequestAttribute/defaultValues/_item/entryType", HFILL }}, { &hf_x509if_ra_values, { "values", "x509if.values", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RequestAttribute/defaultValues/_item/values", HFILL }}, { &hf_x509if_ra_values_item, { "Item", "x509if.values_item", @@ -2345,7 +2381,7 @@ void proto_register_x509if(void) { "RequestAttribute/defaultValues/_item/values/_item", HFILL }}, { &hf_x509if_contexts, { "contexts", "x509if.contexts", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_x509if_contexts_item, { "Item", "x509if.contexts_item", @@ -2357,7 +2393,7 @@ void proto_register_x509if(void) { "RequestAttribute/contextCombination", HFILL }}, { &hf_x509if_matchingUse, { "matchingUse", "x509if.matchingUse", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RequestAttribute/matchingUse", HFILL }}, { &hf_x509if_matchingUse_item, { "Item", "x509if.matchingUse_item", @@ -2365,7 +2401,7 @@ void proto_register_x509if(void) { "RequestAttribute/matchingUse/_item", HFILL }}, { &hf_x509if_contextValue, { "contextValue", "x509if.contextValue", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ContextProfile/contextValue", HFILL }}, { &hf_x509if_contextValue_item, { "Item", "x509if.contextValue_item", @@ -2377,7 +2413,7 @@ void proto_register_x509if(void) { "ContextCombination/context", HFILL }}, { &hf_x509if_contextcombination_and, { "and", "x509if.and", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ContextCombination/and", HFILL }}, { &hf_x509if_contextcombination_and_item, { "Item", "x509if.and_item", @@ -2385,7 +2421,7 @@ void proto_register_x509if(void) { "ContextCombination/and/_item", HFILL }}, { &hf_x509if_contextcombination_or, { "or", "x509if.or", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ContextCombination/or", HFILL }}, { &hf_x509if_contextcombination_or_item, { "Item", "x509if.or_item", @@ -2409,7 +2445,7 @@ void proto_register_x509if(void) { "", HFILL }}, { &hf_x509if_and, { "and", "x509if.and", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AttributeCombination/and", HFILL }}, { &hf_x509if_and_item, { "Item", "x509if.and_item", @@ -2417,7 +2453,7 @@ void proto_register_x509if(void) { "AttributeCombination/and/_item", HFILL }}, { &hf_x509if_or, { "or", "x509if.or", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "AttributeCombination/or", HFILL }}, { &hf_x509if_or_item, { "Item", "x509if.or_item", @@ -2433,7 +2469,7 @@ void proto_register_x509if(void) { "ResultAttribute/outputValues", HFILL }}, { &hf_x509if_selectedValues, { "selectedValues", "x509if.selectedValues", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_x509if_selectedValues_item, { "Item", "x509if.selectedValues_item", @@ -2457,7 +2493,7 @@ void proto_register_x509if(void) { "RelaxationPolicy/basic", HFILL }}, { &hf_x509if_tightenings, { "tightenings", "x509if.tightenings", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RelaxationPolicy/tightenings", HFILL }}, { &hf_x509if_tightenings_item, { "Item", "x509if.tightenings_item", @@ -2465,7 +2501,7 @@ void proto_register_x509if(void) { "RelaxationPolicy/tightenings/_item", HFILL }}, { &hf_x509if_relaxations, { "relaxations", "x509if.relaxations", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RelaxationPolicy/relaxations", HFILL }}, { &hf_x509if_relaxations_item, { "Item", "x509if.relaxations_item", @@ -2481,7 +2517,7 @@ void proto_register_x509if(void) { "RelaxationPolicy/minimum", HFILL }}, { &hf_x509if_mapping, { "mapping", "x509if.mapping", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MRMapping/mapping", HFILL }}, { &hf_x509if_mapping_item, { "Item", "x509if.mapping_item", @@ -2489,7 +2525,7 @@ void proto_register_x509if(void) { "MRMapping/mapping/_item", HFILL }}, { &hf_x509if_substitution, { "substitution", "x509if.substitution", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MRMapping/substitution", HFILL }}, { &hf_x509if_substitution_item, { "Item", "x509if.substitution_item", diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index d6106ab30e..42ed43959d 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -360,7 +360,7 @@ static const ber_choice_t CriteriaItem_choice[] = { static int dissect_x509sat_CriteriaItem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, CriteriaItem_choice, hf_index, ett_x509sat_CriteriaItem, NULL); return offset; @@ -369,6 +369,7 @@ static int dissect_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_x509sat_CriteriaItem(FALSE, tvb, offset, pinfo, tree, hf_x509sat_type); } + static const ber_sequence_t SET_OF_Criteria_set_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item }, }; @@ -376,7 +377,7 @@ static const ber_sequence_t SET_OF_Criteria_set_of[1] = { static int dissect_x509sat_SET_OF_Criteria(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - SET_OF_Criteria_set_of, hf_index, ett_x509sat_SET_OF_Criteria); + SET_OF_Criteria_set_of, hf_index, ett_x509sat_SET_OF_Criteria); return offset; } @@ -406,7 +407,7 @@ static const ber_choice_t Criteria_choice[] = { int dissect_x509sat_Criteria(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, Criteria_choice, hf_index, ett_x509sat_Criteria, NULL); return offset; @@ -469,6 +470,7 @@ dissect_x509sat_EnhancedGuide(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs return offset; } + static const ber_sequence_t PostalAddress_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_PostalAddress_item }, }; @@ -476,7 +478,7 @@ static const ber_sequence_t PostalAddress_sequence_of[1] = { int dissect_x509sat_PostalAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - PostalAddress_sequence_of, hf_index, ett_x509sat_PostalAddress); + PostalAddress_sequence_of, hf_index, ett_x509sat_PostalAddress); return offset; } @@ -598,6 +600,7 @@ static int dissect_PreferredDeliveryMethod_item(packet_info *pinfo, proto_tree * return dissect_x509sat_PreferredDeliveryMethod_item(FALSE, tvb, offset, pinfo, tree, hf_x509sat_PreferredDeliveryMethod_item); } + static const ber_sequence_t PreferredDeliveryMethod_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_PreferredDeliveryMethod_item }, }; @@ -605,16 +608,17 @@ static const ber_sequence_t PreferredDeliveryMethod_sequence_of[1] = { int dissect_x509sat_PreferredDeliveryMethod(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - PreferredDeliveryMethod_sequence_of, hf_index, ett_x509sat_PreferredDeliveryMethod); + PreferredDeliveryMethod_sequence_of, hf_index, ett_x509sat_PreferredDeliveryMethod); return offset; } + static int dissect_x509sat_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -643,6 +647,7 @@ static int dissect_finall_substring(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_x509sat_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_x509sat_finall_substring); } + static const ber_sequence_t T_nAddresses_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_nAddresses_item }, }; @@ -650,7 +655,7 @@ static const ber_sequence_t T_nAddresses_set_of[1] = { static int dissect_x509sat_T_nAddresses(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - T_nAddresses_set_of, hf_index, ett_x509sat_T_nAddresses); + T_nAddresses_set_of, hf_index, ett_x509sat_T_nAddresses); return offset; } @@ -674,6 +679,7 @@ dissect_x509sat_PresentationAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, in return offset; } + static const ber_sequence_t T_profiles_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_profiles_item }, }; @@ -681,7 +687,7 @@ static const ber_sequence_t T_profiles_set_of[1] = { static int dissect_x509sat_T_profiles(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - T_profiles_set_of, hf_index, ett_x509sat_T_profiles); + T_profiles_set_of, hf_index, ett_x509sat_T_profiles); return offset; } @@ -717,6 +723,7 @@ dissect_x509sat_NameAndOptionalUID(gboolean implicit_tag _U_, tvbuff_t *tvb, int return offset; } + static const ber_sequence_t SEQUENCE_OF_AttributeValueAssertion_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeList_item }, }; @@ -724,7 +731,7 @@ static const ber_sequence_t SEQUENCE_OF_AttributeValueAssertion_sequence_of[1] = static int dissect_x509sat_SEQUENCE_OF_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUENCE_OF_AttributeValueAssertion_sequence_of, hf_index, ett_x509sat_SEQUENCE_OF_AttributeValueAssertion); + SEQUENCE_OF_AttributeValueAssertion_sequence_of, hf_index, ett_x509sat_SEQUENCE_OF_AttributeValueAssertion); return offset; } @@ -765,7 +772,7 @@ static const ber_choice_t SubstringAssertion_item_choice[] = { static int dissect_x509sat_SubstringAssertion_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, SubstringAssertion_item_choice, hf_index, ett_x509sat_SubstringAssertion_item, NULL); return offset; @@ -774,6 +781,7 @@ static int dissect_SubstringAssertion_item(packet_info *pinfo, proto_tree *tree, return dissect_x509sat_SubstringAssertion_item(FALSE, tvb, offset, pinfo, tree, hf_x509sat_SubstringAssertion_item); } + static const ber_sequence_t SubstringAssertion_sequence_of[1] = { { -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_SubstringAssertion_item }, }; @@ -781,11 +789,12 @@ static const ber_sequence_t SubstringAssertion_sequence_of[1] = { int dissect_x509sat_SubstringAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SubstringAssertion_sequence_of, hf_index, ett_x509sat_SubstringAssertion); + SubstringAssertion_sequence_of, hf_index, ett_x509sat_SubstringAssertion); return offset; } + static const ber_sequence_t CaseIgnoreListMatch_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_CaseIgnoreListMatch_item }, }; @@ -793,7 +802,7 @@ static const ber_sequence_t CaseIgnoreListMatch_sequence_of[1] = { int dissect_x509sat_CaseIgnoreListMatch(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - CaseIgnoreListMatch_sequence_of, hf_index, ett_x509sat_CaseIgnoreListMatch); + CaseIgnoreListMatch_sequence_of, hf_index, ett_x509sat_CaseIgnoreListMatch); return offset; } @@ -815,7 +824,7 @@ static const ber_choice_t OctetSubstringAssertion_item_choice[] = { static int dissect_x509sat_OctetSubstringAssertion_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, OctetSubstringAssertion_item_choice, hf_index, ett_x509sat_OctetSubstringAssertion_item, NULL); return offset; @@ -824,6 +833,7 @@ static int dissect_OctetSubstringAssertion_item(packet_info *pinfo, proto_tree * return dissect_x509sat_OctetSubstringAssertion_item(FALSE, tvb, offset, pinfo, tree, hf_x509sat_OctetSubstringAssertion_item); } + static const ber_sequence_t OctetSubstringAssertion_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_OctetSubstringAssertion_item }, }; @@ -831,11 +841,12 @@ static const ber_sequence_t OctetSubstringAssertion_sequence_of[1] = { int dissect_x509sat_OctetSubstringAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - OctetSubstringAssertion_sequence_of, hf_index, ett_x509sat_OctetSubstringAssertion); + OctetSubstringAssertion_sequence_of, hf_index, ett_x509sat_OctetSubstringAssertion); return offset; } + static const ber_sequence_t ZonalSelect_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ZonalSelect_item }, }; @@ -843,7 +854,7 @@ static const ber_sequence_t ZonalSelect_sequence_of[1] = { int dissect_x509sat_ZonalSelect(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - ZonalSelect_sequence_of, hf_index, ett_x509sat_ZonalSelect); + ZonalSelect_sequence_of, hf_index, ett_x509sat_ZonalSelect); return offset; } @@ -859,7 +870,8 @@ const value_string x509sat_ZonalResult_vals[] = { int dissect_x509sat_ZonalResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -977,6 +989,7 @@ static int dissect_timesOfDay_item(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_x509sat_DayTimeBand(FALSE, tvb, offset, pinfo, tree, hf_x509sat_timesOfDay_item); } + static const ber_sequence_t SET_OF_DayTimeBand_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_timesOfDay_item }, }; @@ -984,7 +997,7 @@ static const ber_sequence_t SET_OF_DayTimeBand_set_of[1] = { static int dissect_x509sat_SET_OF_DayTimeBand(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - SET_OF_DayTimeBand_set_of, hf_index, ett_x509sat_SET_OF_DayTimeBand); + SET_OF_DayTimeBand_set_of, hf_index, ett_x509sat_SET_OF_DayTimeBand); return offset; } @@ -992,6 +1005,7 @@ static int dissect_timesOfDay(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_x509sat_SET_OF_DayTimeBand(FALSE, tvb, offset, pinfo, tree, hf_x509sat_timesOfDay); } + static const ber_sequence_t T_intDay_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_intDay_item }, }; @@ -999,7 +1013,7 @@ static const ber_sequence_t T_intDay_set_of[1] = { static int dissect_x509sat_T_intDay(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - T_intDay_set_of, hf_index, ett_x509sat_T_intDay); + T_intDay_set_of, hf_index, ett_x509sat_T_intDay); return offset; } @@ -1045,7 +1059,8 @@ static const value_string x509sat_T_intNamedDays_vals[] = { static int dissect_x509sat_T_intNamedDays(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1091,7 +1106,7 @@ static const ber_choice_t NamedDay_choice[] = { int dissect_x509sat_NamedDay(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, NamedDay_choice, hf_index, ett_x509sat_NamedDay, NULL); return offset; @@ -1133,7 +1148,7 @@ static const ber_choice_t XDayOf_choice[] = { int dissect_x509sat_XDayOf(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, XDayOf_choice, hf_index, ett_x509sat_XDayOf, NULL); return offset; @@ -1159,7 +1174,7 @@ static const ber_choice_t T_days_choice[] = { static int dissect_x509sat_T_days(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_days_choice, hf_index, ett_x509sat_T_days, NULL); return offset; @@ -1186,6 +1201,7 @@ static int dissect_now(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_x509sat_NULL(FALSE, tvb, offset, pinfo, tree, hf_x509sat_now); } + static const ber_sequence_t T_intWeek_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_intWeek_item }, }; @@ -1193,7 +1209,7 @@ static const ber_sequence_t T_intWeek_set_of[1] = { static int dissect_x509sat_T_intWeek(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - T_intWeek_set_of, hf_index, ett_x509sat_T_intWeek); + T_intWeek_set_of, hf_index, ett_x509sat_T_intWeek); return offset; } @@ -1239,7 +1255,7 @@ static const ber_choice_t T_weeks_choice[] = { static int dissect_x509sat_T_weeks(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_weeks_choice, hf_index, ett_x509sat_T_weeks, NULL); return offset; @@ -1248,6 +1264,7 @@ static int dissect_weeks(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in return dissect_x509sat_T_weeks(FALSE, tvb, offset, pinfo, tree, hf_x509sat_weeks); } + static const ber_sequence_t T_intMonth_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_intMonth_item }, }; @@ -1255,7 +1272,7 @@ static const ber_sequence_t T_intMonth_set_of[1] = { static int dissect_x509sat_T_intMonth(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - T_intMonth_set_of, hf_index, ett_x509sat_T_intMonth); + T_intMonth_set_of, hf_index, ett_x509sat_T_intMonth); return offset; } @@ -1308,7 +1325,7 @@ static const ber_choice_t T_months_choice[] = { static int dissect_x509sat_T_months(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_months_choice, hf_index, ett_x509sat_T_months, NULL); return offset; @@ -1317,6 +1334,7 @@ static int dissect_months(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_x509sat_T_months(FALSE, tvb, offset, pinfo, tree, hf_x509sat_months); } + static const ber_sequence_t T_years_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_years_item }, }; @@ -1324,7 +1342,7 @@ static const ber_sequence_t T_years_set_of[1] = { static int dissect_x509sat_T_years(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - T_years_set_of, hf_index, ett_x509sat_T_years); + T_years_set_of, hf_index, ett_x509sat_T_years); return offset; } @@ -1352,6 +1370,7 @@ static int dissect_periodic_item(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_x509sat_Period(FALSE, tvb, offset, pinfo, tree, hf_x509sat_periodic_item); } + static const ber_sequence_t SET_OF_Period_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_periodic_item }, }; @@ -1359,7 +1378,7 @@ static const ber_sequence_t SET_OF_Period_set_of[1] = { static int dissect_x509sat_SET_OF_Period(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - SET_OF_Period_set_of, hf_index, ett_x509sat_SET_OF_Period); + SET_OF_Period_set_of, hf_index, ett_x509sat_SET_OF_Period); return offset; } @@ -1382,7 +1401,7 @@ static const ber_choice_t T_time_choice[] = { static int dissect_x509sat_T_time(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, T_time_choice, hf_index, ett_x509sat_T_time, NULL); return offset; @@ -1392,6 +1411,7 @@ static int dissect_time(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int } + static int dissect_x509sat_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index); @@ -1468,7 +1488,7 @@ static const ber_choice_t TimeAssertion_choice[] = { int dissect_x509sat_TimeAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, TimeAssertion_choice, hf_index, ett_x509sat_TimeAssertion, NULL); return offset; @@ -1489,7 +1509,7 @@ static const ber_choice_t LocaleContextSyntax_choice[] = { int dissect_x509sat_LocaleContextSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + offset = dissect_ber_choice(pinfo, tree, tvb, offset, LocaleContextSyntax_choice, hf_index, ett_x509sat_LocaleContextSyntax, NULL); return offset; @@ -1545,7 +1565,7 @@ void proto_register_x509sat(void) { "Criteria/type", HFILL }}, { &hf_x509sat_and, { "and", "x509sat.and", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Criteria/and", HFILL }}, { &hf_x509sat_and_item, { "Item", "x509sat.and_item", @@ -1553,7 +1573,7 @@ void proto_register_x509sat(void) { "Criteria/and/_item", HFILL }}, { &hf_x509sat_or, { "or", "x509sat.or", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Criteria/or", HFILL }}, { &hf_x509sat_or_item, { "Item", "x509sat.or_item", @@ -1633,7 +1653,7 @@ void proto_register_x509sat(void) { "PresentationAddress/tSelector", HFILL }}, { &hf_x509sat_nAddresses, { "nAddresses", "x509sat.nAddresses", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PresentationAddress/nAddresses", HFILL }}, { &hf_x509sat_nAddresses_item, { "Item", "x509sat.nAddresses_item", @@ -1645,7 +1665,7 @@ void proto_register_x509sat(void) { "ProtocolInformation/nAddress", HFILL }}, { &hf_x509sat_profiles, { "profiles", "x509sat.profiles", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "ProtocolInformation/profiles", HFILL }}, { &hf_x509sat_profiles_item, { "Item", "x509sat.profiles_item", @@ -1665,7 +1685,7 @@ void proto_register_x509sat(void) { "MultipleMatchingLocalities/matchingRuleUsed", HFILL }}, { &hf_x509sat_attributeList, { "attributeList", "x509sat.attributeList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "MultipleMatchingLocalities/attributeList", HFILL }}, { &hf_x509sat_attributeList_item, { "Item", "x509sat.attributeList_item", @@ -1733,7 +1753,7 @@ void proto_register_x509sat(void) { "", HFILL }}, { &hf_x509sat_periodic, { "periodic", "x509sat.periodic", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "TimeSpecification/time/periodic", HFILL }}, { &hf_x509sat_periodic_item, { "Item", "x509sat.periodic_item", @@ -1749,7 +1769,7 @@ void proto_register_x509sat(void) { "TimeSpecification/timeZone", HFILL }}, { &hf_x509sat_timesOfDay, { "timesOfDay", "x509sat.timesOfDay", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Period/timesOfDay", HFILL }}, { &hf_x509sat_timesOfDay_item, { "Item", "x509sat.timesOfDay_item", @@ -1761,7 +1781,7 @@ void proto_register_x509sat(void) { "Period/days", HFILL }}, { &hf_x509sat_intDay, { "intDay", "x509sat.intDay", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Period/days/intDay", HFILL }}, { &hf_x509sat_intDay_item, { "Item", "x509sat.intDay_item", @@ -1785,7 +1805,7 @@ void proto_register_x509sat(void) { "Period/weeks/allWeeks", HFILL }}, { &hf_x509sat_intWeek, { "intWeek", "x509sat.intWeek", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Period/weeks/intWeek", HFILL }}, { &hf_x509sat_intWeek_item, { "Item", "x509sat.intWeek_item", @@ -1805,7 +1825,7 @@ void proto_register_x509sat(void) { "Period/months/allMonths", HFILL }}, { &hf_x509sat_intMonth, { "intMonth", "x509sat.intMonth", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Period/months/intMonth", HFILL }}, { &hf_x509sat_intMonth_item, { "Item", "x509sat.intMonth_item", @@ -1817,7 +1837,7 @@ void proto_register_x509sat(void) { "Period/months/bitMonth", HFILL }}, { &hf_x509sat_years, { "years", "x509sat.years", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "Period/years", HFILL }}, { &hf_x509sat_years_item, { "Item", "x509sat.years_item", @@ -2094,40 +2114,40 @@ void proto_reg_handoff_x509sat(void) { /*--- Included file: packet-x509sat-dis-tab.c ---*/ - register_ber_oid_dissector("2.5.4.6", dissect_CountryName_PDU, proto_x509sat, "id-at-countryName"); - register_ber_oid_dissector("2.5.4.2", dissect_DirectoryString_PDU, proto_x509sat, "id-at-knowledgeInformation"); - register_ber_oid_dissector("2.5.4.10", dissect_DirectoryString_PDU, proto_x509sat, "id-at-organizationName"); - register_ber_oid_dissector("2.5.4.7.1", dissect_DirectoryString_PDU, proto_x509sat, "id-at-collectiveLocalityName"); - register_ber_oid_dissector("2.5.4.3", dissect_DirectoryString_PDU, proto_x509sat, "id-at-commonName"); - register_ber_oid_dissector("2.5.4.4", dissect_DirectoryString_PDU, proto_x509sat, "id-at-surname"); - register_ber_oid_dissector("2.5.4.42", dissect_DirectoryString_PDU, proto_x509sat, "id-at-givenName"); - register_ber_oid_dissector("2.5.4.43", dissect_DirectoryString_PDU, proto_x509sat, "id-at-initials"); - register_ber_oid_dissector("2.5.4.44", dissect_DirectoryString_PDU, proto_x509sat, "id-at-generationQualifier"); - register_ber_oid_dissector("2.5.4.51", dissect_DirectoryString_PDU, proto_x509sat, "id-at-houseIdentifier"); - register_ber_oid_dissector("2.5.4.54", dissect_DirectoryString_PDU, proto_x509sat, "id-at-dmdName"); - register_ber_oid_dissector("2.5.4.65", dissect_DirectoryString_PDU, proto_x509sat, "id-at-pseudonym"); - register_ber_oid_dissector("2.5.4.41", dissect_DirectoryString_PDU, proto_x509sat, "id-at-name"); - register_ber_oid_dissector("2.5.4.8.1", dissect_DirectoryString_PDU, proto_x509sat, "id-at-collectiveStateOrProvinceName"); - register_ber_oid_dissector("2.5.4.8", dissect_DirectoryString_PDU, proto_x509sat, "id-at-stateOrProvinceName"); - register_ber_oid_dissector("2.5.4.9", dissect_DirectoryString_PDU, proto_x509sat, "id-at-streetAddress"); - register_ber_oid_dissector("2.5.4.9.1", dissect_DirectoryString_PDU, proto_x509sat, "id-at-collectiveStreetAddress"); - register_ber_oid_dissector("2.5.4.10.1", dissect_DirectoryString_PDU, proto_x509sat, "id-at-collectiveOrganizationName"); - register_ber_oid_dissector("2.5.4.7", dissect_DirectoryString_PDU, proto_x509sat, "id-at-localityName"); - register_ber_oid_dissector("2.5.4.11", dissect_DirectoryString_PDU, proto_x509sat, "id-at-organizationalUnitName"); - register_ber_oid_dissector("2.5.4.11.1", dissect_DirectoryString_PDU, proto_x509sat, "id-at-collectiveOrganizationalUnitName"); - register_ber_oid_dissector("2.5.4.12", dissect_DirectoryString_PDU, proto_x509sat, "id-at-title"); - register_ber_oid_dissector("2.5.4.13", dissect_DirectoryString_PDU, proto_x509sat, "id-at-description"); - register_ber_oid_dissector("2.5.4.15", dissect_DirectoryString_PDU, proto_x509sat, "id-at-businessCategory"); - register_ber_oid_dissector("2.5.4.17", dissect_DirectoryString_PDU, proto_x509sat, "id-at-postalCode"); - register_ber_oid_dissector("2.5.4.17.1", dissect_DirectoryString_PDU, proto_x509sat, "id-at-collectivePostalCode"); - register_ber_oid_dissector("2.5.4.18", dissect_DirectoryString_PDU, proto_x509sat, "id-at-postOfficeBox"); - register_ber_oid_dissector("2.5.4.18.1", dissect_DirectoryString_PDU, proto_x509sat, "id-at-collectivePostOfficeBox"); - register_ber_oid_dissector("2.5.4.19", dissect_DirectoryString_PDU, proto_x509sat, "id-at-physicalDeliveryOfficeName"); - register_ber_oid_dissector("2.5.4.19.1", dissect_DirectoryString_PDU, proto_x509sat, "id-at-collectivePhysicalDeliveryOfficeName"); - register_ber_oid_dissector("2.5.4.20", dissect_TelephoneNumber_PDU, proto_x509sat, "id-at-telephoneNumber"); - register_ber_oid_dissector("2.5.4.20.1", dissect_TelephoneNumber_PDU, proto_x509sat, "id-at-collectiveTelephoneNumber"); - register_ber_oid_dissector("2.5.4.21", dissect_TelexNumber_PDU, proto_x509sat, "id-at-telexNumber"); - register_ber_oid_dissector("2.5.4.21.1", dissect_TelexNumber_PDU, proto_x509sat, "id-at-collectiveTelexNumber"); + register_ber_oid_dissector("2.5.4.6", dissect_CountryName_PDU, proto_x509sat, "id-at-countryName"); + register_ber_oid_dissector("2.5.4.2", dissect_DirectoryString_PDU, proto_x509sat, "id-at-knowledgeInformation"); + register_ber_oid_dissector("2.5.4.10", dissect_DirectoryString_PDU, proto_x509sat, "id-at-organizationName"); + register_ber_oid_dissector("2.5.4.7.1", dissect_DirectoryString_PDU, proto_x509sat, "id-at-collectiveLocalityName"); + register_ber_oid_dissector("2.5.4.3", dissect_DirectoryString_PDU, proto_x509sat, "id-at-commonName"); + register_ber_oid_dissector("2.5.4.4", dissect_DirectoryString_PDU, proto_x509sat, "id-at-surname"); + register_ber_oid_dissector("2.5.4.42", dissect_DirectoryString_PDU, proto_x509sat, "id-at-givenName"); + register_ber_oid_dissector("2.5.4.43", dissect_DirectoryString_PDU, proto_x509sat, "id-at-initials"); + register_ber_oid_dissector("2.5.4.44", dissect_DirectoryString_PDU, proto_x509sat, "id-at-generationQualifier"); + register_ber_oid_dissector("2.5.4.51", dissect_DirectoryString_PDU, proto_x509sat, "id-at-houseIdentifier"); + register_ber_oid_dissector("2.5.4.54", dissect_DirectoryString_PDU, proto_x509sat, "id-at-dmdName"); + register_ber_oid_dissector("2.5.4.65", dissect_DirectoryString_PDU, proto_x509sat, "id-at-pseudonym"); + register_ber_oid_dissector("2.5.4.41", dissect_DirectoryString_PDU, proto_x509sat, "id-at-name"); + register_ber_oid_dissector("2.5.4.8.1", dissect_DirectoryString_PDU, proto_x509sat, "id-at-collectiveStateOrProvinceName"); + register_ber_oid_dissector("2.5.4.8", dissect_DirectoryString_PDU, proto_x509sat, "id-at-stateOrProvinceName"); + register_ber_oid_dissector("2.5.4.9", dissect_DirectoryString_PDU, proto_x509sat, "id-at-streetAddress"); + register_ber_oid_dissector("2.5.4.9.1", dissect_DirectoryString_PDU, proto_x509sat, "id-at-collectiveStreetAddress"); + register_ber_oid_dissector("2.5.4.10.1", dissect_DirectoryString_PDU, proto_x509sat, "id-at-collectiveOrganizationName"); + register_ber_oid_dissector("2.5.4.7", dissect_DirectoryString_PDU, proto_x509sat, "id-at-localityName"); + register_ber_oid_dissector("2.5.4.11", dissect_DirectoryString_PDU, proto_x509sat, "id-at-organizationalUnitName"); + register_ber_oid_dissector("2.5.4.11.1", dissect_DirectoryString_PDU, proto_x509sat, "id-at-collectiveOrganizationalUnitName"); + register_ber_oid_dissector("2.5.4.12", dissect_DirectoryString_PDU, proto_x509sat, "id-at-title"); + register_ber_oid_dissector("2.5.4.13", dissect_DirectoryString_PDU, proto_x509sat, "id-at-description"); + register_ber_oid_dissector("2.5.4.15", dissect_DirectoryString_PDU, proto_x509sat, "id-at-businessCategory"); + register_ber_oid_dissector("2.5.4.17", dissect_DirectoryString_PDU, proto_x509sat, "id-at-postalCode"); + register_ber_oid_dissector("2.5.4.17.1", dissect_DirectoryString_PDU, proto_x509sat, "id-at-collectivePostalCode"); + register_ber_oid_dissector("2.5.4.18", dissect_DirectoryString_PDU, proto_x509sat, "id-at-postOfficeBox"); + register_ber_oid_dissector("2.5.4.18.1", dissect_DirectoryString_PDU, proto_x509sat, "id-at-collectivePostOfficeBox"); + register_ber_oid_dissector("2.5.4.19", dissect_DirectoryString_PDU, proto_x509sat, "id-at-physicalDeliveryOfficeName"); + register_ber_oid_dissector("2.5.4.19.1", dissect_DirectoryString_PDU, proto_x509sat, "id-at-collectivePhysicalDeliveryOfficeName"); + register_ber_oid_dissector("2.5.4.20", dissect_TelephoneNumber_PDU, proto_x509sat, "id-at-telephoneNumber"); + register_ber_oid_dissector("2.5.4.20.1", dissect_TelephoneNumber_PDU, proto_x509sat, "id-at-collectiveTelephoneNumber"); + register_ber_oid_dissector("2.5.4.21", dissect_TelexNumber_PDU, proto_x509sat, "id-at-telexNumber"); + register_ber_oid_dissector("2.5.4.21.1", dissect_TelexNumber_PDU, proto_x509sat, "id-at-collectiveTelexNumber"); /*--- End of included file: packet-x509sat-dis-tab.c ---*/ diff --git a/epan/libethereal.def b/epan/libethereal.def index a1874c5890..a289bd26b1 100644 --- a/epan/libethereal.def +++ b/epan/libethereal.def @@ -126,7 +126,7 @@ dissector_try_port dissector_try_string dissect_ber_bitstring dissect_ber_boolean -dissect_ber_CHOICE +dissect_ber_choice dissect_ber_GeneralizedTime dissect_ber_identifier dissect_ber_integer |