See if this gets rid of some unused code warnings...

svn path=/trunk/; revision=25785
This commit is contained in:
Anders Broman 2008-07-21 22:00:00 +00:00
parent 4acc73af3a
commit 29cee0856c
2 changed files with 455 additions and 184 deletions

View File

@ -7,6 +7,18 @@ Time TYPE = FT_STRING DISPLAY = BASE_NONE STRING = NULL BITMASK = 0
#.IMPORT ../x509sat/x509sat-exp.cnf
#.IMPORT ../x509af/x509af-exp.cnf
#.OMIT_ASSIGNMENT
# These gives unused code warnings
MTAOriginatorRequestedAlternateRecipient
ProofOfDeliveryAlgorithmIdentifier
DeliveryControls
ContentIntegrityAlgorithmIdentifier
MessageOriginAuthenticationAlgorithmIdentifier
ProbeOriginAuthenticationAlgorithmIdentifier
ReportOriginAuthenticationAlgorithmIdentifier
#.END
#.EXPORTS
EXTENSION
Content
@ -217,16 +229,41 @@ TeletexCommonName N x411.extension-attribute 2
TeletexOrganizationName N x411.extension-attribute 3
TeletexPersonalName N x411.extension-attribute 4
TeletexOrganizationalUnitNames N x411.extension-attribute 5
TeletexDomainDefinedAttributes N x411.extension-attribute 6
PDSName N x411.extension-attribute 7
PhysicalDeliveryCountryName N x411.extension-attribute 8
PostalCode N x411.extension-attribute 9
PhysicalDeliveryOfficeName N x411.extension-attribute 10
PhysicalDeliveryOfficeNumber N x411.extension-attribute 11
ExtensionORAddressComponents N x411.extension-attribute 12
PhysicalDeliveryPersonalName N x411.extension-attribute 13
PhysicalDeliveryOrganizationName N x411.extension-attribute 14
ExtensionPhysicalDeliveryAddressComponents N x411.extension-attribute 15
UnformattedPostalAddress N x411.extension-attribute 16
StreetAddress N x411.extension-attribute 17
PostOfficeBoxAddress N x411.extension-attribute 18
PosteRestanteAddress N x411.extension-attribute 19
UniquePostalName N x411.extension-attribute 20
LocalPostalAttributes N x411.extension-attribute 21
ExtendedNetworkAddress N x411.extension-attribute 22
TerminalType N x411.extension-attribute 23
UniversalCommonName N x411.extension-attribute 24
UniversalOrganizationName N x411.extension-attribute 25
UniversalPersonalName N x411.extension-attribute 26
UniversalOrganizationalUnitNames N x411.extension-attribute 27
UniversalDomainDefinedAttributes N x411.extension-attribute 28
UniversalPhysicalDeliveryOfficeName N x411.extension-attribute 29
UniversalPhysicalDeliveryOfficeNumber N x411.extension-attribute 30
UniversalExtensionORAddressComponents N x411.extension-attribute 31
UniversalPhysicalDeliveryPersonalName N x411.extension-attribute 32
UniversalPhysicalDeliveryOrganizationName N x411.extension-attribute 33
UniversalExtensionPhysicalDeliveryAddressComponents N x411.extension-attribute 34
UniversalUnformattedPostalAddress N x411.extension-attribute 35
UniversalStreetAddress N x411.extension-attribute 36
UniversalPostOfficeBoxAddress N x411.extension-attribute 37
UniversalPosteRestanteAddress N x411.extension-attribute 38
UniversalUniquePostalName N x411.extension-attribute 39
UniversalLocalPostalAttributes N x411.extension-attribute 40
ReportDeliveryArgument B "2.6.1.4.14" "id-et-report"
@ -254,65 +291,65 @@ ExtendedEncodedInformationType B "2.6.5.2.18" "id-at-mhs-unacceptable-eits"
# ACP133 - see master list in acp133.cnf
ORName B "2.16.840.1.101.2.1.5.47" "id-at-aLExemptedAddressProcessor"
ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses"
ORName B "2.16.840.1.101.2.1.5.47" "id-at-aLExemptedAddressProcessor"
ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses"
# MSGeneralAttributeTypes - see master list in p7.cnf
CertificateSelectors B "2.6.4.3.80" "id-att-certificate-selectors"
Content B "2.6.4.3.1" "id-att-content"
ContentCorrelator B "2.6.4.3.3" "id-att-content-correlator"
ContentIdentifier B "2.6.4.3.4" "id-att-content-identifier"
ContentIntegrityCheck B "2.6.4.3.5" "id-att-content-inetgrity-check"
ContentLength B "2.6.4.3.6" "id-att-content-length"
ExtendedContentType B "2.6.4.3.8" "id-att-content-type"
ConversionWithLossProhibited B "2.6.4.3.9" "id-att-conversion-with-loss-prohibited"
DeferredDeliveryTime B "2.6.4.3.51" "id-att-deferred-delivery-time"
DeliveryFlags B "2.6.4.3.13" "id-att-delivery-flags"
ORName B "2.6.4.3.78" "id-att-dl-exempted-recipients"
DLExpansion B "2.6.4.3.14" "id-att-dl-expansion-history"
DLExpansionProhibited B "2.6.4.3.53" "id-att-dl-expansion-prohibited"
CertificateSelectors B "2.6.4.3.80" "id-att-certificate-selectors"
Content B "2.6.4.3.1" "id-att-content"
ContentCorrelator B "2.6.4.3.3" "id-att-content-correlator"
ContentIdentifier B "2.6.4.3.4" "id-att-content-identifier"
ContentIntegrityCheck B "2.6.4.3.5" "id-att-content-inetgrity-check"
ContentLength B "2.6.4.3.6" "id-att-content-length"
ExtendedContentType B "2.6.4.3.8" "id-att-content-type"
ConversionWithLossProhibited B "2.6.4.3.9" "id-att-conversion-with-loss-prohibited"
DeferredDeliveryTime B "2.6.4.3.51" "id-att-deferred-delivery-time"
DeliveryFlags B "2.6.4.3.13" "id-att-delivery-flags"
ORName B "2.6.4.3.78" "id-att-dl-exempted-recipients"
DLExpansion B "2.6.4.3.14" "id-att-dl-expansion-history"
DLExpansionProhibited B "2.6.4.3.53" "id-att-dl-expansion-prohibited"
InternalTraceInformationElement B "2.6.4.3.54" "id-att-internal-trace-information"
LatestDeliveryTime B "2.6.4.3.55" "id-att-latest-delivery-time"
MessageDeliveryEnvelope B "2.6.4.3.18" "id-att-message-delivery-envelope"
MessageDeliveryTime B "2.6.4.3.20" "id-att-message-delivery-time"
MTSIdentifier B "2.6.4.3.19" "id-att-message-identifier"
LatestDeliveryTime B "2.6.4.3.55" "id-att-latest-delivery-time"
MessageDeliveryEnvelope B "2.6.4.3.18" "id-att-message-delivery-envelope"
MessageDeliveryTime B "2.6.4.3.20" "id-att-message-delivery-time"
MTSIdentifier B "2.6.4.3.19" "id-att-message-identifier"
MessageOriginAuthenticationCheck B "2.6.4.3.21" "id-at-message-orgin-authentication-check"
MessageSecurityLabel B "2.6.4.3.22" "id-att-message-security-label"
MessageSubmissionEnvelope B "2.6.4.3.59" "id-att-message-submission-envelope"
MessageSubmissionTime B "2.6.4.3.23" "id-att-message-submission-time"
MessageToken B "2.6.4.3.24" "id-att-message-token"
ExtendedCertificates B "2.6.4.3.81" "id-att-multiple-originator-certificates"
ORName B "2.6.4.3.17" "id-att-originally-intended-recipient-name"
OriginatingMTACertificate B "2.6.4.3.62" "id-att-originating-MTA-certificate"
OriginatorCertificate B "2.6.4.3.26" "id-att-originator-certificate"
ORName B "2.6.4.3.27" "id-att-originator-name"
OriginatorReportRequest B "2.6.4.3.63" "id-att-originator-report-request"
OriginatorReturnAddress B "2.6.4.3.64" "id-att-originator-return-address"
ORName B "2.6.4.3.28" "id-att-other-recipient-names"
PerMessageIndicators B "2.6.4.3.65" "id-att-per-message-indicators"
MessageSecurityLabel B "2.6.4.3.22" "id-att-message-security-label"
MessageSubmissionEnvelope B "2.6.4.3.59" "id-att-message-submission-envelope"
MessageSubmissionTime B "2.6.4.3.23" "id-att-message-submission-time"
MessageToken B "2.6.4.3.24" "id-att-message-token"
ExtendedCertificates B "2.6.4.3.81" "id-att-multiple-originator-certificates"
ORName B "2.6.4.3.17" "id-att-originally-intended-recipient-name"
OriginatingMTACertificate B "2.6.4.3.62" "id-att-originating-MTA-certificate"
OriginatorCertificate B "2.6.4.3.26" "id-att-originator-certificate"
ORName B "2.6.4.3.27" "id-att-originator-name"
OriginatorReportRequest B "2.6.4.3.63" "id-att-originator-report-request"
OriginatorReturnAddress B "2.6.4.3.64" "id-att-originator-return-address"
ORName B "2.6.4.3.28" "id-att-other-recipient-names"
PerMessageIndicators B "2.6.4.3.65" "id-att-per-message-indicators"
PerRecipientMessageSubmissionFields B "2.6.4.3.66" "id-att-per-recipient-message-submission-fields"
PerRecipientProbeSubmissionFields B "2.6.4.3.67" "id-att-per-recipient-probe-submission-fields"
PerRecipientReportDeliveryFields B "2.6.4.3.30" "id-att-per-recipient-report-delivery-fields"
Priority B "2.6.4.3.31" "id-att-priority"
Priority B "2.6.4.3.31" "id-att-priority"
ProbeOriginAuthenticationCheck B "2.6.4.3.68" "id-att-probe-origin-authentication-check"
ProbeSubmissionEnvelope B "2.6.4.3.69" "id-att-probe-submission-envelope"
ProofOfDeliveryRequest B "2.6.4.3.32" "id-att-proof-of-delivery-request"
ProofOfSubmission B "2.6.4.3.70" "id-att-proof-of-submission"
ExtendedCertificates B "2.6.4.3.82" "id-att-recipient-certificate"
ORName B "2.6.4.3.71" "id-att-recipient-names"
ProbeSubmissionEnvelope B "2.6.4.3.69" "id-att-probe-submission-envelope"
ProofOfDeliveryRequest B "2.6.4.3.32" "id-att-proof-of-delivery-request"
ProofOfSubmission B "2.6.4.3.70" "id-att-proof-of-submission"
ExtendedCertificates B "2.6.4.3.82" "id-att-recipient-certificate"
ORName B "2.6.4.3.71" "id-att-recipient-names"
RecipientReassignmentProhibited B "2.6.4.3.72" "id-att-recipient-reassignment-prohibited"
Redirection B "2.6.4.3.33" "id-at-redirection-history"
ReportDeliveryEnvelope B "2.6.4.3.34" "id-att-report-delivery-envelope"
ReportingDLName B "2.6.4.3.35" "id-att-reporting-DL-name"
ReportingMTACertificate B "2.6.4.3.36" "id-att-reporting-MTA-certificate"
Redirection B "2.6.4.3.33" "id-at-redirection-history"
ReportDeliveryEnvelope B "2.6.4.3.34" "id-att-report-delivery-envelope"
ReportingDLName B "2.6.4.3.35" "id-att-reporting-DL-name"
ReportingMTACertificate B "2.6.4.3.36" "id-att-reporting-MTA-certificate"
ReportOriginAuthenticationCheck B "2.6.4.3.37" "id-att-report-origin-authentication-check"
SecurityClassification B "2.6.4.3.38" "id-att-security-classification"
SubjectSubmissionIdentifier B "2.6.4.3.40" "id-att-subject-submission-identifier"
ORName B "2.6.4.3.41" "id-att-this-recipient-name"
TraceInformationElement B "2.6.4.3.75" "id-att-trace-information"
SecurityClassification B "2.6.4.3.38" "id-att-security-classification"
SubjectSubmissionIdentifier B "2.6.4.3.40" "id-att-subject-submission-identifier"
ORName B "2.6.4.3.41" "id-att-this-recipient-name"
TraceInformationElement B "2.6.4.3.75" "id-att-trace-information"
# IPMSMessageStoreAttributes - see master list in x420.cnf
MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
#.FN_BODY AdditionalInformation
proto_item *item = NULL;

