Update to:

* support the P3 protocol in addition to the P1 protocol; and 
* reduce the number of changes to the ASN.1 modules (as asn2wrs now handles more of the ASN.1 constructs).
P3 is currently only supported over ROS (and not RTSE)


svn path=/trunk/; revision=28593

1 files changed, 190 insertions, 213 deletions

diff --git a/asn1/x411/MTAAbstractService.asn b/asn1/x411/MTAAbstractService.asn
index 5c5802d5f2..ad28ceafdc 100644
--- a/asn1/x411/MTAAbstractService.asn
+++ b/asn1/x411/MTAAbstractService.asn
@@ -8,110 +8,94 @@ BEGIN
 --	Exports everything
 IMPORTS
   -- Remote Operations
---  CONNECTION-PACKAGE, CONTRACT
+  CONNECTION-PACKAGE, CONTRACT
     --==
---    FROM Remote-Operations-Information-Objects {joint-iso-itu-t
---      remote-operations(4) informationObjects(5) version1(0)}
+    FROM Remote-Operations-Information-Objects {joint-iso-itu-t
+      remote-operations(4) informationObjects(5) version1(0)}
   emptyUnbind
     --==
     FROM Remote-Operations-Useful-Definitions {joint-iso-itu-t
       remote-operations(4) useful-definitions(7) version1(0)}
   -- MTS Abstract Service Parameters
---  ABSTRACT-ERROR, ABSTRACT-OPERATION, administration, 
---    AdministrationDomainName,
---    certificate-selectors, certificate-selectors-override, Content,
---    ContentIdentifier, ContentLength, ContentType,
---    content-confidentiality-algorithm-identifier, content-correlator,
---    content-integrity-check, conversion-with-loss-prohibited,
---    ConvertedEncodedInformationTypes, CountryName, DeferredDeliveryTime,
---    delivery, dl-exempted-recipients, dl-expansion-history,
---    dl-expansion-prohibited, ExplicitConversion, EXTENSION, ExtensionField{},
---    GlobalDomainIdentifier, InitiatorCredentials, latest-delivery-time,
---    message-origin-authentication-check, message-security-label, message-token,
---    MHS-OBJECT, MTAName, MTSIdentifier, multiple-originator-certificates,
---    ORAddressAndOptionalDirectoryName, OriginalEncodedInformationTypes,
---    originator-and-DL-expansion-history, originator-certificate,
---    originator-return-address, PerMessageIndicators, physical-delivery-modes,
---    physical-delivery-report-request, physical-forwarding-address,
---    physical-forwarding-address-request, physical-forwarding-prohibited,
---    physical-rendition-attributes, PORT, Priority, PrivateDomainIdentifier,
---    PrivateExtensions, probe-origin-authentication-check, proof-of-delivery,
---    proof-of-delivery-request, recipient-certificate,
---    recipient-number-for-advice, recipient-reassignment-prohibited,
---    redirection-history, registered-mail-type, reporting-DL-name,
---    reporting-MTA-certificate, reporting-MTA-name, ReportType,
---    report-origin-authentication-check, requested-delivery-method,
---    ResponderCredentials, SecurityContext, submission,
---    SupplementaryInformation, Time
+  ABSTRACT-ERROR, ABSTRACT-OPERATION, administration, AdministrationDomainName,
+    certificate-selectors, certificate-selectors-override, Content,
+    ContentIdentifier, ContentLength, ContentType,
+    content-confidentiality-algorithm-identifier, content-correlator,
+    content-integrity-check, conversion-with-loss-prohibited,
+    ConvertedEncodedInformationTypes, CountryName, DeferredDeliveryTime,
+    delivery, dl-exempted-recipients, dl-expansion-history,
+    dl-expansion-prohibited, ExplicitConversion, EXTENSION, ExtensionField{},
+    GlobalDomainIdentifier, InitiatorCredentials, latest-delivery-time,
+    message-origin-authentication-check, message-security-label, message-token,
+    MHS-OBJECT, MTAName, MTSIdentifier, multiple-originator-certificates,
+    ORAddressAndOptionalDirectoryName, OriginalEncodedInformationTypes,
+    originator-and-DL-expansion-history, originator-certificate,
+    originator-return-address, PerMessageIndicators, physical-delivery-modes,
+    physical-delivery-report-request, physical-forwarding-address,
+    physical-forwarding-address-request, physical-forwarding-prohibited,
+    physical-rendition-attributes, PORT, Priority, PrivateDomainIdentifier,
+    PrivateExtensions, probe-origin-authentication-check, proof-of-delivery,
+    proof-of-delivery-request, recipient-certificate,
+    recipient-number-for-advice, recipient-reassignment-prohibited,
+    redirection-history, registered-mail-type, reporting-DL-name,
+    reporting-MTA-certificate, reporting-MTA-name, ReportType,
+    report-origin-authentication-check, requested-delivery-method,
+    ResponderCredentials, SecurityContext, submission,
+    SupplementaryInformation, Time, OriginallyIntendedRecipientName
     --==
