From 313c4005f924f0aa6f37cd27ad68af51747ebcb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Mon, 13 Oct 2014 13:37:24 +0200 Subject: P1: Added ORAddress and ORName syntax. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Icf8e8cb2988d9134aa65f04a3459e4a4c4a5721f Reviewed-on: https://code.wireshark.org/review/4640 Reviewed-by: Stig Bjørlykke Tested-by: Stig Bjørlykke --- asn1/p1/p1.cnf | 4 ++ asn1/p1/packet-p1-template.c | 1 + epan/dissectors/packet-p1.c | 161 +++++++++++++++++++++++-------------------- 3 files changed, 90 insertions(+), 76 deletions(-) diff --git a/asn1/p1/p1.cnf b/asn1/p1/p1.cnf index ca30df147c..7dbedb3c30 100644 --- a/asn1/p1/p1.cnf +++ b/asn1/p1/p1.cnf @@ -101,6 +101,10 @@ UniversalOrBMPString NonDeliveryReasonCode NonDeliveryDiagnosticCode +#.SYNTAX_NEW +ORAddress +ORName + # Forward declaration of Classes # CONNECTION-PACKAGE CONTRACT from ROS #.CLASS CONNECTION-PACKAGE diff --git a/asn1/p1/packet-p1-template.c b/asn1/p1/packet-p1-template.c index 4c5825adf8..b9c950ba46 100644 --- a/asn1/p1/packet-p1-template.c +++ b/asn1/p1/packet-p1-template.c @@ -370,6 +370,7 @@ void proto_register_p1(void) { 10, &global_p1_tcp_port); register_ber_syntax_dissector("P1 Message", proto_p1, dissect_p1_mts_apdu); +#include "packet-p1-syn-reg.c" } diff --git a/epan/dissectors/packet-p1.c b/epan/dissectors/packet-p1.c index 654c70c258..48d33bbdf8 100644 --- a/epan/dissectors/packet-p1.c +++ b/epan/dissectors/packet-p1.c @@ -971,7 +971,7 @@ dissect_p1_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, as static int dissect_p1_MTAName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 691 "../../asn1/p1/p1.cnf" +#line 695 "../../asn1/p1/p1.cnf" tvbuff_t *mtaname = NULL; p1_address_ctx_t* ctx = (p1_address_ctx_t*)actx->subtree.tree_ctx; @@ -1049,7 +1049,7 @@ dissect_p1_TokenTypeIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_p1_TokenTypeData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1149 "../../asn1/p1/p1.cnf" +#line 1153 "../../asn1/p1/p1.cnf" if(actx->external.direct_reference) call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, actx->private_data); @@ -1160,7 +1160,7 @@ static const ber_choice_t Credentials_choice[] = { int dissect_p1_Credentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1157 "../../asn1/p1/p1.cnf" +#line 1161 "../../asn1/p1/p1.cnf" gint credentials = -1; offset = dissect_ber_choice(actx, tree, tvb, offset, @@ -1239,7 +1239,7 @@ dissect_p1_SecurityCategoryIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _ static int dissect_p1_SecurityCategoryValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 559 "../../asn1/p1/p1.cnf" +#line 563 "../../asn1/p1/p1.cnf" const char *name; if (actx->external.direct_reference) { @@ -1419,7 +1419,7 @@ static const value_string p1_MTABindError_vals[] = { static int dissect_p1_MTABindError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1140 "../../asn1/p1/p1.cnf" +#line 1144 "../../asn1/p1/p1.cnf" int error = -1; offset = dissect_ber_constrained_integer(implicit_tag, actx, tree, tvb, offset, 0U, ub_integer_options, hf_index, &error); @@ -1436,7 +1436,7 @@ dissect_p1_MTABindError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_p1_T_x121_dcc_code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 837 "../../asn1/p1/p1.cnf" +#line 841 "../../asn1/p1/p1.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_NumericString, @@ -1455,7 +1455,7 @@ dissect_p1_T_x121_dcc_code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_p1_T_iso_3166_alpha2_code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 795 "../../asn1/p1/p1.cnf" +#line 799 "../../asn1/p1/p1.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -1496,7 +1496,7 @@ dissect_p1_CountryName_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_p1_CountryName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 592 "../../asn1/p1/p1.cnf" +#line 596 "../../asn1/p1/p1.cnf" do_address("/C=", NULL, actx); offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, @@ -1512,7 +1512,7 @@ dissect_p1_CountryName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_p1_T_numeric(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 844 "../../asn1/p1/p1.cnf" +#line 848 "../../asn1/p1/p1.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_NumericString, @@ -1531,7 +1531,7 @@ dissect_p1_T_numeric(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U static int dissect_p1_T_printable(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 802 "../../asn1/p1/p1.cnf" +#line 806 "../../asn1/p1/p1.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -1572,7 +1572,7 @@ dissect_p1_AdministrationDomainName_U(gboolean implicit_tag _U_, tvbuff_t *tvb _ static int dissect_p1_AdministrationDomainName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 597 "../../asn1/p1/p1.cnf" +#line 601 "../../asn1/p1/p1.cnf" do_address("/A=", NULL, actx); offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, @@ -1588,7 +1588,7 @@ dissect_p1_AdministrationDomainName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_p1_T_numeric_private_domain_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 858 "../../asn1/p1/p1.cnf" +#line 862 "../../asn1/p1/p1.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_NumericString, @@ -1607,7 +1607,7 @@ dissect_p1_T_numeric_private_domain_identifier(gboolean implicit_tag _U_, tvbuff static int dissect_p1_T_printable_private_domain_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 816 "../../asn1/p1/p1.cnf" +#line 820 "../../asn1/p1/p1.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -1637,7 +1637,7 @@ static const ber_choice_t PrivateDomainIdentifier_choice[] = { static int dissect_p1_PrivateDomainIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 731 "../../asn1/p1/p1.cnf" +#line 735 "../../asn1/p1/p1.cnf" do_address("/P=", NULL, actx); @@ -1671,7 +1671,7 @@ dissect_p1_GlobalDomainIdentifier_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_p1_GlobalDomainIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1019 "../../asn1/p1/p1.cnf" +#line 1023 "../../asn1/p1/p1.cnf" p1_address_ctx_t* ctx; if (actx->subtree.tree_ctx == NULL) { @@ -1705,7 +1705,7 @@ dissect_p1_GlobalDomainIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_p1_LocalIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1045 "../../asn1/p1/p1.cnf" +#line 1049 "../../asn1/p1/p1.cnf" tvbuff_t *id = NULL; p1_address_ctx_t* ctx = (p1_address_ctx_t*)actx->subtree.tree_ctx; @@ -1746,7 +1746,7 @@ dissect_p1_MTSIdentifier_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_p1_MTSIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1059 "../../asn1/p1/p1.cnf" +#line 1063 "../../asn1/p1/p1.cnf" set_do_address(actx, TRUE); @@ -1765,7 +1765,7 @@ dissect_p1_MTSIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_p1_MessageIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1014 "../../asn1/p1/p1.cnf" +#line 1018 "../../asn1/p1/p1.cnf" actx->subtree.tree = NULL; offset = dissect_p1_MTSIdentifier(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -1780,7 +1780,7 @@ dissect_p1_MessageIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_p1_X121Address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 708 "../../asn1/p1/p1.cnf" +#line 712 "../../asn1/p1/p1.cnf" tvbuff_t *string = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_NumericString, @@ -1808,7 +1808,7 @@ dissect_p1_NetworkAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs static int dissect_p1_TerminalIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 718 "../../asn1/p1/p1.cnf" +#line 722 "../../asn1/p1/p1.cnf" tvbuff_t *string = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -1827,7 +1827,7 @@ dissect_p1_TerminalIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_p1_T_numeric_private_domain_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 851 "../../asn1/p1/p1.cnf" +#line 855 "../../asn1/p1/p1.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_NumericString, @@ -1846,7 +1846,7 @@ dissect_p1_T_numeric_private_domain_name(gboolean implicit_tag _U_, tvbuff_t *tv static int dissect_p1_T_printable_private_domain_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 809 "../../asn1/p1/p1.cnf" +#line 813 "../../asn1/p1/p1.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -1876,7 +1876,7 @@ static const ber_choice_t PrivateDomainName_choice[] = { static int dissect_p1_PrivateDomainName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 725 "../../asn1/p1/p1.cnf" +#line 729 "../../asn1/p1/p1.cnf" do_address("/P=", NULL, actx); @@ -1894,7 +1894,7 @@ dissect_p1_PrivateDomainName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_p1_OrganizationName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 740 "../../asn1/p1/p1.cnf" +#line 744 "../../asn1/p1/p1.cnf" tvbuff_t *string = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -1924,7 +1924,7 @@ dissect_p1_NumericUserIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_p1_T_printable_surname(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 899 "../../asn1/p1/p1.cnf" +#line 903 "../../asn1/p1/p1.cnf" tvbuff_t *pstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -1943,7 +1943,7 @@ dissect_p1_T_printable_surname(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_p1_T_printable_given_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 906 "../../asn1/p1/p1.cnf" +#line 910 "../../asn1/p1/p1.cnf" tvbuff_t *pstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -1962,7 +1962,7 @@ dissect_p1_T_printable_given_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_p1_T_printable_initials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 913 "../../asn1/p1/p1.cnf" +#line 917 "../../asn1/p1/p1.cnf" tvbuff_t *pstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -1981,7 +1981,7 @@ dissect_p1_T_printable_initials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_p1_T_printable_generation_qualifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 920 "../../asn1/p1/p1.cnf" +#line 924 "../../asn1/p1/p1.cnf" tvbuff_t *pstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -2017,7 +2017,7 @@ dissect_p1_PersonalName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_p1_OrganizationalUnitName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 760 "../../asn1/p1/p1.cnf" +#line 764 "../../asn1/p1/p1.cnf" tvbuff_t *string = NULL; do_address("/OU=", string, actx); @@ -2056,7 +2056,7 @@ static const ber_sequence_t BuiltInStandardAttributes_sequence[] = { static int dissect_p1_BuiltInStandardAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1076 "../../asn1/p1/p1.cnf" +#line 1080 "../../asn1/p1/p1.cnf" actx->subtree.tree = tree; offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, @@ -2072,7 +2072,7 @@ dissect_p1_BuiltInStandardAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U static int dissect_p1_T_printable_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 955 "../../asn1/p1/p1.cnf" +#line 959 "../../asn1/p1/p1.cnf" tvbuff_t *pstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -2091,7 +2091,7 @@ dissect_p1_T_printable_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_p1_T_printable_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 962 "../../asn1/p1/p1.cnf" +#line 966 "../../asn1/p1/p1.cnf" tvbuff_t *pstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -2115,7 +2115,7 @@ static const ber_sequence_t BuiltInDomainDefinedAttribute_sequence[] = { static int dissect_p1_BuiltInDomainDefinedAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 969 "../../asn1/p1/p1.cnf" +#line 973 "../../asn1/p1/p1.cnf" actx->value_ptr = wmem_strbuf_new(wmem_packet_scope(), ""); offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, @@ -2198,7 +2198,7 @@ dissect_p1_ExtensionAttributeType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_p1_T_extension_attribute_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 573 "../../asn1/p1/p1.cnf" +#line 577 "../../asn1/p1/p1.cnf" proto_item_append_text(tree, " (%s)", val_to_str(actx->external.indirect_reference, p1_ExtensionAttributeType_vals, "extension-attribute-type %d")); if (dissector_try_uint(p1_extension_attribute_dissector_table, actx->external.indirect_reference, tvb, actx->pinfo, tree)) { @@ -2268,7 +2268,7 @@ dissect_p1_ORName_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ int dissect_p1_ORName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 995 "../../asn1/p1/p1.cnf" +#line 999 "../../asn1/p1/p1.cnf" p1_address_ctx_t* ctx; if (actx->subtree.tree_ctx == NULL) { @@ -2484,7 +2484,7 @@ static const value_string p1_BuiltInContentType_U_vals[] = { static int dissect_p1_BuiltInContentType_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 639 "../../asn1/p1/p1.cnf" +#line 643 "../../asn1/p1/p1.cnf" static guint32 ict = -1; p1_address_ctx_t* ctx; @@ -2529,7 +2529,7 @@ dissect_p1_BuiltInContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int int dissect_p1_ExtendedContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 618 "../../asn1/p1/p1.cnf" +#line 622 "../../asn1/p1/p1.cnf" const char *name = NULL; p1_address_ctx_t* ctx; @@ -2660,7 +2660,7 @@ dissect_p1_PerMessageIndicators(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_p1_Time(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1118 "../../asn1/p1/p1.cnf" +#line 1122 "../../asn1/p1/p1.cnf" tvbuff_t *arrival = NULL; p1_address_ctx_t* ctx = (p1_address_ctx_t*)actx->subtree.tree_ctx; @@ -2725,7 +2725,7 @@ dissect_p1_T_bilateral_domain(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_p1_T_bilateral_information(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1184 "../../asn1/p1/p1.cnf" +#line 1188 "../../asn1/p1/p1.cnf" proto_item *item = NULL; int loffset = 0; guint32 len = 0; @@ -2793,7 +2793,7 @@ static const value_string p1_RoutingAction_vals[] = { static int dissect_p1_RoutingAction(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1130 "../../asn1/p1/p1.cnf" +#line 1134 "../../asn1/p1/p1.cnf" int action = 0; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -2854,7 +2854,7 @@ static const ber_sequence_t DomainSuppliedInformation_set[] = { static int dissect_p1_DomainSuppliedInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1097 "../../asn1/p1/p1.cnf" +#line 1101 "../../asn1/p1/p1.cnf" set_do_address(actx, FALSE); @@ -2879,7 +2879,7 @@ static const ber_sequence_t TraceInformationElement_sequence[] = { static int dissect_p1_TraceInformationElement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1081 "../../asn1/p1/p1.cnf" +#line 1085 "../../asn1/p1/p1.cnf" set_do_address(actx, TRUE); @@ -2970,7 +2970,7 @@ static const value_string p1_StandardExtension_vals[] = { static int dissect_p1_StandardExtension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 604 "../../asn1/p1/p1.cnf" +#line 608 "../../asn1/p1/p1.cnf" actx->external.indirect_ref_present = TRUE; actx->external.direct_ref_present = FALSE; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -2986,7 +2986,7 @@ dissect_p1_StandardExtension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_p1_T_private_extension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 609 "../../asn1/p1/p1.cnf" +#line 613 "../../asn1/p1/p1.cnf" actx->external.indirect_ref_present = FALSE; actx->external.direct_reference = NULL; offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &actx->external.direct_reference); @@ -3041,7 +3041,7 @@ dissect_p1_Criticality(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_p1_ExtensionValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 533 "../../asn1/p1/p1.cnf" +#line 537 "../../asn1/p1/p1.cnf" const char *name; if(actx->external.indirect_ref_present) { @@ -3223,7 +3223,7 @@ dissect_p1_MessageTransferEnvelope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int dissect_p1_Content(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 663 "../../asn1/p1/p1.cnf" +#line 667 "../../asn1/p1/p1.cnf" tvbuff_t *next_tvb; p1_address_ctx_t* ctx = (p1_address_ctx_t*)actx->subtree.tree_ctx; @@ -3417,7 +3417,7 @@ dissect_p1_SubjectIntermediateTraceInformation(gboolean implicit_tag _U_, tvbuff static int dissect_p1_AdditionalInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 515 "../../asn1/p1/p1.cnf" +#line 519 "../../asn1/p1/p1.cnf" proto_item *item = NULL; int loffset = 0; guint32 len = 0; @@ -3637,7 +3637,7 @@ static const ber_choice_t ReportType_choice[] = { static int dissect_p1_ReportType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1216 "../../asn1/p1/p1.cnf" +#line 1220 "../../asn1/p1/p1.cnf" gint report = -1; offset = dissect_ber_choice(actx, tree, tvb, offset, @@ -3777,7 +3777,7 @@ static const ber_choice_t MTS_APDU_choice[] = { static int dissect_p1_MTS_APDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1202 "../../asn1/p1/p1.cnf" +#line 1206 "../../asn1/p1/p1.cnf" gint apdu = -1; offset = dissect_ber_choice(actx, tree, tvb, offset, @@ -3834,7 +3834,7 @@ static const ber_sequence_t MTASuppliedInformation_set[] = { static int dissect_p1_MTASuppliedInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1106 "../../asn1/p1/p1.cnf" +#line 1110 "../../asn1/p1/p1.cnf" set_do_address(actx, FALSE); @@ -3860,7 +3860,7 @@ static const ber_sequence_t InternalTraceInformationElement_sequence[] = { static int dissect_p1_InternalTraceInformationElement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1089 "../../asn1/p1/p1.cnf" +#line 1093 "../../asn1/p1/p1.cnf" set_do_address(actx, TRUE); @@ -3994,7 +3994,7 @@ static const ber_sequence_t MTSBindResult_set[] = { static int dissect_p1_MTSBindResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1240 "../../asn1/p1/p1.cnf" +#line 1244 "../../asn1/p1/p1.cnf" /* TODO: there may be other entry points where this global should be initialized... */ actx->subtree.tree = NULL; @@ -4127,7 +4127,7 @@ static const ber_sequence_t MessageSubmissionArgument_sequence[] = { static int dissect_p1_MessageSubmissionArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1225 "../../asn1/p1/p1.cnf" +#line 1229 "../../asn1/p1/p1.cnf" p1_initialize_content_globals(actx, tree, TRUE); offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, MessageSubmissionArgument_sequence, hf_index, ett_p1_MessageSubmissionArgument); @@ -4701,7 +4701,7 @@ static const ber_sequence_t MessageDeliveryArgument_sequence[] = { static int dissect_p1_MessageDeliveryArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1230 "../../asn1/p1/p1.cnf" +#line 1234 "../../asn1/p1/p1.cnf" p1_initialize_content_globals(actx, tree, TRUE); offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, MessageDeliveryArgument_sequence, hf_index, ett_p1_MessageDeliveryArgument); @@ -4811,7 +4811,7 @@ static const ber_sequence_t ReportDeliveryArgument_set[] = { static int dissect_p1_ReportDeliveryArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1235 "../../asn1/p1/p1.cnf" +#line 1239 "../../asn1/p1/p1.cnf" p1_initialize_content_globals(actx, tree, TRUE); offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset, ReportDeliveryArgument_set, hf_index, ett_p1_ReportDeliveryArgument); @@ -4949,7 +4949,7 @@ dissect_p1_RefusedArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_p1_T_refused_extension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 589 "../../asn1/p1/p1.cnf" +#line 593 "../../asn1/p1/p1.cnf" /*XXX not implemented yet */ @@ -5024,7 +5024,7 @@ dissect_p1_UserName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ static int dissect_p1_T_x121_address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 830 "../../asn1/p1/p1.cnf" +#line 834 "../../asn1/p1/p1.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_NumericString, @@ -5342,7 +5342,7 @@ dissect_p1_T_standard_parameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_p1_T_type_extensions_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 530 "../../asn1/p1/p1.cnf" +#line 534 "../../asn1/p1/p1.cnf" /*XXX not implemented yet */ @@ -5729,7 +5729,7 @@ static const ber_sequence_t ORAddress_sequence[] = { int dissect_p1_ORAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 974 "../../asn1/p1/p1.cnf" +#line 978 "../../asn1/p1/p1.cnf" p1_address_ctx_t* ctx; if (actx->subtree.tree_ctx == NULL) { @@ -6225,7 +6225,7 @@ dissect_p1_CertificateSelectors(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_p1_CommonName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 778 "../../asn1/p1/p1.cnf" +#line 782 "../../asn1/p1/p1.cnf" tvbuff_t *string = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -6244,7 +6244,7 @@ dissect_p1_CommonName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ static int dissect_p1_TeletexCommonName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 788 "../../asn1/p1/p1.cnf" +#line 792 "../../asn1/p1/p1.cnf" tvbuff_t *string = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString, @@ -6342,7 +6342,7 @@ dissect_p1_UniversalCommonName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_p1_TeletexOrganizationName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 750 "../../asn1/p1/p1.cnf" +#line 754 "../../asn1/p1/p1.cnf" tvbuff_t *string = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString, @@ -6370,7 +6370,7 @@ dissect_p1_UniversalOrganizationName(gboolean implicit_tag _U_, tvbuff_t *tvb _U static int dissect_p1_T_teletex_surname(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 927 "../../asn1/p1/p1.cnf" +#line 931 "../../asn1/p1/p1.cnf" tvbuff_t *tstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString, @@ -6389,7 +6389,7 @@ dissect_p1_T_teletex_surname(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_p1_T_teletex_given_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 934 "../../asn1/p1/p1.cnf" +#line 938 "../../asn1/p1/p1.cnf" tvbuff_t *tstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString, @@ -6408,7 +6408,7 @@ dissect_p1_T_teletex_given_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_p1_T_teletex_initials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 941 "../../asn1/p1/p1.cnf" +#line 945 "../../asn1/p1/p1.cnf" tvbuff_t *tstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString, @@ -6427,7 +6427,7 @@ dissect_p1_T_teletex_initials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_p1_T_teletex_generation_qualifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 948 "../../asn1/p1/p1.cnf" +#line 952 "../../asn1/p1/p1.cnf" tvbuff_t *tstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString, @@ -6480,7 +6480,7 @@ dissect_p1_UniversalPersonalName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_p1_TeletexOrganizationalUnitName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 768 "../../asn1/p1/p1.cnf" +#line 772 "../../asn1/p1/p1.cnf" tvbuff_t *string = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString, @@ -6545,7 +6545,7 @@ dissect_p1_PDSName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, static int dissect_p1_T_x121_dcc_code_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 865 "../../asn1/p1/p1.cnf" +#line 869 "../../asn1/p1/p1.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_NumericString, @@ -6564,7 +6564,7 @@ dissect_p1_T_x121_dcc_code_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_p1_T_iso_3166_alpha2_code_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 823 "../../asn1/p1/p1.cnf" +#line 827 "../../asn1/p1/p1.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -6605,7 +6605,7 @@ dissect_p1_PhysicalDeliveryCountryName(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_p1_T_numeric_code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 872 "../../asn1/p1/p1.cnf" +#line 876 "../../asn1/p1/p1.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_NumericString, @@ -7029,7 +7029,7 @@ dissect_p1_TerminalType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_p1_T_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 880 "../../asn1/p1/p1.cnf" +#line 884 "../../asn1/p1/p1.cnf" tvbuff_t *tstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString, @@ -7048,7 +7048,7 @@ dissect_p1_T_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, static int dissect_p1_T_teletex_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 887 "../../asn1/p1/p1.cnf" +#line 891 "../../asn1/p1/p1.cnf" tvbuff_t *tstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString, @@ -7072,7 +7072,7 @@ static const ber_sequence_t TeletexDomainDefinedAttribute_sequence[] = { static int dissect_p1_TeletexDomainDefinedAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 894 "../../asn1/p1/p1.cnf" +#line 898 "../../asn1/p1/p1.cnf" actx->value_ptr = wmem_strbuf_new(wmem_packet_scope(), ""); offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, @@ -7135,7 +7135,7 @@ static const ber_sequence_t MTANameAndOptionalGDI_sequence[] = { static int dissect_p1_MTANameAndOptionalGDI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1067 "../../asn1/p1/p1.cnf" +#line 1071 "../../asn1/p1/p1.cnf" set_do_address(actx, TRUE); @@ -7195,7 +7195,7 @@ dissect_p1_TokenDataType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_p1_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1169 "../../asn1/p1/p1.cnf" +#line 1173 "../../asn1/p1/p1.cnf" proto_item_append_text(tree, " (%s)", val_to_str(actx->external.indirect_reference, p1_TokenDataType_vals, "tokendata-type %d")); if (dissector_try_uint(p1_tokendata_dissector_table, actx->external.indirect_reference, tvb, actx->pinfo, tree)) { @@ -11164,6 +11164,15 @@ void proto_register_p1(void) { 10, &global_p1_tcp_port); register_ber_syntax_dissector("P1 Message", proto_p1, dissect_p1_mts_apdu); + +/*--- Included file: packet-p1-syn-reg.c ---*/ +#line 1 "../../asn1/p1/packet-p1-syn-reg.c" + /*--- Syntax registrations ---*/ + new_register_ber_syntax_dissector("ORAddress", proto_p1, dissect_ORAddress_PDU); + new_register_ber_syntax_dissector("ORName", proto_p1, dissect_ORName_PDU); + +/*--- End of included file: packet-p1-syn-reg.c ---*/ +#line 374 "../../asn1/p1/packet-p1-template.c" } @@ -11329,7 +11338,7 @@ void proto_reg_handoff_p1(void) { /*--- End of included file: packet-p1-dis-tab.c ---*/ -#line 381 "../../asn1/p1/packet-p1-template.c" +#line 382 "../../asn1/p1/packet-p1-template.c" /* APPLICATION CONTEXT */ -- cgit v1.2.3