View File

@ -174,6 +174,33 @@ static int hf_x411_PDSName_PDU = -1; /* PDSName */
static int hf_x411_PhysicalDeliveryCountryName_PDU = -1; /* PhysicalDeliveryCountryName */
static int hf_x411_PostalCode_PDU = -1; /* PostalCode */
static int hf_x411_PhysicalDeliveryOfficeName_PDU = -1; /* PhysicalDeliveryOfficeName */
static int hf_x411_UniversalPhysicalDeliveryOfficeName_PDU = -1; /* UniversalPhysicalDeliveryOfficeName */
static int hf_x411_PhysicalDeliveryOfficeNumber_PDU = -1; /* PhysicalDeliveryOfficeNumber */
static int hf_x411_UniversalPhysicalDeliveryOfficeNumber_PDU = -1; /* UniversalPhysicalDeliveryOfficeNumber */
static int hf_x411_ExtensionORAddressComponents_PDU = -1; /* ExtensionORAddressComponents */
static int hf_x411_UniversalExtensionORAddressComponents_PDU = -1; /* UniversalExtensionORAddressComponents */
static int hf_x411_PhysicalDeliveryPersonalName_PDU = -1; /* PhysicalDeliveryPersonalName */
static int hf_x411_UniversalPhysicalDeliveryPersonalName_PDU = -1; /* UniversalPhysicalDeliveryPersonalName */
static int hf_x411_PhysicalDeliveryOrganizationName_PDU = -1; /* PhysicalDeliveryOrganizationName */
static int hf_x411_UniversalPhysicalDeliveryOrganizationName_PDU = -1; /* UniversalPhysicalDeliveryOrganizationName */
static int hf_x411_ExtensionPhysicalDeliveryAddressComponents_PDU = -1; /* ExtensionPhysicalDeliveryAddressComponents */
static int hf_x411_UniversalExtensionPhysicalDeliveryAddressComponents_PDU = -1; /* UniversalExtensionPhysicalDeliveryAddressComponents */
static int hf_x411_UnformattedPostalAddress_PDU = -1; /* UnformattedPostalAddress */
static int hf_x411_UniversalUnformattedPostalAddress_PDU = -1; /* UniversalUnformattedPostalAddress */
static int hf_x411_StreetAddress_PDU = -1; /* StreetAddress */
static int hf_x411_UniversalStreetAddress_PDU = -1; /* UniversalStreetAddress */
static int hf_x411_PostOfficeBoxAddress_PDU = -1; /* PostOfficeBoxAddress */
static int hf_x411_UniversalPostOfficeBoxAddress_PDU = -1; /* UniversalPostOfficeBoxAddress */
static int hf_x411_PosteRestanteAddress_PDU = -1; /* PosteRestanteAddress */
static int hf_x411_UniversalPosteRestanteAddress_PDU = -1; /* UniversalPosteRestanteAddress */
static int hf_x411_UniquePostalName_PDU = -1; /* UniquePostalName */
static int hf_x411_UniversalUniquePostalName_PDU = -1; /* UniversalUniquePostalName */
static int hf_x411_LocalPostalAttributes_PDU = -1; /* LocalPostalAttributes */
static int hf_x411_UniversalLocalPostalAttributes_PDU = -1; /* UniversalLocalPostalAttributes */
static int hf_x411_ExtendedNetworkAddress_PDU = -1; /* ExtendedNetworkAddress */
static int hf_x411_TerminalType_PDU = -1; /* TerminalType */
static int hf_x411_TeletexDomainDefinedAttributes_PDU = -1; /* TeletexDomainDefinedAttributes */
static int hf_x411_UniversalDomainDefinedAttributes_PDU = -1; /* UniversalDomainDefinedAttributes */
static int hf_x411_ExtendedEncodedInformationType_PDU = -1; /* ExtendedEncodedInformationType */
static int hf_x411_MTANameAndOptionalGDI_PDU = -1; /* MTANameAndOptionalGDI */
static int hf_x411_AsymmetricToken_PDU = -1; /* AsymmetricToken */
@ -801,7 +828,7 @@ dissect_x411_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
static int
dissect_x411_MTAName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 470 "x411.cnf"
#line 507 "x411.cnf"
tvbuff_t *mtaname = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
@ -882,7 +909,7 @@ dissect_x411_TokenTypeIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
static int
dissect_x411_TokenTypeData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 828 "x411.cnf"
#line 865 "x411.cnf"
if(object_identifier_id)
call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
@ -995,7 +1022,7 @@ static const ber_choice_t Credentials_choice[] = {
int
dissect_x411_Credentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 836 "x411.cnf"
#line 873 "x411.cnf"
gint credentials = -1;
offset = dissect_ber_choice(actx, tree, tvb, offset,
@ -1047,7 +1074,7 @@ static const value_string x411_SecurityClassification_vals[] = {
static int
dissect_x411_SecurityClassification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
NULL);
NULL);
return offset;
}
@ -1076,7 +1103,7 @@ dissect_x411_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
static int
dissect_x411_CategoryValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 360 "x411.cnf"
#line 397 "x411.cnf"
offset = dissect_unknown_ber(actx->pinfo, tvb, offset, tree);
@ -1240,10 +1267,10 @@ static const value_string x411_MTABindError_vals[] = {
static int
dissect_x411_MTABindError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 819 "x411.cnf"
#line 856 "x411.cnf"
int error = -1;
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
&error);
&error);
if((error != -1) && check_col(actx->pinfo->cinfo, COL_INFO))
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%s)", val_to_str(error, x411_MTABindError_vals, "error(%d)"));
@ -1257,7 +1284,7 @@ dissect_x411_MTABindError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
static int
dissect_x411_AddrNumericString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 581 "x411.cnf"
#line 618 "x411.cnf"
tvbuff_t *nstring = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_NumericString,
@ -1277,7 +1304,7 @@ dissect_x411_AddrNumericString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
static int
dissect_x411_AddrPrintableString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 570 "x411.cnf"
#line 607 "x411.cnf"
tvbuff_t *nstring = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
@ -1319,7 +1346,7 @@ dissect_x411_CountryName_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
static int
dissect_x411_CountryName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 387 "x411.cnf"
#line 424 "x411.cnf"
if(doing_address)
g_strlcat(oraddress, "/C=", MAX_ORA_STR_LEN);
@ -1359,7 +1386,7 @@ dissect_x411_AdministrationDomainName_U(gboolean implicit_tag _U_, tvbuff_t *tvb
static int
dissect_x411_AdministrationDomainName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 394 "x411.cnf"
#line 431 "x411.cnf"
if(doing_address)
g_strlcat(oraddress, "/A=", MAX_ORA_STR_LEN);
@ -1388,7 +1415,7 @@ static const ber_choice_t PrivateDomainIdentifier_choice[] = {
static int
dissect_x411_PrivateDomainIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 521 "x411.cnf"
#line 558 "x411.cnf"
if(doing_address)
g_strlcat(oraddress, "/P=", MAX_ORA_STR_LEN);
@ -1423,7 +1450,7 @@ dissect_x411_GlobalDomainIdentifier_U(gboolean implicit_tag _U_, tvbuff_t *tvb _
static int
dissect_x411_GlobalDomainIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 699 "x411.cnf"
#line 736 "x411.cnf"
oraddress = ep_alloc(MAX_ORA_STR_LEN); oraddress[0] = '\0';
address_item = tree;
@ -1450,7 +1477,7 @@ dissect_x411_GlobalDomainIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
static int
dissect_x411_LocalIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 718 "x411.cnf"
#line 755 "x411.cnf"
tvbuff_t *id = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
@ -1490,7 +1517,7 @@ dissect_x411_MTSIdentifier_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
static int
dissect_x411_MTSIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 731 "x411.cnf"
#line 768 "x411.cnf"
doing_address = TRUE;
@ -1516,7 +1543,7 @@ dissect_x411_MTSIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
static int
dissect_x411_MessageIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 693 "x411.cnf"
#line 730 "x411.cnf"
address_item = NULL;
@ -1532,7 +1559,7 @@ dissect_x411_MessageIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
static int
dissect_x411_X121Address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 490 "x411.cnf"
#line 527 "x411.cnf"
tvbuff_t *string = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_NumericString,
@ -1564,7 +1591,7 @@ dissect_x411_NetworkAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
static int
dissect_x411_TerminalIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 504 "x411.cnf"
#line 541 "x411.cnf"
tvbuff_t *string = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
@ -1597,7 +1624,7 @@ static const ber_choice_t PrivateDomainName_choice[] = {
static int
dissect_x411_PrivateDomainName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 514 "x411.cnf"
#line 551 "x411.cnf"
if(doing_address)
g_strlcat(oraddress, "/P=", MAX_ORA_STR_LEN);
@ -1616,7 +1643,7 @@ dissect_x411_PrivateDomainName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
static int
dissect_x411_OrganizationName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 531 "x411.cnf"
#line 568 "x411.cnf"
tvbuff_t *string = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
@ -1649,7 +1676,7 @@ dissect_x411_NumericUserIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
static int
dissect_x411_T_printable_surname(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 601 "x411.cnf"
#line 638 "x411.cnf"
tvbuff_t *pstring = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
@ -1670,7 +1697,7 @@ dissect_x411_T_printable_surname(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
static int
dissect_x411_T_printable_given_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 610 "x411.cnf"
#line 647 "x411.cnf"
tvbuff_t *pstring = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
@ -1691,7 +1718,7 @@ dissect_x411_T_printable_given_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
static int
dissect_x411_T_printable_initials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 619 "x411.cnf"
#line 656 "x411.cnf"
tvbuff_t *pstring = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
@ -1712,7 +1739,7 @@ dissect_x411_T_printable_initials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
static int
dissect_x411_T_printable_generation_qualifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 628 "x411.cnf"
#line 665 "x411.cnf"
tvbuff_t *pstring = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
@ -1751,7 +1778,7 @@ dissect_x411_PersonalName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
static int
dissect_x411_OrganizationalUnitName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 544 "x411.cnf"
#line 581 "x411.cnf"
tvbuff_t *string = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
@ -1798,7 +1825,7 @@ static const ber_sequence_t BuiltInStandardAttributes_sequence[] = {
static int
dissect_x411_BuiltInStandardAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 755 "x411.cnf"
#line 792 "x411.cnf"
address_item = tree;
@ -1815,7 +1842,7 @@ dissect_x411_BuiltInStandardAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb
static int
dissect_x411_T_printable_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 638 "x411.cnf"
#line 675 "x411.cnf"
tvbuff_t *pstring = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
@ -1838,7 +1865,7 @@ dissect_x411_T_printable_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
static int
dissect_x411_T_printable_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 649 "x411.cnf"
#line 686 "x411.cnf"
tvbuff_t *pstring = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
@ -1868,7 +1895,7 @@ static const ber_sequence_t BuiltInDomainDefinedAttribute_sequence[] = {
static int
dissect_x411_BuiltInDomainDefinedAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 662 "x411.cnf"
#line 699 "x411.cnf"
ddatype = ep_alloc(MAX_ORA_STR_LEN); ddatype[0] = '\0';
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
@ -1942,7 +1969,7 @@ static const value_string x411_ExtensionAttributeType_vals[] = {
static int
dissect_x411_ExtensionAttributeType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
&extension_id);
&extension_id);
return offset;
}
@ -1951,7 +1978,7 @@ dissect_x411_ExtensionAttributeType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
static int
dissect_x411_T_extension_attribute_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 367 "x411.cnf"
#line 404 "x411.cnf"
proto_item_append_text(tree, " (%s)", val_to_str(extension_id, x411_ExtensionAttributeType_vals, "extension-attribute-type %d"));
if (dissector_try_port(x411_extension_attribute_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
@ -2022,7 +2049,7 @@ dissect_x411_ORName_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
int
dissect_x411_ORName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 680 "x411.cnf"
#line 717 "x411.cnf"
oraddress = ep_alloc(MAX_ORA_STR_LEN); oraddress[0] = '\0';
address_item = NULL;
@ -2222,11 +2249,11 @@ static const value_string x411_BuiltInContentType_U_vals[] = {
static int
dissect_x411_BuiltInContentType_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 427 "x411.cnf"
#line 464 "x411.cnf"
static guint32 ict = -1;
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
&ict);
&ict);
/* convert integer content type to oid for dispatch when the content is found */
@ -2261,7 +2288,7 @@ dissect_x411_BuiltInContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
int
dissect_x411_ExtendedContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 412 "x411.cnf"
#line 449 "x411.cnf"
const char *name = NULL;
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &content_type_id);
@ -2386,7 +2413,7 @@ dissect_x411_PerMessageIndicators(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
static int
dissect_x411_Time(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 798 "x411.cnf"
#line 835 "x411.cnf"
tvbuff_t *arrival = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_UTCTime,
@ -2452,7 +2479,7 @@ dissect_x411_T_bilateral_domain(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
static int
dissect_x411_T_bilateral_information(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 866 "x411.cnf"
#line 903 "x411.cnf"
proto_item *item = NULL;
int loffset = 0;
guint32 len = 0;
@ -2520,7 +2547,7 @@ static const value_string x411_RoutingAction_vals[] = {
static int
dissect_x411_RoutingAction(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 809 "x411.cnf"
#line 846 "x411.cnf"
int action = 0;
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
@ -2581,7 +2608,7 @@ static const ber_sequence_t DomainSuppliedInformation_set[] = {
static int
dissect_x411_DomainSuppliedInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 777 "x411.cnf"
#line 814 "x411.cnf"
doing_address = FALSE;
@ -2606,7 +2633,7 @@ static const ber_sequence_t TraceInformationElement_sequence[] = {
static int
dissect_x411_TraceInformationElement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 761 "x411.cnf"
#line 798 "x411.cnf"
doing_address = TRUE;
@ -2698,7 +2725,7 @@ static const value_string x411_StandardExtension_vals[] = {
static int
dissect_x411_StandardExtension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
&extension_id);
&extension_id);
return offset;
}
@ -2707,7 +2734,7 @@ dissect_x411_StandardExtension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
static int
dissect_x411_T_private_extension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 404 "x411.cnf"
#line 441 "x411.cnf"
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id);
@ -2761,7 +2788,7 @@ dissect_x411_Criticality(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
static int
dissect_x411_ExtensionValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 336 "x411.cnf"
#line 373 "x411.cnf"
const char *name;
if(extension_id != -1) {
@ -2833,7 +2860,7 @@ dissect_x411_MTARecipientName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
static int
dissect_x411_OriginallySpecifiedRecipientNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
NULL);
NULL);
return offset;
}
@ -2879,7 +2906,7 @@ static const value_string x411_ExplicitConversion_vals[] = {
static int
dissect_x411_ExplicitConversion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
NULL);
NULL);
return offset;
}
@ -2944,7 +2971,7 @@ dissect_x411_MessageTransferEnvelope(gboolean implicit_tag _U_, tvbuff_t *tvb _U
int
dissect_x411_Content(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 445 "x411.cnf"
#line 482 "x411.cnf"
tvbuff_t *next_tvb;
/* we can do this now constructed octet strings are supported */
@ -3052,7 +3079,7 @@ dissect_x411_SubjectIntermediateTraceInformation(gboolean implicit_tag _U_, tvbu
static int
dissect_x411_AdditionalInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 318 "x411.cnf"
#line 355 "x411.cnf"
proto_item *item = NULL;
int loffset = 0;
guint32 len = 0;
@ -3106,7 +3133,7 @@ static const value_string x411_TypeOfMTSUser_vals[] = {
static int
dissect_x411_TypeOfMTSUser(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
NULL);
NULL);
return offset;
}
@ -3144,7 +3171,7 @@ const value_string x411_NonDeliveryReasonCode_vals[] = {
int
dissect_x411_NonDeliveryReasonCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
NULL);
NULL);
return offset;
}
@ -3237,7 +3264,7 @@ const value_string x411_NonDeliveryDiagnosticCode_vals[] = {
int
dissect_x411_NonDeliveryDiagnosticCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
NULL);
NULL);
return offset;
}
@ -3272,7 +3299,7 @@ static const ber_choice_t ReportType_choice[] = {
static int
dissect_x411_ReportType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 898 "x411.cnf"
#line 935 "x411.cnf"
gint report = -1;
offset = dissect_ber_choice(actx, tree, tvb, offset,
@ -3411,7 +3438,7 @@ dissect_x411_ProbeIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
int
dissect_x411_ContentLength(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
NULL);
NULL);
return offset;
}
@ -3497,7 +3524,7 @@ static const ber_choice_t MTS_APDU_choice[] = {
static int
dissect_x411_MTS_APDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 884 "x411.cnf"
#line 921 "x411.cnf"
gint apdu = -1;
offset = dissect_ber_choice(actx, tree, tvb, offset,
@ -3517,15 +3544,6 @@ dissect_x411_MTS_APDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
}
static int
dissect_x411_MTAOriginatorRequestedAlternateRecipient(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_x411_ORAddressAndOptionalDirectoryName(implicit_tag, tvb, offset, actx, tree, hf_index);
return offset;
}
static const value_string x411_T_attempted_vals[] = {
{ 0, "mta" },
{ 1, "domain" },
@ -3560,7 +3578,7 @@ static const ber_sequence_t MTASuppliedInformation_set[] = {
static int
dissect_x411_MTASuppliedInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 786 "x411.cnf"
#line 823 "x411.cnf"
doing_address = FALSE;
@ -3586,7 +3604,7 @@ static const ber_sequence_t InternalTraceInformationElement_sequence[] = {
static int
dissect_x411_InternalTraceInformationElement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 769 "x411.cnf"
#line 806 "x411.cnf"
doing_address = TRUE;
@ -3643,7 +3661,7 @@ dissect_x411_ObjectName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
static int
dissect_x411_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
NULL);
NULL);
return offset;
}
@ -3728,7 +3746,7 @@ static const value_string x411_MTSBindError_vals[] = {
static int
dissect_x411_MTSBindError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
NULL);
NULL);
return offset;
}
@ -4206,7 +4224,7 @@ const value_string x411_SecurityProblem_vals[] = {
int
dissect_x411_SecurityProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
NULL);
NULL);
return offset;
}
@ -4538,7 +4556,7 @@ static const value_string x411_RefusedArgument_vals[] = {
static int
dissect_x411_RefusedArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
NULL);
NULL);
return offset;
}
@ -4547,7 +4565,7 @@ dissect_x411_RefusedArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
static int
dissect_x411_T_refused_extension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 384 "x411.cnf"
#line 421 "x411.cnf"
/*XXX not implemented yet */
@ -4589,7 +4607,7 @@ static const value_string x411_RefusalReason_vals[] = {
static int
dissect_x411_RefusalReason(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
NULL);
NULL);
return offset;
}
@ -4611,24 +4629,6 @@ dissect_x411_RefusedOperation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
static int
dissect_x411_ProofOfDeliveryAlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_x509af_AlgorithmIdentifier(implicit_tag, tvb, offset, actx, tree, hf_index);
return offset;
}
static int
dissect_x411_DeliveryControls(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_x411_Controls(implicit_tag, tvb, offset, actx, tree, hf_index);
return offset;
}
static int
dissect_x411_UserName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_x411_ORAddressAndOptionalDirectoryName(implicit_tag, tvb, offset, actx, tree, hf_index);
@ -4928,7 +4928,7 @@ dissect_x411_T_standard_parameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
static int
dissect_x411_T_type_extensions_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 333 "x411.cnf"
#line 370 "x411.cnf"
/*XXX not implemented yet */
@ -5157,7 +5157,7 @@ static const value_string x411_RequestedDeliveryMethod_item_vals[] = {
static int
dissect_x411_RequestedDeliveryMethod_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
NULL);
NULL);
return offset;
}
@ -5241,7 +5241,7 @@ static const value_string x411_RegisteredMailType_vals[] = {
static int
dissect_x411_RegisteredMailType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
NULL);
NULL);
return offset;
}
@ -5276,7 +5276,7 @@ static const ber_sequence_t ORAddress_sequence[] = {
int
dissect_x411_ORAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 667 "x411.cnf"
#line 704 "x411.cnf"
oraddress = ep_alloc(MAX_ORA_STR_LEN); oraddress[0] = '\0';
doing_address = TRUE;
@ -5318,7 +5318,7 @@ static const value_string x411_PhysicalDeliveryReportRequest_vals[] = {
static int
dissect_x411_PhysicalDeliveryReportRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
NULL);
NULL);
return offset;
}
@ -5361,15 +5361,6 @@ dissect_x411_ContentIntegrityCheck(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
static int
dissect_x411_ContentIntegrityAlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_x509af_AlgorithmIdentifier(implicit_tag, tvb, offset, actx, tree, hf_index);
return offset;
}
int
dissect_x411_MessageOriginAuthenticationCheck(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_x411_Signature(implicit_tag, tvb, offset, actx, tree, hf_index);
@ -5379,15 +5370,6 @@ dissect_x411_MessageOriginAuthenticationCheck(gboolean implicit_tag _U_, tvbuff_
static int
dissect_x411_MessageOriginAuthenticationAlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_x509af_AlgorithmIdentifier(implicit_tag, tvb, offset, actx, tree, hf_index);
return offset;
}
int
dissect_x411_MessageSecurityLabel(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_x411_SecurityLabel(implicit_tag, tvb, offset, actx, tree, hf_index);
@ -5459,15 +5441,6 @@ dissect_x411_ProbeOriginAuthenticationCheck(gboolean implicit_tag _U_, tvbuff_t
}
static int
dissect_x411_ProbeOriginAuthenticationAlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_x509af_AlgorithmIdentifier(implicit_tag, tvb, offset, actx, tree, hf_index);
return offset;
}
static const ber_sequence_t IntendedRecipientName_sequence[] = {
{ &hf_x411_intended_recipient, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_x411_ORAddressAndOptionalDirectoryName },
{ &hf_x411_redirection_time, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_x411_Time },
@ -5622,15 +5595,6 @@ dissect_x411_ReportOriginAuthenticationCheck(gboolean implicit_tag _U_, tvbuff_t
}
static int
dissect_x411_ReportOriginAuthenticationAlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_x509af_AlgorithmIdentifier(implicit_tag, tvb, offset, actx, tree, hf_index);
return offset;
}
static const ber_sequence_t PerRecipientDeliveryReportFields_sequence[] = {
{ &hf_x411_message_delivery_time, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_x411_MessageDeliveryTime },
{ &hf_x411_type_of_MTS_user, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_x411_TypeOfMTSUser },
@ -5803,7 +5767,7 @@ dissect_x411_CertificateSelectors(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
static int
dissect_x411_CommonName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 557 "x411.cnf"
#line 594 "x411.cnf"
tvbuff_t *string = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
@ -5924,7 +5888,7 @@ dissect_x411_UniversalOrganizationName(gboolean implicit_tag _U_, tvbuff_t *tvb
static int
dissect_x411_AddrTeletexString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 592 "x411.cnf"
#line 629 "x411.cnf"
tvbuff_t *tstring = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString,
@ -6398,7 +6362,7 @@ static const value_string x411_TerminalType_vals[] = {
static int
dissect_x411_TerminalType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
NULL);
NULL);
return offset;
}
@ -6483,7 +6447,7 @@ static const ber_sequence_t MTANameAndOptionalGDI_sequence[] = {
static int
dissect_x411_MTANameAndOptionalGDI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 746 "x411.cnf"
#line 783 "x411.cnf"
doing_address = TRUE;
@ -6534,7 +6498,7 @@ static const value_string x411_TokenDataType_vals[] = {
static int
dissect_x411_TokenDataType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
&extension_id);
&extension_id);
return offset;
}
@ -6543,7 +6507,7 @@ dissect_x411_TokenDataType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
static int
dissect_x411_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 850 "x411.cnf"
#line 887 "x411.cnf"
proto_item_append_text(tree, " (%s)", val_to_str(extension_id, x411_TokenDataType_vals, "tokendata-type %d"));
if (dissector_try_port(x411_tokendata_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
@ -7117,6 +7081,141 @@ static void dissect_PhysicalDeliveryOfficeName_PDU(tvbuff_t *tvb _U_, packet_inf
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_PhysicalDeliveryOfficeName(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_PhysicalDeliveryOfficeName_PDU);
}
static void dissect_UniversalPhysicalDeliveryOfficeName_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_UniversalPhysicalDeliveryOfficeName(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_UniversalPhysicalDeliveryOfficeName_PDU);
}
static void dissect_PhysicalDeliveryOfficeNumber_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_PhysicalDeliveryOfficeNumber(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_PhysicalDeliveryOfficeNumber_PDU);
}
static void dissect_UniversalPhysicalDeliveryOfficeNumber_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_UniversalPhysicalDeliveryOfficeNumber(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_UniversalPhysicalDeliveryOfficeNumber_PDU);
}
static void dissect_ExtensionORAddressComponents_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_ExtensionORAddressComponents(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_ExtensionORAddressComponents_PDU);
}
static void dissect_UniversalExtensionORAddressComponents_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_UniversalExtensionORAddressComponents(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_UniversalExtensionORAddressComponents_PDU);
}
static void dissect_PhysicalDeliveryPersonalName_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_PhysicalDeliveryPersonalName(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_PhysicalDeliveryPersonalName_PDU);
}
static void dissect_UniversalPhysicalDeliveryPersonalName_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_UniversalPhysicalDeliveryPersonalName(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_UniversalPhysicalDeliveryPersonalName_PDU);
}
static void dissect_PhysicalDeliveryOrganizationName_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_PhysicalDeliveryOrganizationName(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_PhysicalDeliveryOrganizationName_PDU);
}
static void dissect_UniversalPhysicalDeliveryOrganizationName_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_UniversalPhysicalDeliveryOrganizationName(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_UniversalPhysicalDeliveryOrganizationName_PDU);
}
static void dissect_ExtensionPhysicalDeliveryAddressComponents_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_ExtensionPhysicalDeliveryAddressComponents(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_ExtensionPhysicalDeliveryAddressComponents_PDU);
}
static void dissect_UniversalExtensionPhysicalDeliveryAddressComponents_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_UniversalExtensionPhysicalDeliveryAddressComponents(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_UniversalExtensionPhysicalDeliveryAddressComponents_PDU);
}
static void dissect_UnformattedPostalAddress_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_UnformattedPostalAddress(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_UnformattedPostalAddress_PDU);
}
static void dissect_UniversalUnformattedPostalAddress_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_UniversalUnformattedPostalAddress(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_UniversalUnformattedPostalAddress_PDU);
}
static void dissect_StreetAddress_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_StreetAddress(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_StreetAddress_PDU);
}
static void dissect_UniversalStreetAddress_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_UniversalStreetAddress(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_UniversalStreetAddress_PDU);
}
static void dissect_PostOfficeBoxAddress_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_PostOfficeBoxAddress(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_PostOfficeBoxAddress_PDU);
}
static void dissect_UniversalPostOfficeBoxAddress_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_UniversalPostOfficeBoxAddress(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_UniversalPostOfficeBoxAddress_PDU);
}
static void dissect_PosteRestanteAddress_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_PosteRestanteAddress(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_PosteRestanteAddress_PDU);
}
static void dissect_UniversalPosteRestanteAddress_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_UniversalPosteRestanteAddress(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_UniversalPosteRestanteAddress_PDU);
}
static void dissect_UniquePostalName_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_UniquePostalName(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_UniquePostalName_PDU);
}
static void dissect_UniversalUniquePostalName_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_UniversalUniquePostalName(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_UniversalUniquePostalName_PDU);
}
static void dissect_LocalPostalAttributes_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_LocalPostalAttributes(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_LocalPostalAttributes_PDU);
}
static void dissect_UniversalLocalPostalAttributes_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_UniversalLocalPostalAttributes(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_UniversalLocalPostalAttributes_PDU);
}
static void dissect_ExtendedNetworkAddress_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_ExtendedNetworkAddress(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_ExtendedNetworkAddress_PDU);
}
static void dissect_TerminalType_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_TerminalType(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_TerminalType_PDU);
}
static void dissect_TeletexDomainDefinedAttributes_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_TeletexDomainDefinedAttributes(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_TeletexDomainDefinedAttributes_PDU);
}
static void dissect_UniversalDomainDefinedAttributes_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_x411_UniversalDomainDefinedAttributes(FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_UniversalDomainDefinedAttributes_PDU);
}
static void dissect_ExtendedEncodedInformationType_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
@ -7620,6 +7719,114 @@ void proto_register_x411(void) {
{ "PhysicalDeliveryOfficeName", "x411.PhysicalDeliveryOfficeName",
FT_NONE, BASE_NONE, NULL, 0,
"x411.PhysicalDeliveryOfficeName", HFILL }},
{ &hf_x411_UniversalPhysicalDeliveryOfficeName_PDU,
{ "UniversalPhysicalDeliveryOfficeName", "x411.UniversalPhysicalDeliveryOfficeName",
FT_NONE, BASE_NONE, NULL, 0,
"x411.UniversalPhysicalDeliveryOfficeName", HFILL }},
{ &hf_x411_PhysicalDeliveryOfficeNumber_PDU,
{ "PhysicalDeliveryOfficeNumber", "x411.PhysicalDeliveryOfficeNumber",
FT_NONE, BASE_NONE, NULL, 0,
"x411.PhysicalDeliveryOfficeNumber", HFILL }},
{ &hf_x411_UniversalPhysicalDeliveryOfficeNumber_PDU,
{ "UniversalPhysicalDeliveryOfficeNumber", "x411.UniversalPhysicalDeliveryOfficeNumber",
FT_NONE, BASE_NONE, NULL, 0,
"x411.UniversalPhysicalDeliveryOfficeNumber", HFILL }},
{ &hf_x411_ExtensionORAddressComponents_PDU,
{ "ExtensionORAddressComponents", "x411.ExtensionORAddressComponents",
FT_NONE, BASE_NONE, NULL, 0,
"x411.ExtensionORAddressComponents", HFILL }},
{ &hf_x411_UniversalExtensionORAddressComponents_PDU,
{ "UniversalExtensionORAddressComponents", "x411.UniversalExtensionORAddressComponents",
FT_NONE, BASE_NONE, NULL, 0,
"x411.UniversalExtensionORAddressComponents", HFILL }},
{ &hf_x411_PhysicalDeliveryPersonalName_PDU,
{ "PhysicalDeliveryPersonalName", "x411.PhysicalDeliveryPersonalName",
FT_NONE, BASE_NONE, NULL, 0,
"x411.PhysicalDeliveryPersonalName", HFILL }},
{ &hf_x411_UniversalPhysicalDeliveryPersonalName_PDU,
{ "UniversalPhysicalDeliveryPersonalName", "x411.UniversalPhysicalDeliveryPersonalName",
FT_NONE, BASE_NONE, NULL, 0,
"x411.UniversalPhysicalDeliveryPersonalName", HFILL }},
{ &hf_x411_PhysicalDeliveryOrganizationName_PDU,
{ "PhysicalDeliveryOrganizationName", "x411.PhysicalDeliveryOrganizationName",
FT_NONE, BASE_NONE, NULL, 0,
"x411.PhysicalDeliveryOrganizationName", HFILL }},
{ &hf_x411_UniversalPhysicalDeliveryOrganizationName_PDU,
{ "UniversalPhysicalDeliveryOrganizationName", "x411.UniversalPhysicalDeliveryOrganizationName",
FT_NONE, BASE_NONE, NULL, 0,
"x411.UniversalPhysicalDeliveryOrganizationName", HFILL }},
{ &hf_x411_ExtensionPhysicalDeliveryAddressComponents_PDU,
{ "ExtensionPhysicalDeliveryAddressComponents", "x411.ExtensionPhysicalDeliveryAddressComponents",
FT_NONE, BASE_NONE, NULL, 0,
"x411.ExtensionPhysicalDeliveryAddressComponents", HFILL }},
{ &hf_x411_UniversalExtensionPhysicalDeliveryAddressComponents_PDU,
{ "UniversalExtensionPhysicalDeliveryAddressComponents", "x411.UniversalExtensionPhysicalDeliveryAddressComponents",
FT_NONE, BASE_NONE, NULL, 0,
"x411.UniversalExtensionPhysicalDeliveryAddressComponents", HFILL }},
{ &hf_x411_UnformattedPostalAddress_PDU,
{ "UnformattedPostalAddress", "x411.UnformattedPostalAddress",
FT_NONE, BASE_NONE, NULL, 0,
"x411.UnformattedPostalAddress", HFILL }},
{ &hf_x411_UniversalUnformattedPostalAddress_PDU,
{ "UniversalUnformattedPostalAddress", "x411.UniversalUnformattedPostalAddress",
FT_NONE, BASE_NONE, NULL, 0,
"x411.UniversalUnformattedPostalAddress", HFILL }},
{ &hf_x411_StreetAddress_PDU,
{ "StreetAddress", "x411.StreetAddress",
FT_NONE, BASE_NONE, NULL, 0,
"x411.StreetAddress", HFILL }},
{ &hf_x411_UniversalStreetAddress_PDU,
{ "UniversalStreetAddress", "x411.UniversalStreetAddress",
FT_NONE, BASE_NONE, NULL, 0,
"x411.UniversalStreetAddress", HFILL }},
{ &hf_x411_PostOfficeBoxAddress_PDU,
{ "PostOfficeBoxAddress", "x411.PostOfficeBoxAddress",
FT_NONE, BASE_NONE, NULL, 0,
"x411.PostOfficeBoxAddress", HFILL }},
{ &hf_x411_UniversalPostOfficeBoxAddress_PDU,
{ "UniversalPostOfficeBoxAddress", "x411.UniversalPostOfficeBoxAddress",
FT_NONE, BASE_NONE, NULL, 0,
"x411.UniversalPostOfficeBoxAddress", HFILL }},
{ &hf_x411_PosteRestanteAddress_PDU,
{ "PosteRestanteAddress", "x411.PosteRestanteAddress",
FT_NONE, BASE_NONE, NULL, 0,
"x411.PosteRestanteAddress", HFILL }},
{ &hf_x411_UniversalPosteRestanteAddress_PDU,
{ "UniversalPosteRestanteAddress", "x411.UniversalPosteRestanteAddress",
FT_NONE, BASE_NONE, NULL, 0,
"x411.UniversalPosteRestanteAddress", HFILL }},
{ &hf_x411_UniquePostalName_PDU,
{ "UniquePostalName", "x411.UniquePostalName",
FT_NONE, BASE_NONE, NULL, 0,
"x411.UniquePostalName", HFILL }},
{ &hf_x411_UniversalUniquePostalName_PDU,
{ "UniversalUniquePostalName", "x411.UniversalUniquePostalName",
FT_NONE, BASE_NONE, NULL, 0,
"x411.UniversalUniquePostalName", HFILL }},
{ &hf_x411_LocalPostalAttributes_PDU,
{ "LocalPostalAttributes", "x411.LocalPostalAttributes",
FT_NONE, BASE_NONE, NULL, 0,
"x411.LocalPostalAttributes", HFILL }},
{ &hf_x411_UniversalLocalPostalAttributes_PDU,
{ "UniversalLocalPostalAttributes", "x411.UniversalLocalPostalAttributes",
FT_NONE, BASE_NONE, NULL, 0,
"x411.UniversalLocalPostalAttributes", HFILL }},
{ &hf_x411_ExtendedNetworkAddress_PDU,
{ "ExtendedNetworkAddress", "x411.ExtendedNetworkAddress",
FT_UINT32, BASE_DEC, VALS(x411_ExtendedNetworkAddress_vals), 0,
"x411.ExtendedNetworkAddress", HFILL }},
{ &hf_x411_TerminalType_PDU,
{ "TerminalType", "x411.TerminalType",
FT_INT32, BASE_DEC, VALS(x411_TerminalType_vals), 0,
"x411.TerminalType", HFILL }},
{ &hf_x411_TeletexDomainDefinedAttributes_PDU,
{ "TeletexDomainDefinedAttributes", "x411.TeletexDomainDefinedAttributes",
FT_UINT32, BASE_DEC, NULL, 0,
"x411.TeletexDomainDefinedAttributes", HFILL }},
{ &hf_x411_UniversalDomainDefinedAttributes_PDU,
{ "UniversalDomainDefinedAttributes", "x411.UniversalDomainDefinedAttributes",
FT_UINT32, BASE_DEC, NULL, 0,
"x411.UniversalDomainDefinedAttributes", HFILL }},
{ &hf_x411_ExtendedEncodedInformationType_PDU,
{ "ExtendedEncodedInformationType", "x411.ExtendedEncodedInformationType",
FT_OID, BASE_NONE, NULL, 0,
@ -9544,14 +9751,41 @@ void proto_reg_handoff_x411(void) {
dissector_add("x411.extension-attribute", 3, create_dissector_handle(dissect_TeletexOrganizationName_PDU, proto_x411));
dissector_add("x411.extension-attribute", 4, create_dissector_handle(dissect_TeletexPersonalName_PDU, proto_x411));
dissector_add("x411.extension-attribute", 5, create_dissector_handle(dissect_TeletexOrganizationalUnitNames_PDU, proto_x411));
dissector_add("x411.extension-attribute", 6, create_dissector_handle(dissect_TeletexDomainDefinedAttributes_PDU, proto_x411));
dissector_add("x411.extension-attribute", 7, create_dissector_handle(dissect_PDSName_PDU, proto_x411));
dissector_add("x411.extension-attribute", 8, create_dissector_handle(dissect_PhysicalDeliveryCountryName_PDU, proto_x411));
dissector_add("x411.extension-attribute", 9, create_dissector_handle(dissect_PostalCode_PDU, proto_x411));
dissector_add("x411.extension-attribute", 10, create_dissector_handle(dissect_PhysicalDeliveryOfficeName_PDU, proto_x411));
dissector_add("x411.extension-attribute", 11, create_dissector_handle(dissect_PhysicalDeliveryOfficeNumber_PDU, proto_x411));
dissector_add("x411.extension-attribute", 12, create_dissector_handle(dissect_ExtensionORAddressComponents_PDU, proto_x411));
dissector_add("x411.extension-attribute", 13, create_dissector_handle(dissect_PhysicalDeliveryPersonalName_PDU, proto_x411));
dissector_add("x411.extension-attribute", 14, create_dissector_handle(dissect_PhysicalDeliveryOrganizationName_PDU, proto_x411));
dissector_add("x411.extension-attribute", 15, create_dissector_handle(dissect_ExtensionPhysicalDeliveryAddressComponents_PDU, proto_x411));
dissector_add("x411.extension-attribute", 16, create_dissector_handle(dissect_UnformattedPostalAddress_PDU, proto_x411));
dissector_add("x411.extension-attribute", 17, create_dissector_handle(dissect_StreetAddress_PDU, proto_x411));
dissector_add("x411.extension-attribute", 18, create_dissector_handle(dissect_PostOfficeBoxAddress_PDU, proto_x411));
dissector_add("x411.extension-attribute", 19, create_dissector_handle(dissect_PosteRestanteAddress_PDU, proto_x411));
dissector_add("x411.extension-attribute", 20, create_dissector_handle(dissect_UniquePostalName_PDU, proto_x411));
dissector_add("x411.extension-attribute", 21, create_dissector_handle(dissect_LocalPostalAttributes_PDU, proto_x411));
dissector_add("x411.extension-attribute", 22, create_dissector_handle(dissect_ExtendedNetworkAddress_PDU, proto_x411));
dissector_add("x411.extension-attribute", 23, create_dissector_handle(dissect_TerminalType_PDU, proto_x411));
dissector_add("x411.extension-attribute", 24, create_dissector_handle(dissect_UniversalCommonName_PDU, proto_x411));
dissector_add("x411.extension-attribute", 25, create_dissector_handle(dissect_UniversalOrganizationName_PDU, proto_x411));
dissector_add("x411.extension-attribute", 26, create_dissector_handle(dissect_UniversalPersonalName_PDU, proto_x411));
dissector_add("x411.extension-attribute", 27, create_dissector_handle(dissect_UniversalOrganizationalUnitNames_PDU, proto_x411));
dissector_add("x411.extension-attribute", 28, create_dissector_handle(dissect_UniversalDomainDefinedAttributes_PDU, proto_x411));
dissector_add("x411.extension-attribute", 29, create_dissector_handle(dissect_UniversalPhysicalDeliveryOfficeName_PDU, proto_x411));
dissector_add("x411.extension-attribute", 30, create_dissector_handle(dissect_UniversalPhysicalDeliveryOfficeNumber_PDU, proto_x411));
dissector_add("x411.extension-attribute", 31, create_dissector_handle(dissect_UniversalExtensionORAddressComponents_PDU, proto_x411));
dissector_add("x411.extension-attribute", 32, create_dissector_handle(dissect_UniversalPhysicalDeliveryPersonalName_PDU, proto_x411));
dissector_add("x411.extension-attribute", 33, create_dissector_handle(dissect_UniversalPhysicalDeliveryOrganizationName_PDU, proto_x411));
dissector_add("x411.extension-attribute", 34, create_dissector_handle(dissect_UniversalExtensionPhysicalDeliveryAddressComponents_PDU, proto_x411));
dissector_add("x411.extension-attribute", 35, create_dissector_handle(dissect_UniversalUnformattedPostalAddress_PDU, proto_x411));
dissector_add("x411.extension-attribute", 36, create_dissector_handle(dissect_UniversalStreetAddress_PDU, proto_x411));
dissector_add("x411.extension-attribute", 37, create_dissector_handle(dissect_UniversalPostOfficeBoxAddress_PDU, proto_x411));
dissector_add("x411.extension-attribute", 38, create_dissector_handle(dissect_UniversalPosteRestanteAddress_PDU, proto_x411));
dissector_add("x411.extension-attribute", 39, create_dissector_handle(dissect_UniversalUniquePostalName_PDU, proto_x411));
dissector_add("x411.extension-attribute", 40, create_dissector_handle(dissect_UniversalLocalPostalAttributes_PDU, proto_x411));
register_ber_oid_dissector("2.6.1.4.14", dissect_ReportDeliveryArgument_PDU, proto_x411, "id-et-report");
register_ber_oid_dissector("2.6.3.6.0", dissect_AsymmetricToken_PDU, proto_x411, "id-tok-asymmetricToken");
register_ber_oid_dissector("2.6.5.6.0", dissect_MTANameAndOptionalGDI_PDU, proto_x411, "id-on-mtaName");