---    FROM MTSAbstractService {joint-iso-itu-t mhs(6) mts(3) modules(0)
---      mts-abstract-service(1) version-1999(1)}
+    FROM MTSAbstractService {joint-iso-itu-t mhs(6) mts(3) modules(0)
+      mts-abstract-service(1) version-1999(1)}
   -- IPM Information Objects
   IPMPerRecipientEnvelopeExtensions
     --==
     FROM IPMSInformationObjects {joint-iso-itu-t mhs(6) ipms(1) modules(0)
       information-objects(2) version-1999(1)}
   -- Object Identifiers
---  id-cp-mta-connect, id-ct-mta-transfer, id-ot-mta, id-pt-transfer
+  id-cp-mta-connect, id-ct-mta-transfer, id-ot-mta, id-pt-transfer
     --==
---    FROM MTSObjectIdentifiers {joint-iso-itu-t mhs(6) mts(3) modules(0)
---      object-identifiers(0) version-1999(1)}
+    FROM MTSObjectIdentifiers {joint-iso-itu-t mhs(6) mts(3) modules(0)
+      object-identifiers(0) version-1999(1)}
   -- Upper Bounds
   ub-bit-options, ub-integer-options, ub-recipients, ub-transfers
     --==
     FROM MTSUpperBounds {joint-iso-itu-t mhs(6) mts(3) modules(0)
-      upper-bounds(3) version-1999(1)}
-  Name
-    --==
-    FROM InformationFramework {joint-iso-itu-t ds(5) module(1)
-      informationFramework(1) 3}
-  PresentationAddress
-    --==
-    FROM SelectedAttributeTypes {joint-iso-itu-t ds(5) module(1)
-      selectedAttributeTypes(5) 3}
-  CertificateAssertion
-    --==
-    FROM CertificateExtensions {joint-iso-itu-t ds(5) module(1)
-      certificateExtensions(26) 0}
-  Certificates, AlgorithmIdentifier
-    --==
-    FROM AuthenticationFramework {joint-iso-itu-t ds(5) module(1)
-      authenticationFramework(7) 3};
-
+      upper-bounds(3) version-1999(1)};
 
 --	Objects
---mta MHS-OBJECT ::= {BOTH  {mta-transfer}
---                    ID    id-ot-mta
---}
+mta MHS-OBJECT ::= {BOTH  {mta-transfer}
+                    ID    id-ot-mta
+}
 
 --	Contracts
---mta-transfer CONTRACT ::= {
---  CONNECTION     mta-connect
---  OPERATIONS OF  {transfer}
---  ID             id-ct-mta-transfer
---}
+mta-transfer CONTRACT ::= {
+  CONNECTION     mta-connect
+  OPERATIONS OF  {transfer}
+  ID             id-ct-mta-transfer
+}
 
 --	Connection package
