diff options
33 files changed, 1637 insertions, 892 deletions
diff --git a/asn1/cms/cms-exp.cnf b/asn1/cms/cms-exp.cnf index 71f8a9199d..4cb6434014 100644 --- a/asn1/cms/cms-exp.cnf +++ b/asn1/cms/cms-exp.cnf @@ -6,7 +6,7 @@ DigestAlgorithmIdentifiers BER_CLASS_UNI BER_UNI_TAG_SET SignerInfos BER_CLASS_UNI BER_UNI_TAG_SET EncapsulatedContentInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE SignerInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -SignerIdentifier -1/*choice*/ -1/*choice*/ +SignerIdentifier BER_CLASS_ANY/*choice*/ -1/*choice*/ SignedAttributes BER_CLASS_UNI BER_UNI_TAG_SET UnsignedAttributes BER_CLASS_UNI BER_UNI_TAG_SET SignatureValue BER_CLASS_UNI BER_UNI_TAG_OCTETSTRING diff --git a/asn1/mms/mms-exp.cnf b/asn1/mms/mms-exp.cnf index 7b5fbd5918..6d1be09b4e 100644 --- a/asn1/mms/mms-exp.cnf +++ b/asn1/mms/mms-exp.cnf @@ -1,5 +1,5 @@ #.IMPORT_TAG -MMSpdu BER_CLASS_CON -1/*choice*/ +MMSpdu BER_CLASS_ANY/*choice*/ -1/*choice*/ #.END #.TYPE_ATTR diff --git a/asn1/pkixcmp/cmp-exp.cnf b/asn1/pkixcmp/cmp-exp.cnf index 36c6472139..c5ee310b08 100644 --- a/asn1/pkixcmp/cmp-exp.cnf +++ b/asn1/pkixcmp/cmp-exp.cnf @@ -2,7 +2,7 @@ PKIMessage BER_CLASS_UNI BER_UNI_TAG_SEQUENCE PKIHeader BER_CLASS_UNI BER_UNI_TAG_SEQUENCE PKIFreeText BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -PKIBody BER_CLASS_CON -1/*choice*/ +PKIBody BER_CLASS_ANY/*choice*/ -1/*choice*/ PKIProtection BER_CLASS_UNI BER_UNI_TAG_BITSTRING ProtectedPart BER_CLASS_UNI BER_UNI_TAG_SEQUENCE PasswordBasedMac BER_CLASS_UNI BER_UNI_TAG_OID @@ -21,7 +21,7 @@ POPODecKeyRespContent BER_CLASS_UNI BER_UNI_TAG_SEQUENCE CertRepMessage BER_CLASS_UNI BER_UNI_TAG_SEQUENCE CertResponse BER_CLASS_UNI BER_UNI_TAG_SEQUENCE CertifiedKeyPair BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -CertOrEncCert BER_CLASS_CON -1/*choice*/ +CertOrEncCert BER_CLASS_ANY/*choice*/ -1/*choice*/ KeyRecRepContent BER_CLASS_UNI BER_UNI_TAG_SEQUENCE RevReqContent BER_CLASS_UNI BER_UNI_TAG_SEQUENCE RevDetails BER_CLASS_UNI BER_UNI_TAG_SEQUENCE diff --git a/asn1/pkixcrmf/crmf-exp.cnf b/asn1/pkixcrmf/crmf-exp.cnf index 9aa1a89fad..9cbf380221 100644 --- a/asn1/pkixcrmf/crmf-exp.cnf +++ b/asn1/pkixcrmf/crmf-exp.cnf @@ -6,19 +6,19 @@ CertTemplate BER_CLASS_UNI BER_UNI_TAG_SEQUENCE OptionalValidity BER_CLASS_UNI BER_UNI_TAG_SEQUENCE Controls BER_CLASS_UNI BER_UNI_TAG_SEQUENCE AttributeTypeAndValue BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -ProofOfPossession BER_CLASS_CON -1/*choice*/ +ProofOfPossession BER_CLASS_ANY/*choice*/ -1/*choice*/ POPOSigningKey BER_CLASS_UNI BER_UNI_TAG_SEQUENCE POPOSigningKeyInput BER_CLASS_UNI BER_UNI_TAG_SEQUENCE PKMACValue BER_CLASS_UNI BER_UNI_TAG_SEQUENCE PBMParameter BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -POPOPrivKey BER_CLASS_CON -1/*choice*/ +POPOPrivKey BER_CLASS_ANY/*choice*/ -1/*choice*/ SubsequentMessage BER_CLASS_UNI BER_UNI_TAG_INTEGER RegToken BER_CLASS_UNI BER_UNI_TAG_UTF8String Authenticator BER_CLASS_UNI BER_UNI_TAG_UTF8String PKIPublicationInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE SinglePubInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -PKIArchiveOptions BER_CLASS_CON -1/*choice*/ -EncryptedKey -1/*choice*/ -1/*choice*/ +PKIArchiveOptions BER_CLASS_ANY/*choice*/ -1/*choice*/ +EncryptedKey BER_CLASS_ANY/*choice*/ -1/*choice*/ EncryptedValue BER_CLASS_UNI BER_UNI_TAG_SEQUENCE KeyGenParameters BER_CLASS_UNI BER_UNI_TAG_OCTETSTRING OldCertId BER_CLASS_UNI BER_UNI_TAG_SEQUENCE diff --git a/asn1/x509af/x509af-exp.cnf b/asn1/x509af/x509af-exp.cnf index be84bfb334..111664f963 100644 --- a/asn1/x509af/x509af-exp.cnf +++ b/asn1/x509af/x509af-exp.cnf @@ -5,7 +5,7 @@ CertificateSerialNumber BER_CLASS_UNI BER_UNI_TAG_INTEGER AlgorithmIdentifier BER_CLASS_UNI BER_UNI_TAG_SEQUENCE Validity BER_CLASS_UNI BER_UNI_TAG_SEQUENCE SubjectPublicKeyInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -Time BER_CLASS_UNI -1/*choice*/ +Time BER_CLASS_ANY/*choice*/ -1/*choice*/ Extensions BER_CLASS_UNI BER_UNI_TAG_SEQUENCE Extension BER_CLASS_UNI BER_UNI_TAG_SEQUENCE Certificates BER_CLASS_UNI BER_UNI_TAG_SEQUENCE diff --git a/asn1/x509ce/x509ce-exp.cnf b/asn1/x509ce/x509ce-exp.cnf index 342032bcdf..e9748da6de 100644 --- a/asn1/x509ce/x509ce-exp.cnf +++ b/asn1/x509ce/x509ce-exp.cnf @@ -11,7 +11,7 @@ PolicyInformation BER_CLASS_UNI BER_UNI_TAG_SEQUENCE PolicyQualifierInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE PolicyMappingsSyntax BER_CLASS_UNI BER_UNI_TAG_SEQUENCE GeneralNames BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -GeneralName BER_CLASS_CON -1/*choice*/ +GeneralName BER_CLASS_ANY/*choice*/ -1/*choice*/ EDIPartyName BER_CLASS_UNI BER_UNI_TAG_SEQUENCE AttributesSyntax BER_CLASS_UNI BER_UNI_TAG_SEQUENCE BasicConstraintsSyntax BER_CLASS_UNI BER_UNI_TAG_SEQUENCE @@ -30,7 +30,7 @@ OnlyCertificateTypes BER_CLASS_UNI BER_UNI_TAG_BITSTRING NumberRange BER_CLASS_UNI BER_UNI_TAG_SEQUENCE BaseRevocationInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE StatusReferrals BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -StatusReferral BER_CLASS_CON -1/*choice*/ +StatusReferral BER_CLASS_ANY/*choice*/ -1/*choice*/ CRLReferral BER_CLASS_UNI BER_UNI_TAG_SEQUENCE DeltaRefInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE CRLStreamIdentifier BER_CLASS_UNI BER_UNI_TAG_INTEGER @@ -38,13 +38,13 @@ OrderedListSyntax BER_CLASS_UNI BER_UNI_TAG_ENUMERATED DeltaInformation BER_CLASS_UNI BER_UNI_TAG_SEQUENCE CRLDistPointsSyntax BER_CLASS_UNI BER_UNI_TAG_SEQUENCE DistributionPoint BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -DistributionPointName BER_CLASS_CON -1/*choice*/ +DistributionPointName BER_CLASS_ANY/*choice*/ -1/*choice*/ ReasonFlags BER_CLASS_UNI BER_UNI_TAG_BITSTRING IssuingDistPointSyntax BER_CLASS_UNI BER_UNI_TAG_SEQUENCE BaseCRLNumber BER_CLASS_UNI BER_UNI_TAG_INTEGER CertificateExactAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE CertificateAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -AltNameType BER_CLASS_UNI -1/*choice*/ +AltNameType BER_CLASS_ANY/*choice*/ -1/*choice*/ CertPolicySet BER_CLASS_UNI BER_UNI_TAG_SEQUENCE CertificatePairExactAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE CertificatePairAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE diff --git a/asn1/x509if/x509if-exp.cnf b/asn1/x509if/x509if-exp.cnf index 99a26890cc..ff9802e1d5 100644 --- a/asn1/x509if/x509if-exp.cnf +++ b/asn1/x509if/x509if-exp.cnf @@ -5,7 +5,7 @@ Context BER_CLASS_UNI BER_UNI_TAG_SEQUENCE AttributeValueAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE ContextAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE AttributeTypeAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -Name BER_CLASS_UNI -1/*choice*/ +Name BER_CLASS_ANY/*choice*/ -1/*choice*/ RDNSequence BER_CLASS_UNI BER_UNI_TAG_SEQUENCE DistinguishedName BER_CLASS_UNI BER_UNI_TAG_SEQUENCE RelativeDistinguishedName BER_CLASS_UNI BER_UNI_TAG_SET @@ -14,7 +14,7 @@ SubtreeSpecification BER_CLASS_UNI BER_UNI_TAG_SEQUENCE LocalName BER_CLASS_UNI BER_UNI_TAG_SEQUENCE ChopSpecification BER_CLASS_UNI BER_UNI_TAG_SEQUENCE BaseDistance BER_CLASS_UNI BER_UNI_TAG_INTEGER -Refinement BER_CLASS_CON -1/*choice*/ +Refinement BER_CLASS_ANY/*choice*/ -1/*choice*/ AttributeUsage BER_CLASS_UNI BER_UNI_TAG_ENUMERATED DITStructureRule BER_CLASS_UNI BER_UNI_TAG_SEQUENCE RuleIdentifier BER_CLASS_UNI BER_UNI_TAG_INTEGER @@ -27,11 +27,11 @@ AllowedSubset BER_CLASS_UNI BER_UNI_TAG_BITSTRING ImposedSubset BER_CLASS_UNI BER_UNI_TAG_ENUMERATED RequestAttribute BER_CLASS_UNI BER_UNI_TAG_SEQUENCE ContextProfile BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -ContextCombination BER_CLASS_CON -1/*choice*/ +ContextCombination BER_CLASS_ANY/*choice*/ -1/*choice*/ MatchingUse BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -AttributeCombination BER_CLASS_CON -1/*choice*/ +AttributeCombination BER_CLASS_ANY/*choice*/ -1/*choice*/ ResultAttribute BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -OutputValues BER_CLASS_UNI -1/*choice*/ +OutputValues BER_CLASS_ANY/*choice*/ -1/*choice*/ ControlOptions BER_CLASS_UNI BER_UNI_TAG_SEQUENCE EntryLimit BER_CLASS_UNI BER_UNI_TAG_SEQUENCE RelaxationPolicy BER_CLASS_UNI BER_UNI_TAG_SEQUENCE diff --git a/asn1/x509sat/x509sat-exp.cnf b/asn1/x509sat/x509sat-exp.cnf index 0b9e19f4a5..6f411f0608 100644 --- a/asn1/x509sat/x509sat-exp.cnf +++ b/asn1/x509sat/x509sat-exp.cnf @@ -2,7 +2,7 @@ DirectoryString BER_CLASS_UNI BER_UNI_TAG_PrintableString UniqueIdentifier BER_CLASS_UNI BER_UNI_TAG_BITSTRING CountryName BER_CLASS_UNI BER_UNI_TAG_PrintableString -Criteria BER_CLASS_CON -1/*choice*/ +Criteria BER_CLASS_ANY/*choice*/ -1/*choice*/ EnhancedGuide BER_CLASS_UNI BER_UNI_TAG_SEQUENCE PostalAddress BER_CLASS_UNI BER_UNI_TAG_SEQUENCE FacsimileTelephoneNumber BER_CLASS_UNI BER_UNI_TAG_SEQUENCE @@ -22,13 +22,13 @@ ZonalResult BER_CLASS_UNI BER_UNI_TAG_ENUMERATED LanguageContextSyntax BER_CLASS_UNI BER_UNI_TAG_PrintableString TimeSpecification BER_CLASS_UNI BER_UNI_TAG_SEQUENCE Period BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -XDayOf BER_CLASS_CON -1/*choice*/ -NamedDay BER_CLASS_UNI -1/*choice*/ +XDayOf BER_CLASS_ANY/*choice*/ -1/*choice*/ +NamedDay BER_CLASS_ANY/*choice*/ -1/*choice*/ DayTimeBand BER_CLASS_UNI BER_UNI_TAG_SEQUENCE DayTime BER_CLASS_UNI BER_UNI_TAG_SEQUENCE TimeZone BER_CLASS_UNI BER_UNI_TAG_INTEGER -TimeAssertion BER_CLASS_UNI -1/*choice*/ -LocaleContextSyntax BER_CLASS_UNI -1/*choice*/ +TimeAssertion BER_CLASS_ANY/*choice*/ -1/*choice*/ +LocaleContextSyntax BER_CLASS_ANY/*choice*/ -1/*choice*/ #.END #.TYPE_ATTR diff --git a/epan/dissectors/packet-MAP_DialoguePDU.c b/epan/dissectors/packet-MAP_DialoguePDU.c index 129d5d8633..0ee1625c1d 100644 --- a/epan/dissectors/packet-MAP_DialoguePDU.c +++ b/epan/dissectors/packet-MAP_DialoguePDU.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-MAP_DialoguePDU.c */ +/* ./packet-MAP_DialoguePDU.c */ /* ../../tools/asn2eth.py -X -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */ /* Input file: packet-MAP-DialoguePDU-template.c */ @@ -114,6 +114,7 @@ static int dissect_protectedPayload(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_gsm_map_ProtectedPayload(FALSE, tvb, offset, pinfo, tree, hf_MAP_DialoguePDU_protectedPayload); } + static const ber_sequence_t MAP_OpenInfo_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_destinationReference_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originationReference_impl }, @@ -124,7 +125,7 @@ static const ber_sequence_t MAP_OpenInfo_sequence[] = { static int dissect_MAP_DialoguePDU_MAP_OpenInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - MAP_OpenInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_OpenInfo); + MAP_OpenInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_OpenInfo); return offset; } @@ -132,6 +133,7 @@ static int dissect_map_open_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_MAP_DialoguePDU_MAP_OpenInfo(TRUE, tvb, offset, pinfo, tree, hf_MAP_DialoguePDU_map_open); } + static const ber_sequence_t MAP_AcceptInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } @@ -140,7 +142,7 @@ static const ber_sequence_t MAP_AcceptInfo_sequence[] = { static int dissect_MAP_DialoguePDU_MAP_AcceptInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - MAP_AcceptInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_AcceptInfo); + MAP_AcceptInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_AcceptInfo); return offset; } @@ -148,6 +150,7 @@ static int dissect_map_accept_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_MAP_DialoguePDU_MAP_AcceptInfo(TRUE, tvb, offset, pinfo, tree, hf_MAP_DialoguePDU_map_accept); } + static const ber_sequence_t MAP_CloseInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } @@ -156,7 +159,7 @@ static const ber_sequence_t MAP_CloseInfo_sequence[] = { static int dissect_MAP_DialoguePDU_MAP_CloseInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - MAP_CloseInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_CloseInfo); + MAP_CloseInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_CloseInfo); return offset; } @@ -202,6 +205,7 @@ static int dissect_encapsulatedAC(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_MAP_DialoguePDU_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_MAP_DialoguePDU_encapsulatedAC); } + static const ber_sequence_t MAP_RefuseInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_reason }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, @@ -212,7 +216,7 @@ static const ber_sequence_t MAP_RefuseInfo_sequence[] = { static int dissect_MAP_DialoguePDU_MAP_RefuseInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - MAP_RefuseInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_RefuseInfo); + MAP_RefuseInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_RefuseInfo); return offset; } @@ -298,7 +302,8 @@ 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, - MAP_UserAbortChoice_choice, hf_index, ett_MAP_DialoguePDU_MAP_UserAbortChoice, NULL); + MAP_UserAbortChoice_choice, hf_index, ett_MAP_DialoguePDU_MAP_UserAbortChoice, + NULL); return offset; } @@ -306,8 +311,9 @@ static int dissect_map_UserAbortChoice(packet_info *pinfo, proto_tree *tree, tvb return dissect_MAP_DialoguePDU_MAP_UserAbortChoice(FALSE, tvb, offset, pinfo, tree, hf_MAP_DialoguePDU_map_UserAbortChoice); } + static const ber_sequence_t MAP_UserAbortInfo_sequence[] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_map_UserAbortChoice }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_map_UserAbortChoice }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -315,7 +321,7 @@ static const ber_sequence_t MAP_UserAbortInfo_sequence[] = { static int dissect_MAP_DialoguePDU_MAP_UserAbortInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - MAP_UserAbortInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_UserAbortInfo); + MAP_UserAbortInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_UserAbortInfo); return offset; } @@ -342,6 +348,7 @@ static int dissect_map_ProviderAbortReason(packet_info *pinfo, proto_tree *tree, return dissect_MAP_DialoguePDU_MAP_ProviderAbortReason(FALSE, tvb, offset, pinfo, tree, hf_MAP_DialoguePDU_map_ProviderAbortReason); } + static const ber_sequence_t MAP_ProviderAbortInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_map_ProviderAbortReason }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, @@ -351,7 +358,7 @@ static const ber_sequence_t MAP_ProviderAbortInfo_sequence[] = { static int dissect_MAP_DialoguePDU_MAP_ProviderAbortInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - MAP_ProviderAbortInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_ProviderAbortInfo); + MAP_ProviderAbortInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_ProviderAbortInfo); return offset; } @@ -383,11 +390,13 @@ 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, - MAP_DialoguePDU_choice, hf_index, ett_MAP_DialoguePDU_MAP_DialoguePDU, NULL); + MAP_DialoguePDU_choice, hf_index, ett_MAP_DialoguePDU_MAP_DialoguePDU, + NULL); return offset; } + static const ber_sequence_t MAP_ProtectedDialoguePDU_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_encapsulatedAC }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_securityHeader }, @@ -398,7 +407,7 @@ static const ber_sequence_t MAP_ProtectedDialoguePDU_sequence[] = { static int dissect_MAP_DialoguePDU_MAP_ProtectedDialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - MAP_ProtectedDialoguePDU_sequence, hf_index, ett_MAP_DialoguePDU_MAP_ProtectedDialoguePDU); + MAP_ProtectedDialoguePDU_sequence, hf_index, ett_MAP_DialoguePDU_MAP_ProtectedDialoguePDU); return offset; } diff --git a/epan/dissectors/packet-MAP_DialoguePDU.h b/epan/dissectors/packet-MAP_DialoguePDU.h index 89dab6f0a5..8a7bfd6c9a 100644 --- a/epan/dissectors/packet-MAP_DialoguePDU.h +++ b/epan/dissectors/packet-MAP_DialoguePDU.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-MAP_DialoguePDU.h */ +/* ./packet-MAP_DialoguePDU.h */ /* ../../tools/asn2eth.py -X -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */ /* Input file: packet-MAP-DialoguePDU-template.h */ diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index c3707ff6f1..1692de78bf 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-acse.c */ +/* ./packet-acse.c */ /* ../../tools/asn2eth.py -X -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn */ /* Input file: packet-acse-template.c */ @@ -540,7 +540,7 @@ const value_string acse_AP_title_vals[] = { }; static const ber_choice_t AP_title_choice[] = { - { 0, BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_ap_title_form1 }, + { 0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_ap_title_form1 }, { 1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ap_title_form2 }, { 2, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_ap_title_form3 }, { 3, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_ap_title_form3 }, @@ -1811,7 +1811,7 @@ static const value_string acse_AE_title_vals[] = { }; static const ber_choice_t AE_title_choice[] = { - { 0, BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_ae_title_form1 }, + { 0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_ae_title_form1 }, { 1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ae_title_form2 }, { 0, 0, 0, 0, NULL } }; diff --git a/epan/dissectors/packet-acse.h b/epan/dissectors/packet-acse.h index 32bada1058..2cf1e27146 100644 --- a/epan/dissectors/packet-acse.h +++ b/epan/dissectors/packet-acse.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-acse.h */ +/* ./packet-acse.h */ /* ../../tools/asn2eth.py -X -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn */ /* Input file: packet-acse-template.h */ diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index e44b40ee0a..59de6aa349 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -355,6 +355,7 @@ static int dissect_pvno(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int } + static int dissect_cmp_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index); @@ -403,11 +404,12 @@ static int dissect_rspInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, } + static int dissect_cmp_UTF8String(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, BER_UNI_TAG_UTF8String, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -464,6 +466,7 @@ static int dissect_infoValue(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_cmp_T_infoValue(FALSE, tvb, offset, pinfo, tree, hf_cmp_infoValue); } + static const ber_sequence_t InfoTypeAndValue_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_infoType }, { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_infoValue }, @@ -473,7 +476,7 @@ static const ber_sequence_t InfoTypeAndValue_sequence[] = { int dissect_cmp_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(implicit_tag, pinfo, tree, tvb, offset, - InfoTypeAndValue_sequence, hf_index, ett_cmp_InfoTypeAndValue); + InfoTypeAndValue_sequence, hf_index, ett_cmp_InfoTypeAndValue); return offset; } @@ -503,6 +506,7 @@ static int dissect_generalInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue(FALSE, tvb, offset, pinfo, tree, hf_cmp_generalInfo); } + static const ber_sequence_t PKIHeader_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pvno }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_sender }, @@ -522,7 +526,7 @@ static const ber_sequence_t PKIHeader_sequence[] = { int dissect_cmp_PKIHeader(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - PKIHeader_sequence, hf_index, ett_cmp_PKIHeader); + PKIHeader_sequence, hf_index, ett_cmp_PKIHeader); return offset; } @@ -598,6 +602,7 @@ static int dissect_status(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_cmp_PKIStatus(FALSE, tvb, offset, pinfo, tree, hf_cmp_status); } + static const asn_namedbit PKIFailureInfo_bits[] = { { 0, &hf_cmp_PKIFailureInfo_badAlg, -1, -1, "badAlg", NULL }, { 1, &hf_cmp_PKIFailureInfo_badMessageCheck, -1, -1, "badMessageCheck", NULL }, @@ -615,8 +620,8 @@ static const asn_namedbit PKIFailureInfo_bits[] = { int dissect_cmp_PKIFailureInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - PKIFailureInfo_bits, hf_index, ett_cmp_PKIFailureInfo, - NULL); + PKIFailureInfo_bits, hf_index, ett_cmp_PKIFailureInfo, + NULL); return offset; } @@ -624,6 +629,7 @@ static int dissect_failInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_cmp_PKIFailureInfo(FALSE, tvb, offset, pinfo, tree, hf_cmp_failInfo); } + static const ber_sequence_t PKIStatusInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_status }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_statusString }, @@ -634,7 +640,7 @@ static const ber_sequence_t PKIStatusInfo_sequence[] = { int dissect_cmp_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(implicit_tag, pinfo, tree, tvb, offset, - PKIStatusInfo_sequence, hf_index, ett_cmp_PKIStatusInfo); + PKIStatusInfo_sequence, hf_index, ett_cmp_PKIStatusInfo); return offset; } @@ -664,7 +670,8 @@ 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, - CertOrEncCert_choice, hf_index, ett_cmp_CertOrEncCert, NULL); + CertOrEncCert_choice, hf_index, ett_cmp_CertOrEncCert, + NULL); return offset; } @@ -672,8 +679,9 @@ static int dissect_certOrEncCert(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_cmp_CertOrEncCert(FALSE, tvb, offset, pinfo, tree, hf_cmp_certOrEncCert); } + static const ber_sequence_t CertifiedKeyPair_sequence[] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_certOrEncCert }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_certOrEncCert }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_privateKey }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_publicationInfo }, { 0, 0, 0, NULL } @@ -682,7 +690,7 @@ static const ber_sequence_t CertifiedKeyPair_sequence[] = { int dissect_cmp_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(implicit_tag, pinfo, tree, tvb, offset, - CertifiedKeyPair_sequence, hf_index, ett_cmp_CertifiedKeyPair); + CertifiedKeyPair_sequence, hf_index, ett_cmp_CertifiedKeyPair); return offset; } @@ -693,6 +701,7 @@ static int dissect_keyPairHist_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_cmp_CertifiedKeyPair(FALSE, tvb, offset, pinfo, tree, hf_cmp_keyPairHist_item); } + static const ber_sequence_t CertResponse_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_certReqId }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_status1 }, @@ -704,7 +713,7 @@ static const ber_sequence_t CertResponse_sequence[] = { int dissect_cmp_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(implicit_tag, pinfo, tree, tvb, offset, - CertResponse_sequence, hf_index, ett_cmp_CertResponse); + CertResponse_sequence, hf_index, ett_cmp_CertResponse); return offset; } @@ -728,6 +737,7 @@ static int dissect_response(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_cmp_SEQUENCE_OF_CertResponse(FALSE, tvb, offset, pinfo, tree, hf_cmp_response); } + static const ber_sequence_t CertRepMessage_sequence[] = { { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_caPubs }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_response }, @@ -737,7 +747,7 @@ static const ber_sequence_t CertRepMessage_sequence[] = { int dissect_cmp_CertRepMessage(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - CertRepMessage_sequence, hf_index, ett_cmp_CertRepMessage); + CertRepMessage_sequence, hf_index, ett_cmp_CertRepMessage); return offset; } @@ -754,6 +764,7 @@ static int dissect_ccp(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_cmp_CertRepMessage(FALSE, tvb, offset, pinfo, tree, hf_cmp_ccp); } + static const ber_sequence_t Challenge_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_owf }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_witness }, @@ -764,7 +775,7 @@ static const ber_sequence_t Challenge_sequence[] = { int dissect_cmp_Challenge(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - Challenge_sequence, hf_index, ett_cmp_Challenge); + Challenge_sequence, hf_index, ett_cmp_Challenge); return offset; } @@ -820,6 +831,7 @@ static int dissect_keyPairHist(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair(FALSE, tvb, offset, pinfo, tree, hf_cmp_keyPairHist); } + static const ber_sequence_t KeyRecRepContent_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_status1 }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_newSigCert }, @@ -831,7 +843,7 @@ static const ber_sequence_t KeyRecRepContent_sequence[] = { int dissect_cmp_KeyRecRepContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - KeyRecRepContent_sequence, hf_index, ett_cmp_KeyRecRepContent); + KeyRecRepContent_sequence, hf_index, ett_cmp_KeyRecRepContent); return offset; } @@ -839,6 +851,7 @@ static int dissect_krp(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_cmp_KeyRecRepContent(FALSE, tvb, offset, pinfo, tree, hf_cmp_krp); } + static const ber_sequence_t RevDetails_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certDetails }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_revocationReason }, @@ -850,7 +863,7 @@ static const ber_sequence_t RevDetails_sequence[] = { int dissect_cmp_RevDetails(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - RevDetails_sequence, hf_index, ett_cmp_RevDetails); + RevDetails_sequence, hf_index, ett_cmp_RevDetails); return offset; } @@ -922,6 +935,7 @@ static int dissect_crls(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_CertificateList(FALSE, tvb, offset, pinfo, tree, hf_cmp_crls); } + static const ber_sequence_t RevRepContent_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_status2 }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_revCerts }, @@ -932,7 +946,7 @@ static const ber_sequence_t RevRepContent_sequence[] = { int dissect_cmp_RevRepContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - RevRepContent_sequence, hf_index, ett_cmp_RevRepContent); + RevRepContent_sequence, hf_index, ett_cmp_RevRepContent); return offset; } @@ -940,6 +954,7 @@ static int dissect_rp(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o return dissect_cmp_RevRepContent(FALSE, tvb, offset, pinfo, tree, hf_cmp_rp); } + static const ber_sequence_t CAKeyUpdAnnContent_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_oldWithNew }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_newWithOld }, @@ -950,7 +965,7 @@ static const ber_sequence_t CAKeyUpdAnnContent_sequence[] = { int dissect_cmp_CAKeyUpdAnnContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - CAKeyUpdAnnContent_sequence, hf_index, ett_cmp_CAKeyUpdAnnContent); + CAKeyUpdAnnContent_sequence, hf_index, ett_cmp_CAKeyUpdAnnContent); return offset; } @@ -959,6 +974,7 @@ static int dissect_ckuann(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i } + int dissect_cmp_CertAnnContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_pkix1explicit_Certificate(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -969,6 +985,7 @@ static int dissect_cann(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_cmp_CertAnnContent(FALSE, tvb, offset, pinfo, tree, hf_cmp_cann); } + static const ber_sequence_t RevAnnContent_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_status }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certId }, @@ -981,7 +998,7 @@ static const ber_sequence_t RevAnnContent_sequence[] = { int dissect_cmp_RevAnnContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - RevAnnContent_sequence, hf_index, ett_cmp_RevAnnContent); + RevAnnContent_sequence, hf_index, ett_cmp_RevAnnContent); return offset; } @@ -1018,6 +1035,7 @@ static int dissect_conf(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int } + int dissect_cmp_NestedMessageContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_cmp_PKIMessage(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -1060,6 +1078,7 @@ static int dissect_genp(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_cmp_GenRepContent(FALSE, tvb, offset, pinfo, tree, hf_cmp_genp); } + static const ber_sequence_t ErrorMsgContent_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_pKIStatusInfo }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_errorCode }, @@ -1070,7 +1089,7 @@ static const ber_sequence_t ErrorMsgContent_sequence[] = { int dissect_cmp_ErrorMsgContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - ErrorMsgContent_sequence, hf_index, ett_cmp_ErrorMsgContent); + ErrorMsgContent_sequence, hf_index, ett_cmp_ErrorMsgContent); return offset; } @@ -1136,7 +1155,8 @@ 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, - PKIBody_choice, hf_index, ett_cmp_PKIBody, NULL); + PKIBody_choice, hf_index, ett_cmp_PKIBody, + NULL); return offset; } @@ -1145,11 +1165,12 @@ static int dissect_body(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int } + int dissect_cmp_PKIProtection(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - NULL, hf_index, -1, - NULL); + NULL, hf_index, -1, + NULL); return offset; } @@ -1157,9 +1178,10 @@ static int dissect_protection(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_cmp_PKIProtection(FALSE, tvb, offset, pinfo, tree, hf_cmp_protection); } + static const ber_sequence_t PKIMessage_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_header }, - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_body }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_body }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_protection }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_extraCerts }, { 0, 0, 0, NULL } @@ -1168,21 +1190,22 @@ static const ber_sequence_t PKIMessage_sequence[] = { int dissect_cmp_PKIMessage(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - PKIMessage_sequence, hf_index, ett_cmp_PKIMessage); + PKIMessage_sequence, hf_index, ett_cmp_PKIMessage); return offset; } + static const ber_sequence_t ProtectedPart_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_header }, - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_body }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_body }, { 0, 0, 0, NULL } }; int dissect_cmp_ProtectedPart(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - ProtectedPart_sequence, hf_index, ett_cmp_ProtectedPart); + ProtectedPart_sequence, hf_index, ett_cmp_ProtectedPart); return offset; } @@ -1197,6 +1220,7 @@ dissect_cmp_PasswordBasedMac(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse return offset; } + static const ber_sequence_t PBMParameter_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_salt }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_owf }, @@ -1208,7 +1232,7 @@ static const ber_sequence_t PBMParameter_sequence[] = { int dissect_cmp_PBMParameter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - PBMParameter_sequence, hf_index, ett_cmp_PBMParameter); + PBMParameter_sequence, hf_index, ett_cmp_PBMParameter); return offset; } @@ -1223,6 +1247,7 @@ dissect_cmp_DHBasedMac(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac return offset; } + static const ber_sequence_t DHBMParameter_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_owf }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mac }, @@ -1232,12 +1257,13 @@ static const ber_sequence_t DHBMParameter_sequence[] = { int dissect_cmp_DHBMParameter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - DHBMParameter_sequence, hf_index, ett_cmp_DHBMParameter); + DHBMParameter_sequence, hf_index, ett_cmp_DHBMParameter); return offset; } + int dissect_cmp_OOBCert(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_pkix1explicit_Certificate(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -1246,11 +1272,12 @@ dissect_cmp_OOBCert(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet } + static int dissect_cmp_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - NULL, hf_index, -1, - NULL); + NULL, hf_index, -1, + NULL); return offset; } @@ -1258,6 +1285,7 @@ static int dissect_hashVal(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_cmp_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_cmp_hashVal); } + static const ber_sequence_t OOBCertHash_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_hashAlg }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_certId }, @@ -1268,7 +1296,7 @@ static const ber_sequence_t OOBCertHash_sequence[] = { int dissect_cmp_OOBCertHash(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - OOBCertHash_sequence, hf_index, ett_cmp_OOBCertHash); + OOBCertHash_sequence, hf_index, ett_cmp_OOBCertHash); return offset; } @@ -1391,7 +1419,7 @@ void proto_register_cmp(void) { "PKIFreeText/_item", HFILL }}, { &hf_cmp_ir, { "ir", "cmp.ir", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PKIBody/ir", HFILL }}, { &hf_cmp_ip, { "ip", "cmp.ip", @@ -1399,7 +1427,7 @@ void proto_register_cmp(void) { "PKIBody/ip", HFILL }}, { &hf_cmp_cr, { "cr", "cmp.cr", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PKIBody/cr", HFILL }}, { &hf_cmp_cp, { "cp", "cmp.cp", @@ -1415,7 +1443,7 @@ void proto_register_cmp(void) { "PKIBody/popdecr", HFILL }}, { &hf_cmp_kur, { "kur", "cmp.kur", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PKIBody/kur", HFILL }}, { &hf_cmp_kup, { "kup", "cmp.kup", @@ -1423,7 +1451,7 @@ void proto_register_cmp(void) { "PKIBody/kup", HFILL }}, { &hf_cmp_krr, { "krr", "cmp.krr", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PKIBody/krr", HFILL }}, { &hf_cmp_krp, { "krp", "cmp.krp", @@ -1439,7 +1467,7 @@ void proto_register_cmp(void) { "PKIBody/rp", HFILL }}, { &hf_cmp_ccr, { "ccr", "cmp.ccr", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "PKIBody/ccr", HFILL }}, { &hf_cmp_ccp, { "ccp", "cmp.ccp", diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index 3511cb7296..5415d989bc 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -226,6 +226,7 @@ static int dissect_contentType1(packet_info *pinfo, proto_tree *tree, tvbuff_t * } + static int dissect_cms_T_contentType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, @@ -251,6 +252,7 @@ static int dissect_content(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_cms_T_content(FALSE, tvb, offset, pinfo, tree, hf_cms_content); } + static const ber_sequence_t ContentInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contentType }, { BER_CLASS_CON, 0, 0, dissect_content }, @@ -260,7 +262,7 @@ static const ber_sequence_t ContentInfo_sequence[] = { int dissect_cms_ContentInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - ContentInfo_sequence, hf_index, ett_cms_ContentInfo); + ContentInfo_sequence, hf_index, ett_cms_ContentInfo); return offset; } @@ -288,6 +290,7 @@ static int dissect_version(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, } + static int dissect_cms_DigestAlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_x509af_AlgorithmIdentifier(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -321,6 +324,7 @@ static int dissect_digestAlgorithms(packet_info *pinfo, proto_tree *tree, tvbuff } + static int dissect_cms_T_eContentType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, @@ -357,6 +361,7 @@ static int dissect_eContent(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_cms_T_eContent(FALSE, tvb, offset, pinfo, tree, hf_cms_eContent); } + static const ber_sequence_t EncapsulatedContentInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_eContentType }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_eContent }, @@ -366,7 +371,7 @@ static const ber_sequence_t EncapsulatedContentInfo_sequence[] = { int dissect_cms_EncapsulatedContentInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - EncapsulatedContentInfo_sequence, hf_index, ett_cms_EncapsulatedContentInfo); + EncapsulatedContentInfo_sequence, hf_index, ett_cms_EncapsulatedContentInfo); return offset; } @@ -387,6 +392,7 @@ static int dissect_attrType(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_cms_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_cms_attrType); } + static const ber_sequence_t Attribute_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attrType }, { 0, 0, 0, NULL } @@ -395,7 +401,7 @@ static const ber_sequence_t Attribute_sequence[] = { static int dissect_cms_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(implicit_tag, pinfo, tree, tvb, offset, - Attribute_sequence, hf_index, ett_cms_Attribute); + Attribute_sequence, hf_index, ett_cms_Attribute); return offset; } @@ -434,6 +440,7 @@ static int dissect_attributes(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_cms_UnauthAttributes(FALSE, tvb, offset, pinfo, tree, hf_cms_attributes); } + static const ber_sequence_t ExtendedCertificateInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certificate }, @@ -444,7 +451,7 @@ static const ber_sequence_t ExtendedCertificateInfo_sequence[] = { static int dissect_cms_ExtendedCertificateInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - ExtendedCertificateInfo_sequence, hf_index, ett_cms_ExtendedCertificateInfo); + ExtendedCertificateInfo_sequence, hf_index, ett_cms_ExtendedCertificateInfo); return offset; } @@ -453,6 +460,7 @@ static int dissect_extendedCertificateInfo(packet_info *pinfo, proto_tree *tree, } + static int dissect_cms_SignatureAlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_x509af_AlgorithmIdentifier(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -464,11 +472,12 @@ static int dissect_signatureAlgorithm(packet_info *pinfo, proto_tree *tree, tvbu } + static int dissect_cms_Signature(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - NULL, hf_index, -1, - NULL); + NULL, hf_index, -1, + NULL); return offset; } @@ -476,6 +485,7 @@ static int dissect_signature(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_cms_Signature(FALSE, tvb, offset, pinfo, tree, hf_cms_signature); } + static const ber_sequence_t ExtendedCertificate_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_extendedCertificateInfo }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signatureAlgorithm }, @@ -486,7 +496,7 @@ static const ber_sequence_t ExtendedCertificate_sequence[] = { static int dissect_cms_ExtendedCertificate(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - ExtendedCertificate_sequence, hf_index, ett_cms_ExtendedCertificate); + ExtendedCertificate_sequence, hf_index, ett_cms_ExtendedCertificate); return offset; } @@ -512,7 +522,8 @@ 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, - CertificateChoices_choice, hf_index, ett_cms_CertificateChoices, NULL); + CertificateChoices_choice, hf_index, ett_cms_CertificateChoices, + NULL); return offset; } @@ -522,7 +533,7 @@ static int dissect_CertificateSet_item(packet_info *pinfo, proto_tree *tree, tvb static const ber_sequence_t CertificateSet_set_of[1] = { - { -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_CertificateSet_item }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_CertificateSet_item }, }; static int @@ -555,8 +566,9 @@ static int dissect_crls_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_cms_CertificateRevocationLists(TRUE, tvb, offset, pinfo, tree, hf_cms_crls); } + static const ber_sequence_t IssuerAndSerialNumber_sequence[] = { - { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber }, { 0, 0, 0, NULL } }; @@ -564,7 +576,7 @@ static const ber_sequence_t IssuerAndSerialNumber_sequence[] = { int dissect_cms_IssuerAndSerialNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - IssuerAndSerialNumber_sequence, hf_index, ett_cms_IssuerAndSerialNumber); + IssuerAndSerialNumber_sequence, hf_index, ett_cms_IssuerAndSerialNumber); return offset; } @@ -604,7 +616,8 @@ 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, - SignerIdentifier_choice, hf_index, ett_cms_SignerIdentifier, NULL); + SignerIdentifier_choice, hf_index, ett_cms_SignerIdentifier, + NULL); return offset; } @@ -657,9 +670,10 @@ static int dissect_unsignedAttrs_impl(packet_info *pinfo, proto_tree *tree, tvbu return dissect_cms_UnsignedAttributes(TRUE, tvb, offset, pinfo, tree, hf_cms_unsignedAttrs); } + static const ber_sequence_t SignerInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, - { -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_sid }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_sid }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithm }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_signedAttrs_impl }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signatureAlgorithm }, @@ -671,7 +685,7 @@ static const ber_sequence_t SignerInfo_sequence[] = { int dissect_cms_SignerInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - SignerInfo_sequence, hf_index, ett_cms_SignerInfo); + SignerInfo_sequence, hf_index, ett_cms_SignerInfo); return offset; } @@ -695,6 +709,7 @@ static int dissect_signerInfos(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_cms_SignerInfos(FALSE, tvb, offset, pinfo, tree, hf_cms_signerInfos); } + static const ber_sequence_t SignedData_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithms }, @@ -708,11 +723,12 @@ static const ber_sequence_t SignedData_sequence[] = { int dissect_cms_SignedData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - SignedData_sequence, hf_index, ett_cms_SignedData); + SignedData_sequence, hf_index, ett_cms_SignedData); return offset; } + static const ber_sequence_t OriginatorInfo_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_certs_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_crls_impl }, @@ -722,7 +738,7 @@ static const ber_sequence_t OriginatorInfo_sequence[] = { static int dissect_cms_OriginatorInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - OriginatorInfo_sequence, hf_index, ett_cms_OriginatorInfo); + OriginatorInfo_sequence, hf_index, ett_cms_OriginatorInfo); return offset; } @@ -746,7 +762,8 @@ 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, - RecipientIdentifier_choice, hf_index, ett_cms_RecipientIdentifier, NULL); + RecipientIdentifier_choice, hf_index, ett_cms_RecipientIdentifier, + NULL); return offset; } @@ -755,6 +772,7 @@ static int dissect_rid(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int } + static int dissect_cms_KeyEncryptionAlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_x509af_AlgorithmIdentifier(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -778,9 +796,10 @@ static int dissect_encryptedKey(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_cms_EncryptedKey(FALSE, tvb, offset, pinfo, tree, hf_cms_encryptedKey); } + static const ber_sequence_t KeyTransRecipientInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, - { -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_rid }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_rid }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_keyEncryptionAlgorithm }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_encryptedKey }, { 0, 0, 0, NULL } @@ -789,7 +808,7 @@ static const ber_sequence_t KeyTransRecipientInfo_sequence[] = { static int dissect_cms_KeyTransRecipientInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - KeyTransRecipientInfo_sequence, hf_index, ett_cms_KeyTransRecipientInfo); + KeyTransRecipientInfo_sequence, hf_index, ett_cms_KeyTransRecipientInfo); return offset; } @@ -798,11 +817,12 @@ static int dissect_ktri(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int } + static int dissect_cms_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - NULL, hf_index, -1, - NULL); + NULL, hf_index, -1, + NULL); return offset; } @@ -810,6 +830,7 @@ static int dissect_publicKey(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_cms_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_cms_publicKey); } + static const ber_sequence_t OriginatorPublicKey_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithm }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_publicKey }, @@ -819,7 +840,7 @@ static const ber_sequence_t OriginatorPublicKey_sequence[] = { static int dissect_cms_OriginatorPublicKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - OriginatorPublicKey_sequence, hf_index, ett_cms_OriginatorPublicKey); + OriginatorPublicKey_sequence, hf_index, ett_cms_OriginatorPublicKey); return offset; } @@ -845,7 +866,8 @@ 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, - OriginatorIdentifierOrKey_choice, hf_index, ett_cms_OriginatorIdentifierOrKey, NULL); + OriginatorIdentifierOrKey_choice, hf_index, ett_cms_OriginatorIdentifierOrKey, + NULL); return offset; } @@ -867,6 +889,7 @@ static int dissect_ukm(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int } + static int dissect_cms_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index); @@ -904,6 +927,7 @@ static int dissect_keyAttr(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_cms_T_keyAttr(FALSE, tvb, offset, pinfo, tree, hf_cms_keyAttr); } + static const ber_sequence_t OtherKeyAttribute_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_keyAttrId }, { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_keyAttr }, @@ -913,7 +937,7 @@ static const ber_sequence_t OtherKeyAttribute_sequence[] = { static int dissect_cms_OtherKeyAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - OtherKeyAttribute_sequence, hf_index, ett_cms_OtherKeyAttribute); + OtherKeyAttribute_sequence, hf_index, ett_cms_OtherKeyAttribute); return offset; } @@ -921,6 +945,7 @@ static int dissect_other(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in return dissect_cms_OtherKeyAttribute(FALSE, tvb, offset, pinfo, tree, hf_cms_other); } + static const ber_sequence_t RecipientKeyIdentifier_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_subjectKeyIdentifier }, { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_date }, @@ -931,7 +956,7 @@ static const ber_sequence_t RecipientKeyIdentifier_sequence[] = { static int dissect_cms_RecipientKeyIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - RecipientKeyIdentifier_sequence, hf_index, ett_cms_RecipientKeyIdentifier); + RecipientKeyIdentifier_sequence, hf_index, ett_cms_RecipientKeyIdentifier); return offset; } @@ -955,7 +980,8 @@ 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, - KeyAgreeRecipientIdentifier_choice, hf_index, ett_cms_KeyAgreeRecipientIdentifier, NULL); + KeyAgreeRecipientIdentifier_choice, hf_index, ett_cms_KeyAgreeRecipientIdentifier, + NULL); return offset; } @@ -963,8 +989,9 @@ static int dissect_rekRid(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_cms_KeyAgreeRecipientIdentifier(FALSE, tvb, offset, pinfo, tree, hf_cms_rekRid); } + static const ber_sequence_t RecipientEncryptedKey_sequence[] = { - { -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_rekRid }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_rekRid }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_encryptedKey }, { 0, 0, 0, NULL } }; @@ -972,7 +999,7 @@ static const ber_sequence_t RecipientEncryptedKey_sequence[] = { static int dissect_cms_RecipientEncryptedKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - RecipientEncryptedKey_sequence, hf_index, ett_cms_RecipientEncryptedKey); + RecipientEncryptedKey_sequence, hf_index, ett_cms_RecipientEncryptedKey); return offset; } @@ -996,6 +1023,7 @@ static int dissect_recipientEncryptedKeys(packet_info *pinfo, proto_tree *tree, return dissect_cms_RecipientEncryptedKeys(FALSE, tvb, offset, pinfo, tree, hf_cms_recipientEncryptedKeys); } + static const ber_sequence_t KeyAgreeRecipientInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_originator }, @@ -1008,7 +1036,7 @@ static const ber_sequence_t KeyAgreeRecipientInfo_sequence[] = { static int dissect_cms_KeyAgreeRecipientInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - KeyAgreeRecipientInfo_sequence, hf_index, ett_cms_KeyAgreeRecipientInfo); + KeyAgreeRecipientInfo_sequence, hf_index, ett_cms_KeyAgreeRecipientInfo); return offset; } @@ -1029,6 +1057,7 @@ static int dissect_keyIdentifier(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_cms_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_cms_keyIdentifier); } + static const ber_sequence_t KEKIdentifier_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_keyIdentifier }, { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_date }, @@ -1039,7 +1068,7 @@ static const ber_sequence_t KEKIdentifier_sequence[] = { static int dissect_cms_KEKIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - KEKIdentifier_sequence, hf_index, ett_cms_KEKIdentifier); + KEKIdentifier_sequence, hf_index, ett_cms_KEKIdentifier); return offset; } @@ -1047,6 +1076,7 @@ static int dissect_kekid(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in return dissect_cms_KEKIdentifier(FALSE, tvb, offset, pinfo, tree, hf_cms_kekid); } + static const ber_sequence_t KEKRecipientInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_kekid }, @@ -1058,7 +1088,7 @@ static const ber_sequence_t KEKRecipientInfo_sequence[] = { static int dissect_cms_KEKRecipientInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - KEKRecipientInfo_sequence, hf_index, ett_cms_KEKRecipientInfo); + KEKRecipientInfo_sequence, hf_index, ett_cms_KEKRecipientInfo); return offset; } @@ -1084,7 +1114,8 @@ 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, - RecipientInfo_choice, hf_index, ett_cms_RecipientInfo, NULL); + RecipientInfo_choice, hf_index, ett_cms_RecipientInfo, + NULL); return offset; } @@ -1094,7 +1125,7 @@ static int dissect_RecipientInfos_item(packet_info *pinfo, proto_tree *tree, tvb static const ber_sequence_t RecipientInfos_set_of[1] = { - { -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_RecipientInfos_item }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_RecipientInfos_item }, }; static int @@ -1109,6 +1140,7 @@ static int dissect_recipientInfos(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_cms_ContentEncryptionAlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_x509af_AlgorithmIdentifier(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -1132,6 +1164,7 @@ static int dissect_encryptedContent_impl(packet_info *pinfo, proto_tree *tree, t return dissect_cms_EncryptedContent(TRUE, tvb, offset, pinfo, tree, hf_cms_encryptedContent); } + static const ber_sequence_t EncryptedContentInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contentType1 }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_contentEncryptionAlgorithm }, @@ -1142,7 +1175,7 @@ static const ber_sequence_t EncryptedContentInfo_sequence[] = { static int dissect_cms_EncryptedContentInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - EncryptedContentInfo_sequence, hf_index, ett_cms_EncryptedContentInfo); + EncryptedContentInfo_sequence, hf_index, ett_cms_EncryptedContentInfo); return offset; } @@ -1166,6 +1199,7 @@ static int dissect_unprotectedAttrs_impl(packet_info *pinfo, proto_tree *tree, t return dissect_cms_UnprotectedAttributes(TRUE, tvb, offset, pinfo, tree, hf_cms_unprotectedAttrs); } + static const ber_sequence_t EnvelopedData_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originatorInfo_impl }, @@ -1178,7 +1212,7 @@ static const ber_sequence_t EnvelopedData_sequence[] = { int dissect_cms_EnvelopedData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - EnvelopedData_sequence, hf_index, ett_cms_EnvelopedData); + EnvelopedData_sequence, hf_index, ett_cms_EnvelopedData); return offset; } @@ -1196,6 +1230,7 @@ static int dissect_digest(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_cms_Digest(FALSE, tvb, offset, pinfo, tree, hf_cms_digest); } + static const ber_sequence_t DigestedData_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithm }, @@ -1207,11 +1242,12 @@ static const ber_sequence_t DigestedData_sequence[] = { static int dissect_cms_DigestedData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - DigestedData_sequence, hf_index, ett_cms_DigestedData); + DigestedData_sequence, hf_index, ett_cms_DigestedData); return offset; } + static const ber_sequence_t EncryptedData_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_encryptedContentInfo }, @@ -1222,12 +1258,13 @@ static const ber_sequence_t EncryptedData_sequence[] = { static int dissect_cms_EncryptedData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - EncryptedData_sequence, hf_index, ett_cms_EncryptedData); + EncryptedData_sequence, hf_index, ett_cms_EncryptedData); return offset; } + static int dissect_cms_MessageAuthenticationCodeAlgorithm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_x509af_AlgorithmIdentifier(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -1267,6 +1304,7 @@ static int dissect_mac(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_cms_MessageAuthenticationCode(FALSE, tvb, offset, pinfo, tree, hf_cms_mac); } + static const ber_sequence_t AuthenticatedData_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originatorInfo_impl }, @@ -1283,12 +1321,13 @@ static const ber_sequence_t AuthenticatedData_sequence[] = { static int dissect_cms_AuthenticatedData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - AuthenticatedData_sequence, hf_index, ett_cms_AuthenticatedData); + AuthenticatedData_sequence, hf_index, ett_cms_AuthenticatedData); return offset; } + int dissect_cms_Countersignature(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_cms_SignerInfo(implicit_tag, tvb, offset, pinfo, tree, hf_index); diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c index deaba2d860..cceeccb7b3 100644 --- a/epan/dissectors/packet-crmf.c +++ b/epan/dissectors/packet-crmf.c @@ -233,11 +233,12 @@ static int dissect_version_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t * } + static int dissect_crmf_UniqueIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - NULL, hf_index, -1, - NULL); + NULL, hf_index, -1, + NULL); return offset; } @@ -249,11 +250,12 @@ static int dissect_subjectUID_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ } + static int dissect_crmf_UTCTime(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, BER_UNI_TAG_UTCTime, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -262,6 +264,7 @@ static int dissect_utcTime(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, } + static int dissect_crmf_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index); @@ -288,7 +291,8 @@ 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, - Time_choice, hf_index, ett_crmf_Time, NULL); + Time_choice, hf_index, ett_crmf_Time, + NULL); return offset; } @@ -321,6 +325,7 @@ static int dissect_iterationCount(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_crmf_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_crmf_iterationCount); } + static const ber_sequence_t OptionalValidity_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_notBefore_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_notAfter_impl }, @@ -330,7 +335,7 @@ static const ber_sequence_t OptionalValidity_sequence[] = { int dissect_crmf_OptionalValidity(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - OptionalValidity_sequence, hf_index, ett_crmf_OptionalValidity); + OptionalValidity_sequence, hf_index, ett_crmf_OptionalValidity); return offset; } @@ -338,6 +343,7 @@ static int dissect_validity_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_crmf_OptionalValidity(TRUE, tvb, offset, pinfo, tree, hf_crmf_validity); } + static const ber_sequence_t CertTemplate_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_version_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serialNumber_impl }, @@ -355,7 +361,7 @@ static const ber_sequence_t CertTemplate_sequence[] = { int dissect_crmf_CertTemplate(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - CertTemplate_sequence, hf_index, ett_crmf_CertTemplate); + CertTemplate_sequence, hf_index, ett_crmf_CertTemplate); return offset; } @@ -390,6 +396,7 @@ static int dissect_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in return dissect_crmf_T_value(FALSE, tvb, offset, pinfo, tree, hf_crmf_value); } + static const ber_sequence_t AttributeTypeAndValue_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type }, { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_value }, @@ -399,7 +406,7 @@ static const ber_sequence_t AttributeTypeAndValue_sequence[] = { int dissect_crmf_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(implicit_tag, pinfo, tree, tvb, offset, - AttributeTypeAndValue_sequence, hf_index, ett_crmf_AttributeTypeAndValue); + AttributeTypeAndValue_sequence, hf_index, ett_crmf_AttributeTypeAndValue); return offset; } @@ -426,6 +433,7 @@ static int dissect_controls(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_crmf_Controls(FALSE, tvb, offset, pinfo, tree, hf_crmf_controls); } + static const ber_sequence_t CertRequest_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_certReqId }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certTemplate }, @@ -436,7 +444,7 @@ static const ber_sequence_t CertRequest_sequence[] = { int dissect_crmf_CertRequest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - CertRequest_sequence, hf_index, ett_crmf_CertRequest); + CertRequest_sequence, hf_index, ett_crmf_CertRequest); return offset; } @@ -457,11 +465,12 @@ static int dissect_raVerified_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ } + static int dissect_crmf_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - NULL, hf_index, -1, - NULL); + NULL, hf_index, -1, + NULL); return offset; } @@ -484,6 +493,7 @@ static int dissect_encValue(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_crmf_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_crmf_encValue); } + static const ber_sequence_t PKMACValue_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algId }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_pkmac_value }, @@ -493,7 +503,7 @@ static const ber_sequence_t PKMACValue_sequence[] = { int dissect_crmf_PKMACValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - PKMACValue_sequence, hf_index, ett_crmf_PKMACValue); + PKMACValue_sequence, hf_index, ett_crmf_PKMACValue); return offset; } @@ -517,7 +527,8 @@ 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, - T_authInfo_choice, hf_index, ett_crmf_T_authInfo, NULL); + T_authInfo_choice, hf_index, ett_crmf_T_authInfo, + NULL); return offset; } @@ -525,8 +536,9 @@ static int dissect_authInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_crmf_T_authInfo(FALSE, tvb, offset, pinfo, tree, hf_crmf_authInfo); } + static const ber_sequence_t POPOSigningKeyInput_sequence[] = { - { -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_authInfo }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_authInfo }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_publicKey }, { 0, 0, 0, NULL } }; @@ -534,7 +546,7 @@ static const ber_sequence_t POPOSigningKeyInput_sequence[] = { int dissect_crmf_POPOSigningKeyInput(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - POPOSigningKeyInput_sequence, hf_index, ett_crmf_POPOSigningKeyInput); + POPOSigningKeyInput_sequence, hf_index, ett_crmf_POPOSigningKeyInput); return offset; } @@ -542,6 +554,7 @@ static int dissect_poposkInput_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_crmf_POPOSigningKeyInput(TRUE, tvb, offset, pinfo, tree, hf_crmf_poposkInput); } + static const ber_sequence_t POPOSigningKey_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_poposkInput_impl }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier }, @@ -552,7 +565,7 @@ static const ber_sequence_t POPOSigningKey_sequence[] = { int dissect_crmf_POPOSigningKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - POPOSigningKey_sequence, hf_index, ett_crmf_POPOSigningKey); + POPOSigningKey_sequence, hf_index, ett_crmf_POPOSigningKey); return offset; } @@ -597,7 +610,8 @@ 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, - POPOPrivKey_choice, hf_index, ett_crmf_POPOPrivKey, NULL); + POPOPrivKey_choice, hf_index, ett_crmf_POPOPrivKey, + NULL); return offset; } @@ -628,7 +642,8 @@ 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, - ProofOfPossession_choice, hf_index, ett_crmf_ProofOfPossession, NULL); + ProofOfPossession_choice, hf_index, ett_crmf_ProofOfPossession, + NULL); return offset; } @@ -652,9 +667,10 @@ static int dissect_regInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_crmf_SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue(FALSE, tvb, offset, pinfo, tree, hf_crmf_regInfo); } + static const ber_sequence_t CertReqMsg_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certReq }, - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_pop }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_pop }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_regInfo }, { 0, 0, 0, NULL } }; @@ -662,7 +678,7 @@ static const ber_sequence_t CertReqMsg_sequence[] = { int dissect_crmf_CertReqMsg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - CertReqMsg_sequence, hf_index, ett_crmf_CertReqMsg); + CertReqMsg_sequence, hf_index, ett_crmf_CertReqMsg); return offset; } @@ -699,6 +715,7 @@ static int dissect_valueHint_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_crmf_OCTET_STRING(TRUE, tvb, offset, pinfo, tree, hf_crmf_valueHint); } + static const ber_sequence_t PBMParameter_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_salt }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_owf }, @@ -710,27 +727,29 @@ static const ber_sequence_t PBMParameter_sequence[] = { int dissect_crmf_PBMParameter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - PBMParameter_sequence, hf_index, ett_crmf_PBMParameter); + PBMParameter_sequence, hf_index, ett_crmf_PBMParameter); return offset; } + int dissect_crmf_RegToken(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, BER_UNI_TAG_UTF8String, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } + int dissect_crmf_Authenticator(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, BER_UNI_TAG_UTF8String, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -775,6 +794,7 @@ static int dissect_pubMethod(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_crmf_T_pubMethod(FALSE, tvb, offset, pinfo, tree, hf_crmf_pubMethod); } + static const ber_sequence_t SinglePubInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pubMethod }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_pubLocation }, @@ -784,7 +804,7 @@ static const ber_sequence_t SinglePubInfo_sequence[] = { int dissect_crmf_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(implicit_tag, pinfo, tree, tvb, offset, - SinglePubInfo_sequence, hf_index, ett_crmf_SinglePubInfo); + SinglePubInfo_sequence, hf_index, ett_crmf_SinglePubInfo); return offset; } @@ -808,6 +828,7 @@ static int dissect_pubInfos(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_crmf_SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo(FALSE, tvb, offset, pinfo, tree, hf_crmf_pubInfos); } + static const ber_sequence_t PKIPublicationInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_action }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_pubInfos }, @@ -817,11 +838,12 @@ static const ber_sequence_t PKIPublicationInfo_sequence[] = { int dissect_crmf_PKIPublicationInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - PKIPublicationInfo_sequence, hf_index, ett_crmf_PKIPublicationInfo); + PKIPublicationInfo_sequence, hf_index, ett_crmf_PKIPublicationInfo); return offset; } + static const ber_sequence_t EncryptedValue_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_intendedAlg_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_symmAlg_impl }, @@ -835,7 +857,7 @@ static const ber_sequence_t EncryptedValue_sequence[] = { int dissect_crmf_EncryptedValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - EncryptedValue_sequence, hf_index, ett_crmf_EncryptedValue); + EncryptedValue_sequence, hf_index, ett_crmf_EncryptedValue); return offset; } @@ -859,7 +881,8 @@ 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, - EncryptedKey_choice, hf_index, ett_crmf_EncryptedKey, NULL); + EncryptedKey_choice, hf_index, ett_crmf_EncryptedKey, + NULL); return offset; } @@ -910,11 +933,13 @@ 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, - PKIArchiveOptions_choice, hf_index, ett_crmf_PKIArchiveOptions, NULL); + PKIArchiveOptions_choice, hf_index, ett_crmf_PKIArchiveOptions, + NULL); return offset; } + static const ber_sequence_t CertId_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber }, @@ -924,12 +949,13 @@ static const ber_sequence_t CertId_sequence[] = { int dissect_crmf_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(implicit_tag, pinfo, tree, tvb, offset, - CertId_sequence, hf_index, ett_crmf_CertId); + CertId_sequence, hf_index, ett_crmf_CertId); return offset; } + int dissect_crmf_OldCertId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_crmf_CertId(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -938,6 +964,7 @@ dissect_crmf_OldCertId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac } + int dissect_crmf_ProtocolEncrKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_pkix1explicit_SubjectPublicKeyInfo(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -946,16 +973,18 @@ dissect_crmf_ProtocolEncrKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse } + int dissect_crmf_UTF8Pairs(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, BER_UNI_TAG_UTF8String, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } + int dissect_crmf_CertReq(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_crmf_CertRequest(implicit_tag, tvb, offset, pinfo, tree, hf_index); diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c index a5df540ded..1e49d2ebbe 100644 --- a/epan/dissectors/packet-ess.c +++ b/epan/dissectors/packet-ess.c @@ -240,7 +240,8 @@ 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, - ReceiptsFrom_choice, hf_index, ett_ess_ReceiptsFrom, NULL); + ReceiptsFrom_choice, hf_index, ett_ess_ReceiptsFrom, + NULL); return offset; } @@ -248,9 +249,10 @@ static int dissect_receiptsFrom(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_ess_ReceiptsFrom(FALSE, tvb, offset, pinfo, tree, hf_ess_receiptsFrom); } + static const ber_sequence_t ReceiptRequest_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_signedContentIdentifier }, - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_receiptsFrom }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_receiptsFrom }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_receiptsTo }, { 0, 0, 0, NULL } }; @@ -258,7 +260,7 @@ static const ber_sequence_t ReceiptRequest_sequence[] = { static int dissect_ess_ReceiptRequest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - ReceiptRequest_sequence, hf_index, ett_ess_ReceiptRequest); + ReceiptRequest_sequence, hf_index, ett_ess_ReceiptRequest); return offset; } @@ -294,6 +296,7 @@ static int dissect_originatorSignatureValue(packet_info *pinfo, proto_tree *tree return dissect_ess_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_ess_originatorSignatureValue); } + static const ber_sequence_t Receipt_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contentType }, @@ -305,17 +308,18 @@ static const ber_sequence_t Receipt_sequence[] = { static int dissect_ess_Receipt(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - Receipt_sequence, hf_index, ett_ess_Receipt); + Receipt_sequence, hf_index, ett_ess_Receipt); return offset; } + static int dissect_ess_UTF8String(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, BER_UNI_TAG_UTF8String, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -326,6 +330,7 @@ static int dissect_utf8String(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_ess_UTF8String(FALSE, tvb, offset, pinfo, tree, hf_ess_utf8String); } + static const ber_sequence_t ContentHints_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_UTF8String, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_contentDescription }, { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contentType }, @@ -335,7 +340,7 @@ static const ber_sequence_t ContentHints_sequence[] = { static int dissect_ess_ContentHints(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - ContentHints_sequence, hf_index, ett_ess_ContentHints); + ContentHints_sequence, hf_index, ett_ess_ContentHints); return offset; } @@ -350,6 +355,7 @@ dissect_ess_MsgSigDigest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p return offset; } + static const ber_sequence_t ContentReference_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contentType }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_signedContentIdentifier }, @@ -360,7 +366,7 @@ static const ber_sequence_t ContentReference_sequence[] = { static int dissect_ess_ContentReference(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - ContentReference_sequence, hf_index, ett_ess_ContentReference); + ContentReference_sequence, hf_index, ett_ess_ContentReference); return offset; } @@ -396,11 +402,12 @@ dissect_ess_SecurityClassification(gboolean implicit_tag _U_, tvbuff_t *tvb, int } + static int dissect_ess_PrintableString(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, BER_UNI_TAG_PrintableString, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -424,7 +431,8 @@ 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, - ESSPrivacyMark_choice, hf_index, ett_ess_ESSPrivacyMark, NULL); + ESSPrivacyMark_choice, hf_index, ett_ess_ESSPrivacyMark, + NULL); return offset; } @@ -456,6 +464,7 @@ static int dissect_value_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_ess_T_value(TRUE, tvb, offset, pinfo, tree, hf_ess_value); } + static const ber_sequence_t SecurityCategory_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_type_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_value_impl }, @@ -465,7 +474,7 @@ static const ber_sequence_t SecurityCategory_sequence[] = { static int dissect_ess_SecurityCategory(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - SecurityCategory_sequence, hf_index, ett_ess_SecurityCategory); + SecurityCategory_sequence, hf_index, ett_ess_SecurityCategory); return offset; } @@ -502,7 +511,8 @@ 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, - EntityIdentifier_choice, hf_index, ett_ess_EntityIdentifier, NULL); + EntityIdentifier_choice, hf_index, ett_ess_EntityIdentifier, + NULL); return offset; } @@ -511,6 +521,7 @@ static int dissect_mailListIdentifier(packet_info *pinfo, proto_tree *tree, tvbu } + static int dissect_ess_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index); @@ -551,7 +562,8 @@ 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, - MLReceiptPolicy_choice, hf_index, ett_ess_MLReceiptPolicy, NULL); + MLReceiptPolicy_choice, hf_index, ett_ess_MLReceiptPolicy, + NULL); return offset; } @@ -559,17 +571,18 @@ static int dissect_mlReceiptPolicy(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_ess_MLReceiptPolicy(FALSE, tvb, offset, pinfo, tree, hf_ess_mlReceiptPolicy); } + static const ber_sequence_t MLData_sequence[] = { - { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mailListIdentifier }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mailListIdentifier }, { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_expansionTime }, - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mlReceiptPolicy }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mlReceiptPolicy }, { 0, 0, 0, NULL } }; static int dissect_ess_MLData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - MLData_sequence, hf_index, ett_ess_MLData); + MLData_sequence, hf_index, ett_ess_MLData); return offset; } @@ -603,6 +616,7 @@ static int dissect_certHash(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_ess_Hash(FALSE, tvb, offset, pinfo, tree, hf_ess_certHash); } + static const ber_sequence_t IssuerSerial_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuer }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber }, @@ -612,7 +626,7 @@ static const ber_sequence_t IssuerSerial_sequence[] = { static int dissect_ess_IssuerSerial(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - IssuerSerial_sequence, hf_index, ett_ess_IssuerSerial); + IssuerSerial_sequence, hf_index, ett_ess_IssuerSerial); return offset; } @@ -620,6 +634,7 @@ static int dissect_issuerSerial(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_ess_IssuerSerial(FALSE, tvb, offset, pinfo, tree, hf_ess_issuerSerial); } + static const ber_sequence_t ESSCertID_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_certHash }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_issuerSerial }, @@ -629,7 +644,7 @@ static const ber_sequence_t ESSCertID_sequence[] = { static int dissect_ess_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(implicit_tag, pinfo, tree, tvb, offset, - ESSCertID_sequence, hf_index, ett_ess_ESSCertID); + ESSCertID_sequence, hf_index, ett_ess_ESSCertID); return offset; } @@ -669,6 +684,7 @@ static int dissect_policies(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_ess_SEQUENCE_OF_PolicyInformation(FALSE, tvb, offset, pinfo, tree, hf_ess_policies); } + static const ber_sequence_t SigningCertificate_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certs }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_policies }, @@ -678,7 +694,7 @@ static const ber_sequence_t SigningCertificate_sequence[] = { static int dissect_ess_SigningCertificate(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - SigningCertificate_sequence, hf_index, ett_ess_SigningCertificate); + SigningCertificate_sequence, hf_index, ett_ess_SigningCertificate); return offset; } diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index 1108321b7e..5d08ed1f59 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -669,6 +669,7 @@ static int dissect_actual_values4_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_acse_EXTERNAL(TRUE, tvb, offset, pinfo, tree, hf_ftam_actual_values4); } + static const asn_namedbit Protocol_Version_bits[] = { { 0, &hf_ftam_Protocol_Version_version_1, -1, -1, "version-1", NULL }, { 1, &hf_ftam_Protocol_Version_version_2, -1, -1, "version-2", NULL }, @@ -701,6 +702,7 @@ static int dissect_protocol_Version(packet_info *pinfo, proto_tree *tree, tvbuff } + static int dissect_ftam_Implementation_Information(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { gint8 class; @@ -753,6 +755,7 @@ static int dissect_boolean_value_impl(packet_info *pinfo, proto_tree *tree, tvbu return dissect_ftam_BOOLEAN(TRUE, tvb, offset, pinfo, tree, hf_ftam_boolean_value); } + static const asn_namedbit Service_Class_bits[] = { { 0, &hf_ftam_Service_Class_unconstrained_class, -1, -1, "unconstrained-class", NULL }, { 1, &hf_ftam_Service_Class_management_class, -1, -1, "management-class", NULL }, @@ -787,6 +790,7 @@ static int dissect_service_class(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_ftam_Service_Class(FALSE, tvb, offset, pinfo, tree, hf_ftam_service_class); } + static const asn_namedbit Functional_Units_bits[] = { { 2, &hf_ftam_Functional_Units_read, -1, -1, "read", NULL }, { 3, &hf_ftam_Functional_Units_write, -1, -1, "write", NULL }, @@ -832,6 +836,7 @@ static int dissect_functional_units(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_ftam_Functional_Units(FALSE, tvb, offset, pinfo, tree, hf_ftam_functional_units); } + static const asn_namedbit Attribute_Groups_bits[] = { { 0, &hf_ftam_Attribute_Groups_storage, -1, -1, "storage", NULL }, { 1, &hf_ftam_Attribute_Groups_security, -1, -1, "security", NULL }, @@ -867,6 +872,7 @@ static int dissect_attribute_groups(packet_info *pinfo, proto_tree *tree, tvbuff } + static int dissect_ftam_Shared_ASE_Information(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_acse_EXTERNAL(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -989,7 +995,8 @@ 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, - Contents_Type_List_item_choice, hf_index, ett_ftam_Contents_Type_List_item, NULL); + Contents_Type_List_item_choice, hf_index, ett_ftam_Contents_Type_List_item, + NULL); return offset; } @@ -999,7 +1006,7 @@ static int dissect_Contents_Type_List_item(packet_info *pinfo, proto_tree *tree, 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 }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_Contents_Type_List_item }, }; static int @@ -1028,6 +1035,7 @@ static int dissect_contents_type_list(packet_info *pinfo, proto_tree *tree, tvbu } + static int dissect_ftam_User_Identity(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { gint8 class; @@ -1059,6 +1067,7 @@ static int dissect_actual_values6(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_ftam_Account(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { gint8 class; @@ -1087,11 +1096,12 @@ static int dissect_actual_values2(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_ftam_GraphicString(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, BER_UNI_TAG_GraphicString, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1313,6 +1323,7 @@ static int dissect_success_Object_count_impl(packet_info *pinfo, proto_tree *tre return dissect_ftam_INTEGER(TRUE, tvb, offset, pinfo, tree, hf_ftam_success_Object_count); } + static const ber_sequence_t F_INITIALIZE_request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_protocol_Version }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_implementation_information }, @@ -1333,7 +1344,7 @@ static const ber_sequence_t F_INITIALIZE_request_sequence[] = { static int dissect_ftam_F_INITIALIZE_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(implicit_tag, pinfo, tree, tvb, offset, - F_INITIALIZE_request_sequence, hf_index, ett_ftam_F_INITIALIZE_request); + F_INITIALIZE_request_sequence, hf_index, ett_ftam_F_INITIALIZE_request); return offset; } @@ -1453,6 +1464,7 @@ static int dissect_error_Source_impl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_ftam_Entity_Reference(TRUE, tvb, offset, pinfo, tree, hf_ftam_error_Source); } + static const ber_sequence_t Diagnostic_item_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_diagnostic_type_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_error_identifier_impl }, @@ -1466,7 +1478,7 @@ static const ber_sequence_t Diagnostic_item_sequence[] = { static int dissect_ftam_Diagnostic_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - Diagnostic_item_sequence, hf_index, ett_ftam_Diagnostic_item); + Diagnostic_item_sequence, hf_index, ett_ftam_Diagnostic_item); return offset; } @@ -1504,6 +1516,7 @@ static int dissect_diagnostic(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_ftam_Diagnostic(FALSE, tvb, offset, pinfo, tree, hf_ftam_diagnostic); } + static const ber_sequence_t F_INITIALIZE_response_sequence[] = { { BER_CLASS_APP, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_state_result }, { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, @@ -1524,7 +1537,7 @@ static const ber_sequence_t F_INITIALIZE_response_sequence[] = { static int dissect_ftam_F_INITIALIZE_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(implicit_tag, pinfo, tree, tvb, offset, - F_INITIALIZE_response_sequence, hf_index, ett_ftam_F_INITIALIZE_response); + F_INITIALIZE_response_sequence, hf_index, ett_ftam_F_INITIALIZE_response); return offset; } @@ -1532,6 +1545,7 @@ static int dissect_f_initialize_response_impl(packet_info *pinfo, proto_tree *tr return dissect_ftam_F_INITIALIZE_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_initialize_response); } + static const ber_sequence_t F_TERMINATE_request_sequence[] = { { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information }, { 0, 0, 0, NULL } @@ -1540,7 +1554,7 @@ static const ber_sequence_t F_TERMINATE_request_sequence[] = { static int dissect_ftam_F_TERMINATE_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(implicit_tag, pinfo, tree, tvb, offset, - F_TERMINATE_request_sequence, hf_index, ett_ftam_F_TERMINATE_request); + F_TERMINATE_request_sequence, hf_index, ett_ftam_F_TERMINATE_request); return offset; } @@ -1548,6 +1562,7 @@ static int dissect_f_terminate_request_impl(packet_info *pinfo, proto_tree *tree return dissect_ftam_F_TERMINATE_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_terminate_request); } + static const ber_sequence_t Charging_item_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_resource_identifier_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_charging_unit_impl }, @@ -1558,7 +1573,7 @@ static const ber_sequence_t Charging_item_sequence[] = { static int dissect_ftam_Charging_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - Charging_item_sequence, hf_index, ett_ftam_Charging_item); + Charging_item_sequence, hf_index, ett_ftam_Charging_item); return offset; } @@ -1596,6 +1611,7 @@ static int dissect_charging(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_ftam_Charging(FALSE, tvb, offset, pinfo, tree, hf_ftam_charging); } + static const ber_sequence_t F_TERMINATE_response_sequence[] = { { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information }, { BER_CLASS_APP, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_charging }, @@ -1605,7 +1621,7 @@ static const ber_sequence_t F_TERMINATE_response_sequence[] = { static int dissect_ftam_F_TERMINATE_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(implicit_tag, pinfo, tree, tvb, offset, - F_TERMINATE_response_sequence, hf_index, ett_ftam_F_TERMINATE_response); + F_TERMINATE_response_sequence, hf_index, ett_ftam_F_TERMINATE_response); return offset; } @@ -1613,6 +1629,7 @@ static int dissect_f_terminate_response_impl(packet_info *pinfo, proto_tree *tre return dissect_ftam_F_TERMINATE_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_terminate_response); } + static const ber_sequence_t F_U_ABORT_request_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnostic }, @@ -1622,7 +1639,7 @@ static const ber_sequence_t F_U_ABORT_request_sequence[] = { static int dissect_ftam_F_U_ABORT_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(implicit_tag, pinfo, tree, tvb, offset, - F_U_ABORT_request_sequence, hf_index, ett_ftam_F_U_ABORT_request); + F_U_ABORT_request_sequence, hf_index, ett_ftam_F_U_ABORT_request); return offset; } @@ -1630,6 +1647,7 @@ static int dissect_f_u_abort_request_impl(packet_info *pinfo, proto_tree *tree, return dissect_ftam_F_U_ABORT_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_u_abort_request); } + static const ber_sequence_t F_P_ABORT_request_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnostic }, @@ -1639,7 +1657,7 @@ static const ber_sequence_t F_P_ABORT_request_sequence[] = { static int dissect_ftam_F_P_ABORT_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(implicit_tag, pinfo, tree, tvb, offset, - F_P_ABORT_request_sequence, hf_index, ett_ftam_F_P_ABORT_request); + F_P_ABORT_request_sequence, hf_index, ett_ftam_F_P_ABORT_request); return offset; } @@ -1726,7 +1744,8 @@ 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, - Pathname_Attribute_choice, hf_index, ett_ftam_Pathname_Attribute, NULL); + Pathname_Attribute_choice, hf_index, ett_ftam_Pathname_Attribute, + NULL); return offset; } @@ -1749,8 +1768,9 @@ static int dissect_root_directory(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_ftam_Pathname_Attribute(FALSE, tvb, offset, pinfo, tree, hf_ftam_root_directory); } + static const ber_sequence_t Select_Attributes_sequence[] = { - { -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_pathname }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_pathname }, { 0, 0, 0, NULL } }; @@ -1778,6 +1798,7 @@ static int dissect_select_attributes(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_ftam_Select_Attributes(FALSE, tvb, offset, pinfo, tree, hf_ftam_select_attributes); } + static const asn_namedbit Access_Request_bits[] = { { 0, &hf_ftam_Access_Request_read, -1, -1, "read", NULL }, { 1, &hf_ftam_Access_Request_insert, -1, -1, "insert", NULL }, @@ -1833,6 +1854,7 @@ static int dissect_pass_passwords_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_ftam_Pass_Passwords(TRUE, tvb, offset, pinfo, tree, hf_ftam_pass_passwords); } + static const ber_sequence_t Access_Passwords_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_read_password }, { BER_CLASS_CON, 1, 0, dissect_insert_password }, @@ -1874,6 +1896,7 @@ static int dissect_passwords_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_ftam_Access_Passwords(TRUE, tvb, offset, pinfo, tree, hf_ftam_passwords); } + static const ber_sequence_t Path_Access_Passwords_item_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_read_password_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_insert_password_impl }, @@ -1891,7 +1914,7 @@ static const ber_sequence_t Path_Access_Passwords_item_sequence[] = { static int dissect_ftam_Path_Access_Passwords_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - Path_Access_Passwords_item_sequence, hf_index, ett_ftam_Path_Access_Passwords_item); + Path_Access_Passwords_item_sequence, hf_index, ett_ftam_Path_Access_Passwords_item); return offset; } @@ -1970,6 +1993,7 @@ static int dissect_delete_Object_lock_impl(packet_info *pinfo, proto_tree *tree, return dissect_ftam_Lock(TRUE, tvb, offset, pinfo, tree, hf_ftam_delete_Object_lock); } + static const ber_sequence_t Concurrency_Control_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_read_lock_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_insert_lock_impl }, @@ -2007,6 +2031,7 @@ static int dissect_concurrency_control(packet_info *pinfo, proto_tree *tree, tvb return dissect_ftam_Concurrency_Control(FALSE, tvb, offset, pinfo, tree, hf_ftam_concurrency_control); } + static const ber_sequence_t F_SELECT_request_sequence[] = { { BER_CLASS_APP, 19, BER_FLAGS_NOOWNTAG, dissect_select_attributes }, { BER_CLASS_APP, 3, BER_FLAGS_NOOWNTAG, dissect_requested_access }, @@ -2021,7 +2046,7 @@ static const ber_sequence_t F_SELECT_request_sequence[] = { static int dissect_ftam_F_SELECT_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(implicit_tag, pinfo, tree, tvb, offset, - F_SELECT_request_sequence, hf_index, ett_ftam_F_SELECT_request); + F_SELECT_request_sequence, hf_index, ett_ftam_F_SELECT_request); return offset; } @@ -2054,6 +2079,7 @@ static int dissect_referent_indicator(packet_info *pinfo, proto_tree *tree, tvbu return dissect_ftam_Referent_Indicator(FALSE, tvb, offset, pinfo, tree, hf_ftam_referent_indicator); } + static const ber_sequence_t F_SELECT_response_sequence[] = { { BER_CLASS_APP, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_state_result }, { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, @@ -2067,7 +2093,7 @@ static const ber_sequence_t F_SELECT_response_sequence[] = { static int dissect_ftam_F_SELECT_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(implicit_tag, pinfo, tree, tvb, offset, - F_SELECT_response_sequence, hf_index, ett_ftam_F_SELECT_response); + F_SELECT_response_sequence, hf_index, ett_ftam_F_SELECT_response); return offset; } @@ -2075,6 +2101,7 @@ static int dissect_f_select_response_impl(packet_info *pinfo, proto_tree *tree, return dissect_ftam_F_SELECT_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_select_response); } + static const ber_sequence_t F_DESELECT_request_sequence[] = { { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information }, { 0, 0, 0, NULL } @@ -2083,7 +2110,7 @@ static const ber_sequence_t F_DESELECT_request_sequence[] = { static int dissect_ftam_F_DESELECT_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(implicit_tag, pinfo, tree, tvb, offset, - F_DESELECT_request_sequence, hf_index, ett_ftam_F_DESELECT_request); + F_DESELECT_request_sequence, hf_index, ett_ftam_F_DESELECT_request); return offset; } @@ -2091,6 +2118,7 @@ static int dissect_f_deselect_request_impl(packet_info *pinfo, proto_tree *tree, return dissect_ftam_F_DESELECT_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_deselect_request); } + static const ber_sequence_t F_DESELECT_response_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_charging }, @@ -2102,7 +2130,7 @@ static const ber_sequence_t F_DESELECT_response_sequence[] = { static int dissect_ftam_F_DESELECT_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(implicit_tag, pinfo, tree, tvb, offset, - F_DESELECT_response_sequence, hf_index, ett_ftam_F_DESELECT_response); + F_DESELECT_response_sequence, hf_index, ett_ftam_F_DESELECT_response); return offset; } @@ -2151,6 +2179,7 @@ static int dissect_object_type_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_ftam_Object_Type_Attribute(TRUE, tvb, offset, pinfo, tree, hf_ftam_object_type); } + static const asn_namedbit Permitted_Actions_Attribute_bits[] = { { 0, &hf_ftam_Permitted_Actions_Attribute_read, -1, -1, "read", NULL }, { 1, &hf_ftam_Permitted_Actions_Attribute_insert, -1, -1, "insert", NULL }, @@ -2171,8 +2200,8 @@ static const asn_namedbit Permitted_Actions_Attribute_bits[] = { static int dissect_ftam_Permitted_Actions_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - Permitted_Actions_Attribute_bits, hf_index, ett_ftam_Permitted_Actions_Attribute, - NULL); + Permitted_Actions_Attribute_bits, hf_index, ett_ftam_Permitted_Actions_Attribute, + NULL); return offset; } @@ -2193,6 +2222,7 @@ static int dissect_parameter(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_ftam_T_parameter(FALSE, tvb, offset, pinfo, tree, hf_ftam_parameter); } + static const ber_sequence_t T_document_type_sequence[] = { { BER_CLASS_APP, 14, BER_FLAGS_NOOWNTAG, dissect_document_type_name }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_parameter }, @@ -2202,7 +2232,7 @@ static const ber_sequence_t T_document_type_sequence[] = { static int dissect_ftam_T_document_type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_document_type_sequence, hf_index, ett_ftam_T_document_type); + T_document_type_sequence, hf_index, ett_ftam_T_document_type); return offset; } @@ -2236,6 +2266,7 @@ static int dissect_constraint_set_name(packet_info *pinfo, proto_tree *tree, tvb return dissect_ftam_Constraint_Set_Name(FALSE, tvb, offset, pinfo, tree, hf_ftam_constraint_set_name); } + static const ber_sequence_t T_constraint_set_and_abstract_Syntax_sequence[] = { { BER_CLASS_APP, 11, BER_FLAGS_NOOWNTAG, dissect_constraint_set_name }, { BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_abstract_Syntax_name }, @@ -2245,7 +2276,7 @@ static const ber_sequence_t T_constraint_set_and_abstract_Syntax_sequence[] = { static int dissect_ftam_T_constraint_set_and_abstract_Syntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_constraint_set_and_abstract_Syntax_sequence, hf_index, ett_ftam_T_constraint_set_and_abstract_Syntax); + T_constraint_set_and_abstract_Syntax_sequence, hf_index, ett_ftam_T_constraint_set_and_abstract_Syntax); return offset; } @@ -2269,7 +2300,8 @@ 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, - Contents_Type_Attribute_choice, hf_index, ett_ftam_Contents_Type_Attribute, NULL); + Contents_Type_Attribute_choice, hf_index, ett_ftam_Contents_Type_Attribute, + NULL); return offset; } @@ -2317,7 +2349,8 @@ 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, - Account_Attribute_choice, hf_index, ett_ftam_Account_Attribute, NULL); + Account_Attribute_choice, hf_index, ett_ftam_Account_Attribute, + NULL); return offset; } @@ -2360,7 +2393,8 @@ 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, - Object_Availability_Attribute_choice, hf_index, ett_ftam_Object_Availability_Attribute, NULL); + Object_Availability_Attribute_choice, hf_index, ett_ftam_Object_Availability_Attribute, + NULL); return offset; } @@ -2384,7 +2418,8 @@ 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, - Object_Size_Attribute_choice, hf_index, ett_ftam_Object_Size_Attribute, NULL); + Object_Size_Attribute_choice, hf_index, ett_ftam_Object_Size_Attribute, + NULL); return offset; } @@ -2395,6 +2430,7 @@ static int dissect_object_size(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_ftam_Object_Size_Attribute(FALSE, tvb, offset, pinfo, tree, hf_ftam_object_size); } + static const asn_namedbit Concurrency_Key_bits[] = { { 0, &hf_ftam_Concurrency_Key_not_required, -1, -1, "not-required", NULL }, { 1, &hf_ftam_Concurrency_Key_shared, -1, -1, "shared", NULL }, @@ -2406,8 +2442,8 @@ static const asn_namedbit Concurrency_Key_bits[] = { static int dissect_ftam_Concurrency_Key(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - Concurrency_Key_bits, hf_index, ett_ftam_Concurrency_Key, - NULL); + Concurrency_Key_bits, hf_index, ett_ftam_Concurrency_Key, + NULL); return offset; } @@ -2436,6 +2472,7 @@ static int dissect_delete_Object_key_impl(packet_info *pinfo, proto_tree *tree, return dissect_ftam_Concurrency_Key(TRUE, tvb, offset, pinfo, tree, hf_ftam_delete_Object_key); } + static const ber_sequence_t Concurrency_Access_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_read_key_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_insert_key_impl }, @@ -2451,7 +2488,7 @@ static const ber_sequence_t Concurrency_Access_sequence[] = { static int dissect_ftam_Concurrency_Access(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - Concurrency_Access_sequence, hf_index, ett_ftam_Concurrency_Access); + Concurrency_Access_sequence, hf_index, ett_ftam_Concurrency_Access); return offset; } @@ -2484,6 +2521,7 @@ static int dissect_ae(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o return dissect_ftam_AE_qualifier(FALSE, tvb, offset, pinfo, tree, hf_ftam_ae); } + static const ber_sequence_t AE_title_sequence[] = { { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_ap }, { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_ae }, @@ -2493,12 +2531,13 @@ static const ber_sequence_t AE_title_sequence[] = { static int dissect_ftam_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_sequence(implicit_tag, pinfo, tree, tvb, offset, - AE_title_sequence, hf_index, ett_ftam_AE_title); + AE_title_sequence, hf_index, ett_ftam_AE_title); return offset; } + static int dissect_ftam_Application_Entity_Title(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ftam_AE_title(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -2509,6 +2548,7 @@ static int dissect_location_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_ftam_Application_Entity_Title(TRUE, tvb, offset, pinfo, tree, hf_ftam_location); } + static const ber_sequence_t Access_Control_Element_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_action_list_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_concurrency_access_impl }, @@ -2521,7 +2561,7 @@ static const ber_sequence_t Access_Control_Element_sequence[] = { static int dissect_ftam_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_sequence(implicit_tag, pinfo, tree, tvb, offset, - Access_Control_Element_sequence, hf_index, ett_ftam_Access_Control_Element); + Access_Control_Element_sequence, hf_index, ett_ftam_Access_Control_Element); return offset; } @@ -2573,7 +2613,8 @@ 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, - Access_Control_Attribute_choice, hf_index, ett_ftam_Access_Control_Attribute, NULL); + Access_Control_Attribute_choice, hf_index, ett_ftam_Access_Control_Attribute, + NULL); return offset; } @@ -2603,7 +2644,8 @@ 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, - Legal_Qualification_Attribute_choice, hf_index, ett_ftam_Legal_Qualification_Attribute, NULL); + Legal_Qualification_Attribute_choice, hf_index, ett_ftam_Legal_Qualification_Attribute, + NULL); return offset; } @@ -2629,7 +2671,8 @@ 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, - Private_Use_Attribute_choice, hf_index, ett_ftam_Private_Use_Attribute, NULL); + Private_Use_Attribute_choice, hf_index, ett_ftam_Private_Use_Attribute, + NULL); return offset; } @@ -2677,6 +2720,7 @@ static int dissect_extension_attribute(packet_info *pinfo, proto_tree *tree, tvb return dissect_ftam_T_extension_attribute(FALSE, tvb, offset, pinfo, tree, hf_ftam_extension_attribute); } + static const ber_sequence_t Extension_Attribute_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_extension_attribute_identifier }, { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_extension_attribute }, @@ -2686,7 +2730,7 @@ static const ber_sequence_t Extension_Attribute_sequence[] = { static int dissect_ftam_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(implicit_tag, pinfo, tree, tvb, offset, - Extension_Attribute_sequence, hf_index, ett_ftam_Extension_Attribute); + Extension_Attribute_sequence, hf_index, ett_ftam_Extension_Attribute); return offset; } @@ -2710,6 +2754,7 @@ static int dissect_extension_set_attributes(packet_info *pinfo, proto_tree *tree return dissect_ftam_SEQUENCE_OF_Extension_Attribute(FALSE, tvb, offset, pinfo, tree, hf_ftam_extension_set_attributes); } + static const ber_sequence_t Attribute_Extension_Set_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_extension_set_identifier_impl }, { BER_CLASS_CON, 1, 0, dissect_extension_set_attributes }, @@ -2719,7 +2764,7 @@ static const ber_sequence_t Attribute_Extension_Set_sequence[] = { static int dissect_ftam_Attribute_Extension_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(implicit_tag, pinfo, tree, tvb, offset, - Attribute_Extension_Set_sequence, hf_index, ett_ftam_Attribute_Extension_Set); + Attribute_Extension_Set_sequence, hf_index, ett_ftam_Attribute_Extension_Set); return offset; } @@ -2743,8 +2788,9 @@ static int dissect_attribute_extensions_impl(packet_info *pinfo, proto_tree *tre return dissect_ftam_Attribute_Extensions(TRUE, tvb, offset, pinfo, tree, hf_ftam_attribute_extensions); } + static const ber_sequence_t Create_Attributes_sequence[] = { - { -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_pathname }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_pathname }, { BER_CLASS_CON, 18, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_object_type_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_permitted_actions_impl }, { BER_CLASS_CON, 2, BER_FLAGS_NOTCHKTAG, dissect_contents_type }, @@ -2783,6 +2829,7 @@ static int dissect_initial_attributes(packet_info *pinfo, proto_tree *tree, tvbu return dissect_ftam_Create_Attributes(FALSE, tvb, offset, pinfo, tree, hf_ftam_initial_attributes); } + static const ber_sequence_t F_CREATE_request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_override_impl }, { BER_CLASS_APP, 12, BER_FLAGS_NOOWNTAG, dissect_initial_attributes }, @@ -2799,7 +2846,7 @@ static const ber_sequence_t F_CREATE_request_sequence[] = { static int dissect_ftam_F_CREATE_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(implicit_tag, pinfo, tree, tvb, offset, - F_CREATE_request_sequence, hf_index, ett_ftam_F_CREATE_request); + F_CREATE_request_sequence, hf_index, ett_ftam_F_CREATE_request); return offset; } @@ -2807,6 +2854,7 @@ static int dissect_f_create_request_impl(packet_info *pinfo, proto_tree *tree, t return dissect_ftam_F_CREATE_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_create_request); } + static const ber_sequence_t F_CREATE_response_sequence[] = { { BER_CLASS_APP, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_state_result }, { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, @@ -2819,7 +2867,7 @@ static const ber_sequence_t F_CREATE_response_sequence[] = { static int dissect_ftam_F_CREATE_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(implicit_tag, pinfo, tree, tvb, offset, - F_CREATE_response_sequence, hf_index, ett_ftam_F_CREATE_response); + F_CREATE_response_sequence, hf_index, ett_ftam_F_CREATE_response); return offset; } @@ -2827,6 +2875,7 @@ static int dissect_f_create_response_impl(packet_info *pinfo, proto_tree *tree, return dissect_ftam_F_CREATE_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_create_response); } + static const ber_sequence_t F_DELETE_request_sequence[] = { { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information }, { 0, 0, 0, NULL } @@ -2835,7 +2884,7 @@ static const ber_sequence_t F_DELETE_request_sequence[] = { static int dissect_ftam_F_DELETE_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(implicit_tag, pinfo, tree, tvb, offset, - F_DELETE_request_sequence, hf_index, ett_ftam_F_DELETE_request); + F_DELETE_request_sequence, hf_index, ett_ftam_F_DELETE_request); return offset; } @@ -2843,6 +2892,7 @@ static int dissect_f_delete_request_impl(packet_info *pinfo, proto_tree *tree, t return dissect_ftam_F_DELETE_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_delete_request); } + static const ber_sequence_t F_DELETE_response_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information }, @@ -2854,7 +2904,7 @@ static const ber_sequence_t F_DELETE_response_sequence[] = { static int dissect_ftam_F_DELETE_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(implicit_tag, pinfo, tree, tvb, offset, - F_DELETE_response_sequence, hf_index, ett_ftam_F_DELETE_response); + F_DELETE_response_sequence, hf_index, ett_ftam_F_DELETE_response); return offset; } @@ -2862,6 +2912,7 @@ static int dissect_f_delete_response_impl(packet_info *pinfo, proto_tree *tree, return dissect_ftam_F_DELETE_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_delete_response); } + static const asn_namedbit Attribute_Names_bits[] = { { 0, &hf_ftam_Attribute_Names_read_pathname, -1, -1, "read-pathname", NULL }, { 18, &hf_ftam_Attribute_Names_read_Object_type, -1, -1, "read-Object-type", NULL }, @@ -2892,8 +2943,8 @@ static const asn_namedbit Attribute_Names_bits[] = { static int dissect_ftam_Attribute_Names(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - Attribute_Names_bits, hf_index, ett_ftam_Attribute_Names, - NULL); + Attribute_Names_bits, hf_index, ett_ftam_Attribute_Names, + NULL); return offset; } @@ -2930,6 +2981,7 @@ static int dissect_extension_attribute_names(packet_info *pinfo, proto_tree *tre return dissect_ftam_SEQUENCE_OF_Extension_Attribute_identifier(FALSE, tvb, offset, pinfo, tree, hf_ftam_extension_attribute_names); } + static const ber_sequence_t Attribute_Extension_Set_Name_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_extension_set_identifier_impl }, { BER_CLASS_CON, 1, 0, dissect_extension_attribute_names }, @@ -2939,7 +2991,7 @@ static const ber_sequence_t Attribute_Extension_Set_Name_sequence[] = { static int dissect_ftam_Attribute_Extension_Set_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(implicit_tag, pinfo, tree, tvb, offset, - Attribute_Extension_Set_Name_sequence, hf_index, ett_ftam_Attribute_Extension_Set_Name); + Attribute_Extension_Set_Name_sequence, hf_index, ett_ftam_Attribute_Extension_Set_Name); return offset; } @@ -2963,6 +3015,7 @@ static int dissect_attribute_extension_names_impl(packet_info *pinfo, proto_tree return dissect_ftam_Attribute_Extension_Names(TRUE, tvb, offset, pinfo, tree, hf_ftam_attribute_extension_names); } + static const ber_sequence_t F_READ_ATTRIB_request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_attribute_names_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_attribute_extension_names_impl }, @@ -2972,7 +3025,7 @@ static const ber_sequence_t F_READ_ATTRIB_request_sequence[] = { static int dissect_ftam_F_READ_ATTRIB_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(implicit_tag, pinfo, tree, tvb, offset, - F_READ_ATTRIB_request_sequence, hf_index, ett_ftam_F_READ_ATTRIB_request); + F_READ_ATTRIB_request_sequence, hf_index, ett_ftam_F_READ_ATTRIB_request); return offset; } @@ -2997,6 +3050,7 @@ static int dissect_child_objects(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_ftam_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index); @@ -3026,7 +3080,8 @@ 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, - Date_and_Time_Attribute_choice, hf_index, ett_ftam_Date_and_Time_Attribute, NULL); + Date_and_Time_Attribute_choice, hf_index, ett_ftam_Date_and_Time_Attribute, + NULL); return offset; } @@ -3059,7 +3114,8 @@ 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, - User_Identity_Attribute_choice, hf_index, ett_ftam_User_Identity_Attribute, NULL); + User_Identity_Attribute_choice, hf_index, ett_ftam_User_Identity_Attribute, + NULL); return offset; } @@ -3076,8 +3132,9 @@ static int dissect_identity_last_attribute_modifier(packet_info *pinfo, proto_tr return dissect_ftam_User_Identity_Attribute(FALSE, tvb, offset, pinfo, tree, hf_ftam_identity_last_attribute_modifier); } + static const ber_sequence_t Read_Attributes_sequence[] = { - { -1/*choice*/ , -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_pathname }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_pathname }, { BER_CLASS_CON, 18, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_object_type_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_permitted_actions_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_contents_type }, @@ -3134,6 +3191,7 @@ static int dissect_Objects_Attributes_List_item(packet_info *pinfo, proto_tree * return dissect_ftam_Read_Attributes(FALSE, tvb, offset, pinfo, tree, hf_ftam_Objects_Attributes_List_item); } + static const ber_sequence_t F_READ_ATTRIB_response_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 18, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_read_attributes }, @@ -3144,7 +3202,7 @@ static const ber_sequence_t F_READ_ATTRIB_response_sequence[] = { static int dissect_ftam_F_READ_ATTRIB_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(implicit_tag, pinfo, tree, tvb, offset, - F_READ_ATTRIB_response_sequence, hf_index, ett_ftam_F_READ_ATTRIB_response); + F_READ_ATTRIB_response_sequence, hf_index, ett_ftam_F_READ_ATTRIB_response); return offset; } @@ -3155,6 +3213,7 @@ static int dissect_f_read_attrib_response_impl(packet_info *pinfo, proto_tree *t return dissect_ftam_F_READ_ATTRIB_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_read_attrib_response); } + static const ber_sequence_t T_actual_values1_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_insert_values_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_delete_values_impl }, @@ -3164,7 +3223,7 @@ static const ber_sequence_t T_actual_values1_sequence[] = { static int dissect_ftam_T_actual_values1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_actual_values1_sequence, hf_index, ett_ftam_T_actual_values1); + T_actual_values1_sequence, hf_index, ett_ftam_T_actual_values1); return offset; } @@ -3188,7 +3247,8 @@ 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, - Access_Control_Change_Attribute_choice, hf_index, ett_ftam_Access_Control_Change_Attribute, NULL); + Access_Control_Change_Attribute_choice, hf_index, ett_ftam_Access_Control_Change_Attribute, + NULL); return offset; } @@ -3199,8 +3259,9 @@ static int dissect_change_path_access_control(packet_info *pinfo, proto_tree *tr return dissect_ftam_Access_Control_Change_Attribute(FALSE, tvb, offset, pinfo, tree, hf_ftam_change_path_access_control); } + static const ber_sequence_t Change_Attributes_sequence[] = { - { -1/*choice*/ , -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_pathname }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_pathname }, { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_storage_account }, { BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_object_availability }, { BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_future_Object_size }, @@ -3237,6 +3298,7 @@ static int dissect_attributes(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_ftam_Change_Attributes(FALSE, tvb, offset, pinfo, tree, hf_ftam_attributes); } + static const ber_sequence_t F_CHANGE_ATTRIB_request_sequence[] = { { BER_CLASS_APP, 8, BER_FLAGS_NOOWNTAG, dissect_attributes }, { 0, 0, 0, NULL } @@ -3245,7 +3307,7 @@ static const ber_sequence_t F_CHANGE_ATTRIB_request_sequence[] = { static int dissect_ftam_F_CHANGE_ATTRIB_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(implicit_tag, pinfo, tree, tvb, offset, - F_CHANGE_ATTRIB_request_sequence, hf_index, ett_ftam_F_CHANGE_ATTRIB_request); + F_CHANGE_ATTRIB_request_sequence, hf_index, ett_ftam_F_CHANGE_ATTRIB_request); return offset; } @@ -3253,6 +3315,7 @@ static int dissect_f_Change_attrib_reques_impl(packet_info *pinfo, proto_tree *t return dissect_ftam_F_CHANGE_ATTRIB_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_Change_attrib_reques); } + static const ber_sequence_t F_CHANGE_ATTRIB_response_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_attributes }, @@ -3263,7 +3326,7 @@ static const ber_sequence_t F_CHANGE_ATTRIB_response_sequence[] = { static int dissect_ftam_F_CHANGE_ATTRIB_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(implicit_tag, pinfo, tree, tvb, offset, - F_CHANGE_ATTRIB_response_sequence, hf_index, ett_ftam_F_CHANGE_ATTRIB_response); + F_CHANGE_ATTRIB_response_sequence, hf_index, ett_ftam_F_CHANGE_ATTRIB_response); return offset; } @@ -3271,6 +3334,7 @@ static int dissect_f_Change_attrib_respon_impl(packet_info *pinfo, proto_tree *t return dissect_ftam_F_CHANGE_ATTRIB_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_Change_attrib_respon); } + static const asn_namedbit T_processing_mode_bits[] = { { 0, &hf_ftam_T_processing_mode_f_read, -1, -1, "f-read", NULL }, { 1, &hf_ftam_T_processing_mode_f_insert, -1, -1, "f-insert", NULL }, @@ -3283,8 +3347,8 @@ static const asn_namedbit T_processing_mode_bits[] = { static int dissect_ftam_T_processing_mode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - T_processing_mode_bits, hf_index, ett_ftam_T_processing_mode, - NULL); + T_processing_mode_bits, hf_index, ett_ftam_T_processing_mode, + NULL); return offset; } @@ -3308,7 +3372,8 @@ 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, - T_contents_type_choice, hf_index, ett_ftam_T_contents_type, NULL); + T_contents_type_choice, hf_index, ett_ftam_T_contents_type, + NULL); return offset; } @@ -3414,6 +3479,7 @@ static int dissect_degree_of_overlap(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_ftam_Degree_Of_Overlap(FALSE, tvb, offset, pinfo, tree, hf_ftam_degree_of_overlap); } + static const ber_sequence_t F_OPEN_request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_processing_mode_impl }, { BER_CLASS_CON, 1, 0, dissect_open_contents_type }, @@ -3432,7 +3498,7 @@ static const ber_sequence_t F_OPEN_request_sequence[] = { static int dissect_ftam_F_OPEN_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(implicit_tag, pinfo, tree, tvb, offset, - F_OPEN_request_sequence, hf_index, ett_ftam_F_OPEN_request); + F_OPEN_request_sequence, hf_index, ett_ftam_F_OPEN_request); return offset; } @@ -3460,6 +3526,7 @@ static int dissect_response_recovery_mode_impl(packet_info *pinfo, proto_tree *t return dissect_ftam_T_response_recovery_mode(TRUE, tvb, offset, pinfo, tree, hf_ftam_response_recovery_mode); } + static const ber_sequence_t F_OPEN_response_sequence[] = { { BER_CLASS_APP, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_state_result }, { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, @@ -3477,7 +3544,7 @@ static const ber_sequence_t F_OPEN_response_sequence[] = { static int dissect_ftam_F_OPEN_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(implicit_tag, pinfo, tree, tvb, offset, - F_OPEN_response_sequence, hf_index, ett_ftam_F_OPEN_response); + F_OPEN_response_sequence, hf_index, ett_ftam_F_OPEN_response); return offset; } @@ -3485,6 +3552,7 @@ static int dissect_f_open_response_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_ftam_F_OPEN_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_open_response); } + static const ber_sequence_t F_CLOSE_request_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information }, @@ -3495,7 +3563,7 @@ static const ber_sequence_t F_CLOSE_request_sequence[] = { static int dissect_ftam_F_CLOSE_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(implicit_tag, pinfo, tree, tvb, offset, - F_CLOSE_request_sequence, hf_index, ett_ftam_F_CLOSE_request); + F_CLOSE_request_sequence, hf_index, ett_ftam_F_CLOSE_request); return offset; } @@ -3503,6 +3571,7 @@ static int dissect_f_close_request_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_ftam_F_CLOSE_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_close_request); } + static const ber_sequence_t F_CLOSE_response_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information }, @@ -3513,7 +3582,7 @@ static const ber_sequence_t F_CLOSE_response_sequence[] = { static int dissect_ftam_F_CLOSE_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(implicit_tag, pinfo, tree, tvb, offset, - F_CLOSE_response_sequence, hf_index, ett_ftam_F_CLOSE_response); + F_CLOSE_response_sequence, hf_index, ett_ftam_F_CLOSE_response); return offset; } @@ -3521,6 +3590,7 @@ static int dissect_f_close_response_impl(packet_info *pinfo, proto_tree *tree, t return dissect_ftam_F_CLOSE_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_close_response); } + static const ber_sequence_t F_BEGIN_GROUP_request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_threshold_impl }, { 0, 0, 0, NULL } @@ -3529,7 +3599,7 @@ static const ber_sequence_t F_BEGIN_GROUP_request_sequence[] = { static int dissect_ftam_F_BEGIN_GROUP_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(implicit_tag, pinfo, tree, tvb, offset, - F_BEGIN_GROUP_request_sequence, hf_index, ett_ftam_F_BEGIN_GROUP_request); + F_BEGIN_GROUP_request_sequence, hf_index, ett_ftam_F_BEGIN_GROUP_request); return offset; } @@ -3537,6 +3607,7 @@ static int dissect_f_begin_group_request_impl(packet_info *pinfo, proto_tree *tr return dissect_ftam_F_BEGIN_GROUP_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_begin_group_request); } + static const ber_sequence_t F_BEGIN_GROUP_response_sequence[] = { { 0, 0, 0, NULL } }; @@ -3544,7 +3615,7 @@ static const ber_sequence_t F_BEGIN_GROUP_response_sequence[] = { static int dissect_ftam_F_BEGIN_GROUP_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(implicit_tag, pinfo, tree, tvb, offset, - F_BEGIN_GROUP_response_sequence, hf_index, ett_ftam_F_BEGIN_GROUP_response); + F_BEGIN_GROUP_response_sequence, hf_index, ett_ftam_F_BEGIN_GROUP_response); return offset; } @@ -3552,6 +3623,7 @@ static int dissect_f_begin_group_response_impl(packet_info *pinfo, proto_tree *t return dissect_ftam_F_BEGIN_GROUP_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_begin_group_response); } + static const ber_sequence_t F_END_GROUP_request_sequence[] = { { 0, 0, 0, NULL } }; @@ -3559,7 +3631,7 @@ static const ber_sequence_t F_END_GROUP_request_sequence[] = { static int dissect_ftam_F_END_GROUP_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(implicit_tag, pinfo, tree, tvb, offset, - F_END_GROUP_request_sequence, hf_index, ett_ftam_F_END_GROUP_request); + F_END_GROUP_request_sequence, hf_index, ett_ftam_F_END_GROUP_request); return offset; } @@ -3567,6 +3639,7 @@ static int dissect_f_end_group_request_impl(packet_info *pinfo, proto_tree *tree return dissect_ftam_F_END_GROUP_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_end_group_request); } + static const ber_sequence_t F_END_GROUP_response_sequence[] = { { 0, 0, 0, NULL } }; @@ -3574,7 +3647,7 @@ static const ber_sequence_t F_END_GROUP_response_sequence[] = { static int dissect_ftam_F_END_GROUP_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(implicit_tag, pinfo, tree, tvb, offset, - F_END_GROUP_response_sequence, hf_index, ett_ftam_F_END_GROUP_response); + F_END_GROUP_response_sequence, hf_index, ett_ftam_F_END_GROUP_response); return offset; } @@ -3582,6 +3655,7 @@ static int dissect_f_end_group_response_impl(packet_info *pinfo, proto_tree *tre return dissect_ftam_F_END_GROUP_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_end_group_response); } + static const ber_sequence_t F_RECOVER_request_sequence[] = { { BER_CLASS_APP, 6, BER_FLAGS_NOOWNTAG, dissect_activity_identifier }, { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_bulk_transfer_number_impl }, @@ -3600,7 +3674,7 @@ static const ber_sequence_t F_RECOVER_request_sequence[] = { static int dissect_ftam_F_RECOVER_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(implicit_tag, pinfo, tree, tvb, offset, - F_RECOVER_request_sequence, hf_index, ett_ftam_F_RECOVER_request); + F_RECOVER_request_sequence, hf_index, ett_ftam_F_RECOVER_request); return offset; } @@ -3608,6 +3682,7 @@ static int dissect_f_recover_request_impl(packet_info *pinfo, proto_tree *tree, return dissect_ftam_F_RECOVER_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_recover_request); } + static const ber_sequence_t F_RECOVER_response_sequence[] = { { BER_CLASS_APP, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_state_result }, { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, @@ -3624,7 +3699,7 @@ static const ber_sequence_t F_RECOVER_response_sequence[] = { static int dissect_ftam_F_RECOVER_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(implicit_tag, pinfo, tree, tvb, offset, - F_RECOVER_response_sequence, hf_index, ett_ftam_F_RECOVER_response); + F_RECOVER_response_sequence, hf_index, ett_ftam_F_RECOVER_response); return offset; } @@ -3691,6 +3766,7 @@ static int dissect_begin_end_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_ftam_Node_Name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_acse_EXTERNAL(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -3797,6 +3873,7 @@ static int dissect_fadu_lock(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_ftam_FADU_Lock(FALSE, tvb, offset, pinfo, tree, hf_ftam_fadu_lock); } + static const ber_sequence_t F_LOCATE_request_sequence[] = { { BER_CLASS_APP, 15, BER_FLAGS_NOOWNTAG, dissect_file_access_data_unit_identity }, { BER_CLASS_APP, 16, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_fadu_lock }, @@ -3806,7 +3883,7 @@ static const ber_sequence_t F_LOCATE_request_sequence[] = { static int dissect_ftam_F_LOCATE_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(implicit_tag, pinfo, tree, tvb, offset, - F_LOCATE_request_sequence, hf_index, ett_ftam_F_LOCATE_request); + F_LOCATE_request_sequence, hf_index, ett_ftam_F_LOCATE_request); return offset; } @@ -3814,6 +3891,7 @@ static int dissect_f_locate_request_impl(packet_info *pinfo, proto_tree *tree, t return dissect_ftam_F_LOCATE_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_locate_request); } + static const ber_sequence_t F_LOCATE_response_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_file_access_data_unit_identity }, @@ -3824,7 +3902,7 @@ static const ber_sequence_t F_LOCATE_response_sequence[] = { static int dissect_ftam_F_LOCATE_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(implicit_tag, pinfo, tree, tvb, offset, - F_LOCATE_response_sequence, hf_index, ett_ftam_F_LOCATE_response); + F_LOCATE_response_sequence, hf_index, ett_ftam_F_LOCATE_response); return offset; } @@ -3832,6 +3910,7 @@ static int dissect_f_locate_response_impl(packet_info *pinfo, proto_tree *tree, return dissect_ftam_F_LOCATE_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_locate_response); } + static const ber_sequence_t F_ERASE_request_sequence[] = { { BER_CLASS_APP, 15, BER_FLAGS_NOOWNTAG, dissect_file_access_data_unit_identity }, { 0, 0, 0, NULL } @@ -3840,7 +3919,7 @@ static const ber_sequence_t F_ERASE_request_sequence[] = { static int dissect_ftam_F_ERASE_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(implicit_tag, pinfo, tree, tvb, offset, - F_ERASE_request_sequence, hf_index, ett_ftam_F_ERASE_request); + F_ERASE_request_sequence, hf_index, ett_ftam_F_ERASE_request); return offset; } @@ -3848,6 +3927,7 @@ static int dissect_f_erase_request_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_ftam_F_ERASE_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_erase_request); } + static const ber_sequence_t F_ERASE_response_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnostic }, @@ -3857,7 +3937,7 @@ static const ber_sequence_t F_ERASE_response_sequence[] = { static int dissect_ftam_F_ERASE_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(implicit_tag, pinfo, tree, tvb, offset, - F_ERASE_response_sequence, hf_index, ett_ftam_F_ERASE_response); + F_ERASE_response_sequence, hf_index, ett_ftam_F_ERASE_response); return offset; } @@ -3970,6 +4050,7 @@ static int dissect_access_context_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_ftam_T_access_context(TRUE, tvb, offset, pinfo, tree, hf_ftam_access_context); } + static const ber_sequence_t Access_Context_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_access_context_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_level_number_impl }, @@ -4000,6 +4081,7 @@ static int dissect_read_access_context(packet_info *pinfo, proto_tree *tree, tvb return dissect_ftam_Access_Context(FALSE, tvb, offset, pinfo, tree, hf_ftam_read_access_context); } + static const ber_sequence_t F_READ_request_sequence[] = { { BER_CLASS_APP, 15, BER_FLAGS_NOOWNTAG, dissect_file_access_data_unit_identity }, { BER_CLASS_APP, 1, BER_FLAGS_NOOWNTAG, dissect_read_access_context }, @@ -4011,7 +4093,7 @@ static const ber_sequence_t F_READ_request_sequence[] = { static int dissect_ftam_F_READ_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(implicit_tag, pinfo, tree, tvb, offset, - F_READ_request_sequence, hf_index, ett_ftam_F_READ_request); + F_READ_request_sequence, hf_index, ett_ftam_F_READ_request); return offset; } @@ -4039,6 +4121,7 @@ static int dissect_file_access_data_unit_Operation_impl(packet_info *pinfo, prot return dissect_ftam_T_file_access_data_unit_Operation(TRUE, tvb, offset, pinfo, tree, hf_ftam_file_access_data_unit_Operation); } + static const ber_sequence_t F_WRITE_request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_file_access_data_unit_Operation_impl }, { BER_CLASS_APP, 15, BER_FLAGS_NOOWNTAG, dissect_file_access_data_unit_identity }, @@ -4050,7 +4133,7 @@ static const ber_sequence_t F_WRITE_request_sequence[] = { static int dissect_ftam_F_WRITE_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(implicit_tag, pinfo, tree, tvb, offset, - F_WRITE_request_sequence, hf_index, ett_ftam_F_WRITE_request); + F_WRITE_request_sequence, hf_index, ett_ftam_F_WRITE_request); return offset; } @@ -4058,6 +4141,7 @@ static int dissect_f_write_request_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_ftam_F_WRITE_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_write_request); } + static const ber_sequence_t F_DATA_END_request_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnostic }, @@ -4067,7 +4151,7 @@ static const ber_sequence_t F_DATA_END_request_sequence[] = { static int dissect_ftam_F_DATA_END_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(implicit_tag, pinfo, tree, tvb, offset, - F_DATA_END_request_sequence, hf_index, ett_ftam_F_DATA_END_request); + F_DATA_END_request_sequence, hf_index, ett_ftam_F_DATA_END_request); return offset; } @@ -4107,6 +4191,7 @@ static int dissect_request_type(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_ftam_Request_Type(FALSE, tvb, offset, pinfo, tree, hf_ftam_request_type); } + static const ber_sequence_t F_TRANSFER_END_request_sequence[] = { { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information }, { BER_CLASS_APP, 31, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_request_type }, @@ -4119,7 +4204,7 @@ static const ber_sequence_t F_TRANSFER_END_request_sequence[] = { static int dissect_ftam_F_TRANSFER_END_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(implicit_tag, pinfo, tree, tvb, offset, - F_TRANSFER_END_request_sequence, hf_index, ett_ftam_F_TRANSFER_END_request); + F_TRANSFER_END_request_sequence, hf_index, ett_ftam_F_TRANSFER_END_request); return offset; } @@ -4127,6 +4212,7 @@ static int dissect_f_transfer_end_request_impl(packet_info *pinfo, proto_tree *t return dissect_ftam_F_TRANSFER_END_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_transfer_end_request); } + static const ber_sequence_t F_TRANSFER_END_response_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information }, @@ -4139,7 +4225,7 @@ static const ber_sequence_t F_TRANSFER_END_response_sequence[] = { static int dissect_ftam_F_TRANSFER_END_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(implicit_tag, pinfo, tree, tvb, offset, - F_TRANSFER_END_response_sequence, hf_index, ett_ftam_F_TRANSFER_END_response); + F_TRANSFER_END_response_sequence, hf_index, ett_ftam_F_TRANSFER_END_response); return offset; } @@ -4147,6 +4233,7 @@ static int dissect_f_transfer_end_response_impl(packet_info *pinfo, proto_tree * return dissect_ftam_F_TRANSFER_END_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_transfer_end_response); } + static const ber_sequence_t F_CANCEL_request_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information }, @@ -4163,7 +4250,7 @@ static const ber_sequence_t F_CANCEL_request_sequence[] = { static int dissect_ftam_F_CANCEL_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(implicit_tag, pinfo, tree, tvb, offset, - F_CANCEL_request_sequence, hf_index, ett_ftam_F_CANCEL_request); + F_CANCEL_request_sequence, hf_index, ett_ftam_F_CANCEL_request); return offset; } @@ -4171,6 +4258,7 @@ static int dissect_f_cancel_request_impl(packet_info *pinfo, proto_tree *tree, t return dissect_ftam_F_CANCEL_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_cancel_request); } + static const ber_sequence_t F_CANCEL_response_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information }, @@ -4187,7 +4275,7 @@ static const ber_sequence_t F_CANCEL_response_sequence[] = { static int dissect_ftam_F_CANCEL_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(implicit_tag, pinfo, tree, tvb, offset, - F_CANCEL_response_sequence, hf_index, ett_ftam_F_CANCEL_response); + F_CANCEL_response_sequence, hf_index, ett_ftam_F_CANCEL_response); return offset; } @@ -4195,6 +4283,7 @@ static int dissect_f_cancel_response_impl(packet_info *pinfo, proto_tree *tree, return dissect_ftam_F_CANCEL_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_cancel_response); } + static const ber_sequence_t F_RESTART_request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_checkpoint_identifier_impl }, { BER_CLASS_APP, 31, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_request_type }, @@ -4209,7 +4298,7 @@ static const ber_sequence_t F_RESTART_request_sequence[] = { static int dissect_ftam_F_RESTART_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(implicit_tag, pinfo, tree, tvb, offset, - F_RESTART_request_sequence, hf_index, ett_ftam_F_RESTART_request); + F_RESTART_request_sequence, hf_index, ett_ftam_F_RESTART_request); return offset; } @@ -4217,6 +4306,7 @@ static int dissect_f_restart_request_impl(packet_info *pinfo, proto_tree *tree, return dissect_ftam_F_RESTART_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_restart_request); } + static const ber_sequence_t F_RESTART_response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_checkpoint_identifier_impl }, { BER_CLASS_APP, 31, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_request_type }, @@ -4231,7 +4321,7 @@ static const ber_sequence_t F_RESTART_response_sequence[] = { static int dissect_ftam_F_RESTART_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(implicit_tag, pinfo, tree, tvb, offset, - F_RESTART_response_sequence, hf_index, ett_ftam_F_RESTART_response); + F_RESTART_response_sequence, hf_index, ett_ftam_F_RESTART_response); return offset; } @@ -4287,6 +4377,7 @@ static int dissect_bulk_Data_PDU(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_ftam_Destination_File_Directory(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ftam_Pathname_Attribute(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -4297,6 +4388,7 @@ static int dissect_destination_file_directory(packet_info *pinfo, proto_tree *tr return dissect_ftam_Destination_File_Directory(FALSE, tvb, offset, pinfo, tree, hf_ftam_destination_file_directory); } + static const ber_sequence_t F_CHANGE_PREFIX_request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reset_impl }, { BER_CLASS_APP, 24, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_destination_file_directory }, @@ -4308,7 +4400,7 @@ static const ber_sequence_t F_CHANGE_PREFIX_request_sequence[] = { static int dissect_ftam_F_CHANGE_PREFIX_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(implicit_tag, pinfo, tree, tvb, offset, - F_CHANGE_PREFIX_request_sequence, hf_index, ett_ftam_F_CHANGE_PREFIX_request); + F_CHANGE_PREFIX_request_sequence, hf_index, ett_ftam_F_CHANGE_PREFIX_request); return offset; } @@ -4316,6 +4408,7 @@ static int dissect_f_Change_prefix_request_impl(packet_info *pinfo, proto_tree * return dissect_ftam_F_CHANGE_PREFIX_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_Change_prefix_request); } + static const ber_sequence_t F_CHANGE_PREFIX_response_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 24, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_destination_file_directory }, @@ -4326,7 +4419,7 @@ static const ber_sequence_t F_CHANGE_PREFIX_response_sequence[] = { static int dissect_ftam_F_CHANGE_PREFIX_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(implicit_tag, pinfo, tree, tvb, offset, - F_CHANGE_PREFIX_response_sequence, hf_index, ett_ftam_F_CHANGE_PREFIX_response); + F_CHANGE_PREFIX_response_sequence, hf_index, ett_ftam_F_CHANGE_PREFIX_response); return offset; } @@ -4334,6 +4427,7 @@ static int dissect_f_Change_prefix_response_impl(packet_info *pinfo, proto_tree return dissect_ftam_F_CHANGE_PREFIX_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_Change_prefix_response); } + static const asn_namedbit Equality_Comparision_bits[] = { { 0, &hf_ftam_Equality_Comparision_no_value_available_matches, -1, -1, "no-value-available-matches", NULL }, { 1, &hf_ftam_Equality_Comparision_equals_matches, -1, -1, "equals-matches", NULL }, @@ -4343,8 +4437,8 @@ static const asn_namedbit Equality_Comparision_bits[] = { static int dissect_ftam_Equality_Comparision(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - Equality_Comparision_bits, hf_index, ett_ftam_Equality_Comparision, - NULL); + Equality_Comparision_bits, hf_index, ett_ftam_Equality_Comparision, + NULL); return offset; } @@ -4373,7 +4467,8 @@ 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, - T_string_value_item_choice, hf_index, ett_ftam_T_string_value_item, NULL); + T_string_value_item_choice, hf_index, ett_ftam_T_string_value_item, + NULL); return offset; } @@ -4383,7 +4478,7 @@ static int dissect_string_value_item(packet_info *pinfo, proto_tree *tree, tvbuf 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 }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_string_value_item }, }; static int @@ -4397,6 +4492,7 @@ static int dissect_string_value_impl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_ftam_T_string_value(TRUE, tvb, offset, pinfo, tree, hf_ftam_string_value); } + static const ber_sequence_t String_Pattern_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_equality_comparision_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_string_value_impl }, @@ -4406,7 +4502,7 @@ static const ber_sequence_t String_Pattern_sequence[] = { static int dissect_ftam_String_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(implicit_tag, pinfo, tree, tvb, offset, - String_Pattern_sequence, hf_index, ett_ftam_String_Pattern); + String_Pattern_sequence, hf_index, ett_ftam_String_Pattern); return offset; } @@ -4436,7 +4532,8 @@ 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, - T_pathname_value_item_choice, hf_index, ett_ftam_T_pathname_value_item, NULL); + T_pathname_value_item_choice, hf_index, ett_ftam_T_pathname_value_item, + NULL); return offset; } @@ -4446,7 +4543,7 @@ static int dissect_pathname_value_item(packet_info *pinfo, proto_tree *tree, tvb 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 }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_pathname_value_item }, }; static int @@ -4460,6 +4557,7 @@ static int dissect_pathname_value_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_ftam_T_pathname_value(TRUE, tvb, offset, pinfo, tree, hf_ftam_pathname_value); } + static const ber_sequence_t Pathname_Pattern_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_equality_comparision_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_pathname_value_impl }, @@ -4469,7 +4567,7 @@ static const ber_sequence_t Pathname_Pattern_sequence[] = { static int dissect_ftam_Pathname_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(implicit_tag, pinfo, tree, tvb, offset, - Pathname_Pattern_sequence, hf_index, ett_ftam_Pathname_Pattern); + Pathname_Pattern_sequence, hf_index, ett_ftam_Pathname_Pattern); return offset; } @@ -4486,6 +4584,7 @@ static int dissect_primaty_pathname_Pattern_impl(packet_info *pinfo, proto_tree return dissect_ftam_Pathname_Pattern(TRUE, tvb, offset, pinfo, tree, hf_ftam_primaty_pathname_Pattern); } + static const asn_namedbit Relational_Comparision_bits[] = { { 0, &hf_ftam_Relational_Comparision_no_value_available_matches, -1, -1, "no-value-available-matches", NULL }, { 1, &hf_ftam_Relational_Comparision_equals_matches, -1, -1, "equals-matches", NULL }, @@ -4497,8 +4596,8 @@ static const asn_namedbit Relational_Comparision_bits[] = { static int dissect_ftam_Relational_Comparision(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - Relational_Comparision_bits, hf_index, ett_ftam_Relational_Comparision, - NULL); + Relational_Comparision_bits, hf_index, ett_ftam_Relational_Comparision, + NULL); return offset; } @@ -4506,6 +4605,7 @@ static int dissect_relational_comparision_impl(packet_info *pinfo, proto_tree *t return dissect_ftam_Relational_Comparision(TRUE, tvb, offset, pinfo, tree, hf_ftam_relational_comparision); } + static const ber_sequence_t Integer_Pattern_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_relational_comparision_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_integer_value_impl }, @@ -4515,7 +4615,7 @@ static const ber_sequence_t Integer_Pattern_sequence[] = { static int dissect_ftam_Integer_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(implicit_tag, pinfo, tree, tvb, offset, - Integer_Pattern_sequence, hf_index, ett_ftam_Integer_Pattern); + Integer_Pattern_sequence, hf_index, ett_ftam_Integer_Pattern); return offset; } @@ -4530,11 +4630,12 @@ static int dissect_future_object_size_Pattern_impl(packet_info *pinfo, proto_tre } + static int dissect_ftam_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - NULL, hf_index, -1, - NULL); + NULL, hf_index, -1, + NULL); return offset; } @@ -4545,6 +4646,7 @@ static int dissect_significance_bitstring_impl(packet_info *pinfo, proto_tree *t return dissect_ftam_BIT_STRING(TRUE, tvb, offset, pinfo, tree, hf_ftam_significance_bitstring); } + static const ber_sequence_t Bitstring_Pattern_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_equality_comparision_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_match_bitstring_impl }, @@ -4555,7 +4657,7 @@ static const ber_sequence_t Bitstring_Pattern_sequence[] = { static int dissect_ftam_Bitstring_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(implicit_tag, pinfo, tree, tvb, offset, - Bitstring_Pattern_sequence, hf_index, ett_ftam_Bitstring_Pattern); + Bitstring_Pattern_sequence, hf_index, ett_ftam_Bitstring_Pattern); return offset; } @@ -4579,6 +4681,7 @@ static int dissect_attribute_extension_attribute_identifier(packet_info *pinfo, return dissect_ftam_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_ftam_attribute_extension_attribute_identifier); } + static const ber_sequence_t Object_Identifier_Pattern_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_equality_comparision_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_object_identifier_value_impl }, @@ -4588,7 +4691,7 @@ static const ber_sequence_t Object_Identifier_Pattern_sequence[] = { static int dissect_ftam_Object_Identifier_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(implicit_tag, pinfo, tree, tvb, offset, - Object_Identifier_Pattern_sequence, hf_index, ett_ftam_Object_Identifier_Pattern); + Object_Identifier_Pattern_sequence, hf_index, ett_ftam_Object_Identifier_Pattern); return offset; } @@ -4602,6 +4705,7 @@ static int dissect_abstract_Syntax_Pattern_impl(packet_info *pinfo, proto_tree * return dissect_ftam_Object_Identifier_Pattern(TRUE, tvb, offset, pinfo, tree, hf_ftam_abstract_Syntax_Pattern); } + static const ber_sequence_t T_constraint_set_abstract_Syntax_Pattern_sequence[] = { { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_constraint_Set_Pattern_impl }, { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_abstract_Syntax_Pattern_impl }, @@ -4611,7 +4715,7 @@ static const ber_sequence_t T_constraint_set_abstract_Syntax_Pattern_sequence[] static int dissect_ftam_T_constraint_set_abstract_Syntax_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(implicit_tag, pinfo, tree, tvb, offset, - T_constraint_set_abstract_Syntax_Pattern_sequence, hf_index, ett_ftam_T_constraint_set_abstract_Syntax_Pattern); + T_constraint_set_abstract_Syntax_Pattern_sequence, hf_index, ett_ftam_T_constraint_set_abstract_Syntax_Pattern); return offset; } @@ -4635,7 +4739,8 @@ 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, - Contents_Type_Pattern_choice, hf_index, ett_ftam_Contents_Type_Pattern, NULL); + Contents_Type_Pattern_choice, hf_index, ett_ftam_Contents_Type_Pattern, + NULL); return offset; } @@ -4643,6 +4748,7 @@ static int dissect_contents_type_Pattern(packet_info *pinfo, proto_tree *tree, t return dissect_ftam_Contents_Type_Pattern(FALSE, tvb, offset, pinfo, tree, hf_ftam_contents_type_Pattern); } + static const ber_sequence_t Date_and_Time_Pattern_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_relational_camparision_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_time_and_date_value_impl }, @@ -4652,7 +4758,7 @@ static const ber_sequence_t Date_and_Time_Pattern_sequence[] = { static int dissect_ftam_Date_and_Time_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(implicit_tag, pinfo, tree, tvb, offset, - Date_and_Time_Pattern_sequence, hf_index, ett_ftam_Date_and_Time_Pattern); + Date_and_Time_Pattern_sequence, hf_index, ett_ftam_Date_and_Time_Pattern); return offset; } @@ -4670,6 +4776,7 @@ static int dissect_date_and_time_of_last_attribute_modification_Pattern_impl(pac } + static int dissect_ftam_User_Identity_Pattern(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ftam_String_Pattern(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -4689,6 +4796,7 @@ static int dissect_identity_of_last_attribute_modifier_Pattern_impl(packet_info return dissect_ftam_User_Identity_Pattern(TRUE, tvb, offset, pinfo, tree, hf_ftam_identity_of_last_attribute_modifier_Pattern); } + static const ber_sequence_t Boolean_Pattern_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_equality_comparision_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_boolean_value_impl }, @@ -4698,7 +4806,7 @@ static const ber_sequence_t Boolean_Pattern_sequence[] = { static int dissect_ftam_Boolean_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(implicit_tag, pinfo, tree, tvb, offset, - Boolean_Pattern_sequence, hf_index, ett_ftam_Boolean_Pattern); + Boolean_Pattern_sequence, hf_index, ett_ftam_Boolean_Pattern); return offset; } @@ -4719,6 +4827,7 @@ static int dissect_extension_attribute_Pattern(packet_info *pinfo, proto_tree *t return dissect_ftam_T_extension_attribute_Pattern(FALSE, tvb, offset, pinfo, tree, hf_ftam_extension_attribute_Pattern); } + static const ber_sequence_t T_extension_set_attribute_Patterns_item_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attribute_extension_attribute_identifier }, { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_extension_attribute_Pattern }, @@ -4728,7 +4837,7 @@ static const ber_sequence_t T_extension_set_attribute_Patterns_item_sequence[] = static int dissect_ftam_T_extension_set_attribute_Patterns_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_extension_set_attribute_Patterns_item_sequence, hf_index, ett_ftam_T_extension_set_attribute_Patterns_item); + T_extension_set_attribute_Patterns_item_sequence, hf_index, ett_ftam_T_extension_set_attribute_Patterns_item); return offset; } @@ -4752,6 +4861,7 @@ static int dissect_extension_set_attribute_Patterns_impl(packet_info *pinfo, pro return dissect_ftam_T_extension_set_attribute_Patterns(TRUE, tvb, offset, pinfo, tree, hf_ftam_extension_set_attribute_Patterns); } + static const ber_sequence_t Attribute_Extensions_Pattern_item_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_extension_set_identifier_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_extension_set_attribute_Patterns_impl }, @@ -4761,7 +4871,7 @@ static const ber_sequence_t Attribute_Extensions_Pattern_item_sequence[] = { static int dissect_ftam_Attribute_Extensions_Pattern_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - Attribute_Extensions_Pattern_item_sequence, hf_index, ett_ftam_Attribute_Extensions_Pattern_item); + Attribute_Extensions_Pattern_item_sequence, hf_index, ett_ftam_Attribute_Extensions_Pattern_item); return offset; } @@ -4839,7 +4949,8 @@ 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, - AND_Set_item_choice, hf_index, ett_ftam_AND_Set_item, NULL); + AND_Set_item_choice, hf_index, ett_ftam_AND_Set_item, + NULL); return offset; } @@ -4849,7 +4960,7 @@ static int dissect_AND_Set_item(packet_info *pinfo, proto_tree *tree, tvbuff_t * 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 }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_AND_Set_item }, }; static int @@ -4916,6 +5027,7 @@ static int dissect_retrieval_scope_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_ftam_T_retrieval_scope(TRUE, tvb, offset, pinfo, tree, hf_ftam_retrieval_scope); } + static const ber_sequence_t Scope_item_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_root_directory }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_retrieval_scope_impl }, @@ -4925,7 +5037,7 @@ static const ber_sequence_t Scope_item_sequence[] = { static int dissect_ftam_Scope_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - Scope_item_sequence, hf_index, ett_ftam_Scope_item); + Scope_item_sequence, hf_index, ett_ftam_Scope_item); return offset; } @@ -4962,6 +5074,7 @@ static int dissect_scope(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in return dissect_ftam_Scope(FALSE, tvb, offset, pinfo, tree, hf_ftam_scope); } + static const ber_sequence_t F_LIST_request_sequence[] = { { BER_CLASS_APP, 26, BER_FLAGS_NOOWNTAG, dissect_attribute_value_asset_tions }, { BER_CLASS_APP, 28, BER_FLAGS_NOOWNTAG, dissect_scope }, @@ -4975,7 +5088,7 @@ static const ber_sequence_t F_LIST_request_sequence[] = { static int dissect_ftam_F_LIST_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(implicit_tag, pinfo, tree, tvb, offset, - F_LIST_request_sequence, hf_index, ett_ftam_F_LIST_request); + F_LIST_request_sequence, hf_index, ett_ftam_F_LIST_request); return offset; } @@ -5013,6 +5126,7 @@ static int dissect_objects_attributes_list(packet_info *pinfo, proto_tree *tree, return dissect_ftam_Objects_Attributes_List(FALSE, tvb, offset, pinfo, tree, hf_ftam_objects_attributes_list); } + static const ber_sequence_t F_LIST_response_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_objects_attributes_list }, @@ -5023,7 +5137,7 @@ static const ber_sequence_t F_LIST_response_sequence[] = { static int dissect_ftam_F_LIST_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(implicit_tag, pinfo, tree, tvb, offset, - F_LIST_response_sequence, hf_index, ett_ftam_F_LIST_response); + F_LIST_response_sequence, hf_index, ett_ftam_F_LIST_response); return offset; } @@ -5031,6 +5145,7 @@ static int dissect_f_list_response_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_ftam_F_LIST_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_list_response); } + static const ber_sequence_t F_GROUP_SELECT_request_sequence[] = { { BER_CLASS_APP, 26, BER_FLAGS_NOOWNTAG, dissect_attribute_value_assertions }, { BER_CLASS_APP, 3, BER_FLAGS_NOOWNTAG, dissect_requested_access }, @@ -5047,7 +5162,7 @@ static const ber_sequence_t F_GROUP_SELECT_request_sequence[] = { static int dissect_ftam_F_GROUP_SELECT_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(implicit_tag, pinfo, tree, tvb, offset, - F_GROUP_SELECT_request_sequence, hf_index, ett_ftam_F_GROUP_SELECT_request); + F_GROUP_SELECT_request_sequence, hf_index, ett_ftam_F_GROUP_SELECT_request); return offset; } @@ -5055,6 +5170,7 @@ static int dissect_f_group_select_request_impl(packet_info *pinfo, proto_tree *t return dissect_ftam_F_GROUP_SELECT_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_group_select_request); } + static const ber_sequence_t F_GROUP_SELECT_response_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information }, @@ -5065,7 +5181,7 @@ static const ber_sequence_t F_GROUP_SELECT_response_sequence[] = { static int dissect_ftam_F_GROUP_SELECT_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(implicit_tag, pinfo, tree, tvb, offset, - F_GROUP_SELECT_response_sequence, hf_index, ett_ftam_F_GROUP_SELECT_response); + F_GROUP_SELECT_response_sequence, hf_index, ett_ftam_F_GROUP_SELECT_response); return offset; } @@ -5105,6 +5221,7 @@ static int dissect_request_Operation_result(packet_info *pinfo, proto_tree *tree return dissect_ftam_Request_Operation_Result(FALSE, tvb, offset, pinfo, tree, hf_ftam_request_Operation_result); } + static const ber_sequence_t F_GROUP_DELETE_request_sequence[] = { { BER_CLASS_APP, 31, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_request_Operation_result }, { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information }, @@ -5114,7 +5231,7 @@ static const ber_sequence_t F_GROUP_DELETE_request_sequence[] = { static int dissect_ftam_F_GROUP_DELETE_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(implicit_tag, pinfo, tree, tvb, offset, - F_GROUP_DELETE_request_sequence, hf_index, ett_ftam_F_GROUP_DELETE_request); + F_GROUP_DELETE_request_sequence, hf_index, ett_ftam_F_GROUP_DELETE_request); return offset; } @@ -5175,6 +5292,7 @@ static int dissect_operation_result(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_ftam_Operation_Result(FALSE, tvb, offset, pinfo, tree, hf_ftam_operation_result); } + static const ber_sequence_t F_GROUP_DELETE_response_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_charging }, @@ -5187,7 +5305,7 @@ static const ber_sequence_t F_GROUP_DELETE_response_sequence[] = { static int dissect_ftam_F_GROUP_DELETE_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(implicit_tag, pinfo, tree, tvb, offset, - F_GROUP_DELETE_response_sequence, hf_index, ett_ftam_F_GROUP_DELETE_response); + F_GROUP_DELETE_response_sequence, hf_index, ett_ftam_F_GROUP_DELETE_response); return offset; } @@ -5214,6 +5332,7 @@ static int dissect_error_action_impl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_ftam_Error_Action(TRUE, tvb, offset, pinfo, tree, hf_ftam_error_action); } + static const ber_sequence_t F_GROUP_MOVE_request_sequence[] = { { BER_CLASS_APP, 24, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_destination_file_directory }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_override_impl }, @@ -5229,7 +5348,7 @@ static const ber_sequence_t F_GROUP_MOVE_request_sequence[] = { static int dissect_ftam_F_GROUP_MOVE_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(implicit_tag, pinfo, tree, tvb, offset, - F_GROUP_MOVE_request_sequence, hf_index, ett_ftam_F_GROUP_MOVE_request); + F_GROUP_MOVE_request_sequence, hf_index, ett_ftam_F_GROUP_MOVE_request); return offset; } @@ -5237,6 +5356,7 @@ static int dissect_f_group_move_request_impl(packet_info *pinfo, proto_tree *tre return dissect_ftam_F_GROUP_MOVE_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_group_move_request); } + static const ber_sequence_t F_GROUP_MOVE_response_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 24, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_destination_file_directory }, @@ -5248,7 +5368,7 @@ static const ber_sequence_t F_GROUP_MOVE_response_sequence[] = { static int dissect_ftam_F_GROUP_MOVE_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(implicit_tag, pinfo, tree, tvb, offset, - F_GROUP_MOVE_response_sequence, hf_index, ett_ftam_F_GROUP_MOVE_response); + F_GROUP_MOVE_response_sequence, hf_index, ett_ftam_F_GROUP_MOVE_response); return offset; } @@ -5256,6 +5376,7 @@ static int dissect_f_group_move_response_impl(packet_info *pinfo, proto_tree *tr return dissect_ftam_F_GROUP_MOVE_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_group_move_response); } + static const ber_sequence_t F_GROUP_COPY_request_sequence[] = { { BER_CLASS_APP, 24, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_destination_file_directory }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_override_impl }, @@ -5271,7 +5392,7 @@ static const ber_sequence_t F_GROUP_COPY_request_sequence[] = { static int dissect_ftam_F_GROUP_COPY_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(implicit_tag, pinfo, tree, tvb, offset, - F_GROUP_COPY_request_sequence, hf_index, ett_ftam_F_GROUP_COPY_request); + F_GROUP_COPY_request_sequence, hf_index, ett_ftam_F_GROUP_COPY_request); return offset; } @@ -5279,6 +5400,7 @@ static int dissect_f_group_copy_request_impl(packet_info *pinfo, proto_tree *tre return dissect_ftam_F_GROUP_COPY_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_group_copy_request); } + static const ber_sequence_t F_GROUP_COPY_response_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 24, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_destination_file_directory }, @@ -5290,7 +5412,7 @@ static const ber_sequence_t F_GROUP_COPY_response_sequence[] = { static int dissect_ftam_F_GROUP_COPY_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(implicit_tag, pinfo, tree, tvb, offset, - F_GROUP_COPY_response_sequence, hf_index, ett_ftam_F_GROUP_COPY_response); + F_GROUP_COPY_response_sequence, hf_index, ett_ftam_F_GROUP_COPY_response); return offset; } @@ -5298,6 +5420,7 @@ static int dissect_f_group_copy_response_impl(packet_info *pinfo, proto_tree *tr return dissect_ftam_F_GROUP_COPY_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_group_copy_response); } + static const ber_sequence_t F_GROUP_LIST_request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_attribute_names_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_attribute_extension_names_impl }, @@ -5307,7 +5430,7 @@ static const ber_sequence_t F_GROUP_LIST_request_sequence[] = { static int dissect_ftam_F_GROUP_LIST_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(implicit_tag, pinfo, tree, tvb, offset, - F_GROUP_LIST_request_sequence, hf_index, ett_ftam_F_GROUP_LIST_request); + F_GROUP_LIST_request_sequence, hf_index, ett_ftam_F_GROUP_LIST_request); return offset; } @@ -5315,6 +5438,7 @@ static int dissect_f_group_list_request_impl(packet_info *pinfo, proto_tree *tre return dissect_ftam_F_GROUP_LIST_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_group_list_request); } + static const ber_sequence_t F_GROUP_LIST_response_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_objects_attributes_list }, @@ -5325,7 +5449,7 @@ static const ber_sequence_t F_GROUP_LIST_response_sequence[] = { static int dissect_ftam_F_GROUP_LIST_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(implicit_tag, pinfo, tree, tvb, offset, - F_GROUP_LIST_response_sequence, hf_index, ett_ftam_F_GROUP_LIST_response); + F_GROUP_LIST_response_sequence, hf_index, ett_ftam_F_GROUP_LIST_response); return offset; } @@ -5333,6 +5457,7 @@ static int dissect_f_group_list_response_impl(packet_info *pinfo, proto_tree *tr return dissect_ftam_F_GROUP_LIST_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_group_list_response); } + static const ber_sequence_t F_GROUP_CHANGE_ATTRIB_request_sequence[] = { { BER_CLASS_APP, 8, BER_FLAGS_NOOWNTAG, dissect_attributes }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_error_action_impl }, @@ -5344,7 +5469,7 @@ static const ber_sequence_t F_GROUP_CHANGE_ATTRIB_request_sequence[] = { static int dissect_ftam_F_GROUP_CHANGE_ATTRIB_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(implicit_tag, pinfo, tree, tvb, offset, - F_GROUP_CHANGE_ATTRIB_request_sequence, hf_index, ett_ftam_F_GROUP_CHANGE_ATTRIB_request); + F_GROUP_CHANGE_ATTRIB_request_sequence, hf_index, ett_ftam_F_GROUP_CHANGE_ATTRIB_request); return offset; } @@ -5352,6 +5477,7 @@ static int dissect_f_group_Change_attrib_request_impl(packet_info *pinfo, proto_ return dissect_ftam_F_GROUP_CHANGE_ATTRIB_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_group_Change_attrib_request); } + static const ber_sequence_t F_GROUP_CHANGE_ATTRIB_response_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_operation_result }, @@ -5363,7 +5489,7 @@ static const ber_sequence_t F_GROUP_CHANGE_ATTRIB_response_sequence[] = { static int dissect_ftam_F_GROUP_CHANGE_ATTRIB_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(implicit_tag, pinfo, tree, tvb, offset, - F_GROUP_CHANGE_ATTRIB_response_sequence, hf_index, ett_ftam_F_GROUP_CHANGE_ATTRIB_response); + F_GROUP_CHANGE_ATTRIB_response_sequence, hf_index, ett_ftam_F_GROUP_CHANGE_ATTRIB_response); return offset; } @@ -5371,6 +5497,7 @@ static int dissect_f_group_Change_attrib_response_impl(packet_info *pinfo, proto return dissect_ftam_F_GROUP_CHANGE_ATTRIB_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_group_Change_attrib_response); } + static const ber_sequence_t F_SELECT_ANOTHER_request_sequence[] = { { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information }, { 0, 0, 0, NULL } @@ -5379,7 +5506,7 @@ static const ber_sequence_t F_SELECT_ANOTHER_request_sequence[] = { static int dissect_ftam_F_SELECT_ANOTHER_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(implicit_tag, pinfo, tree, tvb, offset, - F_SELECT_ANOTHER_request_sequence, hf_index, ett_ftam_F_SELECT_ANOTHER_request); + F_SELECT_ANOTHER_request_sequence, hf_index, ett_ftam_F_SELECT_ANOTHER_request); return offset; } @@ -5387,6 +5514,7 @@ static int dissect_f_select_another_request_impl(packet_info *pinfo, proto_tree return dissect_ftam_F_SELECT_ANOTHER_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_select_another_request); } + static const ber_sequence_t F_SELECT_ANOTHER_response_sequence[] = { { BER_CLASS_APP, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_state_result }, { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, @@ -5400,7 +5528,7 @@ static const ber_sequence_t F_SELECT_ANOTHER_response_sequence[] = { static int dissect_ftam_F_SELECT_ANOTHER_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(implicit_tag, pinfo, tree, tvb, offset, - F_SELECT_ANOTHER_response_sequence, hf_index, ett_ftam_F_SELECT_ANOTHER_response); + F_SELECT_ANOTHER_response_sequence, hf_index, ett_ftam_F_SELECT_ANOTHER_response); return offset; } @@ -5408,6 +5536,7 @@ static int dissect_f_select_another_response_impl(packet_info *pinfo, proto_tree return dissect_ftam_F_SELECT_ANOTHER_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_select_another_response); } + static const ber_sequence_t F_CREATE_DIRECTORY_request_sequence[] = { { BER_CLASS_APP, 12, BER_FLAGS_NOOWNTAG, dissect_initial_attributes }, { BER_CLASS_APP, 17, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_create_password }, @@ -5420,7 +5549,7 @@ static const ber_sequence_t F_CREATE_DIRECTORY_request_sequence[] = { static int dissect_ftam_F_CREATE_DIRECTORY_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(implicit_tag, pinfo, tree, tvb, offset, - F_CREATE_DIRECTORY_request_sequence, hf_index, ett_ftam_F_CREATE_DIRECTORY_request); + F_CREATE_DIRECTORY_request_sequence, hf_index, ett_ftam_F_CREATE_DIRECTORY_request); return offset; } @@ -5428,6 +5557,7 @@ static int dissect_f_create_directory_request_impl(packet_info *pinfo, proto_tre return dissect_ftam_F_CREATE_DIRECTORY_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_create_directory_request); } + static const ber_sequence_t F_CREATE_DIRECTORY_response_sequence[] = { { BER_CLASS_APP, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_state_result }, { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, @@ -5440,7 +5570,7 @@ static const ber_sequence_t F_CREATE_DIRECTORY_response_sequence[] = { static int dissect_ftam_F_CREATE_DIRECTORY_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(implicit_tag, pinfo, tree, tvb, offset, - F_CREATE_DIRECTORY_response_sequence, hf_index, ett_ftam_F_CREATE_DIRECTORY_response); + F_CREATE_DIRECTORY_response_sequence, hf_index, ett_ftam_F_CREATE_DIRECTORY_response); return offset; } @@ -5448,9 +5578,10 @@ static int dissect_f_create_directory_response_impl(packet_info *pinfo, proto_tr return dissect_ftam_F_CREATE_DIRECTORY_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_create_directory_response); } + static const ber_sequence_t F_LINK_request_sequence[] = { { BER_CLASS_APP, 12, BER_FLAGS_NOOWNTAG, dissect_initial_attributes }, - { -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_target_object }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_target_object }, { BER_CLASS_APP, 17, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_create_password }, { BER_CLASS_APP, 3, BER_FLAGS_NOOWNTAG, dissect_requested_access }, { BER_CLASS_APP, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_access_passwords }, @@ -5464,7 +5595,7 @@ static const ber_sequence_t F_LINK_request_sequence[] = { static int dissect_ftam_F_LINK_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(implicit_tag, pinfo, tree, tvb, offset, - F_LINK_request_sequence, hf_index, ett_ftam_F_LINK_request); + F_LINK_request_sequence, hf_index, ett_ftam_F_LINK_request); return offset; } @@ -5472,11 +5603,12 @@ static int dissect_f_link_request_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_ftam_F_LINK_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_link_request); } + static const ber_sequence_t F_LINK_response_sequence[] = { { BER_CLASS_APP, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_state_result }, { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 12, BER_FLAGS_NOOWNTAG, dissect_initial_attributes }, - { -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_target_Object }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_target_Object }, { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information }, { BER_CLASS_APP, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnostic }, { 0, 0, 0, NULL } @@ -5485,7 +5617,7 @@ static const ber_sequence_t F_LINK_response_sequence[] = { static int dissect_ftam_F_LINK_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(implicit_tag, pinfo, tree, tvb, offset, - F_LINK_response_sequence, hf_index, ett_ftam_F_LINK_response); + F_LINK_response_sequence, hf_index, ett_ftam_F_LINK_response); return offset; } @@ -5493,6 +5625,7 @@ static int dissect_f_link_response_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_ftam_F_LINK_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_link_response); } + static const ber_sequence_t F_UNLINK_request_sequence[] = { { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information }, { 0, 0, 0, NULL } @@ -5501,7 +5634,7 @@ static const ber_sequence_t F_UNLINK_request_sequence[] = { static int dissect_ftam_F_UNLINK_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(implicit_tag, pinfo, tree, tvb, offset, - F_UNLINK_request_sequence, hf_index, ett_ftam_F_UNLINK_request); + F_UNLINK_request_sequence, hf_index, ett_ftam_F_UNLINK_request); return offset; } @@ -5509,6 +5642,7 @@ static int dissect_f_unlink_request_impl(packet_info *pinfo, proto_tree *tree, t return dissect_ftam_F_UNLINK_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_unlink_request); } + static const ber_sequence_t F_UNLINK_response_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_shared_ASE_information }, @@ -5520,7 +5654,7 @@ static const ber_sequence_t F_UNLINK_response_sequence[] = { static int dissect_ftam_F_UNLINK_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(implicit_tag, pinfo, tree, tvb, offset, - F_UNLINK_response_sequence, hf_index, ett_ftam_F_UNLINK_response); + F_UNLINK_response_sequence, hf_index, ett_ftam_F_UNLINK_response); return offset; } @@ -5528,6 +5662,7 @@ static int dissect_f_unlink_response_impl(packet_info *pinfo, proto_tree *tree, return dissect_ftam_F_UNLINK_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_unlink_response); } + static const ber_sequence_t F_READ_LINK_ATTRIB_request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_attribute_names_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_attribute_extension_names_impl }, @@ -5537,7 +5672,7 @@ static const ber_sequence_t F_READ_LINK_ATTRIB_request_sequence[] = { static int dissect_ftam_F_READ_LINK_ATTRIB_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(implicit_tag, pinfo, tree, tvb, offset, - F_READ_LINK_ATTRIB_request_sequence, hf_index, ett_ftam_F_READ_LINK_ATTRIB_request); + F_READ_LINK_ATTRIB_request_sequence, hf_index, ett_ftam_F_READ_LINK_ATTRIB_request); return offset; } @@ -5545,6 +5680,7 @@ static int dissect_f_read_link_attrib_request_impl(packet_info *pinfo, proto_tre return dissect_ftam_F_READ_LINK_ATTRIB_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_read_link_attrib_request); } + static const ber_sequence_t F_READ_LINK_ATTRIB_response_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 18, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_read_link_attributes }, @@ -5555,7 +5691,7 @@ static const ber_sequence_t F_READ_LINK_ATTRIB_response_sequence[] = { static int dissect_ftam_F_READ_LINK_ATTRIB_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(implicit_tag, pinfo, tree, tvb, offset, - F_READ_LINK_ATTRIB_response_sequence, hf_index, ett_ftam_F_READ_LINK_ATTRIB_response); + F_READ_LINK_ATTRIB_response_sequence, hf_index, ett_ftam_F_READ_LINK_ATTRIB_response); return offset; } @@ -5563,6 +5699,7 @@ static int dissect_f_read_link_attrib_response_impl(packet_info *pinfo, proto_tr return dissect_ftam_F_READ_LINK_ATTRIB_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_read_link_attrib_response); } + static const ber_sequence_t F_CHANGE_LINK_ATTRIB_request_sequence[] = { { BER_CLASS_APP, 8, BER_FLAGS_NOOWNTAG, dissect_attributes }, { 0, 0, 0, NULL } @@ -5571,7 +5708,7 @@ static const ber_sequence_t F_CHANGE_LINK_ATTRIB_request_sequence[] = { static int dissect_ftam_F_CHANGE_LINK_ATTRIB_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(implicit_tag, pinfo, tree, tvb, offset, - F_CHANGE_LINK_ATTRIB_request_sequence, hf_index, ett_ftam_F_CHANGE_LINK_ATTRIB_request); + F_CHANGE_LINK_ATTRIB_request_sequence, hf_index, ett_ftam_F_CHANGE_LINK_ATTRIB_request); return offset; } @@ -5579,6 +5716,7 @@ static int dissect_f_Change_link_attrib_request_impl(packet_info *pinfo, proto_t return dissect_ftam_F_CHANGE_LINK_ATTRIB_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_Change_link_attrib_request); } + static const ber_sequence_t F_CHANGE_LINK_ATTRIB_response_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_attributes }, @@ -5589,7 +5727,7 @@ static const ber_sequence_t F_CHANGE_LINK_ATTRIB_response_sequence[] = { static int dissect_ftam_F_CHANGE_LINK_ATTRIB_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(implicit_tag, pinfo, tree, tvb, offset, - F_CHANGE_LINK_ATTRIB_response_sequence, hf_index, ett_ftam_F_CHANGE_LINK_ATTRIB_response); + F_CHANGE_LINK_ATTRIB_response_sequence, hf_index, ett_ftam_F_CHANGE_LINK_ATTRIB_response); return offset; } @@ -5597,6 +5735,7 @@ static int dissect_f_Change_Iink_attrib_response_impl(packet_info *pinfo, proto_ return dissect_ftam_F_CHANGE_LINK_ATTRIB_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_Change_Iink_attrib_response); } + static const ber_sequence_t F_MOVE_request_sequence[] = { { BER_CLASS_APP, 24, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_destination_file_directory }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_override_impl }, @@ -5610,7 +5749,7 @@ static const ber_sequence_t F_MOVE_request_sequence[] = { static int dissect_ftam_F_MOVE_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(implicit_tag, pinfo, tree, tvb, offset, - F_MOVE_request_sequence, hf_index, ett_ftam_F_MOVE_request); + F_MOVE_request_sequence, hf_index, ett_ftam_F_MOVE_request); return offset; } @@ -5618,6 +5757,7 @@ static int dissect_f_move_request_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_ftam_F_MOVE_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_move_request); } + static const ber_sequence_t F_MOVE_response_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 24, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_destination_file_directory }, @@ -5629,7 +5769,7 @@ static const ber_sequence_t F_MOVE_response_sequence[] = { static int dissect_ftam_F_MOVE_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(implicit_tag, pinfo, tree, tvb, offset, - F_MOVE_response_sequence, hf_index, ett_ftam_F_MOVE_response); + F_MOVE_response_sequence, hf_index, ett_ftam_F_MOVE_response); return offset; } @@ -5637,6 +5777,7 @@ static int dissect_f_move_response_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_ftam_F_MOVE_response(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_move_response); } + static const ber_sequence_t F_COPY_request_sequence[] = { { BER_CLASS_APP, 24, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_destination_file_directory }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_override_impl }, @@ -5650,7 +5791,7 @@ static const ber_sequence_t F_COPY_request_sequence[] = { static int dissect_ftam_F_COPY_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(implicit_tag, pinfo, tree, tvb, offset, - F_COPY_request_sequence, hf_index, ett_ftam_F_COPY_request); + F_COPY_request_sequence, hf_index, ett_ftam_F_COPY_request); return offset; } @@ -5658,6 +5799,7 @@ static int dissect_f_copy_request_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_ftam_F_COPY_request(TRUE, tvb, offset, pinfo, tree, hf_ftam_f_copy_request); } + static const ber_sequence_t F_COPY_response_sequence[] = { { BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_action_result }, { BER_CLASS_APP, 24, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_destination_file_directory }, @@ -5669,7 +5811,7 @@ static const ber_sequence_t F_COPY_response_sequence[] = { static int dissect_ftam_F_COPY_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(implicit_tag, pinfo, tree, tvb, offset, - F_COPY_response_sequence, hf_index, ett_ftam_F_COPY_response); + F_COPY_response_sequence, hf_index, ett_ftam_F_COPY_response); return offset; } @@ -5780,10 +5922,10 @@ static const value_string ftam_PDU_vals[] = { }; static const ber_choice_t PDU_choice[] = { - { 0, BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_fTAM_Regime_PDU }, - { 1, BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_file_PDU }, - { 2, BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_bulk_Data_PDU }, - { 3, BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_fSM_PDU }, + { 0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_fTAM_Regime_PDU }, + { 1, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_file_PDU }, + { 2, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_bulk_Data_PDU }, + { 3, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_fSM_PDU }, { 4, BER_CLASS_PRI, 2, BER_FLAGS_IMPLTAG, dissect_nBS9_impl }, { 0, 0, 0, 0, NULL } }; @@ -5791,11 +5933,13 @@ 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, - PDU_choice, hf_index, ett_ftam_PDU, NULL); + PDU_choice, hf_index, ett_ftam_PDU, + NULL); return offset; } + static const ber_sequence_t F_CHECK_request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_checkpoint_identifier_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_transfer_number_impl }, @@ -5805,11 +5949,12 @@ static const ber_sequence_t F_CHECK_request_sequence[] = { static int dissect_ftam_F_CHECK_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(implicit_tag, pinfo, tree, tvb, offset, - F_CHECK_request_sequence, hf_index, ett_ftam_F_CHECK_request); + F_CHECK_request_sequence, hf_index, ett_ftam_F_CHECK_request); return offset; } + static const ber_sequence_t F_CHECK_response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_checkpoint_identifier_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_transfer_number_impl }, @@ -5819,7 +5964,7 @@ static const ber_sequence_t F_CHECK_response_sequence[] = { static int dissect_ftam_F_CHECK_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(implicit_tag, pinfo, tree, tvb, offset, - F_CHECK_response_sequence, hf_index, ett_ftam_F_CHECK_response); + F_CHECK_response_sequence, hf_index, ett_ftam_F_CHECK_response); return offset; } @@ -5838,6 +5983,7 @@ dissect_ftam_OR_Set(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet } + static int dissect_ftam_Other_Pattern(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ftam_Equality_Comparision(implicit_tag, tvb, offset, pinfo, tree, hf_index); diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index 54ebc86487..f6a0f7c36c 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -1292,11 +1292,12 @@ 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, BER_UNI_TAG_IA5String, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1326,11 +1327,12 @@ static int dissect_domainName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ } + static int dissect_h248_PathName(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, BER_UNI_TAG_IA5String, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1390,11 +1392,12 @@ static int dissect_errorCode_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_h248_ErrorText(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, BER_UNI_TAG_IA5String, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -2240,11 +2243,12 @@ 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, BER_UNI_TAG_IA5String, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -2519,6 +2523,7 @@ static int dissect_sigType_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_h248_SignalType(TRUE, tvb, offset, pinfo, tree, hf_h248_sigType); } + static const asn_namedbit NotifyCompletion_bits[] = { { 0, &hf_h248_NotifyCompletion_onTimeOut, -1, -1, "onTimeOut", NULL }, { 1, &hf_h248_NotifyCompletion_onInterruptByEvent, -1, -1, "onInterruptByEvent", NULL }, @@ -2530,8 +2535,8 @@ static const asn_namedbit NotifyCompletion_bits[] = { static int dissect_h248_NotifyCompletion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - NotifyCompletion_bits, hf_index, ett_h248_NotifyCompletion, - NULL); + NotifyCompletion_bits, hf_index, ett_h248_NotifyCompletion, + NULL); return offset; } @@ -2683,7 +2688,7 @@ static int dissect_SignalsDescriptor_item(packet_info *pinfo, proto_tree *tree, static const ber_sequence_t SignalsDescriptor_sequence_of[1] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_SignalsDescriptor_item }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_SignalsDescriptor_item }, }; static int @@ -2935,6 +2940,7 @@ static int dissect_digitMapDescriptor_impl(packet_info *pinfo, proto_tree *tree, return dissect_h248_DigitMapDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_digitMapDescriptor); } + static const asn_namedbit T_auditToken_bits[] = { { 0, &hf_h248_T_auditToken_muxToken, -1, -1, "muxToken", NULL }, { 1, &hf_h248_T_auditToken_modemToken, -1, -1, "modemToken", NULL }, @@ -2952,8 +2958,8 @@ static const asn_namedbit T_auditToken_bits[] = { static int dissect_h248_T_auditToken(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - T_auditToken_bits, hf_index, ett_h248_T_auditToken, - NULL); + T_auditToken_bits, hf_index, ett_h248_T_auditToken, + NULL); return offset; } @@ -3362,7 +3368,7 @@ static int dissect_auditPropertyToken_item(packet_info *pinfo, proto_tree *tree, 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 }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_auditPropertyToken_item }, }; static int @@ -3439,7 +3445,7 @@ static int dissect_descriptors_item(packet_info *pinfo, proto_tree *tree, tvbuff 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 }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_descriptors_item }, }; static int @@ -3740,11 +3746,12 @@ 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, BER_UNI_TAG_IA5String, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -4086,7 +4093,7 @@ static int dissect_TerminationAudit_item(packet_info *pinfo, proto_tree *tree, t static const ber_sequence_t TerminationAudit_sequence_of[1] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_TerminationAudit_item }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_TerminationAudit_item }, }; static int @@ -4370,7 +4377,7 @@ static int dissect_commandReply_item(packet_info *pinfo, proto_tree *tree, tvbuf 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 }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_commandReply_item }, }; static int @@ -4530,7 +4537,7 @@ static int dissect_transactions_item(packet_info *pinfo, proto_tree *tree, tvbuf 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 }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_transactions_item }, }; static int diff --git a/epan/dissectors/packet-logotypecertextn.c b/epan/dissectors/packet-logotypecertextn.c index f0c0b9b41e..39dd21ac77 100644 --- a/epan/dissectors/packet-logotypecertextn.c +++ b/epan/dissectors/packet-logotypecertextn.c @@ -136,11 +136,12 @@ static int dissect_hashAlg(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, } + static int dissect_logotypecertextn_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, BER_UNI_TAG_IA5String, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -170,6 +171,7 @@ static int dissect_hashValue(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_logotypecertextn_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_hashValue); } + static const ber_sequence_t HashAlgAndValue_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_hashAlg }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_hashValue }, @@ -179,7 +181,7 @@ static const ber_sequence_t HashAlgAndValue_sequence[] = { static int dissect_logotypecertextn_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(implicit_tag, pinfo, tree, tvb, offset, - HashAlgAndValue_sequence, hf_index, ett_logotypecertextn_HashAlgAndValue); + HashAlgAndValue_sequence, hf_index, ett_logotypecertextn_HashAlgAndValue); return offset; } @@ -225,6 +227,7 @@ static int dissect_logotypeURI(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_logotypecertextn_T_logotypeURI(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_logotypeURI); } + static const ber_sequence_t LogotypeDetails_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_mediaType }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_logotypeHash }, @@ -235,7 +238,7 @@ static const ber_sequence_t LogotypeDetails_sequence[] = { static int dissect_logotypecertextn_LogotypeDetails(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - LogotypeDetails_sequence, hf_index, ett_logotypecertextn_LogotypeDetails); + LogotypeDetails_sequence, hf_index, ett_logotypecertextn_LogotypeDetails); return offset; } @@ -315,7 +318,8 @@ 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, - LogotypeImageResolution_choice, hf_index, ett_logotypecertextn_LogotypeImageResolution, NULL); + LogotypeImageResolution_choice, hf_index, ett_logotypecertextn_LogotypeImageResolution, + NULL); return offset; } @@ -323,12 +327,13 @@ static int dissect_resolution(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_logotypecertextn_LogotypeImageResolution(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_resolution); } + static const ber_sequence_t LogotypeImageInfo_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_type_impl }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_fileSize }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_xSize }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_ySize }, - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_resolution }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_resolution }, { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_language_impl }, { 0, 0, 0, NULL } }; @@ -336,7 +341,7 @@ static const ber_sequence_t LogotypeImageInfo_sequence[] = { static int dissect_logotypecertextn_LogotypeImageInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - LogotypeImageInfo_sequence, hf_index, ett_logotypecertextn_LogotypeImageInfo); + LogotypeImageInfo_sequence, hf_index, ett_logotypecertextn_LogotypeImageInfo); return offset; } @@ -344,6 +349,7 @@ static int dissect_imageInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_logotypecertextn_LogotypeImageInfo(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_imageInfo); } + static const ber_sequence_t LogotypeImage_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_imageDetails }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_imageInfo }, @@ -353,7 +359,7 @@ static const ber_sequence_t LogotypeImage_sequence[] = { static int dissect_logotypecertextn_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(implicit_tag, pinfo, tree, tvb, offset, - LogotypeImage_sequence, hf_index, ett_logotypecertextn_LogotypeImage); + LogotypeImage_sequence, hf_index, ett_logotypecertextn_LogotypeImage); return offset; } @@ -377,6 +383,7 @@ static int dissect_image(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in return dissect_logotypecertextn_SEQUENCE_OF_LogotypeImage(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_image); } + static const ber_sequence_t LogotypeAudioInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_fileSize }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_playTime }, @@ -389,7 +396,7 @@ static const ber_sequence_t LogotypeAudioInfo_sequence[] = { static int dissect_logotypecertextn_LogotypeAudioInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - LogotypeAudioInfo_sequence, hf_index, ett_logotypecertextn_LogotypeAudioInfo); + LogotypeAudioInfo_sequence, hf_index, ett_logotypecertextn_LogotypeAudioInfo); return offset; } @@ -397,6 +404,7 @@ static int dissect_audioInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_logotypecertextn_LogotypeAudioInfo(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_audioInfo); } + static const ber_sequence_t LogotypeAudio_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_audioDetails }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_audioInfo }, @@ -406,7 +414,7 @@ static const ber_sequence_t LogotypeAudio_sequence[] = { static int dissect_logotypecertextn_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(implicit_tag, pinfo, tree, tvb, offset, - LogotypeAudio_sequence, hf_index, ett_logotypecertextn_LogotypeAudio); + LogotypeAudio_sequence, hf_index, ett_logotypecertextn_LogotypeAudio); return offset; } @@ -430,6 +438,7 @@ static int dissect_audio_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_logotypecertextn_SEQUENCE_OF_LogotypeAudio(TRUE, tvb, offset, pinfo, tree, hf_logotypecertextn_audio); } + static const ber_sequence_t LogotypeData_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_image }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_audio_impl }, @@ -439,7 +448,7 @@ static const ber_sequence_t LogotypeData_sequence[] = { static int dissect_logotypecertextn_LogotypeData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - LogotypeData_sequence, hf_index, ett_logotypecertextn_LogotypeData); + LogotypeData_sequence, hf_index, ett_logotypecertextn_LogotypeData); return offset; } @@ -463,6 +472,7 @@ static int dissect_refStructURI(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_logotypecertextn_T_refStructURI(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_refStructURI); } + static const ber_sequence_t LogotypeReference_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_refStructHash }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_refStructURI }, @@ -472,7 +482,7 @@ static const ber_sequence_t LogotypeReference_sequence[] = { static int dissect_logotypecertextn_LogotypeReference(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - LogotypeReference_sequence, hf_index, ett_logotypecertextn_LogotypeReference); + LogotypeReference_sequence, hf_index, ett_logotypecertextn_LogotypeReference); return offset; } @@ -496,7 +506,8 @@ 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, - LogotypeInfo_choice, hf_index, ett_logotypecertextn_LogotypeInfo, NULL); + LogotypeInfo_choice, hf_index, ett_logotypecertextn_LogotypeInfo, + NULL); return offset; } @@ -515,7 +526,7 @@ static int dissect_info(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int 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 }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_communityLogos_item }, }; static int @@ -542,16 +553,17 @@ static int dissect_logotypeType(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_logotypecertextn_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_logotypeType); } + static const ber_sequence_t OtherLogotypeInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_logotypeType }, - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_info }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_info }, { 0, 0, 0, NULL } }; static int dissect_logotypecertextn_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(implicit_tag, pinfo, tree, tvb, offset, - OtherLogotypeInfo_sequence, hf_index, ett_logotypecertextn_OtherLogotypeInfo); + OtherLogotypeInfo_sequence, hf_index, ett_logotypecertextn_OtherLogotypeInfo); return offset; } @@ -575,6 +587,7 @@ static int dissect_otherLogos(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_logotypecertextn_SEQUENCE_OF_OtherLogotypeInfo(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_otherLogos); } + static const ber_sequence_t LogotypeExtn_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_communityLogos }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_issuerLogo }, @@ -586,7 +599,7 @@ static const ber_sequence_t LogotypeExtn_sequence[] = { static int dissect_logotypecertextn_LogotypeExtn(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - LogotypeExtn_sequence, hf_index, ett_logotypecertextn_LogotypeExtn); + LogotypeExtn_sequence, hf_index, ett_logotypecertextn_LogotypeExtn); return offset; } diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c index c6111ff8de..6fedeb876a 100644 --- a/epan/dissectors/packet-mms.c +++ b/epan/dissectors/packet-mms.c @@ -1070,11 +1070,12 @@ static int dissect_sizeOfFile_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ } + static int dissect_mms_Identifier(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, BER_UNI_TAG_VisibleString, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1145,6 +1146,7 @@ static int dissect_domain_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_mms_Identifier(TRUE, tvb, offset, pinfo, tree, hf_mms_domain); } + static const ber_sequence_t T_domain_specific_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_domainId }, { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_itemId }, @@ -1154,7 +1156,7 @@ static const ber_sequence_t T_domain_specific_sequence[] = { static int dissect_mms_T_domain_specific(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_domain_specific_sequence, hf_index, ett_mms_T_domain_specific); + T_domain_specific_sequence, hf_index, ett_mms_T_domain_specific); return offset; } @@ -1180,7 +1182,8 @@ 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, - ObjectName_choice, hf_index, ett_mms_ObjectName, NULL); + ObjectName_choice, hf_index, ett_mms_ObjectName, + NULL); return offset; } @@ -1251,6 +1254,7 @@ static int dissect_journalName(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_mms_ObjectName(FALSE, tvb, offset, pinfo, tree, hf_mms_journalName); } + static const asn_namedbit Transitions_bits[] = { { 0, &hf_mms_Transitions_idle_to_disabled, -1, -1, "idle-to-disabled", NULL }, { 1, &hf_mms_Transitions_active_to_disabled, -1, -1, "active-to-disabled", NULL }, @@ -1265,8 +1269,8 @@ static const asn_namedbit Transitions_bits[] = { static int dissect_mms_Transitions(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - Transitions_bits, hf_index, ett_mms_Transitions, - NULL); + Transitions_bits, hf_index, ett_mms_Transitions, + NULL); return offset; } @@ -1280,6 +1284,7 @@ static int dissect_causingTransitions_impl(packet_info *pinfo, proto_tree *tree, return dissect_mms_Transitions(TRUE, tvb, offset, pinfo, tree, hf_mms_causingTransitions); } + static const ber_sequence_t AttachToEventCondition_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventEnrollmentName }, { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_eventConditionName }, @@ -1291,7 +1296,7 @@ static const ber_sequence_t AttachToEventCondition_sequence[] = { static int dissect_mms_AttachToEventCondition(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - AttachToEventCondition_sequence, hf_index, ett_mms_AttachToEventCondition); + AttachToEventCondition_sequence, hf_index, ett_mms_AttachToEventCondition); return offset; } @@ -1328,6 +1333,7 @@ static int dissect_leastSevere_impl(packet_info *pinfo, proto_tree *tree, tvbuff } + static int dissect_mms_Priority(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_Unsigned8(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -1404,6 +1410,7 @@ static int dissect_activeAlarmsOnly_impl(packet_info *pinfo, proto_tree *tree, t return dissect_mms_BOOLEAN(TRUE, tvb, offset, pinfo, tree, hf_mms_activeAlarmsOnly); } + static const ber_sequence_t AttachToSemaphore_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_semaphoreName }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_namedToken_impl }, @@ -1418,7 +1425,7 @@ static const ber_sequence_t AttachToSemaphore_sequence[] = { static int dissect_mms_AttachToSemaphore(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - AttachToSemaphore_sequence, hf_index, ett_mms_AttachToSemaphore); + AttachToSemaphore_sequence, hf_index, ett_mms_AttachToSemaphore); return offset; } @@ -1442,7 +1449,8 @@ 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, - Modifier_choice, hf_index, ett_mms_Modifier, NULL); + Modifier_choice, hf_index, ett_mms_Modifier, + NULL); return offset; } @@ -1452,7 +1460,7 @@ static int dissect_listOfModifier_item(packet_info *pinfo, proto_tree *tree, tvb 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 }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_listOfModifier_item }, }; static int @@ -1524,7 +1532,8 @@ 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, - T_extendedObjectClass_choice, hf_index, ett_mms_T_extendedObjectClass, NULL); + T_extendedObjectClass_choice, hf_index, ett_mms_T_extendedObjectClass, + NULL); return offset; } @@ -1595,7 +1604,8 @@ 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, - T_objectScope_choice, hf_index, ett_mms_T_objectScope, NULL); + T_objectScope_choice, hf_index, ett_mms_T_objectScope, + NULL); return offset; } @@ -1603,6 +1613,7 @@ static int dissect_objectScope(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_mms_T_objectScope(FALSE, tvb, offset, pinfo, tree, hf_mms_objectScope); } + static const ber_sequence_t GetNameList_Request_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_extendedObjectClass }, { BER_CLASS_CON, 1, 0, dissect_objectScope }, @@ -1613,7 +1624,7 @@ static const ber_sequence_t GetNameList_Request_sequence[] = { static int dissect_mms_GetNameList_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(implicit_tag, pinfo, tree, tvb, offset, - GetNameList_Request_sequence, hf_index, ett_mms_GetNameList_Request); + GetNameList_Request_sequence, hf_index, ett_mms_GetNameList_Request); return offset; } @@ -1676,7 +1687,8 @@ 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, - T_extendedObjectClass1_choice, hf_index, ett_mms_T_extendedObjectClass1, NULL); + T_extendedObjectClass1_choice, hf_index, ett_mms_T_extendedObjectClass1, + NULL); return offset; } @@ -1684,6 +1696,7 @@ static int dissect_extendedObjectClass1(packet_info *pinfo, proto_tree *tree, tv return dissect_mms_T_extendedObjectClass1(FALSE, tvb, offset, pinfo, tree, hf_mms_extendedObjectClass1); } + static const ber_sequence_t Rename_Request_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_extendedObjectClass1 }, { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_currentName }, @@ -1694,7 +1707,7 @@ static const ber_sequence_t Rename_Request_sequence[] = { static int dissect_mms_Rename_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(implicit_tag, pinfo, tree, tvb, offset, - Rename_Request_sequence, hf_index, ett_mms_Rename_Request); + Rename_Request_sequence, hf_index, ett_mms_Rename_Request); return offset; } @@ -1703,11 +1716,12 @@ static int dissect_rename_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t } + static int dissect_mms_VisibleString(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, BER_UNI_TAG_VisibleString, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1815,7 +1829,8 @@ 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, - Address_choice, hf_index, ett_mms_Address, NULL); + Address_choice, hf_index, ett_mms_Address, + NULL); return offset; } @@ -1823,6 +1838,7 @@ static int dissect_address(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_mms_Address(FALSE, tvb, offset, pinfo, tree, hf_mms_address); } + static const ber_sequence_t T_array_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_packed_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numberOfElements_impl }, @@ -1833,7 +1849,7 @@ static const ber_sequence_t T_array_sequence[] = { static int dissect_mms_T_array(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_array_sequence, hf_index, ett_mms_T_array); + T_array_sequence, hf_index, ett_mms_T_array); return offset; } @@ -1841,6 +1857,7 @@ static int dissect_array_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_mms_T_array(TRUE, tvb, offset, pinfo, tree, hf_mms_array); } + static const ber_sequence_t T_components_item_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_componentName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_componentType }, @@ -1850,7 +1867,7 @@ static const ber_sequence_t T_components_item_sequence[] = { static int dissect_mms_T_components_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_components_item_sequence, hf_index, ett_mms_T_components_item); + T_components_item_sequence, hf_index, ett_mms_T_components_item); return offset; } @@ -1874,6 +1891,7 @@ static int dissect_components_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_mms_T_components(TRUE, tvb, offset, pinfo, tree, hf_mms_components); } + static const ber_sequence_t T_structure_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_packed_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_components_impl }, @@ -1883,7 +1901,7 @@ static const ber_sequence_t T_structure_sequence[] = { static int dissect_mms_T_structure(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_structure_sequence, hf_index, ett_mms_T_structure); + T_structure_sequence, hf_index, ett_mms_T_structure); return offset; } @@ -1963,21 +1981,23 @@ 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, - TypeSpecification_choice, hf_index, ett_mms_TypeSpecification, NULL); + TypeSpecification_choice, hf_index, ett_mms_TypeSpecification, + NULL); return offset; } + static const ber_sequence_t T_variableDescription_sequence[] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_address }, - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_typeSpecification }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_address }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_typeSpecification }, { 0, 0, 0, NULL } }; static int dissect_mms_T_variableDescription(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_variableDescription_sequence, hf_index, ett_mms_T_variableDescription); + T_variableDescription_sequence, hf_index, ett_mms_T_variableDescription); return offset; } @@ -1985,6 +2005,7 @@ static int dissect_variableDescription_impl(packet_info *pinfo, proto_tree *tree return dissect_mms_T_variableDescription(TRUE, tvb, offset, pinfo, tree, hf_mms_variableDescription); } + static const ber_sequence_t T_indexRange_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_lowIndex_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numberOfElements_impl }, @@ -1994,7 +2015,7 @@ static const ber_sequence_t T_indexRange_sequence[] = { static int dissect_mms_T_indexRange(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_indexRange_sequence, hf_index, ett_mms_T_indexRange); + T_indexRange_sequence, hf_index, ett_mms_T_indexRange); return offset; } @@ -2022,7 +2043,8 @@ 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, - T_selectAccess_choice, hf_index, ett_mms_T_selectAccess, NULL); + T_selectAccess_choice, hf_index, ett_mms_T_selectAccess, + NULL); return offset; } @@ -2037,14 +2059,15 @@ static const value_string mms_AlternateAccessSelection_vals[] = { }; static const ber_choice_t AlternateAccessSelection_choice[] = { - { -1/*choice*/, BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_selectAccess }, + { -1/*choice*/, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_selectAccess }, { 0, 0, 0, 0, NULL } }; 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, - AlternateAccessSelection_choice, hf_index, ett_mms_AlternateAccessSelection, NULL); + AlternateAccessSelection_choice, hf_index, ett_mms_AlternateAccessSelection, + NULL); return offset; } @@ -2055,16 +2078,17 @@ static int dissect_accesst(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_mms_AlternateAccessSelection(FALSE, tvb, offset, pinfo, tree, hf_mms_accesst); } + static const ber_sequence_t T_named_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_componentName_impl }, - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_accesst }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_accesst }, { 0, 0, 0, NULL } }; static int dissect_mms_T_named(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_named_sequence, hf_index, ett_mms_T_named); + T_named_sequence, hf_index, ett_mms_T_named); return offset; } @@ -2074,21 +2098,22 @@ static int dissect_named_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv static const value_string mms_AlternateAccess_item_vals[] = { - { -1/*choice*/, "unnamed" }, - { 5, "named" }, + { 0, "unnamed" }, + { 1, "named" }, { 0, NULL } }; static const ber_choice_t AlternateAccess_item_choice[] = { - { -1/*choice*/, BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_unnamed }, - { 5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_named_impl }, + { 0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_unnamed }, + { 1, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_named_impl }, { 0, 0, 0, 0, NULL } }; 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, - AlternateAccess_item_choice, hf_index, ett_mms_AlternateAccess_item, NULL); + AlternateAccess_item_choice, hf_index, ett_mms_AlternateAccess_item, + NULL); return offset; } @@ -2098,7 +2123,7 @@ static int dissect_AlternateAccess_item(packet_info *pinfo, proto_tree *tree, tv static const ber_sequence_t AlternateAccess_sequence_of[1] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_AlternateAccess_item }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_AlternateAccess_item }, }; static int @@ -2112,6 +2137,7 @@ static int dissect_alternateAccess_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_mms_AlternateAccess(TRUE, tvb, offset, pinfo, tree, hf_mms_alternateAccess); } + static const ber_sequence_t ScatteredAccessDescription_item_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_componentName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_variableSpecification }, @@ -2122,7 +2148,7 @@ static const ber_sequence_t ScatteredAccessDescription_item_sequence[] = { static int dissect_mms_ScatteredAccessDescription_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - ScatteredAccessDescription_item_sequence, hf_index, ett_mms_ScatteredAccessDescription_item); + ScatteredAccessDescription_item_sequence, hf_index, ett_mms_ScatteredAccessDescription_item); return offset; } @@ -2168,13 +2194,15 @@ 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, - VariableSpecification_choice, hf_index, ett_mms_VariableSpecification, NULL); + VariableSpecification_choice, hf_index, ett_mms_VariableSpecification, + NULL); return offset; } + static const ber_sequence_t T_listOfVariable_item2_sequence[] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableSpecification }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableSpecification }, { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alternateAccess_impl }, { 0, 0, 0, NULL } }; @@ -2182,7 +2210,7 @@ static const ber_sequence_t T_listOfVariable_item2_sequence[] = { static int dissect_mms_T_listOfVariable_item2(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_listOfVariable_item2_sequence, hf_index, ett_mms_T_listOfVariable_item2); + T_listOfVariable_item2_sequence, hf_index, ett_mms_T_listOfVariable_item2); return offset; } @@ -2222,7 +2250,8 @@ 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, - VariableAccessSpecification_choice, hf_index, ett_mms_VariableAccessSpecification, NULL); + VariableAccessSpecification_choice, hf_index, ett_mms_VariableAccessSpecification, + NULL); return offset; } @@ -2233,6 +2262,7 @@ static int dissect_variableAccessSpecification(packet_info *pinfo, proto_tree *t return dissect_mms_VariableAccessSpecification(FALSE, tvb, offset, pinfo, tree, hf_mms_variableAccessSpecification); } + static const ber_sequence_t Read_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_specificationWithResult_impl }, { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_variableAccessSpecificatn }, @@ -2242,7 +2272,7 @@ static const ber_sequence_t Read_Request_sequence[] = { static int dissect_mms_Read_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(implicit_tag, pinfo, tree, tvb, offset, - Read_Request_sequence, hf_index, ett_mms_Read_Request); + Read_Request_sequence, hf_index, ett_mms_Read_Request); return offset; } @@ -2252,7 +2282,7 @@ static int dissect_read_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb 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 }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_listOfData_item }, }; static int @@ -2273,11 +2303,12 @@ static int dissect_structure1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ } + static int dissect_mms_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - NULL, hf_index, -1, - NULL); + NULL, hf_index, -1, + NULL); return offset; } @@ -2396,13 +2427,15 @@ 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, - Data_choice, hf_index, ett_mms_Data, NULL); + Data_choice, hf_index, ett_mms_Data, + NULL); return offset; } + static const ber_sequence_t Write_Request_sequence[] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableAccessSpecificatn }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableAccessSpecificatn }, { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfData_impl }, { 0, 0, 0, NULL } }; @@ -2410,7 +2443,7 @@ static const ber_sequence_t Write_Request_sequence[] = { static int dissect_mms_Write_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(implicit_tag, pinfo, tree, tvb, offset, - Write_Request_sequence, hf_index, ett_mms_Write_Request); + Write_Request_sequence, hf_index, ett_mms_Write_Request); return offset; } @@ -2434,7 +2467,8 @@ 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, - GetVariableAccessAttributes_Request_choice, hf_index, ett_mms_GetVariableAccessAttributes_Request, NULL); + GetVariableAccessAttributes_Request_choice, hf_index, ett_mms_GetVariableAccessAttributes_Request, + NULL); return offset; } @@ -2442,6 +2476,7 @@ static int dissect_getVariableAccessAttributes(packet_info *pinfo, proto_tree *t return dissect_mms_GetVariableAccessAttributes_Request(FALSE, tvb, offset, pinfo, tree, hf_mms_getVariableAccessAttributes); } + static const ber_sequence_t DefineNamedVariable_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_variableName }, { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_address }, @@ -2452,7 +2487,7 @@ static const ber_sequence_t DefineNamedVariable_Request_sequence[] = { static int dissect_mms_DefineNamedVariable_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(implicit_tag, pinfo, tree, tvb, offset, - DefineNamedVariable_Request_sequence, hf_index, ett_mms_DefineNamedVariable_Request); + DefineNamedVariable_Request_sequence, hf_index, ett_mms_DefineNamedVariable_Request); return offset; } @@ -2460,6 +2495,7 @@ static int dissect_defineNamedVariable_impl(packet_info *pinfo, proto_tree *tree return dissect_mms_DefineNamedVariable_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_defineNamedVariable); } + static const ber_sequence_t DefineScatteredAccess_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_scatteredAccessName }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_scatteredAccessDescription_impl }, @@ -2469,7 +2505,7 @@ static const ber_sequence_t DefineScatteredAccess_Request_sequence[] = { static int dissect_mms_DefineScatteredAccess_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(implicit_tag, pinfo, tree, tvb, offset, - DefineScatteredAccess_Request_sequence, hf_index, ett_mms_DefineScatteredAccess_Request); + DefineScatteredAccess_Request_sequence, hf_index, ett_mms_DefineScatteredAccess_Request); return offset; } @@ -2478,6 +2514,7 @@ static int dissect_defineScatteredAccess_impl(packet_info *pinfo, proto_tree *tr } + static int dissect_mms_GetScatteredAccessAttributes_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_ObjectName(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -2511,7 +2548,7 @@ static int dissect_scopeOfDelete_impl(packet_info *pinfo, proto_tree *tree, tvbu 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 }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_listOfName_item }, }; static int @@ -2537,6 +2574,7 @@ static int dissect_eventEnrollmentNames_impl(packet_info *pinfo, proto_tree *tre return dissect_mms_SEQUENCE_OF_ObjectName(TRUE, tvb, offset, pinfo, tree, hf_mms_eventEnrollmentNames); } + static const ber_sequence_t DeleteVariableAccess_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_scopeOfDelete_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfName_impl }, @@ -2547,7 +2585,7 @@ static const ber_sequence_t DeleteVariableAccess_Request_sequence[] = { static int dissect_mms_DeleteVariableAccess_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(implicit_tag, pinfo, tree, tvb, offset, - DeleteVariableAccess_Request_sequence, hf_index, ett_mms_DeleteVariableAccess_Request); + DeleteVariableAccess_Request_sequence, hf_index, ett_mms_DeleteVariableAccess_Request); return offset; } @@ -2555,8 +2593,9 @@ static int dissect_deleteVariableAccess_impl(packet_info *pinfo, proto_tree *tre return dissect_mms_DeleteVariableAccess_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_deleteVariableAccess); } + static const ber_sequence_t T_listOfVariable_item_sequence[] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableSpecification }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableSpecification }, { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alternateAccess_impl }, { 0, 0, 0, NULL } }; @@ -2564,7 +2603,7 @@ static const ber_sequence_t T_listOfVariable_item_sequence[] = { static int dissect_mms_T_listOfVariable_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_listOfVariable_item_sequence, hf_index, ett_mms_T_listOfVariable_item); + T_listOfVariable_item_sequence, hf_index, ett_mms_T_listOfVariable_item); return offset; } @@ -2588,8 +2627,9 @@ static int dissect_listOfVariable_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_mms_T_listOfVariable(TRUE, tvb, offset, pinfo, tree, hf_mms_listOfVariable); } + static const ber_sequence_t DefineNamedVariableList_Request_sequence[] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableListName }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableListName }, { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfVariable_impl }, { 0, 0, 0, NULL } }; @@ -2597,7 +2637,7 @@ static const ber_sequence_t DefineNamedVariableList_Request_sequence[] = { static int dissect_mms_DefineNamedVariableList_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(implicit_tag, pinfo, tree, tvb, offset, - DefineNamedVariableList_Request_sequence, hf_index, ett_mms_DefineNamedVariableList_Request); + DefineNamedVariableList_Request_sequence, hf_index, ett_mms_DefineNamedVariableList_Request); return offset; } @@ -2606,6 +2646,7 @@ static int dissect_defineNamedVariableList_impl(packet_info *pinfo, proto_tree * } + static int dissect_mms_GetNamedVariableListAttributes_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_ObjectName(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -2637,6 +2678,7 @@ static int dissect_scopeOfDelete1_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_mms_T_scopeOfDelete1(TRUE, tvb, offset, pinfo, tree, hf_mms_scopeOfDelete1); } + static const ber_sequence_t DeleteNamedVariableList_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_scopeOfDelete1_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfVariableListName_impl }, @@ -2647,7 +2689,7 @@ static const ber_sequence_t DeleteNamedVariableList_Request_sequence[] = { static int dissect_mms_DeleteNamedVariableList_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(implicit_tag, pinfo, tree, tvb, offset, - DeleteNamedVariableList_Request_sequence, hf_index, ett_mms_DeleteNamedVariableList_Request); + DeleteNamedVariableList_Request_sequence, hf_index, ett_mms_DeleteNamedVariableList_Request); return offset; } @@ -2655,16 +2697,17 @@ static int dissect_deleteNamedVariableList_impl(packet_info *pinfo, proto_tree * return dissect_mms_DeleteNamedVariableList_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_deleteNamedVariableList); } + static const ber_sequence_t DefineNamedType_Request_sequence[] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_typeName }, - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_typeSpecification }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_typeName }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_typeSpecification }, { 0, 0, 0, NULL } }; static int dissect_mms_DefineNamedType_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(implicit_tag, pinfo, tree, tvb, offset, - DefineNamedType_Request_sequence, hf_index, ett_mms_DefineNamedType_Request); + DefineNamedType_Request_sequence, hf_index, ett_mms_DefineNamedType_Request); return offset; } @@ -2673,6 +2716,7 @@ static int dissect_defineNamedType_impl(packet_info *pinfo, proto_tree *tree, tv } + static int dissect_mms_GetNamedTypeAttributes_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_ObjectName(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -2704,6 +2748,7 @@ static int dissect_scopeOfDelete2_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_mms_T_scopeOfDelete2(TRUE, tvb, offset, pinfo, tree, hf_mms_scopeOfDelete2); } + static const ber_sequence_t DeleteNamedType_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_scopeOfDelete2_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfTypeName_impl }, @@ -2714,7 +2759,7 @@ static const ber_sequence_t DeleteNamedType_Request_sequence[] = { static int dissect_mms_DeleteNamedType_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(implicit_tag, pinfo, tree, tvb, offset, - DeleteNamedType_Request_sequence, hf_index, ett_mms_DeleteNamedType_Request); + DeleteNamedType_Request_sequence, hf_index, ett_mms_DeleteNamedType_Request); return offset; } @@ -2738,6 +2783,7 @@ static int dissect_listOfPromptData_impl(packet_info *pinfo, proto_tree *tree, t return dissect_mms_T_listOfPromptData(TRUE, tvb, offset, pinfo, tree, hf_mms_listOfPromptData); } + static const ber_sequence_t Input_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_operatorStationName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_echo_impl }, @@ -2749,7 +2795,7 @@ static const ber_sequence_t Input_Request_sequence[] = { static int dissect_mms_Input_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(implicit_tag, pinfo, tree, tvb, offset, - Input_Request_sequence, hf_index, ett_mms_Input_Request); + Input_Request_sequence, hf_index, ett_mms_Input_Request); return offset; } @@ -2773,6 +2819,7 @@ static int dissect_listOfOutputData_impl(packet_info *pinfo, proto_tree *tree, t return dissect_mms_T_listOfOutputData(TRUE, tvb, offset, pinfo, tree, hf_mms_listOfOutputData); } + static const ber_sequence_t Output_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_operatorStationName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfOutputData_impl }, @@ -2782,7 +2829,7 @@ static const ber_sequence_t Output_Request_sequence[] = { static int dissect_mms_Output_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(implicit_tag, pinfo, tree, tvb, offset, - Output_Request_sequence, hf_index, ett_mms_Output_Request); + Output_Request_sequence, hf_index, ett_mms_Output_Request); return offset; } @@ -2791,6 +2838,7 @@ static int dissect_output_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t } + static int dissect_mms_T_ap_title(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset=dissect_acse_AP_title(FALSE, tvb, offset, pinfo, tree, hf_mms_ap_title); @@ -2803,6 +2851,7 @@ static int dissect_ap_title(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, } + static int dissect_mms_T_ap_invocation_id(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset=dissect_acse_AP_invocation_identifier(FALSE, tvb, offset, pinfo, tree, hf_mms_ap_invocation_id); @@ -2815,6 +2864,7 @@ static int dissect_ap_invocation_id(packet_info *pinfo, proto_tree *tree, tvbuff } + static int dissect_mms_T_ae_qualifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset=dissect_acse_AE_qualifier(FALSE, tvb, offset, pinfo, tree, hf_mms_ae_qualifier); @@ -2827,6 +2877,7 @@ static int dissect_ae_qualifier(packet_info *pinfo, proto_tree *tree, tvbuff_t * } + static int dissect_mms_T_ae_invocation_id(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset=dissect_acse_AE_invocation_identifier(FALSE, tvb, offset, pinfo, tree, hf_mms_ae_invocation_id); @@ -2837,6 +2888,7 @@ static int dissect_ae_invocation_id(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_mms_T_ae_invocation_id(FALSE, tvb, offset, pinfo, tree, hf_mms_ae_invocation_id); } + static const ber_sequence_t ApplicationReference_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_ap_title }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_ap_invocation_id }, @@ -2848,7 +2900,7 @@ static const ber_sequence_t ApplicationReference_sequence[] = { static int dissect_mms_ApplicationReference(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - ApplicationReference_sequence, hf_index, ett_mms_ApplicationReference); + ApplicationReference_sequence, hf_index, ett_mms_ApplicationReference); return offset; } @@ -2871,6 +2923,7 @@ static int dissect_sourceFileServer_impl(packet_info *pinfo, proto_tree *tree, t return dissect_mms_ApplicationReference(TRUE, tvb, offset, pinfo, tree, hf_mms_sourceFileServer); } + static const ber_sequence_t TakeControl_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_semaphoreName }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_namedToken_impl }, @@ -2886,7 +2939,7 @@ static const ber_sequence_t TakeControl_Request_sequence[] = { static int dissect_mms_TakeControl_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(implicit_tag, pinfo, tree, tvb, offset, - TakeControl_Request_sequence, hf_index, ett_mms_TakeControl_Request); + TakeControl_Request_sequence, hf_index, ett_mms_TakeControl_Request); return offset; } @@ -2894,6 +2947,7 @@ static int dissect_takeControl_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_mms_TakeControl_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_takeControl); } + static const ber_sequence_t RelinquishControl_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_semaphoreName }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_namedToken_impl }, @@ -2903,7 +2957,7 @@ static const ber_sequence_t RelinquishControl_Request_sequence[] = { static int dissect_mms_RelinquishControl_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(implicit_tag, pinfo, tree, tvb, offset, - RelinquishControl_Request_sequence, hf_index, ett_mms_RelinquishControl_Request); + RelinquishControl_Request_sequence, hf_index, ett_mms_RelinquishControl_Request); return offset; } @@ -2933,6 +2987,7 @@ static int dissect_numberOfHungTokens_impl(packet_info *pinfo, proto_tree *tree, return dissect_mms_Unsigned16(TRUE, tvb, offset, pinfo, tree, hf_mms_numberOfHungTokens); } + static const ber_sequence_t DefineSemaphore_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_semaphoreName }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numbersOfTokens_impl }, @@ -2942,7 +2997,7 @@ static const ber_sequence_t DefineSemaphore_Request_sequence[] = { static int dissect_mms_DefineSemaphore_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(implicit_tag, pinfo, tree, tvb, offset, - DefineSemaphore_Request_sequence, hf_index, ett_mms_DefineSemaphore_Request); + DefineSemaphore_Request_sequence, hf_index, ett_mms_DefineSemaphore_Request); return offset; } @@ -2951,6 +3006,7 @@ static int dissect_defineSemaphore_impl(packet_info *pinfo, proto_tree *tree, tv } + static int dissect_mms_DeleteSemaphore_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_ObjectName(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -2962,6 +3018,7 @@ static int dissect_deleteSemaphore_impl(packet_info *pinfo, proto_tree *tree, tv } + static int dissect_mms_ReportSemaphoreStatus_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_ObjectName(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -2972,6 +3029,7 @@ static int dissect_reportSemaphoreStatus_impl(packet_info *pinfo, proto_tree *tr return dissect_mms_ReportSemaphoreStatus_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_reportSemaphoreStatus); } + static const ber_sequence_t ReportPoolSemaphoreStatus_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_semaphoreName }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_nameToStartAfter_impl }, @@ -2981,7 +3039,7 @@ static const ber_sequence_t ReportPoolSemaphoreStatus_Request_sequence[] = { static int dissect_mms_ReportPoolSemaphoreStatus_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(implicit_tag, pinfo, tree, tvb, offset, - ReportPoolSemaphoreStatus_Request_sequence, hf_index, ett_mms_ReportPoolSemaphoreStatus_Request); + ReportPoolSemaphoreStatus_Request_sequence, hf_index, ett_mms_ReportPoolSemaphoreStatus_Request); return offset; } @@ -3009,6 +3067,7 @@ static int dissect_state2_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_mms_T_state(TRUE, tvb, offset, pinfo, tree, hf_mms_state2); } + static const ber_sequence_t ReportSemaphoreEntryStatus_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_semaphoreName }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_state2_impl }, @@ -3019,7 +3078,7 @@ static const ber_sequence_t ReportSemaphoreEntryStatus_Request_sequence[] = { static int dissect_mms_ReportSemaphoreEntryStatus_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(implicit_tag, pinfo, tree, tvb, offset, - ReportSemaphoreEntryStatus_Request_sequence, hf_index, ett_mms_ReportSemaphoreEntryStatus_Request); + ReportSemaphoreEntryStatus_Request_sequence, hf_index, ett_mms_ReportSemaphoreEntryStatus_Request); return offset; } @@ -3043,6 +3102,7 @@ static int dissect_listOfCapabilities1_impl(packet_info *pinfo, proto_tree *tree return dissect_mms_T_listOfCapabilities1(TRUE, tvb, offset, pinfo, tree, hf_mms_listOfCapabilities1); } + static const ber_sequence_t InitiateDownloadSequence_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_domainName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfCapabilities1_impl }, @@ -3053,7 +3113,7 @@ static const ber_sequence_t InitiateDownloadSequence_Request_sequence[] = { static int dissect_mms_InitiateDownloadSequence_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(implicit_tag, pinfo, tree, tvb, offset, - InitiateDownloadSequence_Request_sequence, hf_index, ett_mms_InitiateDownloadSequence_Request); + InitiateDownloadSequence_Request_sequence, hf_index, ett_mms_InitiateDownloadSequence_Request); return offset; } @@ -3062,6 +3122,7 @@ static int dissect_initiateDownloadSequence_impl(packet_info *pinfo, proto_tree } + static int dissect_mms_DownloadSegment_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_Identifier(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -3377,7 +3438,8 @@ 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, - T_errorClass_choice, hf_index, ett_mms_T_errorClass, NULL); + T_errorClass_choice, hf_index, ett_mms_T_errorClass, + NULL); return offset; } @@ -3431,6 +3493,7 @@ static int dissect_state1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t } + static int dissect_mms_Start_Error(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_ProgramInvocationState(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -3442,6 +3505,7 @@ static int dissect_start2_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t } + static int dissect_mms_Stop_Error(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_ProgramInvocationState(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -3453,6 +3517,7 @@ static int dissect_stop2_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv } + static int dissect_mms_Resume_Error(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_ProgramInvocationState(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -3464,6 +3529,7 @@ static int dissect_resume2_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t * } + static int dissect_mms_Reset_Error(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_ProgramInvocationState(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -3475,6 +3541,7 @@ static int dissect_reset2_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t } + static int dissect_mms_DeleteVariableAccess_Error(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_Unsigned32(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -3486,6 +3553,7 @@ static int dissect_deleteVariableAccess2_impl(packet_info *pinfo, proto_tree *tr } + static int dissect_mms_DeleteNamedVariableList_Error(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_Unsigned32(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -3497,6 +3565,7 @@ static int dissect_deleteNamedVariableList2_impl(packet_info *pinfo, proto_tree } + static int dissect_mms_DeleteNamedType_Error(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_Unsigned32(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -3508,6 +3577,7 @@ static int dissect_deleteNamedType2_impl(packet_info *pinfo, proto_tree *tree, t } + static int dissect_mms_DefineEventEnrollment_Error(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_ObjectName(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -3569,7 +3639,8 @@ 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, - T_serviceSpecificInformation_choice, hf_index, ett_mms_T_serviceSpecificInformation, NULL); + T_serviceSpecificInformation_choice, hf_index, ett_mms_T_serviceSpecificInformation, + NULL); return offset; } @@ -3577,6 +3648,7 @@ static int dissect_serviceSpecificInformation(packet_info *pinfo, proto_tree *tr return dissect_mms_T_serviceSpecificInformation(FALSE, tvb, offset, pinfo, tree, hf_mms_serviceSpecificInformation); } + static const ber_sequence_t ServiceError_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_errorClass }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_additionalCode_impl }, @@ -3588,7 +3660,7 @@ static const ber_sequence_t ServiceError_sequence[] = { static int dissect_mms_ServiceError(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - ServiceError_sequence, hf_index, ett_mms_ServiceError); + ServiceError_sequence, hf_index, ett_mms_ServiceError); return offset; } @@ -3602,6 +3674,7 @@ static int dissect_failure1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_mms_ServiceError(TRUE, tvb, offset, pinfo, tree, hf_mms_failure1); } + static const ber_sequence_t TerminateDownloadSequence_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_domainName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_discard_impl }, @@ -3611,7 +3684,7 @@ static const ber_sequence_t TerminateDownloadSequence_Request_sequence[] = { static int dissect_mms_TerminateDownloadSequence_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(implicit_tag, pinfo, tree, tvb, offset, - TerminateDownloadSequence_Request_sequence, hf_index, ett_mms_TerminateDownloadSequence_Request); + TerminateDownloadSequence_Request_sequence, hf_index, ett_mms_TerminateDownloadSequence_Request); return offset; } @@ -3620,6 +3693,7 @@ static int dissect_terminateDownloadSequence_impl(packet_info *pinfo, proto_tree } + static int dissect_mms_InitiateUploadSequence_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_Identifier(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -3631,6 +3705,7 @@ static int dissect_initiateUploadSequence_impl(packet_info *pinfo, proto_tree *t } + static int dissect_mms_UploadSegment_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_Integer32(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -3642,6 +3717,7 @@ static int dissect_uploadSegment_impl(packet_info *pinfo, proto_tree *tree, tvbu } + static int dissect_mms_TerminateUploadSequence_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_Integer32(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -3669,11 +3745,12 @@ static int dissect_listOfCapabilities3_impl(packet_info *pinfo, proto_tree *tree } + static int dissect_mms_GraphicString(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, BER_UNI_TAG_GraphicString, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -3721,6 +3798,7 @@ static int dissect_filename_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_mms_FileName(TRUE, tvb, offset, pinfo, tree, hf_mms_filename); } + static const ber_sequence_t RequestDomainDownload_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_domainName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfCapabilities3_impl }, @@ -3732,7 +3810,7 @@ static const ber_sequence_t RequestDomainDownload_Request_sequence[] = { static int dissect_mms_RequestDomainDownload_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(implicit_tag, pinfo, tree, tvb, offset, - RequestDomainDownload_Request_sequence, hf_index, ett_mms_RequestDomainDownload_Request); + RequestDomainDownload_Request_sequence, hf_index, ett_mms_RequestDomainDownload_Request); return offset; } @@ -3740,6 +3818,7 @@ static int dissect_requestDomainDownload_impl(packet_info *pinfo, proto_tree *tr return dissect_mms_RequestDomainDownload_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_requestDomainDownload); } + static const ber_sequence_t RequestDomainUpload_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_domainName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_fileName_impl }, @@ -3749,7 +3828,7 @@ static const ber_sequence_t RequestDomainUpload_Request_sequence[] = { static int dissect_mms_RequestDomainUpload_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(implicit_tag, pinfo, tree, tvb, offset, - RequestDomainUpload_Request_sequence, hf_index, ett_mms_RequestDomainUpload_Request); + RequestDomainUpload_Request_sequence, hf_index, ett_mms_RequestDomainUpload_Request); return offset; } @@ -3773,6 +3852,7 @@ static int dissect_listOfCapabilities4_impl(packet_info *pinfo, proto_tree *tree return dissect_mms_T_listOfCapabilities4(TRUE, tvb, offset, pinfo, tree, hf_mms_listOfCapabilities4); } + static const ber_sequence_t LoadDomainContent_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_domainName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfCapabilities4_impl }, @@ -3785,7 +3865,7 @@ static const ber_sequence_t LoadDomainContent_Request_sequence[] = { static int dissect_mms_LoadDomainContent_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(implicit_tag, pinfo, tree, tvb, offset, - LoadDomainContent_Request_sequence, hf_index, ett_mms_LoadDomainContent_Request); + LoadDomainContent_Request_sequence, hf_index, ett_mms_LoadDomainContent_Request); return offset; } @@ -3793,6 +3873,7 @@ static int dissect_loadDomainContent_impl(packet_info *pinfo, proto_tree *tree, return dissect_mms_LoadDomainContent_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_loadDomainContent); } + static const ber_sequence_t StoreDomainContent_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_domainName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_filenName_impl }, @@ -3803,7 +3884,7 @@ static const ber_sequence_t StoreDomainContent_Request_sequence[] = { static int dissect_mms_StoreDomainContent_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(implicit_tag, pinfo, tree, tvb, offset, - StoreDomainContent_Request_sequence, hf_index, ett_mms_StoreDomainContent_Request); + StoreDomainContent_Request_sequence, hf_index, ett_mms_StoreDomainContent_Request); return offset; } @@ -3812,6 +3893,7 @@ static int dissect_storeDomainContent_impl(packet_info *pinfo, proto_tree *tree, } + static int dissect_mms_DeleteDomain_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_Identifier(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -3823,6 +3905,7 @@ static int dissect_deleteDomain_impl(packet_info *pinfo, proto_tree *tree, tvbuf } + static int dissect_mms_GetDomainAttributes_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_Identifier(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -3858,6 +3941,7 @@ static int dissect_listOfDomainNames_impl(packet_info *pinfo, proto_tree *tree, return dissect_mms_SEQUENCE_OF_Identifier(TRUE, tvb, offset, pinfo, tree, hf_mms_listOfDomainNames); } + static const ber_sequence_t CreateProgramInvocation_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_programInvocationName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfDomainName_impl }, @@ -3869,7 +3953,7 @@ static const ber_sequence_t CreateProgramInvocation_Request_sequence[] = { static int dissect_mms_CreateProgramInvocation_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(implicit_tag, pinfo, tree, tvb, offset, - CreateProgramInvocation_Request_sequence, hf_index, ett_mms_CreateProgramInvocation_Request); + CreateProgramInvocation_Request_sequence, hf_index, ett_mms_CreateProgramInvocation_Request); return offset; } @@ -3878,6 +3962,7 @@ static int dissect_createProgramInvocation_impl(packet_info *pinfo, proto_tree * } + static int dissect_mms_DeleteProgramInvocation_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_Identifier(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -3904,7 +3989,8 @@ 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, - T_executionArgument_choice, hf_index, ett_mms_T_executionArgument, NULL); + T_executionArgument_choice, hf_index, ett_mms_T_executionArgument, + NULL); return offset; } @@ -3912,16 +3998,17 @@ static int dissect_executionArgument(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_mms_T_executionArgument(FALSE, tvb, offset, pinfo, tree, hf_mms_executionArgument); } + static const ber_sequence_t Start_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_programInvocationName_impl }, - { -1/*choice*/ , -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_executionArgument }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_executionArgument }, { 0, 0, 0, NULL } }; static int dissect_mms_Start_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(implicit_tag, pinfo, tree, tvb, offset, - Start_Request_sequence, hf_index, ett_mms_Start_Request); + Start_Request_sequence, hf_index, ett_mms_Start_Request); return offset; } @@ -3929,6 +4016,7 @@ static int dissect_start_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_mms_Start_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_start); } + static const ber_sequence_t Stop_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_programInvocationName_impl }, { 0, 0, 0, NULL } @@ -3937,7 +4025,7 @@ static const ber_sequence_t Stop_Request_sequence[] = { static int dissect_mms_Stop_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(implicit_tag, pinfo, tree, tvb, offset, - Stop_Request_sequence, hf_index, ett_mms_Stop_Request); + Stop_Request_sequence, hf_index, ett_mms_Stop_Request); return offset; } @@ -3961,7 +4049,8 @@ 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, - T_executionArgument1_choice, hf_index, ett_mms_T_executionArgument1, NULL); + T_executionArgument1_choice, hf_index, ett_mms_T_executionArgument1, + NULL); return offset; } @@ -3969,16 +4058,17 @@ static int dissect_executionArgument1(packet_info *pinfo, proto_tree *tree, tvbu return dissect_mms_T_executionArgument1(FALSE, tvb, offset, pinfo, tree, hf_mms_executionArgument1); } + static const ber_sequence_t Resume_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_programInvocationName_impl }, - { -1/*choice*/ , -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_executionArgument1 }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_executionArgument1 }, { 0, 0, 0, NULL } }; static int dissect_mms_Resume_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(implicit_tag, pinfo, tree, tvb, offset, - Resume_Request_sequence, hf_index, ett_mms_Resume_Request); + Resume_Request_sequence, hf_index, ett_mms_Resume_Request); return offset; } @@ -3986,6 +4076,7 @@ static int dissect_resume_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_mms_Resume_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_resume); } + static const ber_sequence_t Reset_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_programInvocationName_impl }, { 0, 0, 0, NULL } @@ -3994,7 +4085,7 @@ static const ber_sequence_t Reset_Request_sequence[] = { static int dissect_mms_Reset_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(implicit_tag, pinfo, tree, tvb, offset, - Reset_Request_sequence, hf_index, ett_mms_Reset_Request); + Reset_Request_sequence, hf_index, ett_mms_Reset_Request); return offset; } @@ -4002,6 +4093,7 @@ static int dissect_reset_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_mms_Reset_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_reset); } + static const ber_sequence_t Kill_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_programInvocationName_impl }, { 0, 0, 0, NULL } @@ -4010,7 +4102,7 @@ static const ber_sequence_t Kill_Request_sequence[] = { static int dissect_mms_Kill_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(implicit_tag, pinfo, tree, tvb, offset, - Kill_Request_sequence, hf_index, ett_mms_Kill_Request); + Kill_Request_sequence, hf_index, ett_mms_Kill_Request); return offset; } @@ -4019,6 +4111,7 @@ static int dissect_kill_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb } + static int dissect_mms_GetProgramInvocationAttributes_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_Identifier(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -4029,6 +4122,7 @@ static int dissect_getProgramInvocationAttributes_impl(packet_info *pinfo, proto return dissect_mms_GetProgramInvocationAttributes_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_getProgramInvocationAttributes); } + static const ber_sequence_t ObtainFile_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sourceFileServer_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_sourceFile_impl }, @@ -4039,7 +4133,7 @@ static const ber_sequence_t ObtainFile_Request_sequence[] = { static int dissect_mms_ObtainFile_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(implicit_tag, pinfo, tree, tvb, offset, - ObtainFile_Request_sequence, hf_index, ett_mms_ObtainFile_Request); + ObtainFile_Request_sequence, hf_index, ett_mms_ObtainFile_Request); return offset; } @@ -4066,6 +4160,7 @@ static int dissect_class1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_mms_EC_Class(TRUE, tvb, offset, pinfo, tree, hf_mms_class1); } + static const ber_sequence_t DefineEventCondition_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventConditionName }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_class1_impl }, @@ -4080,7 +4175,7 @@ static const ber_sequence_t DefineEventCondition_Request_sequence[] = { static int dissect_mms_DefineEventCondition_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(implicit_tag, pinfo, tree, tvb, offset, - DefineEventCondition_Request_sequence, hf_index, ett_mms_DefineEventCondition_Request); + DefineEventCondition_Request_sequence, hf_index, ett_mms_DefineEventCondition_Request); return offset; } @@ -4108,7 +4203,8 @@ 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, - DeleteEventCondition_Request_choice, hf_index, ett_mms_DeleteEventCondition_Request, NULL); + DeleteEventCondition_Request_choice, hf_index, ett_mms_DeleteEventCondition_Request, + NULL); return offset; } @@ -4117,6 +4213,7 @@ static int dissect_deleteEventCondition(packet_info *pinfo, proto_tree *tree, tv } + static int dissect_mms_GetEventConditionAttributes_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_ObjectName(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -4128,6 +4225,7 @@ static int dissect_getEventConditionAttributes(packet_info *pinfo, proto_tree *t } + static int dissect_mms_ReportEventConditionStatus_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_ObjectName(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -4138,6 +4236,7 @@ static int dissect_reportEventConditionStatus(packet_info *pinfo, proto_tree *tr return dissect_mms_ReportEventConditionStatus_Request(FALSE, tvb, offset, pinfo, tree, hf_mms_reportEventConditionStatus); } + static const ber_sequence_t AlterEventConditionMonitoring_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventConditionName }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_enabled_impl }, @@ -4150,7 +4249,7 @@ static const ber_sequence_t AlterEventConditionMonitoring_Request_sequence[] = { static int dissect_mms_AlterEventConditionMonitoring_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(implicit_tag, pinfo, tree, tvb, offset, - AlterEventConditionMonitoring_Request_sequence, hf_index, ett_mms_AlterEventConditionMonitoring_Request); + AlterEventConditionMonitoring_Request_sequence, hf_index, ett_mms_AlterEventConditionMonitoring_Request); return offset; } @@ -4158,6 +4257,7 @@ static int dissect_alterEventConditionMonitoring_impl(packet_info *pinfo, proto_ return dissect_mms_AlterEventConditionMonitoring_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_alterEventConditionMonitoring); } + static const ber_sequence_t TriggerEvent_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventConditionName }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_priority_impl }, @@ -4167,7 +4267,7 @@ static const ber_sequence_t TriggerEvent_Request_sequence[] = { static int dissect_mms_TriggerEvent_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(implicit_tag, pinfo, tree, tvb, offset, - TriggerEvent_Request_sequence, hf_index, ett_mms_TriggerEvent_Request); + TriggerEvent_Request_sequence, hf_index, ett_mms_TriggerEvent_Request); return offset; } @@ -4175,6 +4275,7 @@ static int dissect_triggerEvent_impl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_mms_TriggerEvent_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_triggerEvent); } + static const ber_sequence_t DefineEventAction_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventActionName }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfModifier_impl }, @@ -4184,7 +4285,7 @@ static const ber_sequence_t DefineEventAction_Request_sequence[] = { static int dissect_mms_DefineEventAction_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(implicit_tag, pinfo, tree, tvb, offset, - DefineEventAction_Request_sequence, hf_index, ett_mms_DefineEventAction_Request); + DefineEventAction_Request_sequence, hf_index, ett_mms_DefineEventAction_Request); return offset; } @@ -4212,7 +4313,8 @@ 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, - DeleteEventAction_Request_choice, hf_index, ett_mms_DeleteEventAction_Request, NULL); + DeleteEventAction_Request_choice, hf_index, ett_mms_DeleteEventAction_Request, + NULL); return offset; } @@ -4221,6 +4323,7 @@ static int dissect_deleteEventAction(packet_info *pinfo, proto_tree *tree, tvbuf } + static int dissect_mms_GetEventActionAttributes_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_ObjectName(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -4232,6 +4335,7 @@ static int dissect_getEventActionAttributes(packet_info *pinfo, proto_tree *tree } + static int dissect_mms_ReportEventActionStatus_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_ObjectName(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -4266,6 +4370,7 @@ static int dissect_alarmAcknowledgmentRule_impl(packet_info *pinfo, proto_tree * return dissect_mms_AlarmAckRule(TRUE, tvb, offset, pinfo, tree, hf_mms_alarmAcknowledgmentRule); } + static const ber_sequence_t DefineEventEnrollment_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventEnrollmentName }, { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_eventConditionName }, @@ -4279,7 +4384,7 @@ static const ber_sequence_t DefineEventEnrollment_Request_sequence[] = { static int dissect_mms_DefineEventEnrollment_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(implicit_tag, pinfo, tree, tvb, offset, - DefineEventEnrollment_Request_sequence, hf_index, ett_mms_DefineEventEnrollment_Request); + DefineEventEnrollment_Request_sequence, hf_index, ett_mms_DefineEventEnrollment_Request); return offset; } @@ -4305,7 +4410,8 @@ 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, - DeleteEventEnrollment_Request_choice, hf_index, ett_mms_DeleteEventEnrollment_Request, NULL); + DeleteEventEnrollment_Request_choice, hf_index, ett_mms_DeleteEventEnrollment_Request, + NULL); return offset; } @@ -4313,6 +4419,7 @@ static int dissect_deleteEventEnrollment(packet_info *pinfo, proto_tree *tree, t return dissect_mms_DeleteEventEnrollment_Request(FALSE, tvb, offset, pinfo, tree, hf_mms_deleteEventEnrollment); } + static const ber_sequence_t AlterEventEnrollment_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventEnrollmentName }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventConditionTransitions_impl }, @@ -4323,7 +4430,7 @@ static const ber_sequence_t AlterEventEnrollment_Request_sequence[] = { static int dissect_mms_AlterEventEnrollment_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(implicit_tag, pinfo, tree, tvb, offset, - AlterEventEnrollment_Request_sequence, hf_index, ett_mms_AlterEventEnrollment_Request); + AlterEventEnrollment_Request_sequence, hf_index, ett_mms_AlterEventEnrollment_Request); return offset; } @@ -4332,6 +4439,7 @@ static int dissect_alterEventEnrollment_impl(packet_info *pinfo, proto_tree *tre } + static int dissect_mms_ReportEventEnrollmentStatus_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_ObjectName(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -4363,6 +4471,7 @@ static int dissect_scopeOfRequest_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_mms_T_scopeOfRequest(TRUE, tvb, offset, pinfo, tree, hf_mms_scopeOfRequest); } + static const ber_sequence_t GetEventEnrollmentAttributes_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_scopeOfRequest_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventEnrollmentNames_impl }, @@ -4376,7 +4485,7 @@ static const ber_sequence_t GetEventEnrollmentAttributes_Request_sequence[] = { static int dissect_mms_GetEventEnrollmentAttributes_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(implicit_tag, pinfo, tree, tvb, offset, - GetEventEnrollmentAttributes_Request_sequence, hf_index, ett_mms_GetEventEnrollmentAttributes_Request); + GetEventEnrollmentAttributes_Request_sequence, hf_index, ett_mms_GetEventEnrollmentAttributes_Request); return offset; } @@ -4423,7 +4532,8 @@ 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, - EventTime_choice, hf_index, ett_mms_EventTime, NULL); + EventTime_choice, hf_index, ett_mms_EventTime, + NULL); return offset; } @@ -4446,6 +4556,7 @@ static int dissect_timeIdleAcknowledged(packet_info *pinfo, proto_tree *tree, tv return dissect_mms_EventTime(FALSE, tvb, offset, pinfo, tree, hf_mms_timeIdleAcknowledged); } + static const ber_sequence_t AcknowledgeEventNotification_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventEnrollmentName }, { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_acknowledgedState_impl }, @@ -4456,7 +4567,7 @@ static const ber_sequence_t AcknowledgeEventNotification_Request_sequence[] = { static int dissect_mms_AcknowledgeEventNotification_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(implicit_tag, pinfo, tree, tvb, offset, - AcknowledgeEventNotification_Request_sequence, hf_index, ett_mms_AcknowledgeEventNotification_Request); + AcknowledgeEventNotification_Request_sequence, hf_index, ett_mms_AcknowledgeEventNotification_Request); return offset; } @@ -4484,6 +4595,7 @@ static int dissect_acknowledgmentFilter_impl(packet_info *pinfo, proto_tree *tre return dissect_mms_T_acknowledgmentFilter(TRUE, tvb, offset, pinfo, tree, hf_mms_acknowledgmentFilter); } + static const ber_sequence_t T_severityFilter_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mostSevere_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_leastSevere_impl }, @@ -4493,7 +4605,7 @@ static const ber_sequence_t T_severityFilter_sequence[] = { static int dissect_mms_T_severityFilter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_severityFilter_sequence, hf_index, ett_mms_T_severityFilter); + T_severityFilter_sequence, hf_index, ett_mms_T_severityFilter); return offset; } @@ -4501,6 +4613,7 @@ static int dissect_severityFilter_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_mms_T_severityFilter(TRUE, tvb, offset, pinfo, tree, hf_mms_severityFilter); } + static const ber_sequence_t GetAlarmSummary_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_enrollmentsOnly_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_activeAlarmsOnly_impl }, @@ -4513,7 +4626,7 @@ static const ber_sequence_t GetAlarmSummary_Request_sequence[] = { static int dissect_mms_GetAlarmSummary_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(implicit_tag, pinfo, tree, tvb, offset, - GetAlarmSummary_Request_sequence, hf_index, ett_mms_GetAlarmSummary_Request); + GetAlarmSummary_Request_sequence, hf_index, ett_mms_GetAlarmSummary_Request); return offset; } @@ -4541,6 +4654,7 @@ static int dissect_acknowledgmentFilter1_impl(packet_info *pinfo, proto_tree *tr return dissect_mms_T_acknowledgmentFilter1(TRUE, tvb, offset, pinfo, tree, hf_mms_acknowledgmentFilter1); } + static const ber_sequence_t T_severityFilter1_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mostSevere_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_leastSevere_impl }, @@ -4550,7 +4664,7 @@ static const ber_sequence_t T_severityFilter1_sequence[] = { static int dissect_mms_T_severityFilter1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_severityFilter1_sequence, hf_index, ett_mms_T_severityFilter1); + T_severityFilter1_sequence, hf_index, ett_mms_T_severityFilter1); return offset; } @@ -4558,6 +4672,7 @@ static int dissect_severityFilter1_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_mms_T_severityFilter1(TRUE, tvb, offset, pinfo, tree, hf_mms_severityFilter1); } + static const ber_sequence_t GetAlarmEnrollmentSummary_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_enrollmentsOnly_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_activeAlarmsOnly_impl }, @@ -4570,7 +4685,7 @@ static const ber_sequence_t GetAlarmEnrollmentSummary_Request_sequence[] = { static int dissect_mms_GetAlarmEnrollmentSummary_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(implicit_tag, pinfo, tree, tvb, offset, - GetAlarmEnrollmentSummary_Request_sequence, hf_index, ett_mms_GetAlarmEnrollmentSummary_Request); + GetAlarmEnrollmentSummary_Request_sequence, hf_index, ett_mms_GetAlarmEnrollmentSummary_Request); return offset; } @@ -4594,7 +4709,8 @@ 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, - T_rangeStartSpecification_choice, hf_index, ett_mms_T_rangeStartSpecification, NULL); + T_rangeStartSpecification_choice, hf_index, ett_mms_T_rangeStartSpecification, + NULL); return offset; } @@ -4618,7 +4734,8 @@ 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, - T_rangeStopSpecification_choice, hf_index, ett_mms_T_rangeStopSpecification, NULL); + T_rangeStopSpecification_choice, hf_index, ett_mms_T_rangeStopSpecification, + NULL); return offset; } @@ -4642,6 +4759,7 @@ static int dissect_listOfVariables_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_mms_T_listOfVariables(TRUE, tvb, offset, pinfo, tree, hf_mms_listOfVariables); } + static const ber_sequence_t T_entryToStartAfter_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_timeSpecification_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_entrySpecification_impl }, @@ -4651,7 +4769,7 @@ static const ber_sequence_t T_entryToStartAfter_sequence[] = { static int dissect_mms_T_entryToStartAfter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_entryToStartAfter_sequence, hf_index, ett_mms_T_entryToStartAfter); + T_entryToStartAfter_sequence, hf_index, ett_mms_T_entryToStartAfter); return offset; } @@ -4659,6 +4777,7 @@ static int dissect_entryToStartAfter_impl(packet_info *pinfo, proto_tree *tree, return dissect_mms_T_entryToStartAfter(TRUE, tvb, offset, pinfo, tree, hf_mms_entryToStartAfter); } + static const ber_sequence_t ReadJournal_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_journalName }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_rangeStartSpecification }, @@ -4671,7 +4790,7 @@ static const ber_sequence_t ReadJournal_Request_sequence[] = { static int dissect_mms_ReadJournal_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(implicit_tag, pinfo, tree, tvb, offset, - ReadJournal_Request_sequence, hf_index, ett_mms_ReadJournal_Request); + ReadJournal_Request_sequence, hf_index, ett_mms_ReadJournal_Request); return offset; } @@ -4691,6 +4810,7 @@ static int dissect_additionalDetail(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_mms_JOU_Additional_Detail(FALSE, tvb, offset, pinfo, tree, hf_mms_additionalDetail); } + static const ber_sequence_t T_event_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventConditionName }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_currentState_impl }, @@ -4700,7 +4820,7 @@ static const ber_sequence_t T_event_sequence[] = { static int dissect_mms_T_event(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_event_sequence, hf_index, ett_mms_T_event); + T_event_sequence, hf_index, ett_mms_T_event); return offset; } @@ -4708,6 +4828,7 @@ static int dissect_event_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_mms_T_event(TRUE, tvb, offset, pinfo, tree, hf_mms_event); } + static const ber_sequence_t T_listOfVariables_item_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_variableTag_impl }, { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_valueSpecification }, @@ -4717,7 +4838,7 @@ static const ber_sequence_t T_listOfVariables_item_sequence[] = { static int dissect_mms_T_listOfVariables_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_listOfVariables_item_sequence, hf_index, ett_mms_T_listOfVariables_item); + T_listOfVariables_item_sequence, hf_index, ett_mms_T_listOfVariables_item); return offset; } @@ -4741,6 +4862,7 @@ static int dissect_listOfVariables1_impl(packet_info *pinfo, proto_tree *tree, t return dissect_mms_T_listOfVariables1(TRUE, tvb, offset, pinfo, tree, hf_mms_listOfVariables1); } + static const ber_sequence_t T_data_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_event_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_listOfVariables1_impl }, @@ -4750,7 +4872,7 @@ static const ber_sequence_t T_data_sequence[] = { static int dissect_mms_T_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(implicit_tag, pinfo, tree, tvb, offset, - T_data_sequence, hf_index, ett_mms_T_data); + T_data_sequence, hf_index, ett_mms_T_data); return offset; } @@ -4774,7 +4896,8 @@ 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, - T_entryForm_choice, hf_index, ett_mms_T_entryForm, NULL); + T_entryForm_choice, hf_index, ett_mms_T_entryForm, + NULL); return offset; } @@ -4782,17 +4905,18 @@ static int dissect_entryForm(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_mms_T_entryForm(FALSE, tvb, offset, pinfo, tree, hf_mms_entryForm); } + static const ber_sequence_t EntryContent_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_occurenceTime_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_additionalDetail }, - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_entryForm }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_entryForm }, { 0, 0, 0, NULL } }; static int dissect_mms_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(implicit_tag, pinfo, tree, tvb, offset, - EntryContent_sequence, hf_index, ett_mms_EntryContent); + EntryContent_sequence, hf_index, ett_mms_EntryContent); return offset; } @@ -4819,6 +4943,7 @@ static int dissect_listOfJournalEntry1_impl(packet_info *pinfo, proto_tree *tree return dissect_mms_SEQUENCE_OF_EntryContent(TRUE, tvb, offset, pinfo, tree, hf_mms_listOfJournalEntry1); } + static const ber_sequence_t WriteJournal_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_journalName }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfJournalEntry1_impl }, @@ -4828,7 +4953,7 @@ static const ber_sequence_t WriteJournal_Request_sequence[] = { static int dissect_mms_WriteJournal_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(implicit_tag, pinfo, tree, tvb, offset, - WriteJournal_Request_sequence, hf_index, ett_mms_WriteJournal_Request); + WriteJournal_Request_sequence, hf_index, ett_mms_WriteJournal_Request); return offset; } @@ -4836,6 +4961,7 @@ static int dissect_writeJournal_impl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_mms_WriteJournal_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_writeJournal); } + static const ber_sequence_t T_limitSpecification_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_limitingTime_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_limitingEntry_impl }, @@ -4845,7 +4971,7 @@ static const ber_sequence_t T_limitSpecification_sequence[] = { static int dissect_mms_T_limitSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_limitSpecification_sequence, hf_index, ett_mms_T_limitSpecification); + T_limitSpecification_sequence, hf_index, ett_mms_T_limitSpecification); return offset; } @@ -4853,6 +4979,7 @@ static int dissect_limitSpecification_impl(packet_info *pinfo, proto_tree *tree, return dissect_mms_T_limitSpecification(TRUE, tvb, offset, pinfo, tree, hf_mms_limitSpecification); } + static const ber_sequence_t InitializeJournal_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_journalName }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_limitSpecification_impl }, @@ -4862,7 +4989,7 @@ static const ber_sequence_t InitializeJournal_Request_sequence[] = { static int dissect_mms_InitializeJournal_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(implicit_tag, pinfo, tree, tvb, offset, - InitializeJournal_Request_sequence, hf_index, ett_mms_InitializeJournal_Request); + InitializeJournal_Request_sequence, hf_index, ett_mms_InitializeJournal_Request); return offset; } @@ -4871,6 +4998,7 @@ static int dissect_initializeJournal_impl(packet_info *pinfo, proto_tree *tree, } + static int dissect_mms_ReportJournalStatus_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_ObjectName(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -4881,6 +5009,7 @@ static int dissect_reportJournalStatus_impl(packet_info *pinfo, proto_tree *tree return dissect_mms_ReportJournalStatus_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_reportJournalStatus); } + static const ber_sequence_t CreateJournal_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_journalName }, { 0, 0, 0, NULL } @@ -4889,7 +5018,7 @@ static const ber_sequence_t CreateJournal_Request_sequence[] = { static int dissect_mms_CreateJournal_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(implicit_tag, pinfo, tree, tvb, offset, - CreateJournal_Request_sequence, hf_index, ett_mms_CreateJournal_Request); + CreateJournal_Request_sequence, hf_index, ett_mms_CreateJournal_Request); return offset; } @@ -4897,6 +5026,7 @@ static int dissect_createJournal_impl(packet_info *pinfo, proto_tree *tree, tvbu return dissect_mms_CreateJournal_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_createJournal); } + static const ber_sequence_t DeleteJournal_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_journalName }, { 0, 0, 0, NULL } @@ -4905,7 +5035,7 @@ static const ber_sequence_t DeleteJournal_Request_sequence[] = { static int dissect_mms_DeleteJournal_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(implicit_tag, pinfo, tree, tvb, offset, - DeleteJournal_Request_sequence, hf_index, ett_mms_DeleteJournal_Request); + DeleteJournal_Request_sequence, hf_index, ett_mms_DeleteJournal_Request); return offset; } @@ -4913,6 +5043,7 @@ static int dissect_deleteJournal_impl(packet_info *pinfo, proto_tree *tree, tvbu return dissect_mms_DeleteJournal_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_deleteJournal); } + static const ber_sequence_t GetCapabilityList_Request_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_continueAfter1 }, { 0, 0, 0, NULL } @@ -4921,7 +5052,7 @@ static const ber_sequence_t GetCapabilityList_Request_sequence[] = { static int dissect_mms_GetCapabilityList_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(implicit_tag, pinfo, tree, tvb, offset, - GetCapabilityList_Request_sequence, hf_index, ett_mms_GetCapabilityList_Request); + GetCapabilityList_Request_sequence, hf_index, ett_mms_GetCapabilityList_Request); return offset; } @@ -4929,6 +5060,7 @@ static int dissect_getCapabilityList_impl(packet_info *pinfo, proto_tree *tree, return dissect_mms_GetCapabilityList_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_getCapabilityList); } + static const ber_sequence_t FileOpen_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_fileName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_initialPosition_impl }, @@ -4938,7 +5070,7 @@ static const ber_sequence_t FileOpen_Request_sequence[] = { static int dissect_mms_FileOpen_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(implicit_tag, pinfo, tree, tvb, offset, - FileOpen_Request_sequence, hf_index, ett_mms_FileOpen_Request); + FileOpen_Request_sequence, hf_index, ett_mms_FileOpen_Request); return offset; } @@ -4947,6 +5079,7 @@ static int dissect_fileOpen_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_mms_FileRead_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_Integer32(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -4958,6 +5091,7 @@ static int dissect_fileRead_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_mms_FileClose_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_Integer32(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -4968,6 +5102,7 @@ static int dissect_fileClose_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_mms_FileClose_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_fileClose); } + static const ber_sequence_t FileRename_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_currentFileName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_newFileName_impl }, @@ -4977,7 +5112,7 @@ static const ber_sequence_t FileRename_Request_sequence[] = { static int dissect_mms_FileRename_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(implicit_tag, pinfo, tree, tvb, offset, - FileRename_Request_sequence, hf_index, ett_mms_FileRename_Request); + FileRename_Request_sequence, hf_index, ett_mms_FileRename_Request); return offset; } @@ -4986,6 +5121,7 @@ static int dissect_fileRename_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ } + static int dissect_mms_FileDelete_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_FileName(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -4996,6 +5132,7 @@ static int dissect_fileDelete_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_mms_FileDelete_Request(TRUE, tvb, offset, pinfo, tree, hf_mms_fileDelete); } + static const ber_sequence_t FileDirectory_Request_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_fileSpecification_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_continueAfter3_impl }, @@ -5005,7 +5142,7 @@ static const ber_sequence_t FileDirectory_Request_sequence[] = { static int dissect_mms_FileDirectory_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(implicit_tag, pinfo, tree, tvb, offset, - FileDirectory_Request_sequence, hf_index, ett_mms_FileDirectory_Request); + FileDirectory_Request_sequence, hf_index, ett_mms_FileDirectory_Request); return offset; } @@ -5181,7 +5318,8 @@ 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, - ConfirmedServiceRequest_choice, hf_index, ett_mms_ConfirmedServiceRequest, NULL); + ConfirmedServiceRequest_choice, hf_index, ett_mms_ConfirmedServiceRequest, + NULL); return offset; } @@ -5203,7 +5341,8 @@ 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, - CS_Request_Detail_choice, hf_index, ett_mms_CS_Request_Detail, NULL); + CS_Request_Detail_choice, hf_index, ett_mms_CS_Request_Detail, + NULL); return offset; } @@ -5211,10 +5350,11 @@ static int dissect_cs_request_detail(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_mms_CS_Request_Detail(FALSE, tvb, offset, pinfo, tree, hf_mms_cs_request_detail); } + static const ber_sequence_t Confirmed_RequestPDU_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_listOfModifier }, - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_confirmedServiceRequest }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_confirmedServiceRequest }, { BER_CLASS_CON, 79, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_cs_request_detail }, { 0, 0, 0, NULL } }; @@ -5222,7 +5362,7 @@ static const ber_sequence_t Confirmed_RequestPDU_sequence[] = { static int dissect_mms_Confirmed_RequestPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - Confirmed_RequestPDU_sequence, hf_index, ett_mms_Confirmed_RequestPDU); + Confirmed_RequestPDU_sequence, hf_index, ett_mms_Confirmed_RequestPDU); return offset; } @@ -5273,11 +5413,12 @@ static int dissect_vmdPhysicalStatus_impl(packet_info *pinfo, proto_tree *tree, } + static int dissect_mms_BIT_STRING_SIZE_0_128(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - NULL, hf_index, -1, - NULL); + NULL, hf_index, -1, + NULL); return offset; } @@ -5285,6 +5426,7 @@ static int dissect_localDetail_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_mms_BIT_STRING_SIZE_0_128(TRUE, tvb, offset, pinfo, tree, hf_mms_localDetail); } + static const ber_sequence_t Status_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_vmdLogicalStatus_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_vmdPhysicalStatus_impl }, @@ -5295,7 +5437,7 @@ static const ber_sequence_t Status_Response_sequence[] = { static int dissect_mms_Status_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(implicit_tag, pinfo, tree, tvb, offset, - Status_Response_sequence, hf_index, ett_mms_Status_Response); + Status_Response_sequence, hf_index, ett_mms_Status_Response); return offset; } @@ -5303,6 +5445,7 @@ static int dissect_status1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_mms_Status_Response(TRUE, tvb, offset, pinfo, tree, hf_mms_status1); } + static const ber_sequence_t GetNameList_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfIdentifier_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl }, @@ -5312,7 +5455,7 @@ static const ber_sequence_t GetNameList_Response_sequence[] = { static int dissect_mms_GetNameList_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(implicit_tag, pinfo, tree, tvb, offset, - GetNameList_Response_sequence, hf_index, ett_mms_GetNameList_Response); + GetNameList_Response_sequence, hf_index, ett_mms_GetNameList_Response); return offset; } @@ -5349,6 +5492,7 @@ static int dissect_listOfAbstractSyntaxes_impl(packet_info *pinfo, proto_tree *t return dissect_mms_T_listOfAbstractSyntaxes(TRUE, tvb, offset, pinfo, tree, hf_mms_listOfAbstractSyntaxes); } + static const ber_sequence_t Identify_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_vendorName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_modelName_impl }, @@ -5360,7 +5504,7 @@ static const ber_sequence_t Identify_Response_sequence[] = { static int dissect_mms_Identify_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(implicit_tag, pinfo, tree, tvb, offset, - Identify_Response_sequence, hf_index, ett_mms_Identify_Response); + Identify_Response_sequence, hf_index, ett_mms_Identify_Response); return offset; } @@ -5411,20 +5555,21 @@ static int dissect_failure_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t * static const value_string mms_AccessResult_vals[] = { { 0, "failure" }, - { -1/*choice*/, "success" }, + { 1, "success" }, { 0, NULL } }; static const ber_choice_t AccessResult_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_failure_impl }, - { -1/*choice*/, BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_success1 }, + { 1, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_success1 }, { 0, 0, 0, 0, NULL } }; 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, - AccessResult_choice, hf_index, ett_mms_AccessResult, NULL); + AccessResult_choice, hf_index, ett_mms_AccessResult, + NULL); return offset; } @@ -5434,7 +5579,7 @@ static int dissect_listOfAccessResult_item(packet_info *pinfo, proto_tree *tree, 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 }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_listOfAccessResult_item }, }; static int @@ -5448,6 +5593,7 @@ static int dissect_listOfAccessResult_impl(packet_info *pinfo, proto_tree *tree, return dissect_mms_SEQUENCE_OF_AccessResult(TRUE, tvb, offset, pinfo, tree, hf_mms_listOfAccessResult); } + static const ber_sequence_t Read_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_variableAccessSpecificatn }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfAccessResult_impl }, @@ -5457,7 +5603,7 @@ static const ber_sequence_t Read_Response_sequence[] = { static int dissect_mms_Read_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(implicit_tag, pinfo, tree, tvb, offset, - Read_Response_sequence, hf_index, ett_mms_Read_Response); + Read_Response_sequence, hf_index, ett_mms_Read_Response); return offset; } @@ -5481,7 +5627,8 @@ 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, - Write_Response_item_choice, hf_index, ett_mms_Write_Response_item, NULL); + Write_Response_item_choice, hf_index, ett_mms_Write_Response_item, + NULL); return offset; } @@ -5491,7 +5638,7 @@ static int dissect_Write_Response_item(packet_info *pinfo, proto_tree *tree, tvb 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 }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_Write_Response_item }, }; static int @@ -5505,6 +5652,7 @@ static int dissect_write1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_mms_Write_Response(TRUE, tvb, offset, pinfo, tree, hf_mms_write1); } + static const ber_sequence_t GetVariableAccessAttributes_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_address }, @@ -5515,7 +5663,7 @@ static const ber_sequence_t GetVariableAccessAttributes_Response_sequence[] = { static int dissect_mms_GetVariableAccessAttributes_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(implicit_tag, pinfo, tree, tvb, offset, - GetVariableAccessAttributes_Response_sequence, hf_index, ett_mms_GetVariableAccessAttributes_Response); + GetVariableAccessAttributes_Response_sequence, hf_index, ett_mms_GetVariableAccessAttributes_Response); return offset; } @@ -5547,6 +5695,7 @@ static int dissect_defineScatteredAccess1_impl(packet_info *pinfo, proto_tree *t return dissect_mms_DefineScatteredAccess_Response(TRUE, tvb, offset, pinfo, tree, hf_mms_defineScatteredAccess1); } + static const ber_sequence_t GetScatteredAccessAttributes_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_scatteredAccessDescription_impl }, @@ -5556,7 +5705,7 @@ static const ber_sequence_t GetScatteredAccessAttributes_Response_sequence[] = { static int dissect_mms_GetScatteredAccessAttributes_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(implicit_tag, pinfo, tree, tvb, offset, - GetScatteredAccessAttributes_Response_sequence, hf_index, ett_mms_GetScatteredAccessAttributes_Response); + GetScatteredAccessAttributes_Response_sequence, hf_index, ett_mms_GetScatteredAccessAttributes_Response); return offset; } @@ -5564,6 +5713,7 @@ static int dissect_getScatteredAccessAttributes1_impl(packet_info *pinfo, proto_ return dissect_mms_GetScatteredAccessAttributes_Response(TRUE, tvb, offset, pinfo, tree, hf_mms_getScatteredAccessAttributes1); } + static const ber_sequence_t DeleteVariableAccess_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_numberMatched_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numberDeleted_impl }, @@ -5573,7 +5723,7 @@ static const ber_sequence_t DeleteVariableAccess_Response_sequence[] = { static int dissect_mms_DeleteVariableAccess_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(implicit_tag, pinfo, tree, tvb, offset, - DeleteVariableAccess_Response_sequence, hf_index, ett_mms_DeleteVariableAccess_Response); + DeleteVariableAccess_Response_sequence, hf_index, ett_mms_DeleteVariableAccess_Response); return offset; } @@ -5593,8 +5743,9 @@ static int dissect_defineNamedVariableList1_impl(packet_info *pinfo, proto_tree return dissect_mms_DefineNamedVariableList_Response(TRUE, tvb, offset, pinfo, tree, hf_mms_defineNamedVariableList1); } + static const ber_sequence_t T_listOfVariable_item1_sequence[] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableSpecification }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableSpecification }, { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_alternateAccess_impl }, { 0, 0, 0, NULL } }; @@ -5602,7 +5753,7 @@ static const ber_sequence_t T_listOfVariable_item1_sequence[] = { static int dissect_mms_T_listOfVariable_item1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_listOfVariable_item1_sequence, hf_index, ett_mms_T_listOfVariable_item1); + T_listOfVariable_item1_sequence, hf_index, ett_mms_T_listOfVariable_item1); return offset; } @@ -5626,6 +5777,7 @@ static int dissect_listOfVariable1_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_mms_T_listOfVariable1(TRUE, tvb, offset, pinfo, tree, hf_mms_listOfVariable1); } + static const ber_sequence_t GetNamedVariableListAttributes_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfVariable1_impl }, @@ -5635,7 +5787,7 @@ static const ber_sequence_t GetNamedVariableListAttributes_Response_sequence[] = static int dissect_mms_GetNamedVariableListAttributes_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(implicit_tag, pinfo, tree, tvb, offset, - GetNamedVariableListAttributes_Response_sequence, hf_index, ett_mms_GetNamedVariableListAttributes_Response); + GetNamedVariableListAttributes_Response_sequence, hf_index, ett_mms_GetNamedVariableListAttributes_Response); return offset; } @@ -5643,6 +5795,7 @@ static int dissect_getNamedVariableListAttributes1_impl(packet_info *pinfo, prot return dissect_mms_GetNamedVariableListAttributes_Response(TRUE, tvb, offset, pinfo, tree, hf_mms_getNamedVariableListAttributes1); } + static const ber_sequence_t DeleteNamedVariableList_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_numberMatched_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numberDeleted_impl }, @@ -5652,7 +5805,7 @@ static const ber_sequence_t DeleteNamedVariableList_Response_sequence[] = { static int dissect_mms_DeleteNamedVariableList_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(implicit_tag, pinfo, tree, tvb, offset, - DeleteNamedVariableList_Response_sequence, hf_index, ett_mms_DeleteNamedVariableList_Response); + DeleteNamedVariableList_Response_sequence, hf_index, ett_mms_DeleteNamedVariableList_Response); return offset; } @@ -5672,16 +5825,17 @@ static int dissect_defineNamedType1_impl(packet_info *pinfo, proto_tree *tree, t return dissect_mms_DefineNamedType_Response(TRUE, tvb, offset, pinfo, tree, hf_mms_defineNamedType1); } + static const ber_sequence_t GetNamedTypeAttributes_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl }, - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_typeSpecification }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_typeSpecification }, { 0, 0, 0, NULL } }; static int dissect_mms_GetNamedTypeAttributes_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(implicit_tag, pinfo, tree, tvb, offset, - GetNamedTypeAttributes_Response_sequence, hf_index, ett_mms_GetNamedTypeAttributes_Response); + GetNamedTypeAttributes_Response_sequence, hf_index, ett_mms_GetNamedTypeAttributes_Response); return offset; } @@ -5689,6 +5843,7 @@ static int dissect_getNamedTypeAttributes1_impl(packet_info *pinfo, proto_tree * return dissect_mms_GetNamedTypeAttributes_Response(TRUE, tvb, offset, pinfo, tree, hf_mms_getNamedTypeAttributes1); } + static const ber_sequence_t DeleteNamedType_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_numberMatched_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numberDeleted_impl }, @@ -5698,7 +5853,7 @@ static const ber_sequence_t DeleteNamedType_Response_sequence[] = { static int dissect_mms_DeleteNamedType_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(implicit_tag, pinfo, tree, tvb, offset, - DeleteNamedType_Response_sequence, hf_index, ett_mms_DeleteNamedType_Response); + DeleteNamedType_Response_sequence, hf_index, ett_mms_DeleteNamedType_Response); return offset; } @@ -5707,11 +5862,12 @@ static int dissect_deleteNamedType1_impl(packet_info *pinfo, proto_tree *tree, t } + static int dissect_mms_Input_Response(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, BER_UNI_TAG_VisibleString, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -5747,7 +5903,8 @@ 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, - TakeControl_Response_choice, hf_index, ett_mms_TakeControl_Response, NULL); + TakeControl_Response_choice, hf_index, ett_mms_TakeControl_Response, + NULL); return offset; } @@ -5810,6 +5967,7 @@ static int dissect_class_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_mms_T_class(TRUE, tvb, offset, pinfo, tree, hf_mms_class); } + static const ber_sequence_t ReportSemaphoreStatus_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_class_impl }, @@ -5822,7 +5980,7 @@ static const ber_sequence_t ReportSemaphoreStatus_Response_sequence[] = { static int dissect_mms_ReportSemaphoreStatus_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(implicit_tag, pinfo, tree, tvb, offset, - ReportSemaphoreStatus_Response_sequence, hf_index, ett_mms_ReportSemaphoreStatus_Response); + ReportSemaphoreStatus_Response_sequence, hf_index, ett_mms_ReportSemaphoreStatus_Response); return offset; } @@ -5848,7 +6006,8 @@ 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, - T_listOfNamedTokens_item_choice, hf_index, ett_mms_T_listOfNamedTokens_item, NULL); + T_listOfNamedTokens_item_choice, hf_index, ett_mms_T_listOfNamedTokens_item, + NULL); return offset; } @@ -5858,7 +6017,7 @@ static int dissect_listOfNamedTokens_item(packet_info *pinfo, proto_tree *tree, static const ber_sequence_t T_listOfNamedTokens_sequence_of[1] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_listOfNamedTokens_item }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_listOfNamedTokens_item }, }; static int @@ -5872,6 +6031,7 @@ static int dissect_listOfNamedTokens_impl(packet_info *pinfo, proto_tree *tree, return dissect_mms_T_listOfNamedTokens(TRUE, tvb, offset, pinfo, tree, hf_mms_listOfNamedTokens); } + static const ber_sequence_t ReportPoolSemaphoreStatus_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfNamedTokens_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl }, @@ -5881,7 +6041,7 @@ static const ber_sequence_t ReportPoolSemaphoreStatus_Response_sequence[] = { static int dissect_mms_ReportPoolSemaphoreStatus_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(implicit_tag, pinfo, tree, tvb, offset, - ReportPoolSemaphoreStatus_Response_sequence, hf_index, ett_mms_ReportPoolSemaphoreStatus_Response); + ReportPoolSemaphoreStatus_Response_sequence, hf_index, ett_mms_ReportPoolSemaphoreStatus_Response); return offset; } @@ -5908,6 +6068,7 @@ static int dissect_entryClass_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_mms_T_entryClass(TRUE, tvb, offset, pinfo, tree, hf_mms_entryClass); } + static const ber_sequence_t SemaphoreEntry_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_entryId_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_entryClass_impl }, @@ -5923,7 +6084,7 @@ static const ber_sequence_t SemaphoreEntry_sequence[] = { static int dissect_mms_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(implicit_tag, pinfo, tree, tvb, offset, - SemaphoreEntry_sequence, hf_index, ett_mms_SemaphoreEntry); + SemaphoreEntry_sequence, hf_index, ett_mms_SemaphoreEntry); return offset; } @@ -5947,6 +6108,7 @@ static int dissect_listOfSemaphoreEntry_impl(packet_info *pinfo, proto_tree *tre return dissect_mms_SEQUENCE_OF_SemaphoreEntry(TRUE, tvb, offset, pinfo, tree, hf_mms_listOfSemaphoreEntry); } + static const ber_sequence_t ReportSemaphoreEntryStatus_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfSemaphoreEntry_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl }, @@ -5956,7 +6118,7 @@ static const ber_sequence_t ReportSemaphoreEntryStatus_Response_sequence[] = { static int dissect_mms_ReportSemaphoreEntryStatus_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(implicit_tag, pinfo, tree, tvb, offset, - ReportSemaphoreEntryStatus_Response_sequence, hf_index, ett_mms_ReportSemaphoreEntryStatus_Response); + ReportSemaphoreEntryStatus_Response_sequence, hf_index, ett_mms_ReportSemaphoreEntryStatus_Response); return offset; } @@ -5992,7 +6154,8 @@ 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, - T_loadData_choice, hf_index, ett_mms_T_loadData, NULL); + T_loadData_choice, hf_index, ett_mms_T_loadData, + NULL); return offset; } @@ -6000,8 +6163,9 @@ static int dissect_loadData(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_mms_T_loadData(FALSE, tvb, offset, pinfo, tree, hf_mms_loadData); } + static const ber_sequence_t DownloadSegment_Response_sequence[] = { - { -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_loadData }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_loadData }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl }, { 0, 0, 0, NULL } }; @@ -6009,7 +6173,7 @@ static const ber_sequence_t DownloadSegment_Response_sequence[] = { static int dissect_mms_DownloadSegment_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(implicit_tag, pinfo, tree, tvb, offset, - DownloadSegment_Response_sequence, hf_index, ett_mms_DownloadSegment_Response); + DownloadSegment_Response_sequence, hf_index, ett_mms_DownloadSegment_Response); return offset; } @@ -6045,6 +6209,7 @@ static int dissect_listOfCapabilities2_impl(packet_info *pinfo, proto_tree *tree return dissect_mms_T_listOfCapabilities2(TRUE, tvb, offset, pinfo, tree, hf_mms_listOfCapabilities2); } + static const ber_sequence_t InitiateUploadSequence_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ulsmID_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfCapabilities2_impl }, @@ -6054,7 +6219,7 @@ static const ber_sequence_t InitiateUploadSequence_Response_sequence[] = { static int dissect_mms_InitiateUploadSequence_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(implicit_tag, pinfo, tree, tvb, offset, - InitiateUploadSequence_Response_sequence, hf_index, ett_mms_InitiateUploadSequence_Response); + InitiateUploadSequence_Response_sequence, hf_index, ett_mms_InitiateUploadSequence_Response); return offset; } @@ -6078,7 +6243,8 @@ 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, - T_loadData1_choice, hf_index, ett_mms_T_loadData1, NULL); + T_loadData1_choice, hf_index, ett_mms_T_loadData1, + NULL); return offset; } @@ -6086,8 +6252,9 @@ static int dissect_loadData1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_mms_T_loadData1(FALSE, tvb, offset, pinfo, tree, hf_mms_loadData1); } + static const ber_sequence_t UploadSegment_Response_sequence[] = { - { -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_loadData1 }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_loadData1 }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl }, { 0, 0, 0, NULL } }; @@ -6095,7 +6262,7 @@ static const ber_sequence_t UploadSegment_Response_sequence[] = { static int dissect_mms_UploadSegment_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(implicit_tag, pinfo, tree, tvb, offset, - UploadSegment_Response_sequence, hf_index, ett_mms_UploadSegment_Response); + UploadSegment_Response_sequence, hf_index, ett_mms_UploadSegment_Response); return offset; } @@ -6242,6 +6409,7 @@ static int dissect_uploadInProgress_impl(packet_info *pinfo, proto_tree *tree, t return dissect_mms_Integer8(TRUE, tvb, offset, pinfo, tree, hf_mms_uploadInProgress); } + static const ber_sequence_t GetDomainAttributes_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfCapabilities5_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_state_impl }, @@ -6255,7 +6423,7 @@ static const ber_sequence_t GetDomainAttributes_Response_sequence[] = { static int dissect_mms_GetDomainAttributes_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(implicit_tag, pinfo, tree, tvb, offset, - GetDomainAttributes_Response_sequence, hf_index, ett_mms_GetDomainAttributes_Response); + GetDomainAttributes_Response_sequence, hf_index, ett_mms_GetDomainAttributes_Response); return offset; } @@ -6363,7 +6531,8 @@ 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, - T_executionArgument2_choice, hf_index, ett_mms_T_executionArgument2, NULL); + T_executionArgument2_choice, hf_index, ett_mms_T_executionArgument2, + NULL); return offset; } @@ -6371,6 +6540,7 @@ static int dissect_executionArgument2(packet_info *pinfo, proto_tree *tree, tvbu return dissect_mms_T_executionArgument2(FALSE, tvb, offset, pinfo, tree, hf_mms_executionArgument2); } + static const ber_sequence_t GetProgramInvocationAttributes_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_state1_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfDomainNames_impl }, @@ -6378,14 +6548,14 @@ static const ber_sequence_t GetProgramInvocationAttributes_Response_sequence[] = { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_reusable_impl }, { BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_monitor_impl }, { BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_startArgument_impl }, - { -1/*choice*/ , -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_executionArgument2 }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_executionArgument2 }, { 0, 0, 0, NULL } }; static int dissect_mms_GetProgramInvocationAttributes_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(implicit_tag, pinfo, tree, tvb, offset, - GetProgramInvocationAttributes_Response_sequence, hf_index, ett_mms_GetProgramInvocationAttributes_Response); + GetProgramInvocationAttributes_Response_sequence, hf_index, ett_mms_GetProgramInvocationAttributes_Response); return offset; } @@ -6406,6 +6576,7 @@ static int dissect_obtainFile1_impl(packet_info *pinfo, proto_tree *tree, tvbuff } + static int dissect_mms_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index); @@ -6416,6 +6587,7 @@ static int dissect_lastModified_impl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_mms_GeneralizedTime(TRUE, tvb, offset, pinfo, tree, hf_mms_lastModified); } + static const ber_sequence_t FileAttributes_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sizeOfFile_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lastModified_impl }, @@ -6425,7 +6597,7 @@ static const ber_sequence_t FileAttributes_sequence[] = { static int dissect_mms_FileAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - FileAttributes_sequence, hf_index, ett_mms_FileAttributes); + FileAttributes_sequence, hf_index, ett_mms_FileAttributes); return offset; } @@ -6433,6 +6605,7 @@ static int dissect_fileAttributes_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_mms_FileAttributes(TRUE, tvb, offset, pinfo, tree, hf_mms_fileAttributes); } + static const ber_sequence_t FileOpen_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_frsmID_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_fileAttributes_impl }, @@ -6442,7 +6615,7 @@ static const ber_sequence_t FileOpen_Response_sequence[] = { static int dissect_mms_FileOpen_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(implicit_tag, pinfo, tree, tvb, offset, - FileOpen_Response_sequence, hf_index, ett_mms_FileOpen_Response); + FileOpen_Response_sequence, hf_index, ett_mms_FileOpen_Response); return offset; } @@ -6463,6 +6636,7 @@ static int dissect_defineEventCondition1_impl(packet_info *pinfo, proto_tree *tr } + static int dissect_mms_DeleteEventCondition_Response(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_Unsigned32(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -6489,7 +6663,8 @@ 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, - T_monitoredVariable_choice, hf_index, ett_mms_T_monitoredVariable, NULL); + T_monitoredVariable_choice, hf_index, ett_mms_T_monitoredVariable, + NULL); return offset; } @@ -6497,6 +6672,7 @@ static int dissect_monitoredVariable1(packet_info *pinfo, proto_tree *tree, tvbu return dissect_mms_T_monitoredVariable(FALSE, tvb, offset, pinfo, tree, hf_mms_monitoredVariable1); } + static const ber_sequence_t GetEventConditionAttributes_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_class1_impl }, @@ -6511,7 +6687,7 @@ static const ber_sequence_t GetEventConditionAttributes_Response_sequence[] = { static int dissect_mms_GetEventConditionAttributes_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(implicit_tag, pinfo, tree, tvb, offset, - GetEventConditionAttributes_Response_sequence, hf_index, ett_mms_GetEventConditionAttributes_Response); + GetEventConditionAttributes_Response_sequence, hf_index, ett_mms_GetEventConditionAttributes_Response); return offset; } @@ -6519,6 +6695,7 @@ static int dissect_getEventConditionAttributes1_impl(packet_info *pinfo, proto_t return dissect_mms_GetEventConditionAttributes_Response(TRUE, tvb, offset, pinfo, tree, hf_mms_getEventConditionAttributes1); } + static const ber_sequence_t ReportEventConditionStatus_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_currentState_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numberOfEventEnrollments_impl }, @@ -6531,7 +6708,7 @@ static const ber_sequence_t ReportEventConditionStatus_Response_sequence[] = { static int dissect_mms_ReportEventConditionStatus_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(implicit_tag, pinfo, tree, tvb, offset, - ReportEventConditionStatus_Response_sequence, hf_index, ett_mms_ReportEventConditionStatus_Response); + ReportEventConditionStatus_Response_sequence, hf_index, ett_mms_ReportEventConditionStatus_Response); return offset; } @@ -6576,6 +6753,7 @@ static int dissect_defineEventAction1_impl(packet_info *pinfo, proto_tree *tree, } + static int dissect_mms_DeleteEventAction_Response(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_Unsigned32(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -6586,6 +6764,7 @@ static int dissect_deleteEventAction1_impl(packet_info *pinfo, proto_tree *tree, return dissect_mms_DeleteEventAction_Response(TRUE, tvb, offset, pinfo, tree, hf_mms_deleteEventAction1); } + static const ber_sequence_t GetEventActionAttributes_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_listOfModifier_impl }, @@ -6595,7 +6774,7 @@ static const ber_sequence_t GetEventActionAttributes_Response_sequence[] = { static int dissect_mms_GetEventActionAttributes_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(implicit_tag, pinfo, tree, tvb, offset, - GetEventActionAttributes_Response_sequence, hf_index, ett_mms_GetEventActionAttributes_Response); + GetEventActionAttributes_Response_sequence, hf_index, ett_mms_GetEventActionAttributes_Response); return offset; } @@ -6604,6 +6783,7 @@ static int dissect_getEventActionAttributes1_impl(packet_info *pinfo, proto_tree } + static int dissect_mms_ReportEventActionStatus_Response(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_Unsigned32(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -6627,6 +6807,7 @@ static int dissect_defineEventEnrollment1_impl(packet_info *pinfo, proto_tree *t } + static int dissect_mms_DeleteEventEnrollment_Response(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_Unsigned32(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -6684,7 +6865,8 @@ 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, - T_currentState_choice, hf_index, ett_mms_T_currentState, NULL); + T_currentState_choice, hf_index, ett_mms_T_currentState, + NULL); return offset; } @@ -6692,6 +6874,7 @@ static int dissect_currentState2(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_mms_T_currentState(FALSE, tvb, offset, pinfo, tree, hf_mms_currentState2); } + static const ber_sequence_t AlterEventEnrollment_Response_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_currentState2 }, { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_transitionTime }, @@ -6701,7 +6884,7 @@ static const ber_sequence_t AlterEventEnrollment_Response_sequence[] = { static int dissect_mms_AlterEventEnrollment_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(implicit_tag, pinfo, tree, tvb, offset, - AlterEventEnrollment_Response_sequence, hf_index, ett_mms_AlterEventEnrollment_Response); + AlterEventEnrollment_Response_sequence, hf_index, ett_mms_AlterEventEnrollment_Response); return offset; } @@ -6728,6 +6911,7 @@ static int dissect_duration_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_mms_EE_Duration(TRUE, tvb, offset, pinfo, tree, hf_mms_duration); } + static const ber_sequence_t ReportEventEnrollmentStatus_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventConditionTransitions_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notificationLost_impl }, @@ -6740,7 +6924,7 @@ static const ber_sequence_t ReportEventEnrollmentStatus_Response_sequence[] = { static int dissect_mms_ReportEventEnrollmentStatus_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(implicit_tag, pinfo, tree, tvb, offset, - ReportEventEnrollmentStatus_Response_sequence, hf_index, ett_mms_ReportEventEnrollmentStatus_Response); + ReportEventEnrollmentStatus_Response_sequence, hf_index, ett_mms_ReportEventEnrollmentStatus_Response); return offset; } @@ -6764,7 +6948,8 @@ 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, - T_eventConditionName_choice, hf_index, ett_mms_T_eventConditionName, NULL); + T_eventConditionName_choice, hf_index, ett_mms_T_eventConditionName, + NULL); return offset; } @@ -6788,7 +6973,8 @@ 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, - T_eventActionName_choice, hf_index, ett_mms_T_eventActionName, NULL); + T_eventActionName_choice, hf_index, ett_mms_T_eventActionName, + NULL); return offset; } @@ -6815,6 +7001,7 @@ static int dissect_enrollmentClass_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_mms_EE_Class(TRUE, tvb, offset, pinfo, tree, hf_mms_enrollmentClass); } + static const ber_sequence_t EventEnrollment_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventEnrollmentName }, { BER_CLASS_CON, 1, 0, dissect_eventConditionName1 }, @@ -6831,7 +7018,7 @@ static const ber_sequence_t EventEnrollment_sequence[] = { static int dissect_mms_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(implicit_tag, pinfo, tree, tvb, offset, - EventEnrollment_sequence, hf_index, ett_mms_EventEnrollment); + EventEnrollment_sequence, hf_index, ett_mms_EventEnrollment); return offset; } @@ -6855,6 +7042,7 @@ static int dissect_listOfEventEnrollment_impl(packet_info *pinfo, proto_tree *tr return dissect_mms_SEQUENCE_OF_EventEnrollment(TRUE, tvb, offset, pinfo, tree, hf_mms_listOfEventEnrollment); } + static const ber_sequence_t GetEventEnrollmentAttributes_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfEventEnrollment_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl }, @@ -6864,7 +7052,7 @@ static const ber_sequence_t GetEventEnrollmentAttributes_Response_sequence[] = { static int dissect_mms_GetEventEnrollmentAttributes_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(implicit_tag, pinfo, tree, tvb, offset, - GetEventEnrollmentAttributes_Response_sequence, hf_index, ett_mms_GetEventEnrollmentAttributes_Response); + GetEventEnrollmentAttributes_Response_sequence, hf_index, ett_mms_GetEventEnrollmentAttributes_Response); return offset; } @@ -6905,6 +7093,7 @@ static int dissect_unacknowledgedState_impl(packet_info *pinfo, proto_tree *tree return dissect_mms_T_unacknowledgedState(TRUE, tvb, offset, pinfo, tree, hf_mms_unacknowledgedState); } + static const ber_sequence_t AlarmSummary_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventConditionName }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_severity_impl }, @@ -6918,7 +7107,7 @@ static const ber_sequence_t AlarmSummary_sequence[] = { static int dissect_mms_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(implicit_tag, pinfo, tree, tvb, offset, - AlarmSummary_sequence, hf_index, ett_mms_AlarmSummary); + AlarmSummary_sequence, hf_index, ett_mms_AlarmSummary); return offset; } @@ -6942,6 +7131,7 @@ static int dissect_listOfAlarmSummary_impl(packet_info *pinfo, proto_tree *tree, return dissect_mms_SEQUENCE_OF_AlarmSummary(TRUE, tvb, offset, pinfo, tree, hf_mms_listOfAlarmSummary); } + static const ber_sequence_t GetAlarmSummary_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfAlarmSummary_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl }, @@ -6951,7 +7141,7 @@ static const ber_sequence_t GetAlarmSummary_Response_sequence[] = { static int dissect_mms_GetAlarmSummary_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(implicit_tag, pinfo, tree, tvb, offset, - GetAlarmSummary_Response_sequence, hf_index, ett_mms_GetAlarmSummary_Response); + GetAlarmSummary_Response_sequence, hf_index, ett_mms_GetAlarmSummary_Response); return offset; } @@ -6959,6 +7149,7 @@ static int dissect_getAlarmSummary1_impl(packet_info *pinfo, proto_tree *tree, t return dissect_mms_GetAlarmSummary_Response(TRUE, tvb, offset, pinfo, tree, hf_mms_getAlarmSummary1); } + static const ber_sequence_t AlarmEnrollmentSummary_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventEnrollmentName }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_clientApplication }, @@ -6977,7 +7168,7 @@ static const ber_sequence_t AlarmEnrollmentSummary_sequence[] = { static int dissect_mms_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(implicit_tag, pinfo, tree, tvb, offset, - AlarmEnrollmentSummary_sequence, hf_index, ett_mms_AlarmEnrollmentSummary); + AlarmEnrollmentSummary_sequence, hf_index, ett_mms_AlarmEnrollmentSummary); return offset; } @@ -7001,6 +7192,7 @@ static int dissect_listOfAlarmEnrollmentSummary_impl(packet_info *pinfo, proto_t return dissect_mms_SEQUENCE_OF_AlarmEnrollmentSummary(TRUE, tvb, offset, pinfo, tree, hf_mms_listOfAlarmEnrollmentSummary); } + static const ber_sequence_t GetAlarmEnrollmentSummary_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfAlarmEnrollmentSummary_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl }, @@ -7010,7 +7202,7 @@ static const ber_sequence_t GetAlarmEnrollmentSummary_Response_sequence[] = { static int dissect_mms_GetAlarmEnrollmentSummary_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(implicit_tag, pinfo, tree, tvb, offset, - GetAlarmEnrollmentSummary_Response_sequence, hf_index, ett_mms_GetAlarmEnrollmentSummary_Response); + GetAlarmEnrollmentSummary_Response_sequence, hf_index, ett_mms_GetAlarmEnrollmentSummary_Response); return offset; } @@ -7018,6 +7210,7 @@ static int dissect_getAlarmEnrollmentSummary1_impl(packet_info *pinfo, proto_tre return dissect_mms_GetAlarmEnrollmentSummary_Response(TRUE, tvb, offset, pinfo, tree, hf_mms_getAlarmEnrollmentSummary1); } + static const ber_sequence_t JournalEntry_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_entryIdentifier_impl }, { BER_CLASS_CON, 1, 0, dissect_originatingApplication }, @@ -7028,7 +7221,7 @@ static const ber_sequence_t JournalEntry_sequence[] = { static int dissect_mms_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(implicit_tag, pinfo, tree, tvb, offset, - JournalEntry_sequence, hf_index, ett_mms_JournalEntry); + JournalEntry_sequence, hf_index, ett_mms_JournalEntry); return offset; } @@ -7052,6 +7245,7 @@ static int dissect_listOfJournalEntry_impl(packet_info *pinfo, proto_tree *tree, return dissect_mms_SEQUENCE_OF_JournalEntry(TRUE, tvb, offset, pinfo, tree, hf_mms_listOfJournalEntry); } + static const ber_sequence_t ReadJournal_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfJournalEntry_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl }, @@ -7061,7 +7255,7 @@ static const ber_sequence_t ReadJournal_Response_sequence[] = { static int dissect_mms_ReadJournal_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(implicit_tag, pinfo, tree, tvb, offset, - ReadJournal_Response_sequence, hf_index, ett_mms_ReadJournal_Response); + ReadJournal_Response_sequence, hf_index, ett_mms_ReadJournal_Response); return offset; } @@ -7082,6 +7276,7 @@ static int dissect_writeJournal1_impl(packet_info *pinfo, proto_tree *tree, tvbu } + static int dissect_mms_InitializeJournal_Response(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_Unsigned32(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -7092,6 +7287,7 @@ static int dissect_initializeJournal1_impl(packet_info *pinfo, proto_tree *tree, return dissect_mms_InitializeJournal_Response(TRUE, tvb, offset, pinfo, tree, hf_mms_initializeJournal1); } + static const ber_sequence_t ReportJournalStatus_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_currentEntries_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mmsDeletable_impl }, @@ -7101,7 +7297,7 @@ static const ber_sequence_t ReportJournalStatus_Response_sequence[] = { static int dissect_mms_ReportJournalStatus_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(implicit_tag, pinfo, tree, tvb, offset, - ReportJournalStatus_Response_sequence, hf_index, ett_mms_ReportJournalStatus_Response); + ReportJournalStatus_Response_sequence, hf_index, ett_mms_ReportJournalStatus_Response); return offset; } @@ -7149,6 +7345,7 @@ static int dissect_listOfCapabilities_impl(packet_info *pinfo, proto_tree *tree, return dissect_mms_T_listOfCapabilities(TRUE, tvb, offset, pinfo, tree, hf_mms_listOfCapabilities); } + static const ber_sequence_t GetCapabilityList_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfCapabilities_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl }, @@ -7158,7 +7355,7 @@ static const ber_sequence_t GetCapabilityList_Response_sequence[] = { static int dissect_mms_GetCapabilityList_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(implicit_tag, pinfo, tree, tvb, offset, - GetCapabilityList_Response_sequence, hf_index, ett_mms_GetCapabilityList_Response); + GetCapabilityList_Response_sequence, hf_index, ett_mms_GetCapabilityList_Response); return offset; } @@ -7166,6 +7363,7 @@ static int dissect_getCapabilityList1_impl(packet_info *pinfo, proto_tree *tree, return dissect_mms_GetCapabilityList_Response(TRUE, tvb, offset, pinfo, tree, hf_mms_getCapabilityList1); } + static const ber_sequence_t FileRead_Response_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_fileData_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl }, @@ -7175,7 +7373,7 @@ static const ber_sequence_t FileRead_Response_sequence[] = { static int dissect_mms_FileRead_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(implicit_tag, pinfo, tree, tvb, offset, - FileRead_Response_sequence, hf_index, ett_mms_FileRead_Response); + FileRead_Response_sequence, hf_index, ett_mms_FileRead_Response); return offset; } @@ -7219,6 +7417,7 @@ static int dissect_fileDelete1_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_mms_FileDelete_Response(TRUE, tvb, offset, pinfo, tree, hf_mms_fileDelete1); } + static const ber_sequence_t DirectoryEntry_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_filename_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_fileAttributes_impl }, @@ -7228,7 +7427,7 @@ static const ber_sequence_t DirectoryEntry_sequence[] = { static int dissect_mms_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(implicit_tag, pinfo, tree, tvb, offset, - DirectoryEntry_sequence, hf_index, ett_mms_DirectoryEntry); + DirectoryEntry_sequence, hf_index, ett_mms_DirectoryEntry); return offset; } @@ -7252,6 +7451,7 @@ static int dissect_listOfDirectoryEntry(packet_info *pinfo, proto_tree *tree, tv return dissect_mms_SEQUENCE_OF_DirectoryEntry(FALSE, tvb, offset, pinfo, tree, hf_mms_listOfDirectoryEntry); } + static const ber_sequence_t FileDirectory_Response_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_listOfDirectoryEntry }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_moreFollows_impl }, @@ -7261,7 +7461,7 @@ static const ber_sequence_t FileDirectory_Response_sequence[] = { static int dissect_mms_FileDirectory_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(implicit_tag, pinfo, tree, tvb, offset, - FileDirectory_Response_sequence, hf_index, ett_mms_FileDirectory_Response); + FileDirectory_Response_sequence, hf_index, ett_mms_FileDirectory_Response); return offset; } @@ -7437,7 +7637,8 @@ 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, - ConfirmedServiceResponse_choice, hf_index, ett_mms_ConfirmedServiceResponse, NULL); + ConfirmedServiceResponse_choice, hf_index, ett_mms_ConfirmedServiceResponse, + NULL); return offset; } @@ -7448,9 +7649,10 @@ static int dissect_success2(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_mms_ConfirmedServiceResponse(FALSE, tvb, offset, pinfo, tree, hf_mms_success2); } + static const ber_sequence_t Confirmed_ResponsePDU_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeID }, - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_confirmedServiceResponse }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_confirmedServiceResponse }, { BER_CLASS_CON, 79, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_cs_request_detail }, { 0, 0, 0, NULL } }; @@ -7458,7 +7660,7 @@ static const ber_sequence_t Confirmed_ResponsePDU_sequence[] = { static int dissect_mms_Confirmed_ResponsePDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - Confirmed_ResponsePDU_sequence, hf_index, ett_mms_Confirmed_ResponsePDU); + Confirmed_ResponsePDU_sequence, hf_index, ett_mms_Confirmed_ResponsePDU); return offset; } @@ -7466,6 +7668,7 @@ static int dissect_confirmed_ResponsePDU_impl(packet_info *pinfo, proto_tree *tr return dissect_mms_Confirmed_ResponsePDU(TRUE, tvb, offset, pinfo, tree, hf_mms_confirmed_ResponsePDU); } + static const ber_sequence_t Confirmed_ErrorPDU_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_invokeID_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_modifierPosition_impl }, @@ -7476,7 +7679,7 @@ static const ber_sequence_t Confirmed_ErrorPDU_sequence[] = { static int dissect_mms_Confirmed_ErrorPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - Confirmed_ErrorPDU_sequence, hf_index, ett_mms_Confirmed_ErrorPDU); + Confirmed_ErrorPDU_sequence, hf_index, ett_mms_Confirmed_ErrorPDU); return offset; } @@ -7484,8 +7687,9 @@ static int dissect_confirmed_ErrorPDU_impl(packet_info *pinfo, proto_tree *tree, return dissect_mms_Confirmed_ErrorPDU(TRUE, tvb, offset, pinfo, tree, hf_mms_confirmed_ErrorPDU); } + static const ber_sequence_t InformationReport_sequence[] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableAccessSpecification }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_variableAccessSpecification }, { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_listOfAccessResult_impl }, { 0, 0, 0, NULL } }; @@ -7493,7 +7697,7 @@ static const ber_sequence_t InformationReport_sequence[] = { static int dissect_mms_InformationReport(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - InformationReport_sequence, hf_index, ett_mms_InformationReport); + InformationReport_sequence, hf_index, ett_mms_InformationReport); return offset; } @@ -7502,6 +7706,7 @@ static int dissect_informationReport_impl(packet_info *pinfo, proto_tree *tree, } + static int dissect_mms_UnsolicitedStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_Status_Response(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -7528,7 +7733,8 @@ 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, - T_eventConditionName1_choice, hf_index, ett_mms_T_eventConditionName1, NULL); + T_eventConditionName1_choice, hf_index, ett_mms_T_eventConditionName1, + NULL); return offset; } @@ -7552,7 +7758,8 @@ 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, - T_eventActionResult_choice, hf_index, ett_mms_T_eventActionResult, NULL); + T_eventActionResult_choice, hf_index, ett_mms_T_eventActionResult, + NULL); return offset; } @@ -7560,16 +7767,17 @@ static int dissect_eventActionResult(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_mms_T_eventActionResult(FALSE, tvb, offset, pinfo, tree, hf_mms_eventActionResult); } + static const ber_sequence_t T_actionResult_sequence[] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_eventActioName }, - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_eventActionResult }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_eventActioName }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_eventActionResult }, { 0, 0, 0, NULL } }; static int dissect_mms_T_actionResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_actionResult_sequence, hf_index, ett_mms_T_actionResult); + T_actionResult_sequence, hf_index, ett_mms_T_actionResult); return offset; } @@ -7577,6 +7785,7 @@ static int dissect_actionResult_impl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_mms_T_actionResult(TRUE, tvb, offset, pinfo, tree, hf_mms_actionResult); } + static const ber_sequence_t EventNotification_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_eventEnrollmentName }, { BER_CLASS_CON, 1, 0, dissect_eventConditionName2 }, @@ -7592,7 +7801,7 @@ static const ber_sequence_t EventNotification_sequence[] = { static int dissect_mms_EventNotification(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - EventNotification_sequence, hf_index, ett_mms_EventNotification); + EventNotification_sequence, hf_index, ett_mms_EventNotification); return offset; } @@ -7618,7 +7827,8 @@ 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, - UnconfirmedService_choice, hf_index, ett_mms_UnconfirmedService, NULL); + UnconfirmedService_choice, hf_index, ett_mms_UnconfirmedService, + NULL); return offset; } @@ -7626,8 +7836,9 @@ static int dissect_unconfirmedService(packet_info *pinfo, proto_tree *tree, tvbu return dissect_mms_UnconfirmedService(FALSE, tvb, offset, pinfo, tree, hf_mms_unconfirmedService); } + static const ber_sequence_t Unconfirmed_PDU_sequence[] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_unconfirmedService }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_unconfirmedService }, { BER_CLASS_CON, 79, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_cs_request_detail }, { 0, 0, 0, NULL } }; @@ -7635,7 +7846,7 @@ static const ber_sequence_t Unconfirmed_PDU_sequence[] = { static int dissect_mms_Unconfirmed_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - Unconfirmed_PDU_sequence, hf_index, ett_mms_Unconfirmed_PDU); + Unconfirmed_PDU_sequence, hf_index, ett_mms_Unconfirmed_PDU); return offset; } @@ -7907,7 +8118,8 @@ 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, - T_rejectReason_choice, hf_index, ett_mms_T_rejectReason, NULL); + T_rejectReason_choice, hf_index, ett_mms_T_rejectReason, + NULL); return offset; } @@ -7915,16 +8127,17 @@ static int dissect_rejectReason(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_mms_T_rejectReason(FALSE, tvb, offset, pinfo, tree, hf_mms_rejectReason); } + static const ber_sequence_t RejectPDU_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originalInvokeID_impl }, - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_rejectReason }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_rejectReason }, { 0, 0, 0, NULL } }; static int dissect_mms_RejectPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - RejectPDU_sequence, hf_index, ett_mms_RejectPDU); + RejectPDU_sequence, hf_index, ett_mms_RejectPDU); return offset; } @@ -7933,6 +8146,7 @@ static int dissect_rejectPDU_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_mms_Cancel_RequestPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_Unsigned32(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -7944,6 +8158,7 @@ static int dissect_cancel_RequestPDU_impl(packet_info *pinfo, proto_tree *tree, } + static int dissect_mms_Cancel_ResponsePDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_Unsigned32(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -7954,6 +8169,7 @@ static int dissect_cancel_ResponsePDU_impl(packet_info *pinfo, proto_tree *tree, return dissect_mms_Cancel_ResponsePDU(TRUE, tvb, offset, pinfo, tree, hf_mms_cancel_ResponsePDU); } + static const ber_sequence_t Cancel_ErrorPDU_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_originalInvokeID_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_serviceError_impl }, @@ -7963,7 +8179,7 @@ static const ber_sequence_t Cancel_ErrorPDU_sequence[] = { static int dissect_mms_Cancel_ErrorPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - Cancel_ErrorPDU_sequence, hf_index, ett_mms_Cancel_ErrorPDU); + Cancel_ErrorPDU_sequence, hf_index, ett_mms_Cancel_ErrorPDU); return offset; } @@ -7999,6 +8215,7 @@ static int dissect_negociatedVersionNumber_impl(packet_info *pinfo, proto_tree * return dissect_mms_Integer16(TRUE, tvb, offset, pinfo, tree, hf_mms_negociatedVersionNumber); } + static const asn_namedbit ParameterSupportOptions_bits[] = { { 0, &hf_mms_ParameterSupportOptions_str1, -1, -1, "str1", NULL }, { 1, &hf_mms_ParameterSupportOptions_str2, -1, -1, "str2", NULL }, @@ -8016,8 +8233,8 @@ static const asn_namedbit ParameterSupportOptions_bits[] = { static int dissect_mms_ParameterSupportOptions(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - ParameterSupportOptions_bits, hf_index, ett_mms_ParameterSupportOptions, - NULL); + ParameterSupportOptions_bits, hf_index, ett_mms_ParameterSupportOptions, + NULL); return offset; } @@ -8028,6 +8245,7 @@ static int dissect_negociatedParameterCBB_impl(packet_info *pinfo, proto_tree *t return dissect_mms_ParameterSupportOptions(TRUE, tvb, offset, pinfo, tree, hf_mms_negociatedParameterCBB); } + static const asn_namedbit ServiceSupportOptions_bits[] = { { 0, &hf_mms_ServiceSupportOptions_status, -1, -1, "status", NULL }, { 1, &hf_mms_ServiceSupportOptions_getNameList, -1, -1, "getNameList", NULL }, @@ -8120,8 +8338,8 @@ static const asn_namedbit ServiceSupportOptions_bits[] = { static int dissect_mms_ServiceSupportOptions(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - ServiceSupportOptions_bits, hf_index, ett_mms_ServiceSupportOptions, - NULL); + ServiceSupportOptions_bits, hf_index, ett_mms_ServiceSupportOptions, + NULL); return offset; } @@ -8132,6 +8350,7 @@ static int dissect_servicesSupportedCalled_impl(packet_info *pinfo, proto_tree * return dissect_mms_ServiceSupportOptions(TRUE, tvb, offset, pinfo, tree, hf_mms_servicesSupportedCalled); } + static const ber_sequence_t InitRequestDetail_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_proposedVersionNumber_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_proposedParameterCBB_impl }, @@ -8142,7 +8361,7 @@ static const ber_sequence_t InitRequestDetail_sequence[] = { static int dissect_mms_InitRequestDetail(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - InitRequestDetail_sequence, hf_index, ett_mms_InitRequestDetail); + InitRequestDetail_sequence, hf_index, ett_mms_InitRequestDetail); return offset; } @@ -8150,6 +8369,7 @@ static int dissect_mmsInitRequestDetail_impl(packet_info *pinfo, proto_tree *tre return dissect_mms_InitRequestDetail(TRUE, tvb, offset, pinfo, tree, hf_mms_mmsInitRequestDetail); } + static const ber_sequence_t Initiate_RequestPDU_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_localDetailCalling_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_proposedMaxServOutstandingCalling_impl }, @@ -8162,7 +8382,7 @@ static const ber_sequence_t Initiate_RequestPDU_sequence[] = { static int dissect_mms_Initiate_RequestPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - Initiate_RequestPDU_sequence, hf_index, ett_mms_Initiate_RequestPDU); + Initiate_RequestPDU_sequence, hf_index, ett_mms_Initiate_RequestPDU); return offset; } @@ -8170,6 +8390,7 @@ static int dissect_initiate_RequestPDU_impl(packet_info *pinfo, proto_tree *tree return dissect_mms_Initiate_RequestPDU(TRUE, tvb, offset, pinfo, tree, hf_mms_initiate_RequestPDU); } + static const ber_sequence_t InitResponseDetail_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_negociatedVersionNumber_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_negociatedParameterCBB_impl }, @@ -8180,7 +8401,7 @@ static const ber_sequence_t InitResponseDetail_sequence[] = { static int dissect_mms_InitResponseDetail(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - InitResponseDetail_sequence, hf_index, ett_mms_InitResponseDetail); + InitResponseDetail_sequence, hf_index, ett_mms_InitResponseDetail); return offset; } @@ -8188,6 +8409,7 @@ static int dissect_mmsInitResponseDetail_impl(packet_info *pinfo, proto_tree *tr return dissect_mms_InitResponseDetail(TRUE, tvb, offset, pinfo, tree, hf_mms_mmsInitResponseDetail); } + static const ber_sequence_t Initiate_ResponsePDU_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_localDetailCalled_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_negociatedMaxServOutstandingCalling_impl }, @@ -8200,7 +8422,7 @@ static const ber_sequence_t Initiate_ResponsePDU_sequence[] = { static int dissect_mms_Initiate_ResponsePDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - Initiate_ResponsePDU_sequence, hf_index, ett_mms_Initiate_ResponsePDU); + Initiate_ResponsePDU_sequence, hf_index, ett_mms_Initiate_ResponsePDU); return offset; } @@ -8209,6 +8431,7 @@ static int dissect_initiate_ResponsePDU_impl(packet_info *pinfo, proto_tree *tre } + static int dissect_mms_Initiate_ErrorPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_ServiceError(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -8244,6 +8467,7 @@ static int dissect_conclude_ResponsePDU_impl(packet_info *pinfo, proto_tree *tre } + static int dissect_mms_Conclude_ErrorPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_mms_ServiceError(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -8294,7 +8518,8 @@ 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, - MMSpdu_choice, hf_index, ett_mms_MMSpdu, NULL); + MMSpdu_choice, hf_index, ett_mms_MMSpdu, + NULL); return offset; } diff --git a/epan/dissectors/packet-ns_cert_exts.c b/epan/dissectors/packet-ns_cert_exts.c index 4be6beb582..9a13d01bfd 100644 --- a/epan/dissectors/packet-ns_cert_exts.c +++ b/epan/dissectors/packet-ns_cert_exts.c @@ -1,12 +1,13 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ /* ./packet-ns_cert_exts.c */ -/* ../../tools/asn2eth.py -X -b -p ns_cert_exts -c ns_cert_exts.cnf -s packet-ns_cert_exts-template NETSCAPE-CERT-EXTS.asn */ +/* ../../tools/asn2eth.py -X -b -e -p ns_cert_exts -c ns_cert_exts.cnf -s packet-ns_cert_exts-template NETSCAPE-CERT-EXTS.asn */ /* Input file: packet-ns_cert_exts-template.c */ /* packet-ns_cert_exts.c * Routines for NetScape Certificate Extensions packet dissection + * Ronnie Sahlberg 2004 * * $Id$ * @@ -83,87 +84,95 @@ static gint ett_ns_cert_exts_CertType = -1; + static int -dissect_ns_cert_exts_BaseUrl(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_ns_cert_exts_BaseUrl(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, BER_UNI_TAG_IA5String, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } + static int -dissect_ns_cert_exts_RevocationUrl(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_ns_cert_exts_RevocationUrl(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, BER_UNI_TAG_IA5String, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } + static int -dissect_ns_cert_exts_CaRevocationUrl(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_ns_cert_exts_CaRevocationUrl(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, BER_UNI_TAG_IA5String, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } + static int -dissect_ns_cert_exts_CaPolicyUrl(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_ns_cert_exts_CaPolicyUrl(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, BER_UNI_TAG_IA5String, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } + static int -dissect_ns_cert_exts_Comment(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_ns_cert_exts_Comment(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, BER_UNI_TAG_IA5String, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } + static int -dissect_ns_cert_exts_SslServerName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_ns_cert_exts_SslServerName(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, BER_UNI_TAG_IA5String, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } + static int -dissect_ns_cert_exts_CertRenewalUrl(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_ns_cert_exts_CertRenewalUrl(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, BER_UNI_TAG_IA5String, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } + static const asn_namedbit CertType_bits[] = { - { 0, &hf_ns_cert_exts_CertType_client, -1, -1, NULL, NULL }, - { 1, &hf_ns_cert_exts_CertType_server, -1, -1, NULL, NULL }, - { 5, &hf_ns_cert_exts_CertType_ca, -1, -1, NULL, NULL }, + { 0, &hf_ns_cert_exts_CertType_client, -1, -1, "client", NULL }, + { 1, &hf_ns_cert_exts_CertType_server, -1, -1, "server", NULL }, + { 5, &hf_ns_cert_exts_CertType_ca, -1, -1, "ca", NULL }, { 0, NULL, 0, 0, NULL, NULL } }; static int -dissect_ns_cert_exts_CertType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { +dissect_ns_cert_exts_CertType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - CertType_bits, hf_index, ett_ns_cert_exts_CertType, - NULL); + CertType_bits, hf_index, ett_ns_cert_exts_CertType, + NULL); return offset; } @@ -283,14 +292,14 @@ void proto_reg_handoff_ns_cert_exts(void) { /*--- Included file: packet-ns_cert_exts-dis-tab.c ---*/ - register_ber_oid_dissector("2.16.840.1.113730.1.1", dissect_CertType_PDU, proto_ns_cert_exts, "ns-cert-exts.cert_type"); - register_ber_oid_dissector("2.16.840.1.113730.1.2", dissect_BaseUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.base_url"); - register_ber_oid_dissector("2.16.840.1.113730.1.3", dissect_RevocationUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.revocation-url"); - register_ber_oid_dissector("2.16.840.1.113730.1.4", dissect_CaRevocationUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.ca-revocation-url"); - register_ber_oid_dissector("2.16.840.1.113730.1.7", dissect_CertRenewalUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.cert-renewal-url"); - register_ber_oid_dissector("2.16.840.1.113730.1.8", dissect_CaPolicyUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.ca-policy-url"); - register_ber_oid_dissector("2.16.840.1.113730.1.12", dissect_SslServerName_PDU, proto_ns_cert_exts, "ns-cert-exts.ssl-server-name"); - register_ber_oid_dissector("2.16.840.1.113730.1.13", dissect_Comment_PDU, proto_ns_cert_exts, "ns-cert-exts.comment"); + register_ber_oid_dissector("2.16.840.1.113730.1.1", dissect_CertType_PDU, proto_ns_cert_exts, "ns-cert-exts.cert_type"); + register_ber_oid_dissector("2.16.840.1.113730.1.2", dissect_BaseUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.base_url"); + register_ber_oid_dissector("2.16.840.1.113730.1.3", dissect_RevocationUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.revocation-url"); + register_ber_oid_dissector("2.16.840.1.113730.1.4", dissect_CaRevocationUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.ca-revocation-url"); + register_ber_oid_dissector("2.16.840.1.113730.1.7", dissect_CertRenewalUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.cert-renewal-url"); + register_ber_oid_dissector("2.16.840.1.113730.1.8", dissect_CaPolicyUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.ca-policy-url"); + register_ber_oid_dissector("2.16.840.1.113730.1.12", dissect_SslServerName_PDU, proto_ns_cert_exts, "ns-cert-exts.ssl-server-name"); + register_ber_oid_dissector("2.16.840.1.113730.1.13", dissect_Comment_PDU, proto_ns_cert_exts, "ns-cert-exts.comment"); /*--- End of included file: packet-ns_cert_exts-dis-tab.c ---*/ diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c index 22ee91ee32..6a8dbcd375 100644 --- a/epan/dissectors/packet-ocsp.c +++ b/epan/dissectors/packet-ocsp.c @@ -221,6 +221,7 @@ static int dissect_issuerKeyHash(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_ocsp_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_ocsp_issuerKeyHash); } + static const ber_sequence_t CertID_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_hashAlgorithm }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_issuerNameHash }, @@ -232,7 +233,7 @@ static const ber_sequence_t CertID_sequence[] = { static int dissect_ocsp_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(implicit_tag, pinfo, tree, tvb, offset, - CertID_sequence, hf_index, ett_ocsp_CertID); + CertID_sequence, hf_index, ett_ocsp_CertID); return offset; } @@ -243,6 +244,7 @@ static int dissect_certID(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_ocsp_CertID(FALSE, tvb, offset, pinfo, tree, hf_ocsp_certID); } + static const ber_sequence_t Request_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_reqCert }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_singleRequestExtensions }, @@ -252,7 +254,7 @@ static const ber_sequence_t Request_sequence[] = { static int dissect_ocsp_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(implicit_tag, pinfo, tree, tvb, offset, - Request_sequence, hf_index, ett_ocsp_Request); + Request_sequence, hf_index, ett_ocsp_Request); return offset; } @@ -276,6 +278,7 @@ static int dissect_requestList(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_ocsp_SEQUENCE_OF_Request(FALSE, tvb, offset, pinfo, tree, hf_ocsp_requestList); } + static const ber_sequence_t TBSRequest_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_version }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_requestorName }, @@ -287,7 +290,7 @@ static const ber_sequence_t TBSRequest_sequence[] = { static int dissect_ocsp_TBSRequest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - TBSRequest_sequence, hf_index, ett_ocsp_TBSRequest); + TBSRequest_sequence, hf_index, ett_ocsp_TBSRequest); return offset; } @@ -296,11 +299,12 @@ static int dissect_tbsRequest(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv } + static int dissect_ocsp_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - NULL, hf_index, -1, - NULL); + NULL, hf_index, -1, + NULL); return offset; } @@ -324,6 +328,7 @@ static int dissect_certs(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in return dissect_ocsp_SEQUENCE_OF_Certificate(FALSE, tvb, offset, pinfo, tree, hf_ocsp_certs); } + static const ber_sequence_t Signature_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signatureAlgorithm }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_signature }, @@ -334,7 +339,7 @@ static const ber_sequence_t Signature_sequence[] = { static int dissect_ocsp_Signature(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - Signature_sequence, hf_index, ett_ocsp_Signature); + Signature_sequence, hf_index, ett_ocsp_Signature); return offset; } @@ -342,6 +347,7 @@ static int dissect_optionalSignature(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_ocsp_Signature(FALSE, tvb, offset, pinfo, tree, hf_ocsp_optionalSignature); } + static const ber_sequence_t OCSPRequest_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_tbsRequest }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_optionalSignature }, @@ -351,7 +357,7 @@ static const ber_sequence_t OCSPRequest_sequence[] = { static int dissect_ocsp_OCSPRequest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - OCSPRequest_sequence, hf_index, ett_ocsp_OCSPRequest); + OCSPRequest_sequence, hf_index, ett_ocsp_OCSPRequest); return offset; } @@ -413,6 +419,7 @@ static int dissect_response(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_ocsp_T_response(FALSE, tvb, offset, pinfo, tree, hf_ocsp_response); } + static const ber_sequence_t ResponseBytes_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_responseType }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_response }, @@ -422,7 +429,7 @@ static const ber_sequence_t ResponseBytes_sequence[] = { static int dissect_ocsp_ResponseBytes(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - ResponseBytes_sequence, hf_index, ett_ocsp_ResponseBytes); + ResponseBytes_sequence, hf_index, ett_ocsp_ResponseBytes); return offset; } @@ -430,6 +437,7 @@ static int dissect_responseBytes(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_ocsp_ResponseBytes(FALSE, tvb, offset, pinfo, tree, hf_ocsp_responseBytes); } + static const ber_sequence_t OCSPResponse_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_responseStatus }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_responseBytes }, @@ -439,7 +447,7 @@ static const ber_sequence_t OCSPResponse_sequence[] = { static int dissect_ocsp_OCSPResponse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - OCSPResponse_sequence, hf_index, ett_ocsp_OCSPResponse); + OCSPResponse_sequence, hf_index, ett_ocsp_OCSPResponse); return offset; } @@ -473,7 +481,8 @@ 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, - ResponderID_choice, hf_index, ett_ocsp_ResponderID, NULL); + ResponderID_choice, hf_index, ett_ocsp_ResponderID, + NULL); return offset; } @@ -482,6 +491,7 @@ static int dissect_responderID(packet_info *pinfo, proto_tree *tree, tvbuff_t *t } + static int dissect_ocsp_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index); @@ -516,6 +526,7 @@ static int dissect_good_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_ocsp_NULL(TRUE, tvb, offset, pinfo, tree, hf_ocsp_good); } + static const ber_sequence_t RevokedInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_revocationTime }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_revocationReason }, @@ -525,7 +536,7 @@ static const ber_sequence_t RevokedInfo_sequence[] = { static int dissect_ocsp_RevokedInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - RevokedInfo_sequence, hf_index, ett_ocsp_RevokedInfo); + RevokedInfo_sequence, hf_index, ett_ocsp_RevokedInfo); return offset; } @@ -563,7 +574,8 @@ 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, - CertStatus_choice, hf_index, ett_ocsp_CertStatus, NULL); + CertStatus_choice, hf_index, ett_ocsp_CertStatus, + NULL); return offset; } @@ -571,9 +583,10 @@ static int dissect_certStatus(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_ocsp_CertStatus(FALSE, tvb, offset, pinfo, tree, hf_ocsp_certStatus); } + static const ber_sequence_t SingleResponse_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certID }, - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_certStatus }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_certStatus }, { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_thisUpdate }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_nextUpdate }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_singleExtensions }, @@ -583,7 +596,7 @@ static const ber_sequence_t SingleResponse_sequence[] = { static int dissect_ocsp_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(implicit_tag, pinfo, tree, tvb, offset, - SingleResponse_sequence, hf_index, ett_ocsp_SingleResponse); + SingleResponse_sequence, hf_index, ett_ocsp_SingleResponse); return offset; } @@ -607,9 +620,10 @@ static int dissect_responses(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_ocsp_SEQUENCE_OF_SingleResponse(FALSE, tvb, offset, pinfo, tree, hf_ocsp_responses); } + static const ber_sequence_t ResponseData_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_version }, - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_responderID }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_responderID }, { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_producedAt }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_responses }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_responseExtensions }, @@ -619,7 +633,7 @@ static const ber_sequence_t ResponseData_sequence[] = { static int dissect_ocsp_ResponseData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - ResponseData_sequence, hf_index, ett_ocsp_ResponseData); + ResponseData_sequence, hf_index, ett_ocsp_ResponseData); return offset; } @@ -627,6 +641,7 @@ static int dissect_tbsResponseData(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_ocsp_ResponseData(FALSE, tvb, offset, pinfo, tree, hf_ocsp_tbsResponseData); } + static const ber_sequence_t BasicOCSPResponse_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_tbsResponseData }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signatureAlgorithm }, @@ -638,12 +653,13 @@ static const ber_sequence_t BasicOCSPResponse_sequence[] = { static int dissect_ocsp_BasicOCSPResponse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - BasicOCSPResponse_sequence, hf_index, ett_ocsp_BasicOCSPResponse); + BasicOCSPResponse_sequence, hf_index, ett_ocsp_BasicOCSPResponse); return offset; } + static int dissect_ocsp_ArchiveCutoff(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index); @@ -677,6 +693,7 @@ dissect_ocsp_AcceptableResponses(gboolean implicit_tag _U_, tvbuff_t *tvb, int o return offset; } + static const ber_sequence_t ServiceLocator_sequence[] = { { BER_CLASS_ANY, -1, BER_FLAGS_NOOWNTAG, dissect_issuer }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_locator }, @@ -686,17 +703,18 @@ static const ber_sequence_t ServiceLocator_sequence[] = { static int dissect_ocsp_ServiceLocator(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - ServiceLocator_sequence, hf_index, ett_ocsp_ServiceLocator); + ServiceLocator_sequence, hf_index, ett_ocsp_ServiceLocator); return offset; } + static int dissect_ocsp_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, BER_UNI_TAG_IA5String, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -717,6 +735,7 @@ static int dissect_crlNum(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_ocsp_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_ocsp_crlNum); } + static const ber_sequence_t CrlID_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_crlUrl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_crlNum }, @@ -727,7 +746,7 @@ static const ber_sequence_t CrlID_sequence[] = { static int dissect_ocsp_CrlID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - CrlID_sequence, hf_index, ett_ocsp_CrlID); + CrlID_sequence, hf_index, ett_ocsp_CrlID); return offset; } diff --git a/epan/dissectors/packet-pkinit.c b/epan/dissectors/packet-pkinit.c index 31495b6033..f76246d575 100644 --- a/epan/dissectors/packet-pkinit.c +++ b/epan/dissectors/packet-pkinit.c @@ -155,7 +155,8 @@ 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, - TrustedCA_choice, hf_index, ett_pkinit_TrustedCA, NULL); + TrustedCA_choice, hf_index, ett_pkinit_TrustedCA, + NULL); return offset; } @@ -165,7 +166,7 @@ static int dissect_trustedCertifiers_item(packet_info *pinfo, proto_tree *tree, 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 }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_trustedCertifiers_item }, }; static int @@ -179,6 +180,7 @@ static int dissect_trustedCertifiers(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_pkinit_SEQUENCE_OF_TrustedCA(FALSE, tvb, offset, pinfo, tree, hf_pkinit_trustedCertifiers); } + static const ber_sequence_t PaPkAsReq_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_signedAuthPack }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_trustedCertifiers }, @@ -189,7 +191,7 @@ static const ber_sequence_t PaPkAsReq_sequence[] = { static int dissect_pkinit_PaPkAsReq(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - PaPkAsReq_sequence, hf_index, ett_pkinit_PaPkAsReq); + PaPkAsReq_sequence, hf_index, ett_pkinit_PaPkAsReq); return offset; } @@ -223,6 +225,7 @@ static int dissect_paNonce(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_pkinit_INTEGER_0_4294967295(FALSE, tvb, offset, pinfo, tree, hf_pkinit_paNonce); } + static const ber_sequence_t PKAuthenticator_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_cusec }, { BER_CLASS_CON, 1, 0, dissect_ctime }, @@ -234,7 +237,7 @@ static const ber_sequence_t PKAuthenticator_sequence[] = { static int dissect_pkinit_PKAuthenticator(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - PKAuthenticator_sequence, hf_index, ett_pkinit_PKAuthenticator); + PKAuthenticator_sequence, hf_index, ett_pkinit_PKAuthenticator); return offset; } @@ -258,6 +261,7 @@ static int dissect_supportedCMSTypes(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_pkinit_SEQUENCE_OF_AlgorithmIdentifier(FALSE, tvb, offset, pinfo, tree, hf_pkinit_supportedCMSTypes); } + static const ber_sequence_t AuthPack_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_pkAuthenticator }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_clientPublicValue }, @@ -268,7 +272,7 @@ static const ber_sequence_t AuthPack_sequence[] = { static int dissect_pkinit_AuthPack(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - AuthPack_sequence, hf_index, ett_pkinit_AuthPack); + AuthPack_sequence, hf_index, ett_pkinit_AuthPack); return offset; } @@ -289,17 +293,19 @@ 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, - PaPkAsRep_choice, hf_index, ett_pkinit_PaPkAsRep, NULL); + PaPkAsRep_choice, hf_index, ett_pkinit_PaPkAsRep, + NULL); return offset; } + static int dissect_pkinit_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - NULL, hf_index, -1, - NULL); + NULL, hf_index, -1, + NULL); return offset; } @@ -307,6 +313,7 @@ static int dissect_subjectPublicKey(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_pkinit_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_pkinit_subjectPublicKey); } + static const ber_sequence_t KDCDHKeyInfo_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_subjectPublicKey }, { BER_CLASS_CON, 1, 0, dissect_dhNonce }, @@ -317,7 +324,7 @@ static const ber_sequence_t KDCDHKeyInfo_sequence[] = { static int dissect_pkinit_KDCDHKeyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - KDCDHKeyInfo_sequence, hf_index, ett_pkinit_KDCDHKeyInfo); + KDCDHKeyInfo_sequence, hf_index, ett_pkinit_KDCDHKeyInfo); return offset; } diff --git a/epan/dissectors/packet-pkix1explicit.c b/epan/dissectors/packet-pkix1explicit.c index 6f273e907b..db033ba73c 100644 --- a/epan/dissectors/packet-pkix1explicit.c +++ b/epan/dissectors/packet-pkix1explicit.c @@ -202,6 +202,7 @@ static int dissect_extnValue(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_pkix1explicit_T_extnValue(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_extnValue); } + static const ber_sequence_t Extension_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_extnId }, { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_critical }, @@ -212,7 +213,7 @@ static const ber_sequence_t Extension_sequence[] = { int dissect_pkix1explicit_Extension(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - Extension_sequence, hf_index, ett_pkix1explicit_Extension); + Extension_sequence, hf_index, ett_pkix1explicit_Extension); return offset; } @@ -220,6 +221,7 @@ static int dissect_Extensions_item(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_pkix1explicit_Extension(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_Extensions_item); } + static const ber_sequence_t Extensions_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Extensions_item }, }; @@ -227,7 +229,7 @@ static const ber_sequence_t Extensions_sequence_of[1] = { int dissect_pkix1explicit_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_pkix1explicit_Extensions); + Extensions_sequence_of, hf_index, ett_pkix1explicit_Extensions); return offset; } @@ -258,11 +260,12 @@ static int dissect_pgenCounter(packet_info *pinfo, proto_tree *tree, tvbuff_t *t } + static int dissect_pkix1explicit_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - NULL, hf_index, -1, - NULL); + NULL, hf_index, -1, + NULL); return offset; } @@ -270,6 +273,7 @@ static int dissect_seed(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_pkix1explicit_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_seed); } + static const ber_sequence_t ValidationParms_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_seed }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pgenCounter }, @@ -279,7 +283,7 @@ static const ber_sequence_t ValidationParms_sequence[] = { static int dissect_pkix1explicit_ValidationParms(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - ValidationParms_sequence, hf_index, ett_pkix1explicit_ValidationParms); + ValidationParms_sequence, hf_index, ett_pkix1explicit_ValidationParms); return offset; } @@ -287,6 +291,7 @@ static int dissect_validationParms(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_pkix1explicit_ValidationParms(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_validationParms); } + static const ber_sequence_t DomainParameters_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_p }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_g }, @@ -299,7 +304,7 @@ static const ber_sequence_t DomainParameters_sequence[] = { static int dissect_pkix1explicit_DomainParameters(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - DomainParameters_sequence, hf_index, ett_pkix1explicit_DomainParameters); + DomainParameters_sequence, hf_index, ett_pkix1explicit_DomainParameters); return offset; } @@ -333,6 +338,7 @@ static int dissect_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in return dissect_pkix1explicit_T_value(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_value); } + static const ber_sequence_t AttributeTypeAndValue_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type }, { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_value }, @@ -342,7 +348,7 @@ static const ber_sequence_t AttributeTypeAndValue_sequence[] = { int dissect_pkix1explicit_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(implicit_tag, pinfo, tree, tvb, offset, - AttributeTypeAndValue_sequence, hf_index, ett_pkix1explicit_AttributeTypeAndValue); + AttributeTypeAndValue_sequence, hf_index, ett_pkix1explicit_AttributeTypeAndValue); return offset; } @@ -350,6 +356,7 @@ static int dissect_RelativeDistinguishedName_item(packet_info *pinfo, proto_tree return dissect_pkix1explicit_AttributeTypeAndValue(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_RelativeDistinguishedName_item); } + static const ber_sequence_t RelativeDistinguishedName_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RelativeDistinguishedName_item }, }; @@ -357,7 +364,7 @@ static const ber_sequence_t RelativeDistinguishedName_set_of[1] = { int dissect_pkix1explicit_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_pkix1explicit_RelativeDistinguishedName); + RelativeDistinguishedName_set_of, hf_index, ett_pkix1explicit_RelativeDistinguishedName); return offset; } @@ -365,6 +372,7 @@ static int dissect_RDNSequence_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_pkix1explicit_RelativeDistinguishedName(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_RDNSequence_item); } + static const ber_sequence_t RDNSequence_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_RDNSequence_item }, }; @@ -372,12 +380,13 @@ static const ber_sequence_t RDNSequence_sequence_of[1] = { int dissect_pkix1explicit_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_pkix1explicit_RDNSequence); + RDNSequence_sequence_of, hf_index, ett_pkix1explicit_RDNSequence); return offset; } + int dissect_pkix1explicit_DirectoryString(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); @@ -407,11 +416,12 @@ dissect_pkix1explicit_TerminalType(gboolean implicit_tag _U_, tvbuff_t *tvb, int } + static int dissect_pkix1explicit_TeletexString(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, BER_UNI_TAG_TeletexString, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -422,6 +432,7 @@ static int dissect_value1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_pkix1explicit_TeletexString(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_value1); } + static const ber_sequence_t TeletexDomainDefinedAttribute_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_NOOWNTAG, dissect_type1 }, { BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_NOOWNTAG, dissect_value1 }, @@ -431,7 +442,7 @@ static const ber_sequence_t TeletexDomainDefinedAttribute_sequence[] = { int dissect_pkix1explicit_TeletexDomainDefinedAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - TeletexDomainDefinedAttribute_sequence, hf_index, ett_pkix1explicit_TeletexDomainDefinedAttribute); + TeletexDomainDefinedAttribute_sequence, hf_index, ett_pkix1explicit_TeletexDomainDefinedAttribute); return offset; } @@ -523,7 +534,7 @@ void proto_register_pkix1explicit(void) { "AttributeTypeAndValue/value", HFILL }}, { &hf_pkix1explicit_RDNSequence_item, { "Item", "pkix1explicit.RDNSequence_item", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "RDNSequence/_item", HFILL }}, { &hf_pkix1explicit_RelativeDistinguishedName_item, { "Item", "pkix1explicit.RelativeDistinguishedName_item", diff --git a/epan/dissectors/packet-pkix1implicit.c b/epan/dissectors/packet-pkix1implicit.c index 0f025cfeae..fb4b7792b1 100644 --- a/epan/dissectors/packet-pkix1implicit.c +++ b/epan/dissectors/packet-pkix1implicit.c @@ -126,6 +126,7 @@ dissect_pkix1implicit_Dummy(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset return offset; } + static const ber_sequence_t EDIPartyName_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_nameAssigner_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_partyName_impl }, @@ -135,7 +136,7 @@ static const ber_sequence_t EDIPartyName_sequence[] = { static int dissect_pkix1implicit_EDIPartyName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - EDIPartyName_sequence, hf_index, ett_pkix1implicit_EDIPartyName); + EDIPartyName_sequence, hf_index, ett_pkix1implicit_EDIPartyName); return offset; } @@ -153,6 +154,7 @@ static int dissect_accessMethod(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_pkix1implicit_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_accessMethod); } + static const ber_sequence_t AccessDescription_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_accessMethod }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_accessLocation }, @@ -162,7 +164,7 @@ static const ber_sequence_t AccessDescription_sequence[] = { static int dissect_pkix1implicit_AccessDescription(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - AccessDescription_sequence, hf_index, ett_pkix1implicit_AccessDescription); + AccessDescription_sequence, hf_index, ett_pkix1implicit_AccessDescription); return offset; } @@ -184,11 +186,12 @@ dissect_pkix1implicit_AuthorityInfoAccessSyntax(gboolean implicit_tag _U_, tvbuf } + static int dissect_pkix1implicit_VisibleString(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, BER_UNI_TAG_VisibleString, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -197,11 +200,12 @@ static int dissect_visibleString(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_pkix1implicit_BMPString(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, BER_UNI_TAG_BMPString, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -210,11 +214,12 @@ static int dissect_bmpString(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb } + static int dissect_pkix1implicit_UTF8String(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, BER_UNI_TAG_UTF8String, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -240,7 +245,8 @@ 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, - DisplayText_choice, hf_index, ett_pkix1implicit_DisplayText, NULL); + DisplayText_choice, hf_index, ett_pkix1implicit_DisplayText, + NULL); return offset; } @@ -280,8 +286,9 @@ static int dissect_noticeNumbers(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_pkix1implicit_T_noticeNumbers(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_noticeNumbers); } + static const ber_sequence_t NoticeReference_sequence[] = { - { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_organization }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_organization }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_noticeNumbers }, { 0, 0, 0, NULL } }; @@ -289,7 +296,7 @@ static const ber_sequence_t NoticeReference_sequence[] = { static int dissect_pkix1implicit_NoticeReference(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - NoticeReference_sequence, hf_index, ett_pkix1implicit_NoticeReference); + NoticeReference_sequence, hf_index, ett_pkix1implicit_NoticeReference); return offset; } @@ -297,16 +304,17 @@ static int dissect_noticeRef(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_pkix1implicit_NoticeReference(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_noticeRef); } + static const ber_sequence_t UserNotice_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_noticeRef }, - { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_explicitText }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_explicitText }, { 0, 0, 0, NULL } }; int dissect_pkix1implicit_UserNotice(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - UserNotice_sequence, hf_index, ett_pkix1implicit_UserNotice); + UserNotice_sequence, hf_index, ett_pkix1implicit_UserNotice); return offset; } diff --git a/epan/dissectors/packet-pkixqualified.c b/epan/dissectors/packet-pkixqualified.c index f9f9fe556b..52e35a70f6 100644 --- a/epan/dissectors/packet-pkixqualified.c +++ b/epan/dissectors/packet-pkixqualified.c @@ -109,6 +109,7 @@ static int dissect_NameRegistrationAuthorities_item(packet_info *pinfo, proto_tr } + static int dissect_pkixqualified_Generalizedtime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index); @@ -117,6 +118,7 @@ dissect_pkixqualified_Generalizedtime(gboolean implicit_tag _U_, tvbuff_t *tvb, } + static int dissect_pkixqualified_Directorystring(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_x509sat_DirectoryString(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -125,11 +127,12 @@ dissect_pkixqualified_Directorystring(gboolean implicit_tag _U_, tvbuff_t *tvb, } + static int dissect_pkixqualified_Printablestring(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, BER_UNI_TAG_PrintableString, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -185,7 +188,8 @@ 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, - TypeOfBiometricData_choice, hf_index, ett_pkixqualified_TypeOfBiometricData, NULL); + TypeOfBiometricData_choice, hf_index, ett_pkixqualified_TypeOfBiometricData, + NULL); return offset; } @@ -207,11 +211,12 @@ static int dissect_biometricDataHash(packet_info *pinfo, proto_tree *tree, tvbuf } + static int dissect_pkixqualified_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, BER_UNI_TAG_IA5String, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -219,8 +224,9 @@ static int dissect_sourceDataUri(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_pkixqualified_IA5String(FALSE, tvb, offset, pinfo, tree, hf_pkixqualified_sourceDataUri); } + static const ber_sequence_t BiometricData_sequence[] = { - { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_typeOfBiometricData }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_typeOfBiometricData }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_hashAlgorithm }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_biometricDataHash }, { BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_sourceDataUri }, @@ -230,7 +236,7 @@ static const ber_sequence_t BiometricData_sequence[] = { static int dissect_pkixqualified_BiometricData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - BiometricData_sequence, hf_index, ett_pkixqualified_BiometricData); + BiometricData_sequence, hf_index, ett_pkixqualified_BiometricData); return offset; } @@ -278,6 +284,7 @@ static int dissect_statementInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_pkixqualified_T_statementInfo(FALSE, tvb, offset, pinfo, tree, hf_pkixqualified_statementInfo); } + static const ber_sequence_t QCStatement_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_statementId }, { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_statementInfo }, @@ -287,7 +294,7 @@ static const ber_sequence_t QCStatement_sequence[] = { static int dissect_pkixqualified_QCStatement(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - QCStatement_sequence, hf_index, ett_pkixqualified_QCStatement); + QCStatement_sequence, hf_index, ett_pkixqualified_QCStatement); return offset; } @@ -324,6 +331,7 @@ static int dissect_nameRegistrationAuthorities(packet_info *pinfo, proto_tree *t return dissect_pkixqualified_NameRegistrationAuthorities(FALSE, tvb, offset, pinfo, tree, hf_pkixqualified_nameRegistrationAuthorities); } + static const ber_sequence_t SemanticsInformation_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_semanticsIdentifier }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_nameRegistrationAuthorities }, @@ -333,7 +341,7 @@ static const ber_sequence_t SemanticsInformation_sequence[] = { static int dissect_pkixqualified_SemanticsInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - SemanticsInformation_sequence, hf_index, ett_pkixqualified_SemanticsInformation); + SemanticsInformation_sequence, hf_index, ett_pkixqualified_SemanticsInformation); return offset; } diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c index 7cd80aab3c..0f57c4479f 100644 --- a/epan/dissectors/packet-pkixtsp.c +++ b/epan/dissectors/packet-pkixtsp.c @@ -131,7 +131,8 @@ static const value_string pkixtsp_T_version_vals[] = { static int dissect_pkixtsp_T_version(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; } @@ -140,10 +141,11 @@ static int dissect_version(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, } + static int dissect_pkixtsp_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; } @@ -151,6 +153,7 @@ static int dissect_hashedMessage(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_pkixtsp_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_hashedMessage); } + static const ber_sequence_t MessageImprint_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_hashAlgorithm }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_hashedMessage }, @@ -160,7 +163,7 @@ static const ber_sequence_t MessageImprint_sequence[] = { static int dissect_pkixtsp_MessageImprint(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - MessageImprint_sequence, hf_index, ett_pkixtsp_MessageImprint); + MessageImprint_sequence, hf_index, ett_pkixtsp_MessageImprint); return offset; } @@ -169,10 +172,11 @@ static int dissect_messageImprint(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_pkixtsp_TSAPolicyId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, - hf_index, NULL); + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -187,7 +191,8 @@ static int dissect_policy(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i static int dissect_pkixtsp_INTEGER(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; } @@ -202,6 +207,7 @@ static int dissect_seconds(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, } + static int dissect_pkixtsp_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); @@ -215,6 +221,7 @@ static int dissect_ordering(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_pkixtsp_BOOLEAN(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_ordering); } + static const ber_sequence_t TimeStampReq_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_messageImprint }, @@ -228,7 +235,7 @@ static const ber_sequence_t TimeStampReq_sequence[] = { static int dissect_pkixtsp_TimeStampReq(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - TimeStampReq_sequence, hf_index, ett_pkixtsp_TimeStampReq); + TimeStampReq_sequence, hf_index, ett_pkixtsp_TimeStampReq); return offset; } @@ -247,7 +254,8 @@ static const value_string pkixtsp_PKIStatus_vals[] = { static int dissect_pkixtsp_PKIStatus(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; } @@ -255,23 +263,24 @@ static int dissect_pki_status(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_pkixtsp_PKIStatus(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_pki_status); } + static const asn_namedbit PKIFailureInfo_bits[] = { - { 0, &hf_pkixtsp_PKIFailureInfo_badAlg, -1, -1, NULL, NULL }, - { 2, &hf_pkixtsp_PKIFailureInfo_badRequest, -1, -1, NULL, NULL }, - { 5, &hf_pkixtsp_PKIFailureInfo_badDataFormat, -1, -1, NULL, NULL }, - { 14, &hf_pkixtsp_PKIFailureInfo_timeNotAvailable, -1, -1, NULL, NULL }, - { 15, &hf_pkixtsp_PKIFailureInfo_unacceptedPolicy, -1, -1, NULL, NULL }, - { 16, &hf_pkixtsp_PKIFailureInfo_unacceptedExtension, -1, -1, NULL, NULL }, - { 17, &hf_pkixtsp_PKIFailureInfo_addInfoNotAvailable, -1, -1, NULL, NULL }, - { 25, &hf_pkixtsp_PKIFailureInfo_systemFailure, -1, -1, NULL, NULL }, + { 0, &hf_pkixtsp_PKIFailureInfo_badAlg, -1, -1, "badAlg", NULL }, + { 2, &hf_pkixtsp_PKIFailureInfo_badRequest, -1, -1, "badRequest", NULL }, + { 5, &hf_pkixtsp_PKIFailureInfo_badDataFormat, -1, -1, "badDataFormat", NULL }, + { 14, &hf_pkixtsp_PKIFailureInfo_timeNotAvailable, -1, -1, "timeNotAvailable", NULL }, + { 15, &hf_pkixtsp_PKIFailureInfo_unacceptedPolicy, -1, -1, "unacceptedPolicy", NULL }, + { 16, &hf_pkixtsp_PKIFailureInfo_unacceptedExtension, -1, -1, "unacceptedExtension", NULL }, + { 17, &hf_pkixtsp_PKIFailureInfo_addInfoNotAvailable, -1, -1, "addInfoNotAvailable", NULL }, + { 25, &hf_pkixtsp_PKIFailureInfo_systemFailure, -1, -1, "systemFailure", NULL }, { 0, NULL, 0, 0, NULL, NULL } }; static int dissect_pkixtsp_PKIFailureInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - PKIFailureInfo_bits, hf_index, ett_pkixtsp_PKIFailureInfo, - NULL); + PKIFailureInfo_bits, hf_index, ett_pkixtsp_PKIFailureInfo, + NULL); return offset; } @@ -279,6 +288,7 @@ static int dissect_failInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_pkixtsp_PKIFailureInfo(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_failInfo); } + static const ber_sequence_t PKIStatusInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pki_status }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_failInfo }, @@ -288,7 +298,7 @@ static const ber_sequence_t PKIStatusInfo_sequence[] = { static int dissect_pkixtsp_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(implicit_tag, pinfo, tree, tvb, offset, - PKIStatusInfo_sequence, hf_index, ett_pkixtsp_PKIStatusInfo); + PKIStatusInfo_sequence, hf_index, ett_pkixtsp_PKIStatusInfo); return offset; } @@ -297,6 +307,7 @@ static int dissect_status(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i } + static int dissect_pkixtsp_TimeStampToken(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_cms_ContentInfo(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -307,6 +318,7 @@ static int dissect_timeStampToken(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_pkixtsp_TimeStampToken(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_timeStampToken); } + static const ber_sequence_t TimeStampResp_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_status }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_timeStampToken }, @@ -316,7 +328,7 @@ static const ber_sequence_t TimeStampResp_sequence[] = { static int dissect_pkixtsp_TimeStampResp(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - TimeStampResp_sequence, hf_index, ett_pkixtsp_TimeStampResp); + TimeStampResp_sequence, hf_index, ett_pkixtsp_TimeStampResp); return offset; } @@ -330,7 +342,8 @@ static const value_string pkixtsp_tst_version_vals[] = { static int dissect_pkixtsp_tst_version(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; } @@ -339,6 +352,7 @@ static int dissect_tst_version(packet_info *pinfo, proto_tree *tree, tvbuff_t *t } + static int dissect_pkixtsp_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index); @@ -353,7 +367,8 @@ static int dissect_genTime(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, static int dissect_pkixtsp_INTEGER_1_999(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; } @@ -364,6 +379,7 @@ static int dissect_micros_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_pkixtsp_INTEGER_1_999(TRUE, tvb, offset, pinfo, tree, hf_pkixtsp_micros); } + static const ber_sequence_t Accuracy_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_seconds }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_millis_impl }, @@ -374,7 +390,7 @@ static const ber_sequence_t Accuracy_sequence[] = { static int dissect_pkixtsp_Accuracy(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - Accuracy_sequence, hf_index, ett_pkixtsp_Accuracy); + Accuracy_sequence, hf_index, ett_pkixtsp_Accuracy); return offset; } @@ -382,6 +398,7 @@ static int dissect_accuracy(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_pkixtsp_Accuracy(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_accuracy); } + static const ber_sequence_t TSTInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_tst_version }, { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_policy }, @@ -399,7 +416,7 @@ static const ber_sequence_t TSTInfo_sequence[] = { static int dissect_pkixtsp_TSTInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - TSTInfo_sequence, hf_index, ett_pkixtsp_TSTInfo); + TSTInfo_sequence, hf_index, ett_pkixtsp_TSTInfo); return offset; } diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c index 4cd89ff306..14e931bef4 100644 --- a/epan/dissectors/packet-smrse.c +++ b/epan/dissectors/packet-smrse.c @@ -172,6 +172,7 @@ dissect_smrse_SemiOctetString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs } + static int dissect_smrse_T_octet_format(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { char *strp,tmpstr[21]; @@ -223,7 +224,8 @@ 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, - T_address_value_choice, hf_index, ett_smrse_T_address_value, NULL); + T_address_value_choice, hf_index, ett_smrse_T_address_value, + NULL); return offset; } @@ -231,17 +233,18 @@ static int dissect_address_value(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_smrse_T_address_value(FALSE, tvb, offset, pinfo, tree, hf_smrse_address_value); } + static const ber_sequence_t SMS_Address_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_address_type }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_numbering_plan }, - { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_address_value }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_address_value }, { 0, 0, 0, NULL } }; static int dissect_smrse_SMS_Address(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - SMS_Address_sequence, hf_index, ett_smrse_SMS_Address); + SMS_Address_sequence, hf_index, ett_smrse_SMS_Address); return offset; } @@ -271,11 +274,12 @@ static int dissect_ms_address(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv } + static int dissect_smrse_Password(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, BER_UNI_TAG_PrintableString, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -283,6 +287,7 @@ static int dissect_password(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_smrse_Password(FALSE, tvb, offset, pinfo, tree, hf_smrse_password); } + static const ber_sequence_t SMR_Bind_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_sc_address }, { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_password }, @@ -292,7 +297,7 @@ static const ber_sequence_t SMR_Bind_sequence[] = { static int dissect_smrse_SMR_Bind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - SMR_Bind_sequence, hf_index, ett_smrse_SMR_Bind); + SMR_Bind_sequence, hf_index, ett_smrse_SMR_Bind); return offset; } @@ -310,6 +315,7 @@ static int dissect_moimsi_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_smrse_IMSI_Address(TRUE, tvb, offset, pinfo, tree, hf_smrse_moimsi); } + static const ber_sequence_t SMR_Bind_Confirm_sequence[] = { { 0, 0, 0, NULL } }; @@ -317,7 +323,7 @@ static const ber_sequence_t SMR_Bind_Confirm_sequence[] = { static int dissect_smrse_SMR_Bind_Confirm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - SMR_Bind_Confirm_sequence, hf_index, ett_smrse_SMR_Bind_Confirm); + SMR_Bind_Confirm_sequence, hf_index, ett_smrse_SMR_Bind_Confirm); return offset; } @@ -345,6 +351,7 @@ static int dissect_connect_fail_reason(packet_info *pinfo, proto_tree *tree, tvb return dissect_smrse_Connect_fail(FALSE, tvb, offset, pinfo, tree, hf_smrse_connect_fail_reason); } + static const ber_sequence_t SMR_Bind_Failure_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_connect_fail_reason }, { 0, 0, 0, NULL } @@ -353,11 +360,12 @@ static const ber_sequence_t SMR_Bind_Failure_sequence[] = { static int dissect_smrse_SMR_Bind_Failure(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - SMR_Bind_Failure_sequence, hf_index, ett_smrse_SMR_Bind_Failure); + SMR_Bind_Failure_sequence, hf_index, ett_smrse_SMR_Bind_Failure); return offset; } + static const ber_sequence_t SMR_Unbind_sequence[] = { { 0, 0, 0, NULL } }; @@ -365,7 +373,7 @@ static const ber_sequence_t SMR_Unbind_sequence[] = { static int dissect_smrse_SMR_Unbind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - SMR_Unbind_sequence, hf_index, ett_smrse_SMR_Unbind); + SMR_Unbind_sequence, hf_index, ett_smrse_SMR_Unbind); return offset; } @@ -439,6 +447,7 @@ static int dissect_mt_tariffClass_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_smrse_SM_TC(TRUE, tvb, offset, pinfo, tree, hf_smrse_mt_tariffClass); } + static const ber_sequence_t RPDataMT_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_mt_priority_request }, { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_mt_mms }, @@ -454,11 +463,12 @@ static const ber_sequence_t RPDataMT_sequence[] = { static int dissect_smrse_RPDataMT(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - RPDataMT_sequence, hf_index, ett_smrse_RPDataMT); + RPDataMT_sequence, hf_index, ett_smrse_RPDataMT); return offset; } + static const ber_sequence_t RPDataMO_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_mo_message_reference }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mo_originating_address }, @@ -471,11 +481,12 @@ static const ber_sequence_t RPDataMO_sequence[] = { static int dissect_smrse_RPDataMO(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - RPDataMO_sequence, hf_index, ett_smrse_RPDataMO); + RPDataMO_sequence, hf_index, ett_smrse_RPDataMO); return offset; } + static const ber_sequence_t RPAck_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_message_reference }, { 0, 0, 0, NULL } @@ -484,7 +495,7 @@ static const ber_sequence_t RPAck_sequence[] = { static int dissect_smrse_RPAck(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - RPAck_sequence, hf_index, ett_smrse_RPAck); + RPAck_sequence, hf_index, ett_smrse_RPAck); return offset; } @@ -525,6 +536,7 @@ static int dissect_error_reason(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_smrse_Error_reason(FALSE, tvb, offset, pinfo, tree, hf_smrse_error_reason); } + static const ber_sequence_t RPError_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_error_reason }, { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_msg_waiting_set }, @@ -537,11 +549,12 @@ static const ber_sequence_t RPError_sequence[] = { static int dissect_smrse_RPError(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - RPError_sequence, hf_index, ett_smrse_RPError); + RPError_sequence, hf_index, ett_smrse_RPError); return offset; } + static const ber_sequence_t RPAlertSC_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ms_address }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_message_reference }, @@ -551,7 +564,7 @@ static const ber_sequence_t RPAlertSC_sequence[] = { static int dissect_smrse_RPAlertSC(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - RPAlertSC_sequence, hf_index, ett_smrse_RPAlertSC); + RPAlertSC_sequence, hf_index, ett_smrse_RPAlertSC); return offset; } diff --git a/epan/dissectors/packet-wlancertextn.c b/epan/dissectors/packet-wlancertextn.c index 7f107d73e9..9d4ee8deff 100644 --- a/epan/dissectors/packet-wlancertextn.c +++ b/epan/dissectors/packet-wlancertextn.c @@ -90,6 +90,7 @@ static int dissect_SSIDList_item(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_wlancertextn_SSID(FALSE, tvb, offset, pinfo, tree, hf_wlancertextn_SSIDList_item); } + static const ber_sequence_t SSIDList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_SSIDList_item }, }; @@ -97,7 +98,7 @@ static const ber_sequence_t SSIDList_sequence_of[1] = { static int dissect_wlancertextn_SSIDList(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, - SSIDList_sequence_of, hf_index, ett_wlancertextn_SSIDList); + SSIDList_sequence_of, hf_index, ett_wlancertextn_SSIDList); return offset; } @@ -123,7 +124,7 @@ void proto_register_wlancertextn(void) { { &hf_wlancertextn_SSIDList_PDU, { "SSIDList", "wlancertextn.SSIDList", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "SSIDList", HFILL }}, { &hf_wlancertextn_SSIDList_item, { "Item", "wlancertextn.SSIDList_item", diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index bf901da6ef..09d1c08bc5 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -284,6 +284,7 @@ static int dissect_parameters(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_x509af_T_parameters(FALSE, tvb, offset, pinfo, tree, hf_x509af_parameters); } + static const ber_sequence_t AlgorithmIdentifier_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_algorithmId }, { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameters }, @@ -293,7 +294,7 @@ static const ber_sequence_t AlgorithmIdentifier_sequence[] = { int dissect_x509af_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(implicit_tag, pinfo, tree, tvb, offset, - AlgorithmIdentifier_sequence, hf_index, ett_x509af_AlgorithmIdentifier); + AlgorithmIdentifier_sequence, hf_index, ett_x509af_AlgorithmIdentifier); return offset; } @@ -308,11 +309,12 @@ static int dissect_algorithm(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb } + static int dissect_x509af_UTCTime(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, BER_UNI_TAG_UTCTime, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -321,6 +323,7 @@ static int dissect_utcTime(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, } + static int dissect_x509af_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index); @@ -356,7 +359,8 @@ 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, - Time_choice, hf_index, ett_x509af_Time, NULL); + Time_choice, hf_index, ett_x509af_Time, + NULL); return offset; } @@ -376,16 +380,17 @@ static int dissect_revocationDate(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_x509af_Time(FALSE, tvb, offset, pinfo, tree, hf_x509af_revocationDate); } + static const ber_sequence_t Validity_sequence[] = { - { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_notBefore }, - { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_notAfter }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_notBefore }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_notAfter }, { 0, 0, 0, NULL } }; int dissect_x509af_Validity(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - Validity_sequence, hf_index, ett_x509af_Validity); + Validity_sequence, hf_index, ett_x509af_Validity); return offset; } @@ -394,11 +399,12 @@ static int dissect_validity(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, } + static int dissect_x509af_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - NULL, hf_index, -1, - NULL); + NULL, hf_index, -1, + NULL); return offset; } @@ -409,6 +415,7 @@ static int dissect_subjectPublicKey(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_x509af_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_x509af_subjectPublicKey); } + static const ber_sequence_t SubjectPublicKeyInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithm }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_subjectPublicKey }, @@ -418,7 +425,7 @@ static const ber_sequence_t SubjectPublicKeyInfo_sequence[] = { int dissect_x509af_SubjectPublicKeyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - SubjectPublicKeyInfo_sequence, hf_index, ett_x509af_SubjectPublicKeyInfo); + SubjectPublicKeyInfo_sequence, hf_index, ett_x509af_SubjectPublicKeyInfo); return offset; } @@ -472,6 +479,7 @@ static int dissect_extnValue(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_x509af_T_extnValue(FALSE, tvb, offset, pinfo, tree, hf_x509af_extnValue); } + static const ber_sequence_t Extension_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_extnId }, { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_critical }, @@ -482,7 +490,7 @@ static const ber_sequence_t Extension_sequence[] = { int dissect_x509af_Extension(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - Extension_sequence, hf_index, ett_x509af_Extension); + Extension_sequence, hf_index, ett_x509af_Extension); return offset; } @@ -512,6 +520,7 @@ static int dissect_crlExtensions(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_x509af_Extensions(FALSE, tvb, offset, pinfo, tree, hf_x509af_crlExtensions); } + static const ber_sequence_t T_signedCertificate_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_version }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber }, @@ -529,7 +538,7 @@ static const ber_sequence_t T_signedCertificate_sequence[] = { static int dissect_x509af_T_signedCertificate(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_signedCertificate_sequence, hf_index, ett_x509af_T_signedCertificate); + T_signedCertificate_sequence, hf_index, ett_x509af_T_signedCertificate); return offset; } @@ -537,6 +546,7 @@ static int dissect_signedCertificate(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_x509af_T_signedCertificate(FALSE, tvb, offset, pinfo, tree, hf_x509af_signedCertificate); } + static const ber_sequence_t Certificate_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedCertificate }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier }, @@ -547,7 +557,7 @@ static const ber_sequence_t Certificate_sequence[] = { int dissect_x509af_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(implicit_tag, pinfo, tree, tvb, offset, - Certificate_sequence, hf_index, ett_x509af_Certificate); + Certificate_sequence, hf_index, ett_x509af_Certificate); return offset; } @@ -599,6 +609,7 @@ static int dissect_certificationPath(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_x509af_ForwardCertificationPath(FALSE, tvb, offset, pinfo, tree, hf_x509af_certificationPath); } + static const ber_sequence_t Certificates_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_userCertificate }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_certificationPath }, @@ -608,11 +619,12 @@ static const ber_sequence_t Certificates_sequence[] = { int dissect_x509af_Certificates(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - Certificates_sequence, hf_index, ett_x509af_Certificates); + Certificates_sequence, hf_index, ett_x509af_Certificates); return offset; } + static const ber_sequence_t CertificatePair_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_issuedByThisCA }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_issuedToThisCA }, @@ -622,7 +634,7 @@ static const ber_sequence_t CertificatePair_sequence[] = { int dissect_x509af_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(implicit_tag, pinfo, tree, tvb, offset, - CertificatePair_sequence, hf_index, ett_x509af_CertificatePair); + CertificatePair_sequence, hf_index, ett_x509af_CertificatePair); return offset; } @@ -646,6 +658,7 @@ static int dissect_theCACertificates(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_x509af_SEQUENCE_OF_CertificatePair(FALSE, tvb, offset, pinfo, tree, hf_x509af_theCACertificates); } + static const ber_sequence_t CertificationPath_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_userCertificate }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_theCACertificates }, @@ -655,14 +668,15 @@ static const ber_sequence_t CertificationPath_sequence[] = { int dissect_x509af_CertificationPath(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - CertificationPath_sequence, hf_index, ett_x509af_CertificationPath); + CertificationPath_sequence, hf_index, ett_x509af_CertificationPath); return offset; } + static const ber_sequence_t T_revokedCertificates_item_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_revokedUserCertificate }, - { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_revocationDate }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_revocationDate }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_crlEntryExtensions }, { 0, 0, 0, NULL } }; @@ -670,7 +684,7 @@ static const ber_sequence_t T_revokedCertificates_item_sequence[] = { static int dissect_x509af_T_revokedCertificates_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_revokedCertificates_item_sequence, hf_index, ett_x509af_T_revokedCertificates_item); + T_revokedCertificates_item_sequence, hf_index, ett_x509af_T_revokedCertificates_item); return offset; } @@ -694,12 +708,13 @@ static int dissect_revokedCertificates(packet_info *pinfo, proto_tree *tree, tvb return dissect_x509af_T_revokedCertificates(FALSE, tvb, offset, pinfo, tree, hf_x509af_revokedCertificates); } + static const ber_sequence_t T_signedCertificateList_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signature }, { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer }, - { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_thisUpdate }, - { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_nextUpdate }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_thisUpdate }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_nextUpdate }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_revokedCertificates }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_crlExtensions }, { 0, 0, 0, NULL } @@ -708,7 +723,7 @@ static const ber_sequence_t T_signedCertificateList_sequence[] = { static int dissect_x509af_T_signedCertificateList(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_signedCertificateList_sequence, hf_index, ett_x509af_T_signedCertificateList); + T_signedCertificateList_sequence, hf_index, ett_x509af_T_signedCertificateList); return offset; } @@ -716,6 +731,7 @@ static int dissect_signedCertificateList(packet_info *pinfo, proto_tree *tree, t return dissect_x509af_T_signedCertificateList(FALSE, tvb, offset, pinfo, tree, hf_x509af_signedCertificateList); } + static const ber_sequence_t CertificateList_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedCertificateList }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier }, @@ -726,11 +742,12 @@ static const ber_sequence_t CertificateList_sequence[] = { int dissect_x509af_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(implicit_tag, pinfo, tree, tvb, offset, - CertificateList_sequence, hf_index, ett_x509af_CertificateList); + CertificateList_sequence, hf_index, ett_x509af_CertificateList); return offset; } + static const ber_sequence_t IssuerSerial_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerName }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serial }, @@ -741,7 +758,7 @@ static const ber_sequence_t IssuerSerial_sequence[] = { int dissect_x509af_IssuerSerial(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - IssuerSerial_sequence, hf_index, ett_x509af_IssuerSerial); + IssuerSerial_sequence, hf_index, ett_x509af_IssuerSerial); return offset; } @@ -765,7 +782,8 @@ 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, - InfoSubject_choice, hf_index, ett_x509af_InfoSubject, NULL); + InfoSubject_choice, hf_index, ett_x509af_InfoSubject, + NULL); return offset; } @@ -773,6 +791,7 @@ static int dissect_info_subject(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_x509af_InfoSubject(FALSE, tvb, offset, pinfo, tree, hf_x509af_info_subject); } + static const ber_sequence_t AttCertValidityPeriod_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_notBeforeTime }, { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_notAfterTime }, @@ -782,7 +801,7 @@ static const ber_sequence_t AttCertValidityPeriod_sequence[] = { int dissect_x509af_AttCertValidityPeriod(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - AttCertValidityPeriod_sequence, hf_index, ett_x509af_AttCertValidityPeriod); + AttCertValidityPeriod_sequence, hf_index, ett_x509af_AttCertValidityPeriod); return offset; } @@ -806,9 +825,10 @@ static int dissect_attributes(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_x509af_SEQUENCE_OF_Attribute(FALSE, tvb, offset, pinfo, tree, hf_x509af_attributes); } + static const ber_sequence_t AttributeCertificateInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_version }, - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_info_subject }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_info_subject }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerName }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signature }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber }, @@ -822,7 +842,7 @@ static const ber_sequence_t AttributeCertificateInfo_sequence[] = { int dissect_x509af_AttributeCertificateInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - AttributeCertificateInfo_sequence, hf_index, ett_x509af_AttributeCertificateInfo); + AttributeCertificateInfo_sequence, hf_index, ett_x509af_AttributeCertificateInfo); return offset; } @@ -830,6 +850,7 @@ static int dissect_signedAttributeCertificateInfo(packet_info *pinfo, proto_tree return dissect_x509af_AttributeCertificateInfo(FALSE, tvb, offset, pinfo, tree, hf_x509af_signedAttributeCertificateInfo); } + static const ber_sequence_t AttributeCertificate_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedAttributeCertificateInfo }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier }, @@ -840,7 +861,7 @@ static const ber_sequence_t AttributeCertificate_sequence[] = { int dissect_x509af_AttributeCertificate(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - AttributeCertificate_sequence, hf_index, ett_x509af_AttributeCertificate); + AttributeCertificate_sequence, hf_index, ett_x509af_AttributeCertificate); return offset; } @@ -848,6 +869,7 @@ static int dissect_attributeCertificate(packet_info *pinfo, proto_tree *tree, tv return dissect_x509af_AttributeCertificate(FALSE, tvb, offset, pinfo, tree, hf_x509af_attributeCertificate); } + static const ber_sequence_t ACPathData_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_certificate }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_attributeCertificate }, @@ -857,7 +879,7 @@ static const ber_sequence_t ACPathData_sequence[] = { int dissect_x509af_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(implicit_tag, pinfo, tree, tvb, offset, - ACPathData_sequence, hf_index, ett_x509af_ACPathData); + ACPathData_sequence, hf_index, ett_x509af_ACPathData); return offset; } @@ -881,6 +903,7 @@ static int dissect_acPath(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_x509af_SEQUENCE_OF_ACPathData(FALSE, tvb, offset, pinfo, tree, hf_x509af_acPath); } + static const ber_sequence_t AttributeCertificationPath_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeCertificate }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_acPath }, @@ -890,7 +913,7 @@ static const ber_sequence_t AttributeCertificationPath_sequence[] = { int dissect_x509af_AttributeCertificationPath(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - AttributeCertificationPath_sequence, hf_index, ett_x509af_AttributeCertificationPath); + AttributeCertificationPath_sequence, hf_index, ett_x509af_AttributeCertificationPath); return offset; } @@ -911,7 +934,8 @@ 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, - AssertionSubject_choice, hf_index, ett_x509af_AssertionSubject, NULL); + AssertionSubject_choice, hf_index, ett_x509af_AssertionSubject, + NULL); return offset; } @@ -935,6 +959,7 @@ static int dissect_attType(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_x509af_SET_OF_AttributeType(FALSE, tvb, offset, pinfo, tree, hf_x509af_attType); } + static const ber_sequence_t AttributeCertificateAssertion_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_assertion_subject }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_assertionIssuer }, @@ -946,7 +971,7 @@ static const ber_sequence_t AttributeCertificateAssertion_sequence[] = { int dissect_x509af_AttributeCertificateAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - AttributeCertificateAssertion_sequence, hf_index, ett_x509af_AttributeCertificateAssertion); + AttributeCertificateAssertion_sequence, hf_index, ett_x509af_AttributeCertificateAssertion); return offset; } diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c index 885ed9d99f..eaa24e5442 100644 --- a/epan/dissectors/packet-x509ce.c +++ b/epan/dissectors/packet-x509ce.c @@ -324,11 +324,12 @@ 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, BER_UNI_TAG_IA5String, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -342,6 +343,7 @@ static int dissect_uniformResourceIdentifier_impl(packet_info *pinfo, proto_tree return dissect_x509ce_IA5String(TRUE, tvb, offset, pinfo, tree, hf_x509ce_uniformResourceIdentifier); } + static const ber_sequence_t EDIPartyName_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_nameAssigner_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_partyName_impl }, @@ -351,7 +353,7 @@ static const ber_sequence_t EDIPartyName_sequence[] = { int dissect_x509ce_EDIPartyName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - EDIPartyName_sequence, hf_index, ett_x509ce_EDIPartyName); + EDIPartyName_sequence, hf_index, ett_x509ce_EDIPartyName); return offset; } @@ -418,7 +420,8 @@ 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, - GeneralName_choice, hf_index, ett_x509ce_GeneralName, NULL); + GeneralName_choice, hf_index, ett_x509ce_GeneralName, + NULL); return offset; } @@ -443,7 +446,7 @@ static int dissect_deltaLocation(packet_info *pinfo, proto_tree *tree, tvbuff_t static const ber_sequence_t GeneralNames_sequence_of[1] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_GeneralNames_item }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_GeneralNames_item }, }; int @@ -466,6 +469,7 @@ static int dissect_fullName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_x509ce_GeneralNames(TRUE, tvb, offset, pinfo, tree, hf_x509ce_fullName); } + static const ber_sequence_t AuthorityKeyIdentifier_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_keyIdentifier_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authorityCertIssuer_impl }, @@ -476,7 +480,7 @@ static const ber_sequence_t AuthorityKeyIdentifier_sequence[] = { int dissect_x509ce_AuthorityKeyIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - AuthorityKeyIdentifier_sequence, hf_index, ett_x509ce_AuthorityKeyIdentifier); + AuthorityKeyIdentifier_sequence, hf_index, ett_x509ce_AuthorityKeyIdentifier); return offset; } @@ -485,6 +489,7 @@ static int dissect_authorityKeyIdentifier_impl(packet_info *pinfo, proto_tree *t } + int dissect_x509ce_SubjectKeyIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_x509ce_KeyIdentifier(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -495,6 +500,7 @@ static int dissect_subjectKeyIdentifier_impl(packet_info *pinfo, proto_tree *tre return dissect_x509ce_SubjectKeyIdentifier(TRUE, tvb, offset, pinfo, tree, hf_x509ce_subjectKeyIdentifier); } + static const asn_namedbit KeyUsage_bits[] = { { 0, &hf_x509ce_KeyUsage_digitalSignature, -1, -1, "digitalSignature", NULL }, { 1, &hf_x509ce_KeyUsage_nonRepudiation, -1, -1, "nonRepudiation", NULL }, @@ -511,8 +517,8 @@ static const asn_namedbit KeyUsage_bits[] = { int dissect_x509ce_KeyUsage(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - KeyUsage_bits, hf_index, ett_x509ce_KeyUsage, - NULL); + KeyUsage_bits, hf_index, ett_x509ce_KeyUsage, + NULL); return offset; } @@ -547,6 +553,7 @@ dissect_x509ce_KeyPurposeIDs(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse } + static int dissect_x509ce_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index); @@ -578,6 +585,7 @@ static int dissect_privateKeyValid_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_x509ce_GeneralizedTime(TRUE, tvb, offset, pinfo, tree, hf_x509ce_privateKeyValid); } + static const ber_sequence_t PrivateKeyUsagePeriod_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notBefore_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notAfter_impl }, @@ -587,7 +595,7 @@ static const ber_sequence_t PrivateKeyUsagePeriod_sequence[] = { int dissect_x509ce_PrivateKeyUsagePeriod(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - PrivateKeyUsagePeriod_sequence, hf_index, ett_x509ce_PrivateKeyUsagePeriod); + PrivateKeyUsagePeriod_sequence, hf_index, ett_x509ce_PrivateKeyUsagePeriod); return offset; } @@ -641,6 +649,7 @@ static int dissect_qualifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_x509ce_PolicyQualifierValue(FALSE, tvb, offset, pinfo, tree, hf_x509ce_qualifier); } + static const ber_sequence_t PolicyQualifierInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_policyQualifierId }, { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_qualifier }, @@ -650,7 +659,7 @@ static const ber_sequence_t PolicyQualifierInfo_sequence[] = { int dissect_x509ce_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(implicit_tag, pinfo, tree, tvb, offset, - PolicyQualifierInfo_sequence, hf_index, ett_x509ce_PolicyQualifierInfo); + PolicyQualifierInfo_sequence, hf_index, ett_x509ce_PolicyQualifierInfo); return offset; } @@ -674,6 +683,7 @@ static int dissect_policyQualifiers(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_x509ce_SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo(FALSE, tvb, offset, pinfo, tree, hf_x509ce_policyQualifiers); } + static const ber_sequence_t PolicyInformation_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_policyIdentifier }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_policyQualifiers }, @@ -683,7 +693,7 @@ static const ber_sequence_t PolicyInformation_sequence[] = { int dissect_x509ce_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(implicit_tag, pinfo, tree, tvb, offset, - PolicyInformation_sequence, hf_index, ett_x509ce_PolicyInformation); + PolicyInformation_sequence, hf_index, ett_x509ce_PolicyInformation); return offset; } @@ -704,6 +714,7 @@ dissect_x509ce_CertificatePoliciesSyntax(gboolean implicit_tag _U_, tvbuff_t *tv return offset; } + static const ber_sequence_t PolicyMappingsSyntax_item_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_issuerDomainPolicy }, { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_subjectDomainPolicy }, @@ -713,7 +724,7 @@ static const ber_sequence_t PolicyMappingsSyntax_item_sequence[] = { static int dissect_x509ce_PolicyMappingsSyntax_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - PolicyMappingsSyntax_item_sequence, hf_index, ett_x509ce_PolicyMappingsSyntax_item); + PolicyMappingsSyntax_item_sequence, hf_index, ett_x509ce_PolicyMappingsSyntax_item); return offset; } @@ -799,6 +810,7 @@ static int dissect_modulus(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_x509ce_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_x509ce_modulus); } + static const ber_sequence_t BasicConstraintsSyntax_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_cA }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_pathLenConstraint }, @@ -808,7 +820,7 @@ static const ber_sequence_t BasicConstraintsSyntax_sequence[] = { int dissect_x509ce_BasicConstraintsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - BasicConstraintsSyntax_sequence, hf_index, ett_x509ce_BasicConstraintsSyntax); + BasicConstraintsSyntax_sequence, hf_index, ett_x509ce_BasicConstraintsSyntax); return offset; } @@ -829,8 +841,9 @@ static int dissect_maximum_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_x509ce_BaseDistance(TRUE, tvb, offset, pinfo, tree, hf_x509ce_maximum); } + static const ber_sequence_t GeneralSubtree_sequence[] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_base }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_base }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_minimum_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_maximum_impl }, { 0, 0, 0, NULL } @@ -839,7 +852,7 @@ static const ber_sequence_t GeneralSubtree_sequence[] = { int dissect_x509ce_GeneralSubtree(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - GeneralSubtree_sequence, hf_index, ett_x509ce_GeneralSubtree); + GeneralSubtree_sequence, hf_index, ett_x509ce_GeneralSubtree); return offset; } @@ -866,6 +879,7 @@ static int dissect_excludedSubtrees_impl(packet_info *pinfo, proto_tree *tree, t return dissect_x509ce_GeneralSubtrees(TRUE, tvb, offset, pinfo, tree, hf_x509ce_excludedSubtrees); } + static const ber_sequence_t NameConstraintsSyntax_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_permittedSubtrees_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_excludedSubtrees_impl }, @@ -875,7 +889,7 @@ static const ber_sequence_t NameConstraintsSyntax_sequence[] = { int dissect_x509ce_NameConstraintsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - NameConstraintsSyntax_sequence, hf_index, ett_x509ce_NameConstraintsSyntax); + NameConstraintsSyntax_sequence, hf_index, ett_x509ce_NameConstraintsSyntax); return offset; } @@ -899,6 +913,7 @@ static int dissect_inhibitPolicyMapping_impl(packet_info *pinfo, proto_tree *tre return dissect_x509ce_SkipCerts(TRUE, tvb, offset, pinfo, tree, hf_x509ce_inhibitPolicyMapping); } + static const ber_sequence_t PolicyConstraintsSyntax_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requireExplicitPolicy_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inhibitPolicyMapping_impl }, @@ -908,7 +923,7 @@ static const ber_sequence_t PolicyConstraintsSyntax_sequence[] = { int dissect_x509ce_PolicyConstraintsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - PolicyConstraintsSyntax_sequence, hf_index, ett_x509ce_PolicyConstraintsSyntax); + PolicyConstraintsSyntax_sequence, hf_index, ett_x509ce_PolicyConstraintsSyntax); return offset; } @@ -982,7 +997,8 @@ 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, - DistributionPointName_choice, hf_index, ett_x509ce_DistributionPointName, NULL); + DistributionPointName_choice, hf_index, ett_x509ce_DistributionPointName, + NULL); return offset; } @@ -993,6 +1009,7 @@ static int dissect_distributionPoint_impl(packet_info *pinfo, proto_tree *tree, return dissect_x509ce_DistributionPointName(TRUE, tvb, offset, pinfo, tree, hf_x509ce_distributionPoint); } + static const asn_namedbit OnlyCertificateTypes_bits[] = { { 0, &hf_x509ce_OnlyCertificateTypes_userPublicKey, -1, -1, "userPublicKey", NULL }, { 1, &hf_x509ce_OnlyCertificateTypes_cA, -1, -1, "cA", NULL }, @@ -1005,8 +1022,8 @@ static const asn_namedbit OnlyCertificateTypes_bits[] = { int dissect_x509ce_OnlyCertificateTypes(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - OnlyCertificateTypes_bits, hf_index, ett_x509ce_OnlyCertificateTypes, - NULL); + OnlyCertificateTypes_bits, hf_index, ett_x509ce_OnlyCertificateTypes, + NULL); return offset; } @@ -1014,6 +1031,7 @@ static int dissect_onlyContains_impl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_x509ce_OnlyCertificateTypes(TRUE, tvb, offset, pinfo, tree, hf_x509ce_onlyContains); } + static const asn_namedbit ReasonFlags_bits[] = { { 0, &hf_x509ce_ReasonFlags_unused, -1, -1, "unused", NULL }, { 1, &hf_x509ce_ReasonFlags_keyCompromise, -1, -1, "keyCompromise", NULL }, @@ -1030,8 +1048,8 @@ static const asn_namedbit ReasonFlags_bits[] = { int dissect_x509ce_ReasonFlags(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - ReasonFlags_bits, hf_index, ett_x509ce_ReasonFlags, - NULL); + ReasonFlags_bits, hf_index, ett_x509ce_ReasonFlags, + NULL); return offset; } @@ -1045,6 +1063,7 @@ static int dissect_reasonFlags(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_x509ce_ReasonFlags(FALSE, tvb, offset, pinfo, tree, hf_x509ce_reasonFlags); } + static const ber_sequence_t NumberRange_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_startingNumber_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_endingNumber_impl }, @@ -1055,7 +1074,7 @@ static const ber_sequence_t NumberRange_sequence[] = { int dissect_x509ce_NumberRange(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - NumberRange_sequence, hf_index, ett_x509ce_NumberRange); + NumberRange_sequence, hf_index, ett_x509ce_NumberRange); return offset; } @@ -1079,6 +1098,7 @@ static int dissect_cRLStreamIdentifier_impl(packet_info *pinfo, proto_tree *tree return dissect_x509ce_CRLStreamIdentifier(TRUE, tvb, offset, pinfo, tree, hf_x509ce_cRLStreamIdentifier); } + static const ber_sequence_t BaseRevocationInfo_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cRLStreamIdentifier_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_cRLNumber_impl }, @@ -1089,7 +1109,7 @@ static const ber_sequence_t BaseRevocationInfo_sequence[] = { int dissect_x509ce_BaseRevocationInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - BaseRevocationInfo_sequence, hf_index, ett_x509ce_BaseRevocationInfo); + BaseRevocationInfo_sequence, hf_index, ett_x509ce_BaseRevocationInfo); return offset; } @@ -1097,6 +1117,7 @@ static int dissect_baseRevocationInfo_impl(packet_info *pinfo, proto_tree *tree, return dissect_x509ce_BaseRevocationInfo(TRUE, tvb, offset, pinfo, tree, hf_x509ce_baseRevocationInfo); } + static const ber_sequence_t PerAuthorityScope_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_authorityName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint_impl }, @@ -1112,7 +1133,7 @@ static const ber_sequence_t PerAuthorityScope_sequence[] = { int dissect_x509ce_PerAuthorityScope(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - PerAuthorityScope_sequence, hf_index, ett_x509ce_PerAuthorityScope); + PerAuthorityScope_sequence, hf_index, ett_x509ce_PerAuthorityScope); return offset; } @@ -1136,8 +1157,9 @@ static int dissect_cRLScope(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_x509ce_CRLScopeSyntax(FALSE, tvb, offset, pinfo, tree, hf_x509ce_cRLScope); } + static const ber_sequence_t DeltaRefInfo_sequence[] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_deltaLocation }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_deltaLocation }, { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_lastDelta }, { 0, 0, 0, NULL } }; @@ -1145,7 +1167,7 @@ static const ber_sequence_t DeltaRefInfo_sequence[] = { int dissect_x509ce_DeltaRefInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - DeltaRefInfo_sequence, hf_index, ett_x509ce_DeltaRefInfo); + DeltaRefInfo_sequence, hf_index, ett_x509ce_DeltaRefInfo); return offset; } @@ -1153,6 +1175,7 @@ static int dissect_deltaRefInfo_impl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_x509ce_DeltaRefInfo(TRUE, tvb, offset, pinfo, tree, hf_x509ce_deltaRefInfo); } + static const ber_sequence_t CRLReferral_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_crlr_issuer_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_location_impl }, @@ -1166,7 +1189,7 @@ static const ber_sequence_t CRLReferral_sequence[] = { int dissect_x509ce_CRLReferral(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - CRLReferral_sequence, hf_index, ett_x509ce_CRLReferral); + CRLReferral_sequence, hf_index, ett_x509ce_CRLReferral); return offset; } @@ -1188,7 +1211,8 @@ 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, - StatusReferral_choice, hf_index, ett_x509ce_StatusReferral, NULL); + StatusReferral_choice, hf_index, ett_x509ce_StatusReferral, + NULL); return offset; } @@ -1198,7 +1222,7 @@ static int dissect_StatusReferrals_item(packet_info *pinfo, proto_tree *tree, tv static const ber_sequence_t StatusReferrals_sequence_of[1] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_StatusReferrals_item }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_StatusReferrals_item }, }; int @@ -1225,8 +1249,9 @@ dissect_x509ce_OrderedListSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int o return offset; } + static const ber_sequence_t DeltaInformation_sequence[] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_deltaLocation }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_deltaLocation }, { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_nextDelta }, { 0, 0, 0, NULL } }; @@ -1234,11 +1259,12 @@ static const ber_sequence_t DeltaInformation_sequence[] = { int dissect_x509ce_DeltaInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - DeltaInformation_sequence, hf_index, ett_x509ce_DeltaInformation); + DeltaInformation_sequence, hf_index, ett_x509ce_DeltaInformation); return offset; } + static const ber_sequence_t DistributionPoint_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reasons_impl }, @@ -1249,7 +1275,7 @@ static const ber_sequence_t DistributionPoint_sequence[] = { int dissect_x509ce_DistributionPoint(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - DistributionPoint_sequence, hf_index, ett_x509ce_DistributionPoint); + DistributionPoint_sequence, hf_index, ett_x509ce_DistributionPoint); return offset; } @@ -1270,6 +1296,7 @@ dissect_x509ce_CRLDistPointsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int return offset; } + static const ber_sequence_t IssuingDistPointSyntax_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_containsUserPublicKeyCerts_impl }, @@ -1285,12 +1312,13 @@ static const ber_sequence_t IssuingDistPointSyntax_sequence[] = { int dissect_x509ce_IssuingDistPointSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - IssuingDistPointSyntax_sequence, hf_index, ett_x509ce_IssuingDistPointSyntax); + IssuingDistPointSyntax_sequence, hf_index, ett_x509ce_IssuingDistPointSyntax); return offset; } + int dissect_x509ce_BaseCRLNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_x509ce_CRLNumber(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -1298,6 +1326,7 @@ dissect_x509ce_BaseCRLNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse return offset; } + static const ber_sequence_t CertificateExactAssertion_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber }, { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer }, @@ -1307,7 +1336,7 @@ static const ber_sequence_t CertificateExactAssertion_sequence[] = { int dissect_x509ce_CertificateExactAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - CertificateExactAssertion_sequence, hf_index, ett_x509ce_CertificateExactAssertion); + CertificateExactAssertion_sequence, hf_index, ett_x509ce_CertificateExactAssertion); return offset; } @@ -1359,7 +1388,8 @@ 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, - AltNameType_choice, hf_index, ett_x509ce_AltNameType, NULL); + AltNameType_choice, hf_index, ett_x509ce_AltNameType, + NULL); return offset; } @@ -1383,6 +1413,7 @@ static int dissect_policy_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_x509ce_CertPolicySet(TRUE, tvb, offset, pinfo, tree, hf_x509ce_policy); } + static const ber_sequence_t CertificateAssertion_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serialNumber_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_issuer_impl }, @@ -1402,7 +1433,7 @@ static const ber_sequence_t CertificateAssertion_sequence[] = { int dissect_x509ce_CertificateAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - CertificateAssertion_sequence, hf_index, ett_x509ce_CertificateAssertion); + CertificateAssertion_sequence, hf_index, ett_x509ce_CertificateAssertion); return offset; } @@ -1413,6 +1444,7 @@ static int dissect_issuedByThisCAAssertion_impl(packet_info *pinfo, proto_tree * return dissect_x509ce_CertificateAssertion(TRUE, tvb, offset, pinfo, tree, hf_x509ce_issuedByThisCAAssertion); } + static const ber_sequence_t CertificatePairExactAssertion_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cpea_issuedToThisCAAssertion_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cpea_issuedByThisCAAssertion_impl }, @@ -1422,11 +1454,12 @@ static const ber_sequence_t CertificatePairExactAssertion_sequence[] = { int dissect_x509ce_CertificatePairExactAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - CertificatePairExactAssertion_sequence, hf_index, ett_x509ce_CertificatePairExactAssertion); + CertificatePairExactAssertion_sequence, hf_index, ett_x509ce_CertificatePairExactAssertion); return offset; } + static const ber_sequence_t CertificatePairAssertion_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_issuedToThisCAAssertion_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_issuedByThisCAAssertion_impl }, @@ -1436,25 +1469,27 @@ static const ber_sequence_t CertificatePairAssertion_sequence[] = { int dissect_x509ce_CertificatePairAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - CertificatePairAssertion_sequence, hf_index, ett_x509ce_CertificatePairAssertion); + CertificatePairAssertion_sequence, hf_index, ett_x509ce_CertificatePairAssertion); return offset; } + static const ber_sequence_t CertificateListExactAssertion_sequence[] = { { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer }, - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint }, { 0, 0, 0, NULL } }; int dissect_x509ce_CertificateListExactAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - CertificateListExactAssertion_sequence, hf_index, ett_x509ce_CertificateListExactAssertion); + CertificateListExactAssertion_sequence, hf_index, ett_x509ce_CertificateListExactAssertion); return offset; } + static const ber_sequence_t CertificateListAssertion_sequence[] = { { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_issuer }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_minCRLNumber_impl }, @@ -1468,11 +1503,12 @@ static const ber_sequence_t CertificateListAssertion_sequence[] = { int dissect_x509ce_CertificateListAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - CertificateListAssertion_sequence, hf_index, ett_x509ce_CertificateListAssertion); + CertificateListAssertion_sequence, hf_index, ett_x509ce_CertificateListAssertion); return offset; } + static const ber_sequence_t PkiPathMatchSyntax_sequence[] = { { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_firstIssuer }, { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_lastSubject }, @@ -1482,7 +1518,7 @@ static const ber_sequence_t PkiPathMatchSyntax_sequence[] = { int dissect_x509ce_PkiPathMatchSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - PkiPathMatchSyntax_sequence, hf_index, ett_x509ce_PkiPathMatchSyntax); + PkiPathMatchSyntax_sequence, hf_index, ett_x509ce_PkiPathMatchSyntax); return offset; } diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index 71623a6d59..077515677a 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -41,9 +41,9 @@ #include <stdio.h> #include <string.h> +#include "packet-x509if.h" #include "packet-ber.h" #include "packet-x509sat.h" -#include "packet-x509if.h" #define PNAME "X.509 Information Framework" #define PSNAME "X509IF" @@ -463,6 +463,7 @@ static int dissect_includeSubtypes(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_x509if_BOOLEAN(FALSE, tvb, offset, pinfo, tree, hf_x509if_includeSubtypes); } + static const ber_sequence_t Context_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contextType }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_contextValues }, @@ -473,7 +474,7 @@ static const ber_sequence_t Context_sequence[] = { int dissect_x509if_Context(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - Context_sequence, hf_index, ett_x509if_Context); + Context_sequence, hf_index, ett_x509if_Context); return offset; } @@ -497,6 +498,7 @@ static int dissect_contextList(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_x509if_SET_OF_Context(FALSE, tvb, offset, pinfo, tree, hf_x509if_contextList); } + static const ber_sequence_t T_valuesWithContext_item_sequence[] = { { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_value }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_contextList }, @@ -506,7 +508,7 @@ static const ber_sequence_t T_valuesWithContext_item_sequence[] = { static int dissect_x509if_T_valuesWithContext_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_valuesWithContext_item_sequence, hf_index, ett_x509if_T_valuesWithContext_item); + T_valuesWithContext_item_sequence, hf_index, ett_x509if_T_valuesWithContext_item); return offset; } @@ -530,6 +532,7 @@ static int dissect_valuesWithContext(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_x509if_T_valuesWithContext(FALSE, tvb, offset, pinfo, tree, hf_x509if_valuesWithContext); } + static const ber_sequence_t Attribute_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_values }, @@ -540,12 +543,13 @@ static const ber_sequence_t Attribute_sequence[] = { int dissect_x509if_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(implicit_tag, pinfo, tree, tvb, offset, - Attribute_sequence, hf_index, ett_x509if_Attribute); + Attribute_sequence, hf_index, ett_x509if_Attribute); return offset; } + int dissect_x509if_AttributeType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_x509if_AttributeId(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -617,6 +621,7 @@ static int dissect_ca_contextValues(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_x509if_SET_OF_ContextValue(FALSE, tvb, offset, pinfo, tree, hf_x509if_ca_contextValues); } + static const ber_sequence_t ContextAssertion_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ca_contextType }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_ca_contextValues }, @@ -626,7 +631,7 @@ static const ber_sequence_t ContextAssertion_sequence[] = { int dissect_x509if_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(implicit_tag, pinfo, tree, tvb, offset, - ContextAssertion_sequence, hf_index, ett_x509if_ContextAssertion); + ContextAssertion_sequence, hf_index, ett_x509if_ContextAssertion); return offset; } @@ -669,7 +674,8 @@ 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, - T_assertedContexts_choice, hf_index, ett_x509if_T_assertedContexts, NULL); + T_assertedContexts_choice, hf_index, ett_x509if_T_assertedContexts, + NULL); return offset; } @@ -677,17 +683,18 @@ static int dissect_assertedContexts(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_x509if_T_assertedContexts(FALSE, tvb, offset, pinfo, tree, hf_x509if_assertedContexts); } + static const ber_sequence_t AttributeValueAssertion_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type }, { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_assertion }, - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_assertedContexts }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_assertedContexts }, { 0, 0, 0, NULL } }; int dissect_x509if_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(implicit_tag, pinfo, tree, tvb, offset, - AttributeValueAssertion_sequence, hf_index, ett_x509if_AttributeValueAssertion); + AttributeValueAssertion_sequence, hf_index, ett_x509if_AttributeValueAssertion); return offset; } @@ -708,6 +715,7 @@ static int dissect_ata_assertedContexts(packet_info *pinfo, proto_tree *tree, tv return dissect_x509if_SEQUENCE_OF_ContextAssertion(FALSE, tvb, offset, pinfo, tree, hf_x509if_ata_assertedContexts); } + static const ber_sequence_t AttributeTypeAssertion_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ata_assertedContexts }, @@ -717,11 +725,12 @@ static const ber_sequence_t AttributeTypeAssertion_sequence[] = { int dissect_x509if_AttributeTypeAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - AttributeTypeAssertion_sequence, hf_index, ett_x509if_AttributeTypeAssertion); + AttributeTypeAssertion_sequence, hf_index, ett_x509if_AttributeTypeAssertion); return offset; } + static const ber_sequence_t T_valWithContext_item_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_distingAttrValue }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_contextList }, @@ -731,7 +740,7 @@ static const ber_sequence_t T_valWithContext_item_sequence[] = { static int dissect_x509if_T_valWithContext_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_valWithContext_item_sequence, hf_index, ett_x509if_T_valWithContext_item); + T_valWithContext_item_sequence, hf_index, ett_x509if_T_valWithContext_item); return offset; } @@ -755,6 +764,7 @@ static int dissect_valueswithContext(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_x509if_T_valWithContext(FALSE, tvb, offset, pinfo, tree, hf_x509if_valueswithContext); } + static const ber_sequence_t AttributeTypeAndDistinguishedValue_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type }, { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_atadv_value }, @@ -766,7 +776,7 @@ static const ber_sequence_t AttributeTypeAndDistinguishedValue_sequence[] = { int dissect_x509if_AttributeTypeAndDistinguishedValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - AttributeTypeAndDistinguishedValue_sequence, hf_index, ett_x509if_AttributeTypeAndDistinguishedValue); + AttributeTypeAndDistinguishedValue_sequence, hf_index, ett_x509if_AttributeTypeAndDistinguishedValue); return offset; } @@ -820,12 +830,14 @@ 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, - Name_choice, hf_index, ett_x509if_Name, NULL); + Name_choice, hf_index, ett_x509if_Name, + NULL); return offset; } + int dissect_x509if_DistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_x509if_RDNSequence(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -834,6 +846,7 @@ dissect_x509if_DistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tvb, int o } + int dissect_x509if_LocalName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_x509if_RDNSequence(implicit_tag, tvb, offset, pinfo, tree, hf_index); @@ -866,7 +879,8 @@ 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, - T_specificExclusions_item_choice, hf_index, ett_x509if_T_specificExclusions_item, NULL); + T_specificExclusions_item_choice, hf_index, ett_x509if_T_specificExclusions_item, + NULL); return offset; } @@ -876,7 +890,7 @@ static int dissect_specificExclusions_item(packet_info *pinfo, proto_tree *tree, static const ber_sequence_t T_specificExclusions_set_of[1] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_specificExclusions_item }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_specificExclusions_item }, }; static int @@ -954,7 +968,7 @@ static int dissect_newMatchingRule(packet_info *pinfo, proto_tree *tree, tvbuff_ 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 }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_refinement_and_item }, }; static int @@ -991,11 +1005,13 @@ 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, - Refinement_choice, hf_index, ett_x509if_Refinement, NULL); + Refinement_choice, hf_index, ett_x509if_Refinement, + NULL); return offset; } + static const ber_sequence_t SubtreeSpecification_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_base }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_specificExclusions }, @@ -1008,7 +1024,7 @@ static const ber_sequence_t SubtreeSpecification_sequence[] = { int dissect_x509if_SubtreeSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - SubtreeSpecification_sequence, hf_index, ett_x509if_SubtreeSpecification); + SubtreeSpecification_sequence, hf_index, ett_x509if_SubtreeSpecification); return offset; } @@ -1029,7 +1045,8 @@ 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, - T_chopSpecificExclusions_item_choice, hf_index, ett_x509if_T_chopSpecificExclusions_item, NULL); + T_chopSpecificExclusions_item_choice, hf_index, ett_x509if_T_chopSpecificExclusions_item, + NULL); return offset; } @@ -1039,7 +1056,7 @@ static int dissect_chopSpecificExclusions_item(packet_info *pinfo, proto_tree *t static const ber_sequence_t T_chopSpecificExclusions_set_of[1] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_chopSpecificExclusions_item }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_chopSpecificExclusions_item }, }; static int @@ -1053,6 +1070,7 @@ static int dissect_chopSpecificExclusions(packet_info *pinfo, proto_tree *tree, return dissect_x509if_T_chopSpecificExclusions(FALSE, tvb, offset, pinfo, tree, hf_x509if_chopSpecificExclusions); } + static const ber_sequence_t ChopSpecification_sequence[] = { { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_chopSpecificExclusions }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_minimum }, @@ -1063,7 +1081,7 @@ static const ber_sequence_t ChopSpecification_sequence[] = { int dissect_x509if_ChopSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - ChopSpecification_sequence, hf_index, ett_x509if_ChopSpecification); + ChopSpecification_sequence, hf_index, ett_x509if_ChopSpecification); return offset; } @@ -1135,6 +1153,7 @@ static int dissect_superiorStructureRules(packet_info *pinfo, proto_tree *tree, return dissect_x509if_SET_OF_RuleIdentifier(FALSE, tvb, offset, pinfo, tree, hf_x509if_superiorStructureRules); } + static const ber_sequence_t DITStructureRule_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_ruleIdentifier }, { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_nameForm }, @@ -1145,7 +1164,7 @@ static const ber_sequence_t DITStructureRule_sequence[] = { int dissect_x509if_DITStructureRule(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - DITStructureRule_sequence, hf_index, ett_x509if_DITStructureRule); + DITStructureRule_sequence, hf_index, ett_x509if_DITStructureRule); return offset; } @@ -1188,6 +1207,7 @@ static int dissect_precluded(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_x509if_SET_SIZE_1_MAX_OF_AttributeId(FALSE, tvb, offset, pinfo, tree, hf_x509if_precluded); } + static const ber_sequence_t DITContentRule_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_structuralObjectClass }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_auxiliaries }, @@ -1200,7 +1220,7 @@ static const ber_sequence_t DITContentRule_sequence[] = { int dissect_x509if_DITContentRule(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - DITContentRule_sequence, hf_index, ett_x509if_DITContentRule); + DITContentRule_sequence, hf_index, ett_x509if_DITContentRule); return offset; } @@ -1237,6 +1257,7 @@ static int dissect_optionalContexts(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_x509if_T_optionalContexts(FALSE, tvb, offset, pinfo, tree, hf_x509if_optionalContexts); } + static const ber_sequence_t DITContextUse_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeType }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_mandatoryContexts }, @@ -1247,7 +1268,7 @@ static const ber_sequence_t DITContextUse_sequence[] = { int dissect_x509if_DITContextUse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - DITContextUse_sequence, hf_index, ett_x509if_DITContextUse); + DITContextUse_sequence, hf_index, ett_x509if_DITContextUse); return offset; } @@ -1355,6 +1376,7 @@ static int dissect_ra_values(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_x509if_SEQUENCE_OF_DefaultValueValues(FALSE, tvb, offset, pinfo, tree, hf_x509if_ra_values); } + static const ber_sequence_t T_defaultValues_item_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_entryType }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ra_values }, @@ -1364,7 +1386,7 @@ static const ber_sequence_t T_defaultValues_item_sequence[] = { static int dissect_x509if_T_defaultValues_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_defaultValues_item_sequence, hf_index, ett_x509if_T_defaultValues_item); + T_defaultValues_item_sequence, hf_index, ett_x509if_T_defaultValues_item); return offset; } @@ -1407,6 +1429,7 @@ static int dissect_selectedValues(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_x509if_SEQUENCE_OF_AttributeValue(FALSE, tvb, offset, pinfo, tree, hf_x509if_selectedValues); } + static const ber_sequence_t ContextProfile_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contextType }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_contextValue }, @@ -1416,7 +1439,7 @@ static const ber_sequence_t ContextProfile_sequence[] = { int dissect_x509if_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(implicit_tag, pinfo, tree, tvb, offset, - ContextProfile_sequence, hf_index, ett_x509if_ContextProfile); + ContextProfile_sequence, hf_index, ett_x509if_ContextProfile); return offset; } @@ -1442,7 +1465,7 @@ static int dissect_contexts(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, 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 }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_contextcombination_and_item }, }; static int @@ -1479,11 +1502,13 @@ 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, - ContextCombination_choice, hf_index, ett_x509if_ContextCombination, NULL); + ContextCombination_choice, hf_index, ett_x509if_ContextCombination, + NULL); return offset; } + static const ber_sequence_t MatchingUse_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_restrictionType }, { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_restrictionValue }, @@ -1493,7 +1518,7 @@ static const ber_sequence_t MatchingUse_sequence[] = { int dissect_x509if_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(implicit_tag, pinfo, tree, tvb, offset, - MatchingUse_sequence, hf_index, ett_x509if_MatchingUse); + MatchingUse_sequence, hf_index, ett_x509if_MatchingUse); return offset; } @@ -1517,6 +1542,7 @@ static int dissect_matchingUse(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_x509if_SEQUENCE_OF_MatchingUse(FALSE, tvb, offset, pinfo, tree, hf_x509if_matchingUse); } + static const ber_sequence_t RequestAttribute_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeType }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_includeSubtypes }, @@ -1531,7 +1557,7 @@ static const ber_sequence_t RequestAttribute_sequence[] = { int dissect_x509if_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(implicit_tag, pinfo, tree, tvb, offset, - RequestAttribute_sequence, hf_index, ett_x509if_RequestAttribute); + RequestAttribute_sequence, hf_index, ett_x509if_RequestAttribute); return offset; } @@ -1557,7 +1583,7 @@ static int dissect_inputAttributeTypes(packet_info *pinfo, proto_tree *tree, tvb 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 }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item }, }; static int @@ -1594,7 +1620,8 @@ 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, - AttributeCombination_choice, hf_index, ett_x509if_AttributeCombination, NULL); + AttributeCombination_choice, hf_index, ett_x509if_AttributeCombination, + NULL); return offset; } @@ -1615,7 +1642,8 @@ 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, - T_outputValues_choice, hf_index, ett_x509if_T_outputValues, NULL); + T_outputValues_choice, hf_index, ett_x509if_T_outputValues, + NULL); return offset; } @@ -1623,9 +1651,10 @@ static int dissect_outputValues(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_x509if_T_outputValues(FALSE, tvb, offset, pinfo, tree, hf_x509if_outputValues); } + static const ber_sequence_t ResultAttribute_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeType }, - { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_outputValues }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_outputValues }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_contexts }, { 0, 0, 0, NULL } }; @@ -1633,7 +1662,7 @@ static const ber_sequence_t ResultAttribute_sequence[] = { int dissect_x509if_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(implicit_tag, pinfo, tree, tvb, offset, - ResultAttribute_sequence, hf_index, ett_x509if_ResultAttribute); + ResultAttribute_sequence, hf_index, ett_x509if_ResultAttribute); return offset; } @@ -1657,6 +1686,7 @@ static int dissect_outputAttributeTypes(packet_info *pinfo, proto_tree *tree, tv return dissect_x509if_SEQUENCE_OF_ResultAttribute(FALSE, tvb, offset, pinfo, tree, hf_x509if_outputAttributeTypes); } + static const ber_sequence_t ControlOptions_sequence[] = { { 0, 0, 0, NULL } }; @@ -1664,7 +1694,7 @@ static const ber_sequence_t ControlOptions_sequence[] = { int dissect_x509if_ControlOptions(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - ControlOptions_sequence, hf_index, ett_x509if_ControlOptions); + ControlOptions_sequence, hf_index, ett_x509if_ControlOptions); return offset; } @@ -1678,6 +1708,7 @@ static int dissect_searchRuleControls(packet_info *pinfo, proto_tree *tree, tvbu return dissect_x509if_ControlOptions(FALSE, tvb, offset, pinfo, tree, hf_x509if_searchRuleControls); } + static const ber_sequence_t Mapping_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_mappingFunction }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_level }, @@ -1687,7 +1718,7 @@ static const ber_sequence_t Mapping_sequence[] = { int dissect_x509if_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(implicit_tag, pinfo, tree, tvb, offset, - Mapping_sequence, hf_index, ett_x509if_Mapping); + Mapping_sequence, hf_index, ett_x509if_Mapping); return offset; } @@ -1711,6 +1742,7 @@ static int dissect_mapping(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_x509if_SEQUENCE_OF_Mapping(FALSE, tvb, offset, pinfo, tree, hf_x509if_mapping); } + static const ber_sequence_t MRSubstitution_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attribute }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_oldMatchingRule }, @@ -1721,7 +1753,7 @@ static const ber_sequence_t MRSubstitution_sequence[] = { int dissect_x509if_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(implicit_tag, pinfo, tree, tvb, offset, - MRSubstitution_sequence, hf_index, ett_x509if_MRSubstitution); + MRSubstitution_sequence, hf_index, ett_x509if_MRSubstitution); return offset; } @@ -1745,6 +1777,7 @@ static int dissect_substitution(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_x509if_SEQUENCE_OF_MRSubstitution(FALSE, tvb, offset, pinfo, tree, hf_x509if_substitution); } + static const ber_sequence_t MRMapping_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_mapping }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_substitution }, @@ -1754,7 +1787,7 @@ static const ber_sequence_t MRMapping_sequence[] = { int dissect_x509if_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(implicit_tag, pinfo, tree, tvb, offset, - MRMapping_sequence, hf_index, ett_x509if_MRMapping); + MRMapping_sequence, hf_index, ett_x509if_MRMapping); return offset; } @@ -1787,6 +1820,7 @@ static int dissect_relaxations(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_x509if_SEQUENCE_OF_MRMapping(FALSE, tvb, offset, pinfo, tree, hf_x509if_relaxations); } + static const ber_sequence_t RelaxationPolicy_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_basic }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_tightenings }, @@ -1799,7 +1833,7 @@ static const ber_sequence_t RelaxationPolicy_sequence[] = { int dissect_x509if_RelaxationPolicy(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - RelaxationPolicy_sequence, hf_index, ett_x509if_RelaxationPolicy); + RelaxationPolicy_sequence, hf_index, ett_x509if_RelaxationPolicy); return offset; } @@ -1823,6 +1857,7 @@ static int dissect_additionalControl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_x509if_SEQUENCE_OF_AttributeType(FALSE, tvb, offset, pinfo, tree, hf_x509if_additionalControl); } + static const asn_namedbit AllowedSubset_bits[] = { { 0, &hf_x509if_AllowedSubset_baseObject, -1, -1, "baseObject", NULL }, { 1, &hf_x509if_AllowedSubset_oneLevel, -1, -1, "oneLevel", NULL }, @@ -1833,8 +1868,8 @@ static const asn_namedbit AllowedSubset_bits[] = { int dissect_x509if_AllowedSubset(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - AllowedSubset_bits, hf_index, ett_x509if_AllowedSubset, - NULL); + AllowedSubset_bits, hf_index, ett_x509if_AllowedSubset, + NULL); return offset; } @@ -1862,6 +1897,7 @@ static int dissect_imposedSubset(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_x509if_ImposedSubset(FALSE, tvb, offset, pinfo, tree, hf_x509if_imposedSubset); } + static const ber_sequence_t EntryLimit_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_default }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_max }, @@ -1871,7 +1907,7 @@ static const ber_sequence_t EntryLimit_sequence[] = { int dissect_x509if_EntryLimit(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - EntryLimit_sequence, hf_index, ett_x509if_EntryLimit); + EntryLimit_sequence, hf_index, ett_x509if_EntryLimit); return offset; } @@ -1895,6 +1931,7 @@ static int dissect_name(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_x509if_SET_OF_DirectoryString(FALSE, tvb, offset, pinfo, tree, hf_x509if_name); } + static const ber_sequence_t SearchRuleDescription_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_id }, { BER_CLASS_CON, 0, 0, dissect_dmdId }, @@ -1920,11 +1957,12 @@ static const ber_sequence_t SearchRuleDescription_sequence[] = { int dissect_x509if_SearchRuleDescription(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - SearchRuleDescription_sequence, hf_index, ett_x509if_SearchRuleDescription); + SearchRuleDescription_sequence, hf_index, ett_x509if_SearchRuleDescription); return offset; } + static const ber_sequence_t SearchRule_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_id }, { BER_CLASS_CON, 0, 0, dissect_dmdId }, @@ -1947,11 +1985,12 @@ static const ber_sequence_t SearchRule_sequence[] = { int dissect_x509if_SearchRule(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - SearchRule_sequence, hf_index, ett_x509if_SearchRule); + SearchRule_sequence, hf_index, ett_x509if_SearchRule); return offset; } + static const ber_sequence_t SearchRuleId_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_id }, { BER_CLASS_CON, 0, 0, dissect_dmdId }, @@ -1961,7 +2000,7 @@ static const ber_sequence_t SearchRuleId_sequence[] = { int dissect_x509if_SearchRuleId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - SearchRuleId_sequence, hf_index, ett_x509if_SearchRuleId); + SearchRuleId_sequence, hf_index, ett_x509if_SearchRuleId); return offset; } @@ -1982,7 +2021,8 @@ 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, - OutputValues_choice, hf_index, ett_x509if_OutputValues, NULL); + OutputValues_choice, hf_index, ett_x509if_OutputValues, + NULL); return offset; } diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index 7d21a24e89..52bbf2cd96 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -290,6 +290,7 @@ static int dissect_ZonalSelect_item(packet_info *pinfo, proto_tree *tree, tvbuff } + int dissect_x509sat_DirectoryString(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); @@ -317,11 +318,12 @@ static int dissect_localeID2(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb } + int dissect_x509sat_UniqueIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - NULL, hf_index, -1, - NULL); + NULL, hf_index, -1, + NULL); return offset; } @@ -330,11 +332,12 @@ static int dissect_uid(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int } + int dissect_x509sat_CountryName(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, BER_UNI_TAG_PrintableString, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -361,7 +364,8 @@ 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, - CriteriaItem_choice, hf_index, ett_x509sat_CriteriaItem, NULL); + CriteriaItem_choice, hf_index, ett_x509sat_CriteriaItem, + NULL); return offset; } @@ -371,7 +375,7 @@ static int dissect_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int 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 }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item }, }; static int @@ -408,7 +412,8 @@ 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, - Criteria_choice, hf_index, ett_x509sat_Criteria, NULL); + Criteria_choice, hf_index, ett_x509sat_Criteria, + NULL); return offset; } @@ -455,6 +460,7 @@ static int dissect_subset(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_x509sat_T_subset(FALSE, tvb, offset, pinfo, tree, hf_x509sat_subset); } + static const ber_sequence_t EnhancedGuide_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_objectClass }, { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_criteria }, @@ -465,7 +471,7 @@ static const ber_sequence_t EnhancedGuide_sequence[] = { int dissect_x509sat_EnhancedGuide(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - EnhancedGuide_sequence, hf_index, ett_x509sat_EnhancedGuide); + EnhancedGuide_sequence, hf_index, ett_x509sat_EnhancedGuide); return offset; } @@ -484,11 +490,12 @@ dissect_x509sat_PostalAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs } + static int dissect_x509sat_TelephoneNumber(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, BER_UNI_TAG_PrintableString, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -497,11 +504,12 @@ static int dissect_telephoneNumber(packet_info *pinfo, proto_tree *tree, tvbuff_ } + static int dissect_x509sat_PrintableString(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, BER_UNI_TAG_PrintableString, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -515,6 +523,7 @@ static int dissect_answerback(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_x509sat_PrintableString(FALSE, tvb, offset, pinfo, tree, hf_x509sat_answerback); } + static const ber_sequence_t TelexNumber_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_telexNumber }, { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_countryCode }, @@ -525,11 +534,12 @@ static const ber_sequence_t TelexNumber_sequence[] = { static int dissect_x509sat_TelexNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - TelexNumber_sequence, hf_index, ett_x509sat_TelexNumber); + TelexNumber_sequence, hf_index, ett_x509sat_TelexNumber); return offset; } + static const ber_sequence_t FacsimileTelephoneNumber_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_telephoneNumber }, { 0, 0, 0, NULL } @@ -538,37 +548,40 @@ static const ber_sequence_t FacsimileTelephoneNumber_sequence[] = { int dissect_x509sat_FacsimileTelephoneNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - FacsimileTelephoneNumber_sequence, hf_index, ett_x509sat_FacsimileTelephoneNumber); + FacsimileTelephoneNumber_sequence, hf_index, ett_x509sat_FacsimileTelephoneNumber); return offset; } + int dissect_x509sat_X121Address(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, BER_UNI_TAG_NumericString, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } + int dissect_x509sat_InternationalISDNNumber(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, BER_UNI_TAG_NumericString, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } + int dissect_x509sat_DestinationIndicator(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, BER_UNI_TAG_PrintableString, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -663,6 +676,7 @@ static int dissect_nAddresses(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_x509sat_T_nAddresses(FALSE, tvb, offset, pinfo, tree, hf_x509sat_nAddresses); } + static const ber_sequence_t PresentationAddress_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_pSelector }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_sSelector }, @@ -674,7 +688,7 @@ static const ber_sequence_t PresentationAddress_sequence[] = { int dissect_x509sat_PresentationAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - PresentationAddress_sequence, hf_index, ett_x509sat_PresentationAddress); + PresentationAddress_sequence, hf_index, ett_x509sat_PresentationAddress); return offset; } @@ -695,6 +709,7 @@ static int dissect_profiles(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_x509sat_T_profiles(FALSE, tvb, offset, pinfo, tree, hf_x509sat_profiles); } + static const ber_sequence_t ProtocolInformation_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_nAddress }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_profiles }, @@ -704,11 +719,12 @@ static const ber_sequence_t ProtocolInformation_sequence[] = { int dissect_x509sat_ProtocolInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - ProtocolInformation_sequence, hf_index, ett_x509sat_ProtocolInformation); + ProtocolInformation_sequence, hf_index, ett_x509sat_ProtocolInformation); return offset; } + static const ber_sequence_t NameAndOptionalUID_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_dn }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_uid }, @@ -718,7 +734,7 @@ static const ber_sequence_t NameAndOptionalUID_sequence[] = { int dissect_x509sat_NameAndOptionalUID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - NameAndOptionalUID_sequence, hf_index, ett_x509sat_NameAndOptionalUID); + NameAndOptionalUID_sequence, hf_index, ett_x509sat_NameAndOptionalUID); return offset; } @@ -739,6 +755,7 @@ static int dissect_attributeList(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_x509sat_SEQUENCE_OF_AttributeValueAssertion(FALSE, tvb, offset, pinfo, tree, hf_x509sat_attributeList); } + static const ber_sequence_t MultipleMatchingLocalities_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_matchingRuleUsed }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeList }, @@ -748,7 +765,7 @@ static const ber_sequence_t MultipleMatchingLocalities_sequence[] = { int dissect_x509sat_MultipleMatchingLocalities(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - MultipleMatchingLocalities_sequence, hf_index, ett_x509sat_MultipleMatchingLocalities); + MultipleMatchingLocalities_sequence, hf_index, ett_x509sat_MultipleMatchingLocalities); return offset; } @@ -773,7 +790,8 @@ 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, - SubstringAssertion_item_choice, hf_index, ett_x509sat_SubstringAssertion_item, NULL); + SubstringAssertion_item_choice, hf_index, ett_x509sat_SubstringAssertion_item, + NULL); return offset; } @@ -783,7 +801,7 @@ static int dissect_SubstringAssertion_item(packet_info *pinfo, proto_tree *tree, static const ber_sequence_t SubstringAssertion_sequence_of[1] = { - { -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_SubstringAssertion_item }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_SubstringAssertion_item }, }; int @@ -825,7 +843,8 @@ 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, - OctetSubstringAssertion_item_choice, hf_index, ett_x509sat_OctetSubstringAssertion_item, NULL); + OctetSubstringAssertion_item_choice, hf_index, ett_x509sat_OctetSubstringAssertion_item, + NULL); return offset; } @@ -835,7 +854,7 @@ static int dissect_OctetSubstringAssertion_item(packet_info *pinfo, proto_tree * static const ber_sequence_t OctetSubstringAssertion_sequence_of[1] = { - { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_OctetSubstringAssertion_item }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_OctetSubstringAssertion_item }, }; int @@ -877,16 +896,18 @@ dissect_x509sat_ZonalResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset } + int dissect_x509sat_LanguageContextSyntax(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, BER_UNI_TAG_PrintableString, - pinfo, tree, tvb, offset, hf_index, - NULL); + pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } + static int dissect_x509sat_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index); @@ -903,6 +924,7 @@ static int dissect_at(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o return dissect_x509sat_GeneralizedTime(FALSE, tvb, offset, pinfo, tree, hf_x509sat_at); } + static const ber_sequence_t T_absolute_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_startTime }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_endTime }, @@ -912,7 +934,7 @@ static const ber_sequence_t T_absolute_sequence[] = { static int dissect_x509sat_T_absolute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_absolute_sequence, hf_index, ett_x509sat_T_absolute); + T_absolute_sequence, hf_index, ett_x509sat_T_absolute); return offset; } @@ -951,6 +973,7 @@ static int dissect_second(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_x509sat_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_x509sat_second); } + static const ber_sequence_t DayTime_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_hour }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_minute }, @@ -961,7 +984,7 @@ static const ber_sequence_t DayTime_sequence[] = { int dissect_x509sat_DayTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - DayTime_sequence, hf_index, ett_x509sat_DayTime); + DayTime_sequence, hf_index, ett_x509sat_DayTime); return offset; } @@ -972,6 +995,7 @@ static int dissect_endDayTime(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_x509sat_DayTime(FALSE, tvb, offset, pinfo, tree, hf_x509sat_endDayTime); } + static const ber_sequence_t DayTimeBand_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_startDayTime }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_endDayTime }, @@ -981,7 +1005,7 @@ static const ber_sequence_t DayTimeBand_sequence[] = { int dissect_x509sat_DayTimeBand(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - DayTimeBand_sequence, hf_index, ett_x509sat_DayTimeBand); + DayTimeBand_sequence, hf_index, ett_x509sat_DayTimeBand); return offset; } @@ -1021,6 +1045,7 @@ static int dissect_intDay(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_x509sat_T_intDay(FALSE, tvb, offset, pinfo, tree, hf_x509sat_intDay); } + static const asn_namedbit T_bitDay_bits[] = { { 0, &hf_x509sat_T_bitDay_sunday, -1, -1, "sunday", NULL }, { 1, &hf_x509sat_T_bitDay_monday, -1, -1, "monday", NULL }, @@ -1035,8 +1060,8 @@ static const asn_namedbit T_bitDay_bits[] = { static int dissect_x509sat_T_bitDay(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - T_bitDay_bits, hf_index, ett_x509sat_T_bitDay, - NULL); + T_bitDay_bits, hf_index, ett_x509sat_T_bitDay, + NULL); return offset; } @@ -1068,6 +1093,7 @@ static int dissect_intNamedDays(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_x509sat_T_intNamedDays(FALSE, tvb, offset, pinfo, tree, hf_x509sat_intNamedDays); } + static const asn_namedbit T_bitNamedDays_bits[] = { { 0, &hf_x509sat_T_bitNamedDays_sunday, -1, -1, "sunday", NULL }, { 1, &hf_x509sat_T_bitNamedDays_monday, -1, -1, "monday", NULL }, @@ -1082,8 +1108,8 @@ static const asn_namedbit T_bitNamedDays_bits[] = { static int dissect_x509sat_T_bitNamedDays(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - T_bitNamedDays_bits, hf_index, ett_x509sat_T_bitNamedDays, - NULL); + T_bitNamedDays_bits, hf_index, ett_x509sat_T_bitNamedDays, + NULL); return offset; } @@ -1107,7 +1133,8 @@ 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, - NamedDay_choice, hf_index, ett_x509sat_NamedDay, NULL); + NamedDay_choice, hf_index, ett_x509sat_NamedDay, + NULL); return offset; } @@ -1149,7 +1176,8 @@ 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, - XDayOf_choice, hf_index, ett_x509sat_XDayOf, NULL); + XDayOf_choice, hf_index, ett_x509sat_XDayOf, + NULL); return offset; } @@ -1168,14 +1196,15 @@ static const value_string x509sat_T_days_vals[] = { static const ber_choice_t T_days_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_intDay }, { 1, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_bitDay }, - { 2, BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_dayOf }, + { 2, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_dayOf }, { 0, 0, 0, 0, NULL } }; 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, - T_days_choice, hf_index, ett_x509sat_T_days, NULL); + T_days_choice, hf_index, ett_x509sat_T_days, + NULL); return offset; } @@ -1217,6 +1246,7 @@ static int dissect_intWeek(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_x509sat_T_intWeek(FALSE, tvb, offset, pinfo, tree, hf_x509sat_intWeek); } + static const asn_namedbit T_bitWeek_bits[] = { { 0, &hf_x509sat_T_bitWeek_week1, -1, -1, "week1", NULL }, { 1, &hf_x509sat_T_bitWeek_week2, -1, -1, "week2", NULL }, @@ -1229,8 +1259,8 @@ static const asn_namedbit T_bitWeek_bits[] = { static int dissect_x509sat_T_bitWeek(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - T_bitWeek_bits, hf_index, ett_x509sat_T_bitWeek, - NULL); + T_bitWeek_bits, hf_index, ett_x509sat_T_bitWeek, + NULL); return offset; } @@ -1256,7 +1286,8 @@ 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, - T_weeks_choice, hf_index, ett_x509sat_T_weeks, NULL); + T_weeks_choice, hf_index, ett_x509sat_T_weeks, + NULL); return offset; } @@ -1280,6 +1311,7 @@ static int dissect_intMonth(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_x509sat_T_intMonth(FALSE, tvb, offset, pinfo, tree, hf_x509sat_intMonth); } + static const asn_namedbit T_bitMonth_bits[] = { { 0, &hf_x509sat_T_bitMonth_january, -1, -1, "january", NULL }, { 1, &hf_x509sat_T_bitMonth_february, -1, -1, "february", NULL }, @@ -1299,8 +1331,8 @@ static const asn_namedbit T_bitMonth_bits[] = { static int dissect_x509sat_T_bitMonth(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset, - T_bitMonth_bits, hf_index, ett_x509sat_T_bitMonth, - NULL); + T_bitMonth_bits, hf_index, ett_x509sat_T_bitMonth, + NULL); return offset; } @@ -1326,7 +1358,8 @@ 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, - T_months_choice, hf_index, ett_x509sat_T_months, NULL); + T_months_choice, hf_index, ett_x509sat_T_months, + NULL); return offset; } @@ -1350,6 +1383,7 @@ static int dissect_years(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in return dissect_x509sat_T_years(FALSE, tvb, offset, pinfo, tree, hf_x509sat_years); } + static const ber_sequence_t Period_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_timesOfDay }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_days }, @@ -1362,7 +1396,7 @@ static const ber_sequence_t Period_sequence[] = { int dissect_x509sat_Period(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - Period_sequence, hf_index, ett_x509sat_Period); + Period_sequence, hf_index, ett_x509sat_Period); return offset; } @@ -1402,7 +1436,8 @@ 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, - T_time_choice, hf_index, ett_x509sat_T_time, NULL); + T_time_choice, hf_index, ett_x509sat_T_time, + NULL); return offset; } @@ -1438,8 +1473,9 @@ static int dissect_timeZone(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_x509sat_TimeZone(FALSE, tvb, offset, pinfo, tree, hf_x509sat_timeZone); } + static const ber_sequence_t TimeSpecification_sequence[] = { - { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_time }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_time }, { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_notThisTime }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_timeZone }, { 0, 0, 0, NULL } @@ -1448,11 +1484,12 @@ static const ber_sequence_t TimeSpecification_sequence[] = { int dissect_x509sat_TimeSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - TimeSpecification_sequence, hf_index, ett_x509sat_TimeSpecification); + TimeSpecification_sequence, hf_index, ett_x509sat_TimeSpecification); return offset; } + static const ber_sequence_t T_between_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_startTime }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_endTime }, @@ -1463,7 +1500,7 @@ static const ber_sequence_t T_between_sequence[] = { static int dissect_x509sat_T_between(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, - T_between_sequence, hf_index, ett_x509sat_T_between); + T_between_sequence, hf_index, ett_x509sat_T_between); return offset; } @@ -1489,7 +1526,8 @@ 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, - TimeAssertion_choice, hf_index, ett_x509sat_TimeAssertion, NULL); + TimeAssertion_choice, hf_index, ett_x509sat_TimeAssertion, + NULL); return offset; } @@ -1510,7 +1548,8 @@ 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, - LocaleContextSyntax_choice, hf_index, ett_x509sat_LocaleContextSyntax, NULL); + LocaleContextSyntax_choice, hf_index, ett_x509sat_LocaleContextSyntax, + NULL); return offset; } @@ -1673,7 +1712,7 @@ void proto_register_x509sat(void) { "ProtocolInformation/profiles/_item", HFILL }}, { &hf_x509sat_dn, { "dn", "x509sat.dn", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "NameAndOptionalUID/dn", HFILL }}, { &hf_x509sat_uid, { "uid", "x509sat.uid", |