---mta-connect CONNECTION-PACKAGE ::= {
---  BIND    mta-bind
---  UNBIND  mta-unbind
---  ID      id-cp-mta-connect
---}
+mta-connect CONNECTION-PACKAGE ::= {
+  BIND    mta-bind
+  UNBIND  mta-unbind
+  ID      id-cp-mta-connect
+}
 
 --	Ports
---transfer PORT ::= {
---  OPERATIONS  {message-transfer | probe-transfer | report-transfer}
---  ID          id-pt-transfer
---}
+PORT ::= OPERATION-PACKAGE
+
+transfer PORT ::= {
+  OPERATIONS  {message-transfer | probe-transfer | report-transfer}
+  ID          id-pt-transfer
+}
 
 --	MTA-bind and MTA-unbind
---mta-bind ABSTRACT-OPERATION ::= {
---  ARGUMENT  MTABindArgument
---  RESULT    MTABindResult
---  ERRORS    {mta-bind-error}
---}
+mta-bind ABSTRACT-OPERATION ::= {
+  ARGUMENT  MTABindArgument
+  RESULT    MTABindResult
+  ERRORS    {mta-bind-error}
+}
 
--- mta-unbind ABSTRACT-OPERATION ::= emptyUnbind
+mta-unbind ABSTRACT-OPERATION ::= emptyUnbind
 
 MTABindArgument ::= CHOICE {
   unauthenticated  NULL, -- if no authentication is required
@@ -136,13 +120,13 @@ MTABindResult ::= CHOICE {
                                                   [0]  MTAName,
                                                 responder-credentials
                                                   [1]  ResponderCredentials
---                                                         (WITH COMPONENTS {
---                                                            ...,
---                                                            protected  ABSENT
---                                                          })--}
+                                                         (WITH COMPONENTS {
+                                                            ...,
+                                                            protected  ABSENT
+                                                          })}
 }
-
---mta-bind-error ABSTRACT-ERROR -- MTABindError ::= -- {
+MTABindError ::= 
+--mta-bind-error ABSTRACT-ERROR ::= {
 --  PARAMETER
     INTEGER {busy(0), authentication-error(2), unacceptable-dialogue-mode(3),
              unacceptable-security-context(4),
@@ -150,20 +134,20 @@ MTABindResult ::= CHOICE {
 --}
 
 --	Transfer Port
---message-transfer ABSTRACT-OPERATION ::= {ARGUMENT  Message
---}
+message-transfer ABSTRACT-OPERATION ::= {ARGUMENT  Message
+}
 
---probe-transfer ABSTRACT-OPERATION ::= {ARGUMENT  Probe
---}
+probe-transfer ABSTRACT-OPERATION ::= {ARGUMENT  Probe
+}
 
---report-transfer ABSTRACT-OPERATION ::= {ARGUMENT  Report
---}
+report-transfer ABSTRACT-OPERATION ::= {ARGUMENT  Report
+}
 
--- taken from X.419
+-- 	MTS Application Protocol Data Units
 MTS-APDU ::= CHOICE {
-message	[0] Message,
-report [1] Report,
-probe [2] Probe
+  message 	[0]  Message,
+  probe  	[2]  Probe,
+  report	[1]  Report
 }
 
 Message ::= SEQUENCE {envelope  MessageTransferEnvelope,
@@ -179,46 +163,39 @@ Report ::= SEQUENCE {
 
 --	Message Transfer Envelope
 MessageTransferEnvelope ::= SET {
---  COMPONENTS OF PerMessageTransferFields,
---  per-recipient-fields
---    [2]  SEQUENCE SIZE (1..ub-recipients) OF PerRecipientMessageTransferFields
---}
+  COMPONENTS OF PerMessageTransferFields,
+  per-recipient-fields
+    [2]  SEQUENCE SIZE (1..ub-recipients) OF PerRecipientMessageTransferFields
+}
 
---PerMessageTransferFields ::= SET {
+PerMessageTransferFields ::= SET {
   message-identifier                  MessageIdentifier,
   originator-name                     MTAOriginatorName,
   original-encoded-information-types  OriginalEncodedInformationTypes OPTIONAL,
   content-type                        ContentType,
--- asn2wrs seems to have a problem with untagged choices - so we will expand 'in situ' for now
--- it's not the greatest solution - but should be OK
---  built-in-content-type			BuiltInContentType OPTIONAL,
---  extended-content-type			ExtendedContentType OPTIONAL,
--- end of workaround
   content-identifier                  ContentIdentifier OPTIONAL,
   priority                            Priority DEFAULT normal,
   per-message-indicators              PerMessageIndicators DEFAULT {},
   deferred-delivery-time              [0]  DeferredDeliveryTime OPTIONAL,
   per-domain-bilateral-information
-    [1]  SEQUENCE -- SIZE (1..ub-transfers) -- OF PerDomainBilateralInformation
+    [1]  SEQUENCE SIZE (1..ub-transfers) OF PerDomainBilateralInformation
       OPTIONAL,
   trace-information                   TraceInformation,
   extensions
-    [3]  SET OF ExtensionField --{{MessageTransferExtensions}}-- DEFAULT {}
-  ,per-recipient-fields
-    [2]  SEQUENCE --SIZE  (1..ub-recipients) -- OF PerRecipientMessageTransferFields
+    [3]  SET OF ExtensionField{{MessageTransferExtensions}} DEFAULT {}
 }
 
---MessageTransferExtensions EXTENSION ::=
-  --{- - May contain the following extensions, private extensions, and future standardised extensions,
+MessageTransferExtensions EXTENSION ::=
+  {-- May contain the following extensions, private extensions, and future standardised extensions,
    -- at most one instance of each extension type:
---   recipient-reassignment-prohibited | dl-expansion-prohibited |
---   conversion-with-loss-prohibited | latest-delivery-time |
---   originator-return-address | originator-certificate |
---   content-confidentiality-algorithm-identifier |
---   message-origin-authentication-check | message-security-label |
---   content-correlator | dl-exempted-recipients | certificate-selectors |
---   multiple-originator-certificates | dl-expansion-history |
---   internal-trace-information | PrivateExtensions, ...}
+   recipient-reassignment-prohibited | dl-expansion-prohibited |
+   conversion-with-loss-prohibited | latest-delivery-time |
+   originator-return-address | originator-certificate |
+   content-confidentiality-algorithm-identifier |
+   message-origin-authentication-check | message-security-label |
+   content-correlator | dl-exempted-recipients | certificate-selectors |
+   multiple-originator-certificates | dl-expansion-history |
+   internal-trace-information | PrivateExtensions, ...}
 
 PerRecipientMessageTransferFields ::= SET {
   recipient-name                         MTARecipientName,
@@ -227,29 +204,29 @@ PerRecipientMessageTransferFields ::= SET {
   per-recipient-indicators               [1]  PerRecipientIndicators,
   explicit-conversion                    [2]  ExplicitConversion OPTIONAL,
   extensions
-    [3]  SET OF ExtensionField --{{PerRecipientMessageTransferExtensions}}
+    [3]  SET OF ExtensionField{{PerRecipientMessageTransferExtensions}}
       DEFAULT {}
 }
 
---PerRecipientMessageTransferExtensions EXTENSION ::=
---  {- - May contain the following extensions, private extensions, and future standardised extensions,
+PerRecipientMessageTransferExtensions EXTENSION ::=
+  {-- May contain the following extensions, private extensions, and future standardised extensions,
    -- at most one instance of each extension type:
---   originator-requested-alternate-recipient | requested-delivery-method |
---   physical-forwarding-prohibited | physical-forwarding-address-request |
---   physical-delivery-modes | registered-mail-type | recipient-number-for-advice
---   | physical-rendition-attributes | physical-delivery-report-request |
---   message-token | content-integrity-check | proof-of-delivery-request |
---   certificate-selectors-override | recipient-certificate | redirection-history
---   | IPMPerRecipientEnvelopeExtensions | PrivateExtensions, ...}
+   originator-requested-alternate-recipient | requested-delivery-method |
+   physical-forwarding-prohibited | physical-forwarding-address-request |
+   physical-delivery-modes | registered-mail-type | recipient-number-for-advice
+   | physical-rendition-attributes | physical-delivery-report-request |
+   message-token | content-integrity-check | proof-of-delivery-request |
+   certificate-selectors-override | recipient-certificate | redirection-history
+   | IPMPerRecipientEnvelopeExtensions | PrivateExtensions, ...}
 
 --	Probe Transfer Envelope
 ProbeTransferEnvelope ::= SET {
---  COMPONENTS OF PerProbeTransferFields,
---  per-recipient-fields
---    [2]  SEQUENCE SIZE (1..ub-recipients) OF PerRecipientProbeTransferFields
---}
+  COMPONENTS OF PerProbeTransferFields,
+  per-recipient-fields
+    [2]  SEQUENCE SIZE (1..ub-recipients) OF PerRecipientProbeTransferFields
+}
 
---PerProbeTransferFields ::= SET {
+PerProbeTransferFields ::= SET {
   probe-identifier                    ProbeIdentifier,
   originator-name                     MTAOriginatorName,
   original-encoded-information-types  OriginalEncodedInformationTypes OPTIONAL,
@@ -258,23 +235,21 @@ ProbeTransferEnvelope ::= SET {
   content-length                      [0]  ContentLength OPTIONAL,
   per-message-indicators              PerMessageIndicators DEFAULT {},
   per-domain-bilateral-information
-    [1]  SEQUENCE -- SIZE (1..ub-transfers) -- OF PerDomainBilateralInformation
+    [1]  SEQUENCE SIZE (1..ub-transfers) OF PerDomainBilateralInformation
       OPTIONAL,
   trace-information                   TraceInformation,
   extensions
-    [3]  SET OF ExtensionField --{{ProbeTransferExtensions}}-- DEFAULT {}
-  ,per-recipient-fields
-    [2]  SEQUENCE -- SIZE (1..ub-recipients) -- OF PerRecipientProbeTransferFields
+    [3]  SET OF ExtensionField{{ProbeTransferExtensions}} DEFAULT {}
 }
 
---ProbeTransferExtensions EXTENSION ::=
---  {- - May contain the following extensions, private extensions, and future standardised extensions,
+ProbeTransferExtensions EXTENSION ::=
+  {-- May contain the following extensions, private extensions, and future standardised extensions,
    -- at most one instance of each extension type:
---   recipient-reassignment-prohibited | dl-expansion-prohibited |
---   conversion-with-loss-prohibited | originator-certificate |
---   message-security-label | content-correlator |
---   probe-origin-authentication-check | internal-trace-information |
---   PrivateExtensions, ...}
+   recipient-reassignment-prohibited | dl-expansion-prohibited |
+   conversion-with-loss-prohibited | originator-certificate |
+   message-security-label | content-correlator |
+   probe-origin-authentication-check | internal-trace-information |
+   PrivateExtensions, ...}
 
 PerRecipientProbeTransferFields ::= SET {
   recipient-name                         MTARecipientName,
@@ -283,16 +258,16 @@ PerRecipientProbeTransferFields ::= SET {
   per-recipient-indicators               [1]  PerRecipientIndicators,
   explicit-conversion                    [2]  ExplicitConversion OPTIONAL,
   extensions
-    [3]  SET OF ExtensionField --{{PerRecipientProbeTransferExtensions}}
+    [3]  SET OF ExtensionField{{PerRecipientProbeTransferExtensions}}
       DEFAULT {}
 }
 
---PerRecipientProbeTransferExtensions EXTENSION ::=
---  {- - May contain the following extensions, private extensions, and future standardised extensions,
+PerRecipientProbeTransferExtensions EXTENSION ::=
+  {-- May contain the following extensions, private extensions, and future standardised extensions,
    -- at most one instance of each extension type:
---   originator-requested-alternate-recipient | requested-delivery-method |
---   physical-rendition-attributes | redirection-history | PrivateExtensions, 
---   ...}
+   originator-requested-alternate-recipient | requested-delivery-method |
+   physical-rendition-attributes | redirection-history | PrivateExtensions, 
+   ...}
 
 --	Report Transfer Envelope
 ReportTransferEnvelope ::= SET {
@@ -300,26 +275,26 @@ ReportTransferEnvelope ::= SET {
   report-destination-name  ReportDestinationName,
   trace-information        TraceInformation,
   extensions
-    [1]  SET OF ExtensionField --{{ReportTransferEnvelopeExtensions}}-- DEFAULT {}
+    [1]  SET OF ExtensionField{{ReportTransferEnvelopeExtensions}} DEFAULT {}
 }
 
---ReportTransferEnvelopeExtensions EXTENSION ::=
---  {- - May contain the following extensions, private extensions, and future standardised extensions,
+ReportTransferEnvelopeExtensions EXTENSION ::=
+  {-- May contain the following extensions, private extensions, and future standardised extensions,
    -- at most one instance of each extension type:
---   message-security-label | redirection-history |
---   originator-and-DL-expansion-history | reporting-DL-name |
---   reporting-MTA-certificate | report-origin-authentication-check |
---   internal-trace-information | reporting-MTA-name | PrivateExtensions, 
---   ...}
+   message-security-label | redirection-history |
+   originator-and-DL-expansion-history | reporting-DL-name |
+   reporting-MTA-certificate | report-origin-authentication-check |
+   internal-trace-information | reporting-MTA-name | PrivateExtensions, 
+   ...}
 
 --	Report Transfer Content
 ReportTransferContent ::= SET {
---  COMPONENTS OF PerReportTransferFields,
---  per-recipient-fields
---    [0]  SEQUENCE SIZE (1..ub-recipients) OF PerRecipientReportTransferFields
---}
+  COMPONENTS OF PerReportTransferFields,
+  per-recipient-fields
+    [0]  SEQUENCE SIZE (1..ub-recipients) OF PerRecipientReportTransferFields
+}
 
---PerReportTransferFields ::= SET {
+PerReportTransferFields ::= SET {
   subject-identifier                      SubjectIdentifier,
   subject-intermediate-trace-information
     SubjectIntermediateTraceInformation OPTIONAL,
@@ -330,15 +305,13 @@ ReportTransferContent ::= SET {
   returned-content                        [1]  Content OPTIONAL,
   additional-information                  [2]  AdditionalInformation OPTIONAL,
   extensions
-    [3]  SET OF ExtensionField --{{ReportTransferContentExtensions}}-- DEFAULT {}
-  ,per-recipient-fields
-    [0]  SEQUENCE -- SIZE (1..ub-recipients) -- OF PerRecipientReportTransferFields
+    [3]  SET OF ExtensionField{{ReportTransferContentExtensions}} DEFAULT {}
 }
 
---ReportTransferContentExtensions EXTENSION ::=
---  {- - May contain the following extensions, private extensions, and future standardised extensions,
+ReportTransferContentExtensions EXTENSION ::=
+  {-- May contain the following extensions, private extensions, and future standardised extensions,
    -- at most one instance of each extension type:
---   content-correlator | PrivateExtensions, ...}
+   content-correlator | PrivateExtensions, ...}
 
 PerRecipientReportTransferFields ::= SET {
   actual-recipient-name                  [0]  MTAActualRecipientName,
@@ -347,36 +320,45 @@ PerRecipientReportTransferFields ::= SET {
   per-recipient-indicators               [2]  PerRecipientIndicators,
   last-trace-information                 [3]  LastTraceInformation,
   originally-intended-recipient-name
-    [4]  MTAOriginallyIntendedRecipientName OPTIONAL,
+    [4]  OriginallyIntendedRecipientName OPTIONAL,
   supplementary-information              [5]  SupplementaryInformation OPTIONAL,
   extensions
-    [6]  SET OF ExtensionField --{{PerRecipientReportTransferExtensions}}
+    [6]  SET OF ExtensionField{{PerRecipientReportTransferExtensions}}
       DEFAULT {}
 }
 
---PerRecipientReportTransferExtensions EXTENSION ::=
---  {- - May contain the following extensions, private extensions, and future standardised extensions,
+PerRecipientReportTransferExtensions EXTENSION ::=
+  {-- May contain the following extensions, private extensions, and future standardised extensions,
    -- at most one instance of each extension type:
---   redirection-history | physical-forwarding-address | recipient-certificate |
---   proof-of-delivery | PrivateExtensions, ...}
+   redirection-history | physical-forwarding-address | recipient-certificate |
+   proof-of-delivery | PrivateExtensions, ...}
 
 --	Envelope & Report Content Fields
 MessageIdentifier ::= MTSIdentifier
 
 MTAOriginatorName ::= ORAddressAndOptionalDirectoryName
 
+BILATERAL ::= CLASS {&id    BilateralDomain UNIQUE,
+                     &Type  
+}WITH SYNTAX {&Type,
+              IDENTIFIED BY &id
+}
+
 PerDomainBilateralInformation ::= SEQUENCE {
 --  COMPONENTS OF BILATERAL.&id,
---  bilateral-information  BILATERAL.&Type
---}
+  country-name  CountryName,
+  domain
+    CHOICE {administration-domain-name  AdministrationDomainName,
+            private-domain
+              SEQUENCE {administration-domain-name
+                          [0]  AdministrationDomainName,
+                        private-domain-identifier
+                          [1]  PrivateDomainIdentifier}},
+  bilateral-information  BILATERAL.&Type
+}
 
---BILATERAL ::= CLASS {&id    BilateralDomain UNIQUE,
---                     &Type  
---}WITH SYNTAX {&Type,
---              IDENTIFIED BY &id
---}
 
---BilateralDomain ::= SEQUENCE {
+BilateralDomain ::= SEQUENCE {
   country-name  CountryName,
   domain
     CHOICE {administration-domain-name  AdministrationDomainName,
@@ -384,13 +366,12 @@ PerDomainBilateralInformation ::= SEQUENCE {
               SEQUENCE {administration-domain-name
                           [0]  AdministrationDomainName,
                         private-domain-identifier
-                          [1]  PrivateDomainIdentifier}},
-  bilateral-information  ANY
+                          [1]  PrivateDomainIdentifier}}
 }
 
 MTARecipientName ::= ORAddressAndOptionalDirectoryName
 
-OriginallySpecifiedRecipientNumber ::= INTEGER --(1..ub-recipients)
+OriginallySpecifiedRecipientNumber ::= INTEGER(1..ub-recipients)
 
 PerRecipientIndicators ::= BIT STRING {
   responsibility(0),
@@ -411,7 +392,7 @@ PerRecipientIndicators ::= BIT STRING {
   -- both bits 'zero' requests 'no-report'
   reserved-5(5), reserved-6(6), reserved-7(7)
                                 
--- reserved- bits 5 - 7 shall be 'zero' --}--(SIZE (8..ub-bit-options))
+-- reserved- bits 5 - 7 shall be 'zero' --}(SIZE (8..ub-bit-options))
 
 ProbeIdentifier ::= MTSIdentifier
 
@@ -427,11 +408,11 @@ SubjectIntermediateTraceInformation ::= TraceInformation
 
 --	AdditionalInformation is retained for backwards compatibility only, 
 --	and use in new systems is strongly deprecated
---ADDITIONAL ::= CLASS {&Type  
---}
+ADDITIONAL ::= CLASS {&Type  
+}
 
 AdditionalInformation ::=
-  ANY --ADDITIONAL.&Type - - maximum ub-additional-info octets including all encoding
+  ADDITIONAL.&Type -- maximum ub-additional-info octets including all encoding
 
 MTAActualRecipientName ::= ORAddressAndOptionalDirectoryName
 
@@ -442,28 +423,28 @@ LastTraceInformation ::= SET {
   report-type                          [1]  ReportType
 }
 
-MTAOriginallyIntendedRecipientName ::= ORAddressAndOptionalDirectoryName
+--OriginallyIntendedRecipientName ::= ORAddressAndOptionalDirectoryName
 
 --	Extension Fields
---originator-requested-alternate-recipient EXTENSION ::= {
---  OriginatorRequestedAlternateRecipient,
---  IDENTIFIED BY  standard-extension:2
---}
+originator-requested-alternate-recipient EXTENSION ::= {
+  MTAOriginatorRequestedAlternateRecipient,
+  IDENTIFIED BY  standard-extension:2
+}
 
 MTAOriginatorRequestedAlternateRecipient ::= ORAddressAndOptionalDirectoryName
 
---trace-information EXTENSION ::= {
---  TraceInformation,
---  IDENTIFIED BY  standard-extension:37
---}
+trace-information EXTENSION ::= {
+  TraceInformation,
+  IDENTIFIED BY  standard-extension:37
+}
 
---internal-trace-information EXTENSION ::= {
---  InternalTraceInformation,
---  IDENTIFIED BY  standard-extension:38
---}
+internal-trace-information EXTENSION ::= {
+  InternalTraceInformation,
+  IDENTIFIED BY  standard-extension:38
+}
 
 InternalTraceInformation ::=
-  SEQUENCE -- SIZE (1..ub-transfers)-- OF InternalTraceInformationElement
+  SEQUENCE SIZE (1..ub-transfers) OF InternalTraceInformationElement
 
 InternalTraceInformationElement ::= SEQUENCE {
   global-domain-identifier  GlobalDomainIdentifier,
@@ -476,18 +457,14 @@ MTASuppliedInformation ::= SET {
   routing-action  [2]  RoutingAction,
   attempted       CHOICE {mta     MTAName,
                           domain  GlobalDomainIdentifier} OPTIONAL,
-  -- additional-actions - -COMPONENTS OF InternalAdditionalActions
-  deferred-time                        [1]  DeferredTime OPTIONAL,
-  converted-encoded-information-types
-    ConvertedEncodedInformationTypes OPTIONAL,
-  other-actions                        [3]  OtherActions DEFAULT {}
+  -- additional-actions --COMPONENTS OF InternalAdditionalActions
 }
 
---InternalAdditionalActions ::= AdditionalActions
+InternalAdditionalActions ::= AdditionalActions
 
 --	Common Parameter Types
 TraceInformation ::=
-  [APPLICATION 9]  SEQUENCE -- SIZE (1..ub-transfers) -- OF TraceInformationElement
+  [APPLICATION 9]  SEQUENCE SIZE (1..ub-transfers) OF TraceInformationElement
 
 TraceInformationElement ::= SEQUENCE {
   global-domain-identifier     GlobalDomainIdentifier,
@@ -498,10 +475,10 @@ DomainSuppliedInformation ::= SET {
   arrival-time      [0]  ArrivalTime,
   routing-action    [2]  RoutingAction,
   attempted-domain  GlobalDomainIdentifier OPTIONAL,
-  -- additional-actions - -COMPONENTS OF AdditionalActions
---}
+  -- additional-actions --COMPONENTS OF AdditionalActions
+}
 
---AdditionalActions ::= SET {
+AdditionalActions ::= SET {
   deferred-time                        [1]  DeferredTime OPTIONAL,
   converted-encoded-information-types
     ConvertedEncodedInformationTypes OPTIONAL,
@@ -515,9 +492,9 @@ DeferredTime ::= Time
 ArrivalTime ::= Time
 
 OtherActions ::= BIT STRING {redirected(0), dl-operation(1)
-}--(SIZE (0..ub-bit-options))--
+}(SIZE (0..ub-bit-options))
 
-END
+END -- of MTA Abstract Service
 
 -- Generated by Asnp, the ASN.1 pretty-printer of France Telecom R&D