Changes suggested/provided by Anders so that fewer changes are required to the ASN modules.

Also includes the MSAccessProtocol.asn to generate defines for the operation numbers.


svn path=/trunk/; revision=23586

7 files changed, 757 insertions, 338 deletions

diff --git a/asn1/p7/MSAbstractService.asn b/asn1/p7/MSAbstractService.asn
index 7877b0f989..3f7d6e1586 100755..100644
--- a/asn1/p7/MSAbstractService.asn
+++ b/asn1/p7/MSAbstractService.asn
@@ -1,7 +1,5 @@
---
 -- $Id$
---
-
+-- http://www.itu.int/ITU-T/asn1/database/itu-t/x/x413/1999/index.html
 -- Module MSAbstractService (X.413:06/1999)
 MSAbstractService {joint-iso-itu-t mhs(6) ms(4) modules(0) abstract-service(1)
   version-1999(1)} DEFINITIONS ::=
@@ -28,10 +26,10 @@ IMPORTS
     MessageSubmissionArgument, MessageSubmissionResult, MessageToken,
     ORAddressAndOrDirectoryName, ProbeSubmissionArgument,
     ProbeSubmissionResult, ResponderCredentials, SecurityContext, SecurityLabel,
-    MessageSubmissionEnvelope, Content, -- COMPONENTS OF MessageSubmissionArgument
-    MessageSubmissionIdentifier, MessageSubmissionTime, ContentIdentifier, ExtensionField, -- COMPONENTS OF MessageSubmissionResult
-    ProbeSubmissionEnvelope, -- COMPONENTS OF ProbeSubmissionArgument (?)
-    ProbeSubmissionIdentifier, ProbeSubmissionTime -- COMPONENTS OF ProbeSubmissionResult
+-- WS added imports because of expansion of COMPONENTS OF
+	MessageSubmissionIdentifier, ExtensionField, MTSOriginatorName, 
+	OriginalEncodedInformationTypes, ContentType, ProbeSubmissionIdentifier, 
+	ProbeSubmissionTime
     FROM MTSAbstractService {joint-iso-itu-t mhs(6) mts(3) modules(0)
       mts-abstract-service(1) version-1999(1)}
   -- MTS abstract-service 1988 ports
@@ -107,49 +105,49 @@ IMPORTS
       remote-operations(4) useful-definitions(7) version1(0)};
 
 -- MS Abstract Objects
---ms MHS-OBJECT ::= {
---  IS        {mts-user}
---  RESPONDS  {ms-access-contract-88 | ms-access-contract-94}
---  ID        id-ot-ms
---}
+ms MHS-OBJECT ::= {
+  IS        {mts-user}
+  RESPONDS  {ms-access-contract-88 | ms-access-contract-94}
+  ID        id-ot-ms
+}
 
---ms-user MHS-OBJECT ::= {
---  INITIATES  {ms-access-contract-88 | ms-access-contract-94}
---  ID         id-ot-ms-user
---}
+ms-user MHS-OBJECT ::= {
+  INITIATES  {ms-access-contract-88 | ms-access-contract-94}
+  ID         id-ot-ms-user
+}
 
 -- Contracts
---ms-access-contract-94 CONTRACT ::= {
---  CONNECTION             ms-connect
---  INITIATOR CONSUMER OF  {retrieval | ms-submission | administration}
---  ID                     id-crt-ms-access-94
---}
+ms-access-contract-94 CONTRACT ::= {
+  CONNECTION             ms-connect
+  INITIATOR CONSUMER OF  {retrieval | ms-submission | administration}
+  ID                     id-crt-ms-access-94
+}
 
---ms-access-contract-88 CONTRACT ::= {
---  CONNECTION             ms-connect - - with all 1994 extensions omitted 
---  INITIATOR CONSUMER OF  {retrieval-88 | submission | administration-88}
---  ID                     id-crt-ms-access-88
---}
+ms-access-contract-88 CONTRACT ::= {
+  CONNECTION             ms-connect -- with all 1994 extensions omitted 
+  INITIATOR CONSUMER OF  {retrieval-88 | submission | administration-88}
+  ID                     id-crt-ms-access-88
+}
 
 -- Connection-package
---ms-connect CONNECTION-PACKAGE ::= {
---  BIND    ms-bind
---  UNBIND  ms-unbind
---  ID      id-cp-ms-connection
---}
+ms-connect CONNECTION-PACKAGE ::= {
+  BIND    ms-bind
+  UNBIND  ms-unbind
+  ID      id-cp-ms-connection
+}
 
 -- MS Ports
 --retrieval PORT ::= {
 --  OPERATIONS        {operationObject1, ...}
 --  CONSUMER INVOKES
 --    {summarize | list | fetch | delete | register-MS,
---      ... - - 1994 extension addition - -, modify}
+--      ... - 1994 extension addition -, modify}
 --  SUPPLIER INVOKES  {alert}
 --  ID                id-pt-retrieval-94
 --}
 
 --retrieval-88 PORT ::= {
-  -- With all 1994 extensions to the abstract-operations absent 
+--  - With all 1994 extensions to the abstract-operations absent 
 --  OPERATIONS        {operationObject1, ...}
 --  CONSUMER INVOKES  {summarize | list | fetch | delete | register-MS}
 --  SUPPLIER INVOKES  {alert}
@@ -165,72 +163,72 @@ IMPORTS
 --}
 
 -- X413ATTRIBUTE information object class
---X413ATTRIBUTE ::= CLASS {
---  &id               AttributeType UNIQUE,
---  &Type             ,
---  &equalityMatch    MATCHING-RULE OPTIONAL,
---  &substringsMatch  MATCHING-RULE OPTIONAL,
---  &orderingMatch    MATCHING-RULE OPTIONAL,
---  &numeration       ENUMERATED {single-valued(0), multi-valued(1)},
+X413ATTRIBUTE ::= CLASS {
+  &id               AttributeType UNIQUE,
+  &Type             ,
+  &equalityMatch    MATCHING-RULE OPTIONAL,
+  &substringsMatch  MATCHING-RULE OPTIONAL,
+  &orderingMatch    MATCHING-RULE OPTIONAL,
+  &numeration       ENUMERATED {single-valued(0), multi-valued(1)},
   -- 1994 extension 
---  &OtherMatches     MATCHING-RULE OPTIONAL
---}
---WITH SYNTAX {
---  WITH ATTRIBUTE-SYNTAX &Type,
---  [EQUALITY MATCHING-RULE &equalityMatch,]
---  [SUBSTRINGS MATCHING-RULE &substringsMatch,]
---  [ORDERING MATCHING-RULE &orderingMatch,]
---  [OTHER MATCHING-RULES &OtherMatches,]
---  NUMERATION &numeration,
---  ID &id
---}
+  &OtherMatches     MATCHING-RULE OPTIONAL
+}
+WITH SYNTAX {
+  WITH ATTRIBUTE-SYNTAX &Type,
+  [EQUALITY MATCHING-RULE &equalityMatch,]
+  [SUBSTRINGS MATCHING-RULE &substringsMatch,]
+  [ORDERING MATCHING-RULE &orderingMatch,]
+  [OTHER MATCHING-RULES &OtherMatches,]
+  NUMERATION &numeration,
+  ID &id
+}
 
 Attribute ::= SEQUENCE {
-  attribute-type    --X413ATTRIBUTE.&id({AttributeTable})-- AttributeType,
+  attribute-type    X413ATTRIBUTE.&id({AttributeTable}),
   attribute-values
     SEQUENCE SIZE (1..ub-attribute-values) OF
---      X413ATTRIBUTE.&Type({AttributeTable}{@attribute-type}) -- ANY
+      X413ATTRIBUTE.&Type({AttributeTable}{@attribute-type})
 }
 
 AttributeType ::= OBJECT IDENTIFIER
 
 -- AUTO-ACTION information object class
---AUTO-ACTION ::= CLASS {
---  &id                     AutoActionType UNIQUE,
---  &RegistrationParameter  OPTIONAL,
---  &Errors                 AUTO-ACTION-ERROR OPTIONAL
---}
---WITH SYNTAX {
---  [REGISTRATION PARAMETER IS &RegistrationParameter]
---  [ERRORS &Errors]
---  IDENTIFIED BY &id
---}
+AUTO-ACTION ::= CLASS {
+  &id                     AutoActionType UNIQUE,
+  &RegistrationParameter  OPTIONAL,
+  &Errors                 AUTO-ACTION-ERROR OPTIONAL
+}
+WITH SYNTAX {
+  [REGISTRATION PARAMETER IS &RegistrationParameter]
+  [ERRORS &Errors]
+  IDENTIFIED BY &id
+}
 
 AutoActionType ::= OBJECT IDENTIFIER
 
 AutoActionRegistration ::= SEQUENCE {
-  auto-action-type         --AUTO-ACTION.&id({AutoActionTable})-- AutoActionType,
+  auto-action-type         AUTO-ACTION.&id({AutoActionTable}),
   registration-identifier  [0]  INTEGER(1..ub-per-auto-action) DEFAULT 1,
   registration-parameter
-    [1]  --AUTO-ACTION.&RegistrationParameter
-         --  ({AutoActionTable}{@auto-action-type}) -- ANY OPTIONAL
+    [1]  AUTO-ACTION.&RegistrationParameter
+           ({AutoActionTable}{@auto-action-type}) OPTIONAL
 }
 
 -- AUTO-ACTION-ERROR information object class
---AUTO-ACTION-ERROR ::=
---  ABSTRACT-ERROR
+AUTO-ACTION-ERROR ::=
+  ABSTRACT-ERROR
 
 AutoActionError ::= SET {
-  error-code       [0]  --AUTO-ACTION-ERROR.&errorCode({AutoActionErrorTable})-- OBJECT IDENTIFIER,
+  error-code       [0]  AUTO-ACTION-ERROR.&errorCode({AutoActionErrorTable}),
   error-parameter
-    [1]  --AUTO-ACTION-ERROR.&ParameterType({AutoActionErrorTable}{@error-code})
-      ANY OPTIONAL
+    [1]  AUTO-ACTION-ERROR.&ParameterType({AutoActionErrorTable}{@error-code})
+      OPTIONAL
 }
 
 -- MS-EXTENSION information object class
---MS-EXTENSION ::= TYPE-IDENTIFIER
+MS-EXTENSION ::= TYPE-IDENTIFIER
 
-MSExtensionItem ::= --INSTANCE OF MS-EXTENSION-- EXTERNAL
+MSExtensionItem ::= INSTANCE OF MS-EXTENSION
 
 MSExtensions ::= SEQUENCE SIZE (1..ub-extensions) OF MSExtensionItem
 
@@ -291,11 +289,11 @@ RegistrationIdentifier ::=
 MSBindResult ::= SET {
   responder-credentials         [2]  ResponderCredentials,
   available-auto-actions
-    [3]  SET SIZE (1..ub-auto-actions) OF --AUTO-ACTION.&id({AutoActionTable})-- AutoActionType
+    [3]  SET SIZE (1..ub-auto-actions) OF AUTO-ACTION.&id({AutoActionTable})
       OPTIONAL,
   available-attribute-types
     [4]  SET SIZE (1..ub-attributes-supported) OF
-           --X413ATTRIBUTE.&id({AttributeTable})-- AttributeType OPTIONAL,
+           X413ATTRIBUTE.&id({AttributeTable}) OPTIONAL,
   alert-indication              [5]  BOOLEAN DEFAULT FALSE,
   content-types-supported
     [6]  SET SIZE (1..ub-content-types) OF OBJECT IDENTIFIER OPTIONAL,
@@ -314,20 +312,20 @@ MSBindResult ::= SET {
     [14]  GeneralString(SIZE (1..ub-service-information-length)) OPTIONAL
 }
 
---modify-capability MS-EXTENSION ::= {
---  NULL
---  IDENTIFIED BY  id-ext-modify-capability
---}
+modify-capability MS-EXTENSION ::= {
+  NULL
+  IDENTIFIED BY  id-ext-modify-capability
+}
 
---modify-retrieval-status-capability MS-EXTENSION ::= {
---  NULL
---  IDENTIFIED BY  id-ext-modify-retrieval-status-capability
---}
+modify-retrieval-status-capability MS-EXTENSION ::= {
+  NULL
+  IDENTIFIED BY  id-ext-modify-retrieval-status-capability
+}
 
---protected-change-credentials-capability MS-EXTENSION ::= {
---  ChangeCredentialsAlgorithms
---  IDENTIFIED BY  id-ext-protected-change-credentials-capability
---}
+protected-change-credentials-capability MS-EXTENSION ::= {
+  ChangeCredentialsAlgorithms
+  IDENTIFIED BY  id-ext-protected-change-credentials-capability
+}
 
 ChangeCredentialsAlgorithms ::= SET OF OBJECT IDENTIFIER
 
@@ -358,7 +356,7 @@ BindProblem ::= ENUMERATED {
 }
 
 -- MS Unbind abstract-operation
--- ms-unbind ABSTRACT-OPERATION ::= emptyUnbind
+ms-unbind ABSTRACT-OPERATION ::= emptyUnbind
 
 -- Common data-types
 Range ::= CHOICE {
@@ -388,37 +386,37 @@ Filter ::= CHOICE {
 FilterItem ::= CHOICE {
   equality           [0]  AttributeValueAssertion,
   substrings
-    [1]  SEQUENCE {type     --X413ATTRIBUTE.&id({AttributeTable})-- AttributeType,
+    [1]  SEQUENCE {type     X413ATTRIBUTE.&id({AttributeTable}),
                    strings
                      SEQUENCE OF
                        CHOICE {initial
-                                 [0]  --X413ATTRIBUTE.&Type
-                                      --  ({AttributeTable}{@substrings.type})-- ANY,
+                                 [0]  X413ATTRIBUTE.&Type
+                                        ({AttributeTable}{@substrings.type}),
                                any
-                                 [1]  --X413ATTRIBUTE.&Type
-                                      --  ({AttributeTable}{@substrings.type})-- ANY,
+                                 [1]  X413ATTRIBUTE.&Type
+                                        ({AttributeTable}{@substrings.type}),
                                final
-                                 [2]  --X413ATTRIBUTE.&Type
-                                      --  ({AttributeTable}{@substrings.type})-- ANY
+                                 [2]  X413ATTRIBUTE.&Type
+                                        ({AttributeTable}{@substrings.type})
                        }},
   greater-or-equal   [2]  AttributeValueAssertion,
   less-or-equal      [3]  AttributeValueAssertion,
-  present            [4]  --X413ATTRIBUTE.&id({AttributeTable})-- AttributeType,
+  present            [4]  X413ATTRIBUTE.&id({AttributeTable}),
   approximate-match  [5]  AttributeValueAssertion,
   -- 1994 extension 
   other-match        [6]  MatchingRuleAssertion
 }
 
 MatchingRuleAssertion ::= SEQUENCE {
-  matching-rule   [0]  --MATCHING-RULE.&id({MatchingRuleTable})-- OBJECT IDENTIFIER,
-  attribute-type  [1]  --X413ATTRIBUTE.&id-- AttributeType,
+  matching-rule   [0]  MATCHING-RULE.&id({MatchingRuleTable}),
+  attribute-type  [1]  X413ATTRIBUTE.&id,
   match-value
-    [2]  --MATCHING-RULE.&AssertionType({MatchingRuleTable}{@matching-rule})-- ANY
+    [2]  MATCHING-RULE.&AssertionType({MatchingRuleTable}{@matching-rule})
 }
 
 AttributeValueAssertion ::= SEQUENCE {
-  attribute-type   --X413ATTRIBUTE.&id({AttributeTable})-- AttributeType,
-  attribute-value  --X413ATTRIBUTE.&Type({AttributeTable}{@attribute-type})-- ANY
+  attribute-type   X413ATTRIBUTE.&id({AttributeTable}),
+  attribute-value  X413ATTRIBUTE.&Type({AttributeTable}{@attribute-type})
 }
 
 Selector ::= SET {
@@ -439,7 +437,7 @@ OverrideRestrictions ::= BIT STRING {
 EntryInformationSelection ::= SET SIZE (0..ub-per-entry) OF AttributeSelection
 
 AttributeSelection ::= SET {
-  type   --X413ATTRIBUTE.&id({AttributeTable})-- AttributeType,
+  type   X413ATTRIBUTE.&id({AttributeTable}),
   from
     [0]  INTEGER(1..ub-attribute-values)
       OPTIONAL --used if type is multi valued--,
@@ -457,7 +455,7 @@ EntryInformation ::= SEQUENCE {
 }
 
 AttributeValueCount ::= SEQUENCE {
-  type   [0]  --X413ATTRIBUTE.&id({AttributeTable})-- AttributeType,
+  type   [0]  X413ATTRIBUTE.&id({AttributeTable}),
   total  [1]  INTEGER
 }
 
@@ -470,25 +468,25 @@ MSSubmissionOptions ::= SET {
   ms-submission-extensions  [3]  MSExtensions OPTIONAL
 }
 
---originator-token MS-EXTENSION ::= {
---  OriginatorToken
---  IDENTIFIED BY  id-ext-originator-token
---}
+originator-token MS-EXTENSION ::= {
+  OriginatorToken
+  IDENTIFIED BY  id-ext-originator-token
+}
 
 OriginatorToken ::=
   MessageToken
---    (CONSTRAINED BY {
+    (CONSTRAINED BY {
        
---       - - Must contain an asymmetric-token with an encrypted-data component - -})
-
---originator-certificate-selectors-override MS-EXTENSION ::= {
---  CertificateSelectors
---    (WITH COMPONENTS {
---       ...,
---       message-origin-authentication  ABSENT
---     })
---  IDENTIFIED BY  id-ext-originator-certificate-selectors-override
---}
+       -- Must contain an asymmetric-token with an encrypted-data component --})
+
+originator-certificate-selectors-override MS-EXTENSION ::= {
+  CertificateSelectors
+    (WITH COMPONENTS {
+       ...,
+       message-origin-authentication  ABSENT
+     })
+  IDENTIFIED BY  id-ext-originator-certificate-selectors-override
+}
 
 CommonSubmissionResults ::= SET {
   created-entry                    [0]  SequenceNumber OPTIONAL,
@@ -497,22 +495,22 @@ CommonSubmissionResults ::= SET {
 }
 
 -- Retrieval Port abstract-operations
---summarize ABSTRACT-OPERATION ::= {
---  ARGUMENT  SummarizeArgument
---  RESULT    SummarizeResult
---  ERRORS
---    {attribute-error | invalid-parameters-error | range-error | security-error
---      | service-error, ... - - 1994 extension additions - -, entry-class-error |
---      ms-extension-error}
---  LINKED    {operationObject1, ...}
---  CODE      op-summarize
---}
+summarize ABSTRACT-OPERATION ::= {
+  ARGUMENT  SummarizeArgument
+  RESULT    SummarizeResult
+  ERRORS
+    {attribute-error | invalid-parameters-error | range-error | security-error
+      | service-error, ... -- 1994 extension additions --, entry-class-error |
+      ms-extension-error}
+  LINKED    {operationObject1, ...}
+  CODE      op-summarize
+}
 
 SummarizeArgument ::= SET {
   entry-class           [0]  EntryClass DEFAULT delivery,
   selector              [1]  Selector,
   summary-requests
-    [2]  SEQUENCE SIZE (1..ub-summaries) OF --X413ATTRIBUTE.&id({AttributeTable})-- AttributeType
+    [2]  SEQUENCE SIZE (1..ub-summaries) OF X413ATTRIBUTE.&id({AttributeTable})
       OPTIONAL -- absent if no summaries are requested--,
   -- 1994 extension 
   summarize-extensions  [3]  MSExtensions OPTIONAL
@@ -540,22 +538,22 @@ Summary ::= SET {
   present
     [1]  SET SIZE (1..ub-attribute-values)
            OF--one for each X413ATTRIBUTE value present--
-           SEQUENCE {type   --X413ATTRIBUTE.&id({AttributeTable})-- AttributeType,
-                     value  --X413ATTRIBUTE.&Type({AttributeTable}{@.type})-- ANY,
+           SEQUENCE {type   X413ATTRIBUTE.&id({AttributeTable}),
+                     value  X413ATTRIBUTE.&Type({AttributeTable}{@.type}),
                      count  INTEGER(1..ub-messages)} OPTIONAL
 }
 
 -- 
---list ABSTRACT-OPERATION ::= {
---  ARGUMENT  ListArgument
---  RESULT    ListResult
---  ERRORS
---    {attribute-error | invalid-parameters-error | range-error | security-error
---      | service-error, ... - - 1994 extension additions - -, entry-class-error |
---      ms-extension-error}
---  LINKED    {operationObject1, ...}
---  CODE      op-list
---}
+list ABSTRACT-OPERATION ::= {
+  ARGUMENT  ListArgument
+  RESULT    ListResult
+  ERRORS
+    {attribute-error | invalid-parameters-error | range-error | security-error
+      | service-error, ... -- 1994 extension additions --, entry-class-error |
+      ms-extension-error}
+  LINKED    {operationObject1, ...}
+  CODE      op-list
+}
 
 ListArgument ::= SET {
   entry-class           [0]  EntryClass DEFAULT delivery,
@@ -574,17 +572,17 @@ ListResult ::= SET {
 }
 
 -- 
---fetch ABSTRACT-OPERATION ::= {
---  ARGUMENT  FetchArgument
---  RESULT    FetchResult
---  ERRORS
---    {attribute-error | fetch-restriction-error | invalid-parameters-error |
---      range-error | security-error | sequence-number-error | service-error,
---      ... - - 1994 extension additions - -, entry-class-error |
---      ms-extension-error}
---  LINKED    {operationObject1, ...}
---  CODE      op-fetch
---}
+fetch ABSTRACT-OPERATION ::= {
+  ARGUMENT  FetchArgument
+  RESULT    FetchResult
+  ERRORS
+    {attribute-error | fetch-restriction-error | invalid-parameters-error |
+      range-error | security-error | sequence-number-error | service-error,
+      ... -- 1994 extension additions --, entry-class-error |
+      ms-extension-error}
+  LINKED    {operationObject1, ...}
+  CODE      op-fetch
+}
 
 FetchArgument ::= SET {
   entry-class           [0]  EntryClass DEFAULT delivery,
@@ -607,17 +605,17 @@ FetchResult ::= SET {
 }
 
 -- 
---delete ABSTRACT-OPERATION ::= {
---  ARGUMENT  DeleteArgument
---  RESULT    DeleteResult
---  ERRORS
---    {delete-error | invalid-parameters-error | range-error | security-error |
---      sequence-number-error | service-error,
---      ... - - 1994 extension additions - -, entry-class-error |
---      ms-extension-error}
---  LINKED    {operationObject1, ...}
---  CODE      op-delete
---}
+delete ABSTRACT-OPERATION ::= {
+  ARGUMENT  DeleteArgument
+  RESULT    DeleteResult
+  ERRORS
+    {delete-error | invalid-parameters-error | range-error | security-error |
+      sequence-number-error | service-error,
+      ... -- 1994 extension additions --, entry-class-error |
+      ms-extension-error}
+  LINKED    {operationObject1, ...}
+  CODE      op-delete
+}
 
 DeleteArgument ::= SET {
   entry-class        [0]  EntryClass DEFAULT delivery,
@@ -639,17 +637,17 @@ DeleteResult ::= CHOICE {
 }
 
 -- 
---register-MS ABSTRACT-OPERATION ::= {
---  ARGUMENT  Register-MSArgument
---  RESULT    Register-MSResult
---  ERRORS
---    {attribute-error | auto-action-request-error | invalid-parameters-error |
---      security-error | service-error | old-credentials-incorrectly-specified |
---      new-credentials-unacceptable, ... - - 1994 extension additions - -,
---      message-group-error | ms-extension-error | register-ms-error}
---  LINKED    {operationObject1, ...}
---  CODE      op-register-ms
---}
+register-MS ABSTRACT-OPERATION ::= {
+  ARGUMENT  Register-MSArgument
+  RESULT    Register-MSResult
+  ERRORS
+    {attribute-error | auto-action-request-error | invalid-parameters-error |
+      security-error | service-error | old-credentials-incorrectly-specified |
+      new-credentials-unacceptable, ... -- 1994 extension additions --,
+      message-group-error | ms-extension-error | register-ms-error}
+  LINKED    {operationObject1, ...}
+  CODE      op-register-ms
+}
 
 Register-MSArgument ::= SET {
   auto-action-registrations
@@ -659,10 +657,10 @@ Register-MSArgument ::= SET {
       OPTIONAL,
   list-attribute-defaults
     [2]  SET SIZE (0..ub-default-registrations) OF
-           --X413ATTRIBUTE.&id({AttributeTable})-- AttributeType OPTIONAL,
+           X413ATTRIBUTE.&id({AttributeTable}) OPTIONAL,
   fetch-attribute-defaults
     [3]  SET SIZE (0..ub-default-registrations) OF
-           --X413ATTRIBUTE.&id({AttributeTable})-- AttributeType OPTIONAL,
+           X413ATTRIBUTE.&id({AttributeTable}) OPTIONAL,
   change-credentials
     [4]  SEQUENCE {old-credentials
                      [0]  Credentials(WITH COMPONENTS {
@@ -684,7 +682,7 @@ Register-MSArgument ::= SET {
 }
 
 AutoActionDeregistration ::= SEQUENCE {
-  auto-action-type         --AUTO-ACTION.&id({AutoActionTable})-- AutoActionType,
+  auto-action-type         AUTO-ACTION.&id({AutoActionTable}),
   registration-identifier  [0]  INTEGER(1..ub-per-auto-action) DEFAULT 1
 }
 
@@ -692,10 +690,10 @@ UARegistration ::= SET {
   ua-registration-identifier   [0]  RegistrationIdentifier,
   ua-list-attribute-defaults
     [1]  SET SIZE (0..ub-default-registrations) OF
-           --X413ATTRIBUTE.&id({AttributeTable})-- AttributeType OPTIONAL,
+           X413ATTRIBUTE.&id({AttributeTable}) OPTIONAL,
   ua-fetch-attribute-defaults
     [2]  SET SIZE (0..ub-default-registrations) OF
-           --X413ATTRIBUTE.&id({AttributeTable})-- AttributeType OPTIONAL,
+           X413ATTRIBUTE.&id({AttributeTable}) OPTIONAL,
   ua-submission-defaults       [3]  MSSubmissionOptions OPTIONAL,
   content-specific-defaults    [4]  MSExtensions OPTIONAL
 }
@@ -718,7 +716,7 @@ RegistrationTypes ::= SET {
                      fetch-attribute-defaults(2), ua-registrations(3),
                      submission-defaults(4), message-group-registrations(5)}
       OPTIONAL,
-  extended-registrations   [1]  SET OF --MS-EXTENSION.&id-- OBJECT IDENTIFIER OPTIONAL,
+  extended-registrations   [1]  SET OF MS-EXTENSION.&id OPTIONAL,
   restrict-message-groups  [2]  MessageGroupsRestriction OPTIONAL
 }
 
@@ -728,10 +726,10 @@ MessageGroupsRestriction ::= SET {
   omit-descriptors            [2]  BOOLEAN DEFAULT TRUE
 }
 
---protected-change-credentials MS-EXTENSION ::= {
---  ProtectedChangeCredentials
---  IDENTIFIED BY  id-ext-protected-change-credentials
---}
+protected-change-credentials MS-EXTENSION ::= {
+  ProtectedChangeCredentials
+  IDENTIFIED BY  id-ext-protected-change-credentials
+}
 
 ProtectedChangeCredentials ::= SEQUENCE {
   algorithm-identifier  [0] IMPLICIT OBJECT IDENTIFIER,
@@ -751,10 +749,10 @@ Register-MSResult ::= CHOICE {
              OPTIONAL,
          list-attribute-defaults
            [1]  SET SIZE (1..ub-default-registrations) OF
-                  --X413ATTRIBUTE.&id({AttributeTable})-- AttributeType OPTIONAL,
+                  X413ATTRIBUTE.&id({AttributeTable}) OPTIONAL,
          fetch-attribute-defaults
            [2]  SET SIZE (1..ub-default-registrations) OF
-                  --X413ATTRIBUTE.&id({AttributeTable})-- AttributeType OPTIONAL,
+                  X413ATTRIBUTE.&id({AttributeTable}) OPTIONAL,
          ua-registrations
            [3]  SET SIZE (1..ub-ua-registrations) OF UARegistration OPTIONAL,
          submission-defaults            [4]  MSSubmissionOptions OPTIONAL,
@@ -764,14 +762,14 @@ Register-MSResult ::= CHOICE {
          register-ms-result-extensions  [6]  MSExtensions OPTIONAL}
 }
 
-
---alert ABSTRACT-OPERATION ::= {
---  ARGUMENT  AlertArgument
---  RESULT    AlertResult
---  ERRORS    {security-error}
---  LINKED    {operationObject1, ...}
---  CODE      op-alert
---}
+-- 
+alert ABSTRACT-OPERATION ::= {
+  ARGUMENT  AlertArgument
+  RESULT    AlertResult
+  ERRORS    {security-error}
+  LINKED    {operationObject1, ...}
+  CODE      op-alert
+}
 
 AlertArgument ::= SET {
   alert-registration-identifier  [0]  INTEGER(1..ub-auto-actions),
@@ -781,17 +779,17 @@ AlertArgument ::= SET {
 AlertResult ::= NULL
 
 -- 
---modify ABSTRACT-OPERATION ::= {
---  ARGUMENT  ModifyArgument
---  RESULT    ModifyResult
---  ERRORS
---    {attribute-error | invalid-parameters-error | security-error |
---      sequence-number-error | service-error | modify-error |
---      message-group-error | entry-class-error | ms-extension-error,
---      ... - - For future extension additions - -}
---  LINKED    {operationObject1, ...}
---  CODE      op-modify
---}
+modify ABSTRACT-OPERATION ::= {
+  ARGUMENT  ModifyArgument
+  RESULT    ModifyResult
+  ERRORS
+    {attribute-error | invalid-parameters-error | security-error |
+      sequence-number-error | service-error | modify-error |
+      message-group-error | entry-class-error | ms-extension-error,
+      ... -- For future extension additions --}
+  LINKED    {operationObject1, ...}
+  CODE      op-modify
+}
 
 ModifyArgument ::= SET {
   entry-class        [0]  EntryClass DEFAULT delivery,
@@ -808,18 +806,18 @@ EntryModification ::= SET {
   strict        [0]  BOOLEAN DEFAULT FALSE,
   modification
     CHOICE {add-attribute     [1]  Attribute,
-            remove-attribute  [2]  --X413ATTRIBUTE.&id({AttributeTable})-- AttributeType,
+            remove-attribute  [2]  X413ATTRIBUTE.&id({AttributeTable}),
             add-values        [3]  OrderedAttribute,
             remove-values     [4]  OrderedAttribute}
 }
 
 OrderedAttribute ::= SEQUENCE {
-  attribute-type    --X413ATTRIBUTE.&id({AttributeTable})-- AttributeType,
+  attribute-type    X413ATTRIBUTE.&id({AttributeTable}),
   attribute-values
     SEQUENCE SIZE (1..ub-attribute-values) OF
       SEQUENCE {-- at least one must be specified 
                 value
-                  [0]  --X413ATTRIBUTE.&Type({AttributeTable}{@attribute-type})-- ANY
+                  [0]  X413ATTRIBUTE.&Type({AttributeTable}{@attribute-type})
                     OPTIONAL,
                 position  [1]  INTEGER(1..ub-attribute-values) OPTIONAL
       }
@@ -832,42 +830,46 @@ ModifyResult ::= SET {
 }
 
 -- MS-submission Port abstract-operations
---ms-message-submission ABSTRACT-OPERATION ::= {
---  ARGUMENT  MSMessageSubmissionArgument
---  RESULT    MSMessageSubmissionResult
---  ERRORS
---    {submission-control-violated | element-of-service-not-subscribed |
---      originator-invalid | recipient-improperly-specified |
---      inconsistent-request | security-error | unsupported-critical-function |
---      remote-bind-error, ... - - 1994 extension additions - -, ms-extension-error
---      | message-group-error | entry-class-error | service-error}
---  LINKED    {operationObject1, ...}
---  CODE      op-ms-message-submission
---}
+ms-message-submission ABSTRACT-OPERATION ::= {
+  ARGUMENT  MSMessageSubmissionArgument
+  RESULT    MSMessageSubmissionResult
+  ERRORS
+    {submission-control-violated | element-of-service-not-subscribed |
+      originator-invalid | recipient-improperly-specified |
+      inconsistent-request | security-error | unsupported-critical-function |
+      remote-bind-error, ... -- 1994 extension additions --, ms-extension-error
+      | message-group-error | entry-class-error | service-error}
+  LINKED    {operationObject1, ...}
+  CODE      op-ms-message-submission
+}
 
 MSMessageSubmissionArgument ::= SEQUENCE {
 --  COMPONENTS OF
---    MessageSubmissionArgument - - This imported type has IMPLICIT tags - -,
+--    MessageSubmissionArgument - This imported type has IMPLICIT tags -,
+-- WS expanded here
   envelope  MessageSubmissionEnvelope,
   content   Content,
+
   -- 1994 extension 
   submission-options  [4]  MSSubmissionOptions OPTIONAL
 }
 
---forwarding-request EXTENSION ::= {
---  SequenceNumber,
---  IDENTIFIED BY  standard-extension:36
---}
+forwarding-request EXTENSION ::= {
+  SequenceNumber,
+  IDENTIFIED BY  standard-extension:36
+}
 
 MSMessageSubmissionResult ::= CHOICE {
   mts-result
-    SET {--COMPONENTS OF
-         --  MessageSubmissionResult- - This imported type has IMPLICIT tags - - ,
-         message-submission-identifier  MessageSubmissionIdentifier,
-         message-submission-time        [0] IMPLICIT MessageSubmissionTime,
-         content-identifier             ContentIdentifier OPTIONAL,
-         extensions
-            [1]  SET OF ExtensionField --{{MessageSubmissionResultExtensions}}-- DEFAULT {},
+   SET {--COMPONENTS OF
+--           MessageSubmissionResult- This imported type has IMPLICIT tags - ,
+-- WS extended here
+  message-submission-identifier  MessageSubmissionIdentifier,
+  message-submission-time        [0]  IMPLICIT MessageSubmissionTime,
+  content-identifier             ContentIdentifier OPTIONAL,
+  extensions
+    [1]  SET OF ExtensionField --{{MessageSubmissionResultExtensions}}-- DEFAULT {},
+
          -- 1994 extension 
          ms-message-result  [4]  CommonSubmissionResults OPTIONAL},
   -- 1994 extension 
@@ -875,42 +877,55 @@ MSMessageSubmissionResult ::= CHOICE {
 }
 
 -- 
---ms-probe-submission ABSTRACT-OPERATION ::= {
---  ARGUMENT  MSProbeSubmissionArgument
---  RESULT    MSProbeSubmissionResult
---  ERRORS
---    {submission-control-violated | element-of-service-not-subscribed |
---      originator-invalid | recipient-improperly-specified |
---      inconsistent-request | security-error | unsupported-critical-function |
---      remote-bind-error, ... - - 1994 extension additions - -, ms-extension-error
---      | message-group-error | entry-class-error | service-error}
---  LINKED    {operationObject1, ...}
---  CODE      op-ms-probe-submission
---}
+ms-probe-submission ABSTRACT-OPERATION ::= {
+  ARGUMENT  MSProbeSubmissionArgument
+  RESULT    MSProbeSubmissionResult
+  ERRORS
+    {submission-control-violated | element-of-service-not-subscribed |
+      originator-invalid | recipient-improperly-specified |
+      inconsistent-request | security-error | unsupported-critical-function |
+      remote-bind-error, ... -- 1994 extension additions --, ms-extension-error
+      | message-group-error | entry-class-error | service-error}
+  LINKED    {operationObject1, ...}
+  CODE      op-ms-probe-submission
+}
 
 MSProbeSubmissionArgument ::= SET {
 --  COMPONENTS OF
---    ProbeSubmissionArgument - - This imported type has IMPLICIT tags - -,
-  probe-submission-envelope ProbeSubmissionEnvelope, -- XXX: Is this right?
+--    ProbeSubmissionArgument - This imported type has IMPLICIT tags -,
+-- WS Expanded
+  originator-name                     MTSOriginatorName,
+  original-encoded-information-types  OriginalEncodedInformationTypes OPTIONAL,
+  content-type                        ContentType,
+  content-identifier                  ContentIdentifier OPTIONAL,
+  content-length                      [0]  ContentLength OPTIONAL,
+  per-message-indicators              PerMessageIndicators DEFAULT {},
+  extensions
+    [2]  SET OF ExtensionField --{{PerProbeSubmissionExtensions}}-- DEFAULT {}
+  ,per-recipient-fields
+    [3]  SEQUENCE --SIZE (1..ub-recipients)-- OF PerRecipientProbeSubmissionFields,
+
+
   -- 1994 extension 
   submission-options  [4]  MSSubmissionOptions OPTIONAL
 }
 
 MSProbeSubmissionResult ::= SET {
 --  COMPONENTS OF
---    ProbeSubmissionResult - - This imported type has IMPLICIT tags - -,
+--    ProbeSubmissionResult - This imported type has IMPLICIT tags -,
   probe-submission-identifier  ProbeSubmissionIdentifier,
-  probe-submission-time        [0]  IMPLICIT ProbeSubmissionTime,
+  probe-submission-time        [0]  ProbeSubmissionTime,
   content-identifier           ContentIdentifier OPTIONAL,
   extensions
     [1]  SET OF ExtensionField --{{ProbeResultExtensions}}-- DEFAULT {},
+
   -- 1994 extension 
   ms-probe-result  [4]  CommonSubmissionResults OPTIONAL
 }
 
---ms-cancel-deferred-delivery ABSTRACT-OPERATION ::= cancel-deferred-delivery
+ms-cancel-deferred-delivery ABSTRACT-OPERATION ::= cancel-deferred-delivery
 
---ms-submission-control ABSTRACT-OPERATION ::= submission-control
+ms-submission-control ABSTRACT-OPERATION ::= submission-control
 
 -- Abstract-errors
 --attribute-error ABSTRACT-ERROR ::= {
@@ -919,9 +934,9 @@ AttributeErrorParameter ::=
     SET {problems
            [0]  SET SIZE (1..ub-per-entry) OF
                   SET {problem  [0]  AttributeProblem,
-                       type     [1]  --X413ATTRIBUTE.&id({AttributeTable})-- AttributeType,
+                       type     [1]  X413ATTRIBUTE.&id({AttributeTable}),
                        value
-                         [2]  --X413ATTRIBUTE.&Type({AttributeTable}{@.type})-- ANY
+                         [2]  X413ATTRIBUTE.&Type({AttributeTable}{@.type})
                            OPTIONAL}}
 --  CODE       err-attribute-error
 --}
@@ -941,7 +956,7 @@ AutoActionRequestErrorParameter ::=
     SET {problems
            [0]  SET SIZE (1..ub-auto-registrations) OF
                   SET {problem  [0]  AutoActionRequestProblem,
-                       type     [1]  --AUTO-ACTION.&id({AutoActionTable})-- AutoActionType
+                       type     [1]  AUTO-ACTION.&id({AutoActionTable})
                   }}
 --  CODE       err-auto-action-request-error
 --}
@@ -992,14 +1007,14 @@ FetchRestrictionProblem ::= INTEGER {
 }(0..ub-error-reasons)
 
 -- 
---invalid-parameters-error ABSTRACT-ERROR ::= {
---  PARAMETER  NULL
---  CODE       err-invalid-parameters-error
---}
+invalid-parameters-error ABSTRACT-ERROR ::= {
+  PARAMETER  NULL
+  CODE       err-invalid-parameters-error
+}
 
 -- 
 --range-error ABSTRACT-ERROR ::= {
---  PARAMETER-- RangeErrorParameter ::=  SET {problem  [0]  RangeProblem}
+--  PARAMETER -- RangeErrorParameter ::=  SET {problem  [0]  RangeProblem}
 --  CODE       err-range-error
 --}
 
@@ -1008,7 +1023,7 @@ RangeProblem ::= INTEGER {reversed(0)}(0..ub-error-reasons)
 -- 
 --sequence-number-error ABSTRACT-ERROR ::= {
 --  PARAMETER
-SequenceNumberErrorParameter ::= 
+SequenceNumberErrorParameter ::=
     SET {problems
            [1]  SET SIZE (1..ub-messages) OF
                   SET {problem          [0]  SequenceNumberProblem,
@@ -1018,11 +1033,11 @@ SequenceNumberErrorParameter ::=
 
 SequenceNumberProblem ::= INTEGER {no-such-entry(0)}(0..ub-error-reasons)
 
---
---service-error ABSTRACT-ERROR ::= {
---  PARAMETER  ServiceErrorParameter
---  CODE       err-service-error
---}
+-- 
+service-error ABSTRACT-ERROR ::= {
+  PARAMETER  ServiceErrorParameter
+  CODE       err-service-error
+}
 
 ServiceErrorParameter ::= SET {
   problem                    [0]  ServiceProblem,
@@ -1035,10 +1050,10 @@ ServiceProblem ::= INTEGER {busy(0), unavailable(1), unwilling-to-perform(2)
 }(0..ub-error-reasons)
 
 -- 
---message-group-error ABSTRACT-ERROR ::= {
---  PARAMETER  MessageGroupErrorParameter
---  CODE       err-message-group-error
---}
+message-group-error ABSTRACT-ERROR ::= {
+  PARAMETER  MessageGroupErrorParameter
+  CODE       err-message-group-error
+}
 
 MessageGroupErrorParameter ::= SET {
   problem  [0]  MessageGroupProblem,
@@ -1051,10 +1066,10 @@ MessageGroupProblem ::= INTEGER {
   group-depth-exceeded(6)}(0..ub-error-reasons)
 
 -- 
---ms-extension-error ABSTRACT-ERROR ::= {
---  PARAMETER  MSExtensionErrorParameter
---  CODE       err-ms-extension-error
---}
+ms-extension-error ABSTRACT-ERROR ::= {
+  PARAMETER  MSExtensionErrorParameter
+  CODE       err-ms-extension-error
+}
 
 MSExtensionErrorParameter ::= CHOICE {
   ms-extension-problem  [0]  MSExtensionItem,
@@ -1076,10 +1091,10 @@ RegistrationProblem ::= ENUMERATED {
   }
 
 -- 
---modify-error ABSTRACT-ERROR ::= {
---  PARAMETER  ModifyErrorParameter
---  CODE       err-modify-error
---}
+modify-error ABSTRACT-ERROR ::= {
+  PARAMETER  ModifyErrorParameter
+  CODE       err-modify-error
+}
 
 ModifyErrorParameter ::= SET {
   entries-modified
@@ -1095,10 +1110,10 @@ ModifyProblem ::= INTEGER {
   modify-restriction-problem(4)}(0..ub-error-reasons)
 
 -- 
---entry-class-error ABSTRACT-ERROR ::= {
---  PARAMETER  EntryClassErrorParameter
---  CODE       err-entry-class-error
---}
+entry-class-error ABSTRACT-ERROR ::= {
+  PARAMETER  EntryClassErrorParameter
+  CODE       err-entry-class-error
+}
 
 EntryClassErrorParameter ::= SET {
   entry-class  [0]  EntryClass,
diff --git a/asn1/p7/MSAccessProtocol.asn b/asn1/p7/MSAccessProtocol.asn
new file mode 100644
index 0000000000..b7ac4c6828
--- /dev/null
+++ b/asn1/p7/MSAccessProtocol.asn
@@ -0,0 +1,258 @@
+-- $Id$
+-- http://www.itu.int/ITU-T/asn1/database/itu-t/x/x419/1999/index.html
+-- Module MSAccessProtocol (X.419:06/1999)
+MSAccessProtocol {joint-iso-itu-t mhs(6) protocols(0) modules(0)
+  ms-access-protocol(2) version-1999(1)} DEFINITIONS ::=
+BEGIN
+
+--	Prologue
+IMPORTS
+  -- MS Abstract Service
+  ms-access-contract-88, ms-access-contract-94, ms-submission, retrieval,
+    retrieval-88
+    --==
+    FROM MSAbstractService {joint-iso-itu-t mhs(6) ms(4) modules(0)
+      abstract-service(1) version-1999(1)}
+  -- Remote Operations
+  APPLICATION-CONTEXT
+    --==
+    FROM Remote-Operations-Information-Objects-extensions {joint-iso-itu-t
+      remote-operations(4) informationObjects-extensions(8) version1(0)}
+  Code
+    --==
+    FROM Remote-Operations-Information-Objects {joint-iso-itu-t
+      remote-operations(4) informationObjects(5) version1(0)}
+  Bind{}, InvokeId, Unbind{}
+    --==
+    FROM Remote-Operations-Generic-ROS-PDUs {joint-iso-itu-t
+      remote-operations(4) generic-ROS-PDUs(6) version1(0)}
+  ROS-SingleAS{}
+    --==
+    FROM Remote-Operations-Useful-Definitions {joint-iso-itu-t
+      remote-operations(4) useful-definitions(7) version1(0)}
+  acse, association-by-RTSE, pData, transfer-by-RTSE
+    --==
+    FROM Remote-Operations-Realizations {joint-iso-itu-t remote-operations(4)
+      realizations(9) version1(0)}
+  acse-abstract-syntax
+    --==
+    FROM Remote-Operations-Abstract-Syntaxes {joint-iso-itu-t
+      remote-operations(4) remote-operations-abstract-syntaxes(12) version1(0)}
+  -- Reliable Transfer
+  RTORQapdu, RTOACapdu, RTORJapdu
+    FROM Reliable-Transfer-APDU {joint-iso-itu-t reliable-transfer(3) apdus(0)}
+  -- MTS Access Protocol
+  message-administration-abstract-syntax-88,
+    message-administration-abstract-syntax-94,
+    message-submission-abstract-syntax
+    --==
+    FROM MTSAccessProtocol {joint-iso-itu-t mhs(6) protocols(0) modules(0)
+      mts-access-protocol(1) version-1999(1)}
+  -- Object Identifiers
+  id-ac-ms-access-88, id-ac-ms-access-94, id-ac-ms-reliable-access-88,
+    id-ac-ms-reliable-access-94, id-as-ms-msse, id-as-mase-88, id-as-mase-94,
+    id-as-mdse-88, id-as-mdse-94, id-as-mrse-88, id-as-mrse-94, id-as-ms-88,
+    id-as-ms-94, id-as-ms-rtse, id-as-msse
+    --==
+    FROM MHSProtocolObjectIdentifiers {joint-iso-itu-t mhs(6) protocols(0)
+      modules(0) object-identifiers(0) version-1994(0)};
+
+RTSE-apdus ::= CHOICE {
+  rtorq-apdu  [16] IMPLICIT RTORQapdu,
+  rtoac-apdu  [17] IMPLICIT RTOACapdu,
+  rtorj-apdu  [18] IMPLICIT RTORJapdu,
+  rttp-apdu   RTTPapdu,
+  rttr-apdu   RTTRapdu,
+  rtab-apdu   [22] IMPLICIT RTABapdu
+}
+
+RTTPapdu ::= -- priority-- INTEGER
+
+RTTRapdu ::= OCTET STRING
+
+RTABapdu ::= SET {
+  abortReason         [0] IMPLICIT AbortReason OPTIONAL,
+  reflectedParameter  [1] IMPLICIT BIT STRING OPTIONAL,
+  -- 8 bits maximum, only if abortReason is invalidParameter
+  userdataAB
+    [2]  TYPE-IDENTIFIER.&Type
+      OPTIONAL -- only in normal mode and if abortReason--
+  -- is userError 
+}
+
+AbortReason ::= INTEGER {
+  localSystemProblem(0),
+  invalidParameter(1), -- reflectedParameter supplied
+  unrecognizedActivity(2),
+  temporaryProblem(3),
+  -- the RTSE cannot accept a session for a period of time
+  protocolError(4), -- RTSE level protocol error
+  permanentProblem(5), --provider-abort solely in normal mode 
+  userError(6), -- user-abort solely in normal mode
+  transferCompleted(7) -- activity can't be discarded--}
+
+--	APPLICATION-CONTEXTS
+--	1994 Application Context omitting RTSE
+ms-access-94 APPLICATION-CONTEXT ::= {
+  CONTRACT                  ms-access-contract-94
+  ESTABLISHED BY            acse
+  INFORMATION TRANSFER BY   pData
+  ABSTRACT SYNTAXES
+    {acse-abstract-syntax | ms-message-submission-abstract-syntax |
+      message-retrieval-abstract-syntax-94 |
+      message-administration-abstract-syntax-94 |
+      ms-bind-unbind-abstract-syntax-94}
+  APPLICATION CONTEXT NAME  id-ac-ms-access-94
+}
+
+--	1994 Application Context including RTSE
+ms-reliable-access-94 APPLICATION-CONTEXT ::= {
+  CONTRACT                  ms-access-contract-94
+  ESTABLISHED BY            association-by-RTSE
+  INFORMATION TRANSFER BY   transfer-by-RTSE
+  ABSTRACT SYNTAXES
+    {acse-abstract-syntax | ms-message-submission-abstract-syntax |
+      message-retrieval-abstract-syntax-94 |
+      message-administration-abstract-syntax-94 |
+      ms-bind-unbind-rtse-abstract-syntax}
+  APPLICATION CONTEXT NAME  id-ac-ms-reliable-access-94
+}
+
+--	1988 Application Context omitting RTSE
+ms-access-88 APPLICATION-CONTEXT ::= {
+  CONTRACT                  ms-access-contract-88
+  ESTABLISHED BY            acse
+  INFORMATION TRANSFER BY   pData
+  ABSTRACT SYNTAXES
+    {acse-abstract-syntax | message-submission-abstract-syntax |
+      message-retrieval-abstract-syntax-88 |
+      message-administration-abstract-syntax-88 |
+      ms-bind-unbind-abstract-syntax-88}
+  APPLICATION CONTEXT NAME  id-ac-ms-access-88
+}
+
+--	1988 Application Context including RTSE
+ms-reliable-access-88 APPLICATION-CONTEXT ::= {
+  CONTRACT                  ms-access-contract-88
+  ESTABLISHED BY            association-by-RTSE
+  INFORMATION TRANSFER BY   transfer-by-RTSE
+  ABSTRACT SYNTAXES
+    {acse-abstract-syntax | message-submission-abstract-syntax |
+      message-retrieval-abstract-syntax-88 |
+      message-administration-abstract-syntax-88 |
+      ms-bind-unbind-rtse-abstract-syntax}
+  APPLICATION CONTEXT NAME  id-ac-ms-reliable-access-88
+}
+
+--	ABSTRACT SYNTAXES
+--	Abstract-syntax for 1994 MS-bind and MS-unbind
+ms-bind-unbind-abstract-syntax-94 ABSTRACT-SYNTAX ::= {
+  MSBindUnbindPDUs94
+  IDENTIFIED BY  id-as-ms-94
+}
+
+--MSBindUnbindPDUs94 ::= CHOICE {
+--  bind    Bind{ms-access-contract-94.&connection.&bind},
+--  unbind  Unbind{ms-access-contract-94.&connection.&unbind}
+--}
+
+--	Abstract-syntax for 1988 MS-bind and MS-unbind
+ms-bind-unbind-abstract-syntax-88 ABSTRACT-SYNTAX ::= {
+  MSBindUnbindPDUs88
+  IDENTIFIED BY  id-as-ms-88
+}
+
+--MSBindUnbindPDUs88 ::= CHOICE {
+--  bind    Bind{ms-access-contract-88.&connection.&bind},
+--  unbind  Unbind{ms-access-contract-88.&connection.&unbind}
+--}
+
+--	Abstract-syntax for MS-bind and MS-unbind with RTSE 
+ms-bind-unbind-rtse-abstract-syntax ABSTRACT-SYNTAX ::= {
+  RTSE-apdus -- With MS-bind and MS-unbind --
+  IDENTIFIED BY  id-as-ms-rtse
+}
+
+--	Abstract Syntax for MS Message Submission Service Element
+ms-message-submission-abstract-syntax ABSTRACT-SYNTAX ::= {
+  MSMessageSubmissionPDUs
+  IDENTIFIED BY  id-as-ms-msse
+}
+
+--MSMessageSubmissionPDUs ::= ROS-SingleAS{{MSInvokeIds}, ms-submission}
+
+--MSInvokeIds ::= InvokeId(ALL EXCEPT absent:NULL) 
+
+--	Abstract Syntax for Message Retrieval Service Element 1994
+--message-retrieval-abstract-syntax-94 ABSTRACT-SYNTAX ::= {
+--  MessageRetrievalPDUs
+--  IDENTIFIED BY  id-as-mrse-94
+--}
+
+--	Abstract Syntax for Message Retrieval Service Element 1988
+--MessageRetrievalPDUs ::=
+--  ROS-SingleAS{{MSInvokeIds}, retrieval}
+
+--message-retrieval-abstract-syntax-88 ABSTRACT-SYNTAX ::= {
+--  MessageRetrievalPDUs88
+--  IDENTIFIED BY  id-as-mrse-88
+--}
+
+--MessageRetrievalPDUs88 ::= ROS-SingleAS{{MSInvokeIds}, retrieval-88}
+
+--	Remote Operations
+op-ms-submission-control Code ::= local:2
+
+op-ms-message-submission Code ::= local:3
+
+op-ms-probe-submission Code ::= local:4
+
+op-ms-cancel-deferred-delivery Code ::= local:7
+
+op-summarize Code ::= local:20
+
+op-list Code ::= local:21
+
+op-fetch Code ::= local:22
+
+op-delete Code ::= local:23
+
+op-register-ms Code ::= local:24
+
+op-alert Code ::= local:25
+
+op-modify Code ::= local:26
+
+--	Remote Errors
+err-attribute-error Code ::= local:21
+
+err-auto-action-request-error Code ::= local:22
+
+err-delete-error Code ::= local:23
+
+err-fetch-restriction-error Code ::= local:24
+
+err-range-error Code ::= local:25 -- 1988 Application Contexts only 
+
+err-security-error Code ::= local:26
+
+err-service-error Code ::= local:27
+
+err-sequence-number-error Code ::= local:28
+
+err-invalid-parameters-error Code ::= local:29
+
+err-message-group-error Code ::= local:30
+
+err-ms-extension-error Code ::= local:31
+
+err-register-ms-error Code ::= local:32
+
+err-modify-error Code ::= local:33
+
+err-entry-class-error Code ::= local:34
+
+END -- of MSAccessProtocol
+
+-- Generated by Asnp, the ASN.1 pretty-printer of France Telecom R&D
+
diff --git a/asn1/p7/MSGeneralAttributeTypes.asn b/asn1/p7/MSGeneralAttributeTypes.asn
index 04a3c97758..04a3c97758 100755..100644
--- a/asn1/p7/MSGeneralAttributeTypes.asn
+++ b/asn1/p7/MSGeneralAttributeTypes.asn
diff --git a/asn1/p7/Makefile.common b/asn1/p7/Makefile.common
index 36c3cd93f9..99668de5d0 100644
--- a/asn1/p7/Makefile.common
+++ b/asn1/p7/Makefile.common
@@ -34,7 +34,8 @@ EXT_ASN_FILE_LIST =
 
 ASN_FILE_LIST = \
 	MSAbstractService.asn \
-	MSGeneralAttributeTypes.asn
+	MSGeneralAttributeTypes.asn \
+	MSAccessProtocol.asn
 
 # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn
 # files do not exist # for all protocols: Please add/remove as required.
@@ -51,8 +52,16 @@ SRC_FILES = \
 A2W_FLAGS= -b -e -X -T
 
 EXTRA_CNF= \
-	../x411/x411-exp.cnf 
+	../x411/x411-exp.cnf \
+	../ros/ros-exp.cnf \
+	../rtse/rtse.cnf
 
 ../x411/x411-exp.cnf:
 	(cd ../x411 && $(MAKE_CNF_EXPORT))
 
+../ros/ros-exp.cnf:
+	(cd ../ros && $(MAKE_CNF_EXPORT))
+
+../rtse/rtse-exp.cnf:
+	(cd ../rtse && $(MAKE_CNF_EXPORT))
+
diff --git a/asn1/p7/p7.cnf b/asn1/p7/p7.cnf
index 4f45aa49be..713eee78d1 100644
--- a/asn1/p7/p7.cnf
+++ b/asn1/p7/p7.cnf
@@ -3,10 +3,78 @@
 #
 
 #.IMPORT ../x411/x411-exp.cnf
+#.IMPORT ../ros/ros-exp.cnf
+#.IMPORT ../rtse/rtse-exp.cnf
 
 #.MODULE_IMPORT
 MTSAbstractService				x411
 
+
+# Forward declaration of Classes
+# CONNECTION-PACKAGE CONTRACT from ROS
+#.CLASS CONNECTION-PACKAGE
+&bind                ClassReference OPERATION
+&unbind              ClassReference OPERATION
+&responderCanUnbind  BooleanType
+&unbindCanFail       BooleanType
+&id                  ObjectIdentifierType
+#.END
+
+#.CLASS CONTRACT
+&connection           ClassReference CONNECTION-PACKAGE
+&OperationsOf         ClassReference OPERATION-PACKAGE
+&InitiatorConsumerOf  ClassReference OPERATION-PACKAGE
+&InitiatorSupplierOf  ClassReference OPERATION-PACKAGE
+&id                   ObjectIdentifierType
+#.END
+
+#.CLASS MHS-OBJECT
+&Is                    ClassReference MHS-OBJECT
+&Initiates             ClassReference CONTRACT
+&Responds              ClassReference CONTRACT
+&InitiatesAndResponds  ClassReference CONTRACT
+&id                    ObjectIdentifierType
+#.END
+
+# Ros OPERATION
+#.CLASS ABSTRACT-OPERATION 
+&ArgumentType          
+&argumentTypeOptional  BooleanType
+&returnResult          BooleanType
+&ResultType            
+&resultTypeOptional    BooleanType
+&Errors                ClassReference ERROR
+&Linked                ClassReference OPERATION
+&synchronous           BooleanType
+&alwaysReturns         BooleanType
+&InvokePriority        _FixedTypeValueSetFieldSpec
+&ResultPriority        _FixedTypeValueSetFieldSpec
+&operationCode         TypeReference Code
+#.END
+
+# ros ERROR
+#.CLASS ABSTRACT-ERROR 
+&ParameterType          
+&parameterTypeOptional  BooleanType
+&ErrorPriority          _FixedTypeValueSetFieldSpec
+&errorCode              TypeReference Code
+#.END
+
+#.CLASS MATCHING-RULE
+&ParentMatchingRules   ClassReference MATCHING-RULE
+&AssertionType         
+&uniqueMatchIndicator  ClassReference ATTRIBUTE
+&id                    ObjectIdentifierType
+#.END
+
+#.CLASS APPLICATION-CONTEXT
+&associationContract	ClassReference CONTRACT
+&associationRealization
+&transferRealization
+&AbstractSyntaxes	ClassReference ABSTRACT-SYNTAX
+&applicationContextName	ObjectIdentifierType
+#.END
+
 #.TYPE_RENAME
 Attribute/attribute-values			AttributeValues
 OrderedAttribute/attribute-values 		OrderedAttributeValues
@@ -28,6 +96,7 @@ Summary/present/_item/value			SummaryPresentItemValue
 OrderedAttribute/attribute-values/_item/value	OrderedAttributeValue
 AttributeErrorParameter/problems/_item/value	AttributeErrorProblemValue
 
+
 #.FIELD_RENAME
 OrderedAttribute/attribute-values 		ordered-attribute-values
 OrderedAttribute/attribute-values/_item		ordered-attribute-values-item
@@ -54,17 +123,17 @@ Filter/item 					filter-item
 
 Summary/present					summary-present
 
-AttributeErrorParameter/problems		attribute-error-problems
-AutoActionRequestErrorParameter/problems	auto-action-request-error-problems
-DeleteErrorParameter/problems			delete-error-problems
-SequenceNumberErrorParameter/problems		sequence-number-error-problems
-FetchRestrictionErrorParameter/problems		fetch-restriction-error-problems
+AttributeErrorParameter/problems			attribute-error-problems
+AutoActionRequestErrorParameter/problems		auto-action-request-error-problems
+DeleteErrorParameter/problems				delete-error-problems
+SequenceNumberErrorParameter/problems			sequence-number-error-problems
+FetchRestrictionErrorParameter/problems			fetch-restriction-error-problems
 
-DeleteErrorParameter/problems/_item		delete-error-problem-item
-AttributeErrorParameter/problems/_item 		attribute-error-problem-item
-AutoActionRequestErrorParameter/problems/_item 	auto-action-request-error-problem-item
-SequenceNumberErrorParameter/problems/_item 	sequence-number-error-problem-item
-FetchRestrictionErrorParameter/problems/_item 	fetch-restriction-error-problem-item
+DeleteErrorParameter/problems/_item			delete-error-problem-item
+AttributeErrorParameter/problems/_item 			attribute-error-problem-item
+AutoActionRequestErrorParameter/problems/_item 		auto-action-request-error-problem-item
+SequenceNumberErrorParameter/problems/_item 		sequence-number-error-problem-item
+FetchRestrictionErrorParameter/problems/_item 		fetch-restriction-error-problem-item
 
 EntryClassErrorParameter/problem			entry-class-problem
 FetchRestrictionErrorParameter/problems/_item/problem	fetch-restriction-problem
@@ -81,8 +150,11 @@ AutoActionRequestErrorParameter/problems/_item/problem	auto-action-request-probl
 AutoActionRequestErrorParameter/problems/_item/type 	auto-action-type
 
 AttributeErrorParameter/problems/_item/value 		problem-value
+
 OrderedAttribute/attribute-values/_item/value 		ordered-attribute-value
 
+FetchRestrictionErrorParameter/problems/_item/restriction/content-type	extended-content-type
+
 #.PDU
 MSBindArgument
 MSBindResult
@@ -108,15 +180,66 @@ AlertResult
 AttributeErrorParameter
 AutoActionRequestErrorParameter
 DeleteErrorParameter
+EntryClassErrorParameter
 FetchRestrictionErrorParameter
-RangeErrorParameter
-SequenceNumberErrorParameter
 MessageGroupErrorParameter
+ModifyErrorParameter
 MSExtensionErrorParameter
-EntryClassErrorParameter
-ServiceErrorParameter
+RangeErrorParameter
 RegisterMSErrorParameter
-ModifyErrorParameter
+SequenceNumberErrorParameter
+ServiceErrorParameter
+
+# This table creates the value_sting to name P7 operation codes and errors
+# in file packet-p7-table.c which is included in the template file
+#
+#TABLE_HDR
+#/* P7 ABSTRACT-OPERATIONS */
+#const value_string p7_opr_code_strings[] = {
+#TABLE_BODY ABSTRACT-OPERATION
+#	{ %(&operationCode)s, "%(_ident)s" },
+#TABLE_FTR
+#  { 0, NULL }
+#;
+#END
+
+#TABLE_HDR
+#/* P7 ERRORS */
+#static const value_string p7_err_code_string_vals[] = {
+#TABLE_BODY ABSTRACT-ERROR
+#	{ %(&errorCode)s, "%(_ident)s" },  
+#TABLE_FTR
+#  { 0, NULL }
+#};
+#END
+
+# Create a table of opcode and corresponding args and res
+#TABLE11_HDR
+#typedef struct _ros_op_t {
+#  gint32 opcode;
+#  new_dissector_t arg_pdu;
+#  new_dissector_t res_pdu;
+#} ros_op_t;
+
+#static const ros_op_t p7_op_tab[] = {
+#TABLE11_BODY ABSTRACT-OPERATION
+#  /* %(_name)-31s */ { %(&operationCode)-40s, %(_argument_pdu)-45s, %(_result_pdu)s },
+#TABLE11_FTR
+#};
+#END
+#TABLE21_HDR
+#typedef struct _ros_err_t {
+#  gint32 errcode;
+#  new_dissector_t err_pdu;
+#} ros_err_t;
+
+#static const ros_err_t p7_err_tab[] = {
+#TABLE21_BODY ABSTRACT-ERROR
+#  /* %(_name)-24s */ { %(&errorCode)4s, %(_parameter_pdu)s },
+#TABLE21_FTR
+#};
+#END
+
 
 #.REGISTER
 # MSGeneralAttributeTypes
@@ -137,7 +260,7 @@ SequenceNumber		B	"2.6.4.3.0"	"id-att-child-sequence-numbers"
 #ContentIntegrityCheck	B	"2.6.4.3.5"	"id-att-content-inetgrity-check" - see x411.cnf
 #ContentLength		B	"2.6.4.3.6"	"id-att-content-length" - see x411.cnf
 #Boolean		B	"2.6.4.3.7"	"id-att-content-returned" - see XXX
-#ObjectIdentifier	B	"2.6.4.3.8"	"id-att-content-type" - see XXX
+#ExtendedContentType	B	"2.6.4.3.8"	"id-att-content-type" - see x411.cnf
 #ConversionWithLossProhibited	B	"2.6.4.3.9"	"id-att-conversion-with-loss-prohibited" - see x411.cnf
 MS-EIT			B	"2.6.4.3.10"	"id-att-converted-EITs"
 CreationTime		B	"2.6.4.3.11"	"id-att-creation-time"
@@ -237,22 +360,35 @@ StorageTime		B	"2.6.4.3.74"	"id-att-storage-time"
 	if(object_identifier_id) 
    	   call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
-#.FN_BODY 	AttributeErrorParameter/problems/_item/value
-	if(object_identifier_id) 
-   	   call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
-
 #.FN_PARS	AutoActionType	FN_VARIANT = _str VAL_PTR = &object_identifier_id
 
 #.FN_BODY	AutoActionRegistration/registration-parameter
 	if(object_identifier_id) 
    	   call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
-#.FN_PARS	AutoActionError/error-code	FN_VARIANT = _str VAL_PTR = &object_identifier_id
+
+#.FN_BODY	AutoActionError/error-code
+	/* XXX: Is this really the best way to do this? */
+	offset = dissect_ros_Code(implicit_tag, tvb, offset, actx, tree, hf_index);
+
+#.FN_BODY	RegistrationTypes/extended-registrations/_item
+	/* XXX: Is this really the best way to do this? */
+	offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id);
+
+#.FN_BODY	RTABapdu/userdataAB
+	offset = dissect_unknown_ber(actx->pinfo, tvb, offset, tree);
+
+#.END
 
 #.FN_BODY	AutoActionError/error-parameter
 	if(object_identifier_id) 
    	   call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
+#.FN_BODY	AttributeErrorParameter/problems/_item/value
+	if(object_identifier_id) 
+   	   call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
+
+
 #.FN_BODY	MSBindArgument/initiator-name
 	char *ora = NULL;
 	
@@ -294,5 +430,3 @@ StorageTime		B	"2.6.4.3.74"	"id-att-storage-time"
 		col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (count=%%d)", count);
 	}
 
-
-	
\ No newline at end of file
diff --git a/asn1/p7/packet-p7-template.c b/asn1/p7/packet-p7-template.c
index 44cf92bb82..2e565e255a 100644
--- a/asn1/p7/packet-p7-template.c
+++ b/asn1/p7/packet-p7-template.c
@@ -40,6 +40,7 @@
 #include "packet-ber.h"
 #include "packet-acse.h"
 #include "packet-ros.h"
+#include "packet-rtse.h"
 
 #include "packet-x411.h"
 #include <epan/strutil.h>
@@ -54,7 +55,7 @@ static dissector_handle_t tpkt_handle = NULL;
 static const char *object_identifier_id = NULL; /* attribute identifier */
 static int seqno = 0;
 
-void prefs_register_p7(void); /* forwad declaration for use in preferences registration */
+void prefs_register_p7(void); /* forward declaration for use in preferences registration */
 
 
 /* Initialize the protocol and registered fields */
@@ -68,6 +69,8 @@ static struct SESSION_DATA_STRUCTURE* session = NULL;
 static gint ett_p7 = -1;
 #include "packet-p7-ett.c"
 
+#include "packet-p7-val.h"
+
 #include "packet-p7-fn.c"
 
 /*
@@ -125,47 +128,47 @@ dissect_p7(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	  break;
 	case (ROS_OP_INVOKE | ROS_OP_ARGUMENT):	/*  Invoke Argument */
 	  switch(session->ros_op & ROS_OP_OPCODE_MASK) {
-	  case 3: /* msMessageSubmission */
+	  case op_ms_message_submission: /* msMessageSubmission */
 	    p7_dissector = dissect_p7_MSMessageSubmissionArgument;
 	    p7_op_name = "MS-Message-Submission-Argument";
 	    hf_p7_index = hf_p7_MSMessageSubmissionArgument_PDU;
 	    break;
-	  case 4: /* msProbeSubmission */
+	  case op_ms_probe_submission: /* msProbeSubmission */
 	    p7_dissector = dissect_p7_MSProbeSubmissionArgument;
 	    p7_op_name = "MS-Probe-Submission-Argument";
 	    hf_p7_index = hf_p7_MSProbeSubmissionArgument_PDU;
 	    break;
-	  case 20: /* summarize */
+	  case op_summarize: /* summarize */
 	    p7_dissector = dissect_p7_SummarizeArgument;
 	    p7_op_name = "Summarize-Argument";
 	    hf_p7_index = hf_p7_SummarizeArgument_PDU;
 	    break;
-	  case 21: /* list */
+	  case op_list: /* list */
 	    p7_dissector = dissect_p7_ListArgument;
 	    p7_op_name = "List-Argument";
 	    hf_p7_index = hf_p7_ListArgument_PDU;
 	    break;
-	  case 22: /* fetch */
+	  case op_fetch: /* fetch */
 	    p7_dissector = dissect_p7_FetchArgument;
 	    p7_op_name = "Fetch-Argument";
 	    hf_p7_index = hf_p7_FetchArgument_PDU;
 	    break;
-	  case 23: /* delete */
+	  case op_delete: /* delete */
 	    p7_dissector = dissect_p7_DeleteArgument;
 	    p7_op_name = "Delete-Argument";
 	    hf_p7_index = hf_p7_DeleteArgument_PDU;
 	    break;
-	  case 24: /* register-ms */
+	  case op_register_ms: /* register-ms */
 	    p7_dissector = dissect_p7_Register_MSArgument;
 	    p7_op_name = "RegisterMS-Argument";
 	    hf_p7_index = hf_p7_Register_MSArgument_PDU;
 	    break;
-	  case 25: /* alert */
+	  case op_alert: /* alert */
 	    p7_dissector = dissect_p7_AlertArgument;
 	    p7_op_name = "Alert-Argument";
 	    hf_p7_index = hf_p7_AlertArgument_PDU;
 	    break;
-	  case 26: /* modify */
+	  case op_modify: /* modify */
 	    p7_dissector = dissect_p7_ModifyArgument;
 	    p7_op_name = "Modify-Argument";
 	    hf_p7_index = hf_p7_ModifyArgument_PDU;
@@ -178,46 +181,46 @@ dissect_p7(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	  break;
 	case (ROS_OP_INVOKE | ROS_OP_RESULT):	/*  Return Result */
 	  switch(session->ros_op & ROS_OP_OPCODE_MASK) {
-	  case 3: /* msMessageSubmission */
+	  case op_ms_message_submission: /* msMessageSubmission */
 	    p7_dissector = dissect_p7_MSMessageSubmissionResult;
 	    p7_op_name = "MS-Message-Submission-Result";
 	    hf_p7_index = hf_p7_MSMessageSubmissionResult_PDU;
 	    break;
-	  case 4: /* msProbeSubmission */
+	  case op_ms_probe_submission: /* msProbeSubmission */
 	    p7_dissector = dissect_p7_MSProbeSubmissionResult;
 	    p7_op_name = "MS-Probe-Submission-Result";
 	    hf_p7_index = hf_p7_MSProbeSubmissionResult_PDU;
 	    break;
-	  case 20: /* summarize */
+	  case op_summarize: /* summarize */
 	    p7_dissector = dissect_p7_SummarizeResult;
 	    p7_op_name = "Summarize-Result";
 	    hf_p7_index = hf_p7_SummarizeResult_PDU;
 	    break;
-	  case 21: /* list */
+	  case op_list: /* list */
 	    p7_dissector = dissect_p7_ListResult;
 	    p7_op_name = "List-Result";
 	    hf_p7_index = hf_p7_ListResult_PDU;
 	    break;
-	  case 22: /* fetch */
+	  case op_fetch: /* fetch */
 	    p7_dissector = dissect_p7_FetchResult;
 	    p7_op_name = "Fetch-Result";
 	    hf_p7_index = hf_p7_FetchResult_PDU;
 	    break;
-	  case 23: /* delete */
+	  case op_delete: /* delete */
 	    p7_dissector = dissect_p7_DeleteResult;
 	    p7_op_name = "Delete-Result";
 	    break;
-	  case 24: /* register-ms */
+	  case op_register_ms: /* register-ms */
 	    p7_dissector = dissect_p7_Register_MSResult;
 	    p7_op_name = "RegisterMS-Result";
 	    hf_p7_index = hf_p7_Register_MSResult_PDU;
 	    break;
-	  case 25: /* alert */
+	  case op_alert: /* alert */
 	    p7_dissector = dissect_p7_AlertResult;
 	    p7_op_name = "Alert-Result";
 	    hf_p7_index = hf_p7_AlertResult_PDU;
 	    break;
-	  case 26: /* modify */
+	  case op_modify: /* modify */
 	    p7_dissector = dissect_p7_ModifyResult;
 	    p7_op_name = "Modify-Result";
 	    hf_p7_index = hf_p7_ModifyResult_PDU;
@@ -230,70 +233,70 @@ dissect_p7(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	  break;
 	case (ROS_OP_INVOKE | ROS_OP_ERROR):	/*  Return Error */
 	  switch(session->ros_op & ROS_OP_OPCODE_MASK) {
-	  case 21: /* attributeError */
+	  case err_attribute_error: /* attributeError */
 	    p7_dissector = dissect_p7_AttributeErrorParameter;
 	    p7_op_name = "Attribute-Error";
 	    hf_p7_index = hf_p7_AttributeErrorParameter_PDU;
 	    break;
-	  case 22: /* autoActionRequestError */
+	  case err_auto_action_request_error: /* autoActionRequestError */
 	    p7_dissector = dissect_p7_AutoActionRequestErrorParameter;
 	    p7_op_name = "Auto-Action-Request-Error";
 	    hf_p7_index = hf_p7_AutoActionRequestErrorParameter_PDU;
 	    break;
-	  case 23: /* deleteError */
+	  case err_delete_error: /* deleteError */
 	    p7_dissector = dissect_p7_DeleteErrorParameter;
 	    p7_op_name = "Delete-Error";
 	    hf_p7_index = hf_p7_DeleteErrorParameter_PDU;
 	    break;
-	  case 24: /* fetchRestrictionError */
+	  case err_fetch_restriction_error: /* fetchRestrictionError */
 	    p7_dissector = dissect_p7_FetchRestrictionErrorParameter;
 	    p7_op_name = "Fetch-Restriction-Error";
 	    hf_p7_index = hf_p7_FetchRestrictionErrorParameter_PDU;
 	    break;
-	  case 25: /* rangeError */
+	  case err_range_error: /* rangeError */
 	    p7_dissector = dissect_p7_RangeErrorParameter;
 	    p7_op_name = "Range-Error";
 	    hf_p7_index = hf_p7_RangeErrorParameter_PDU;
 	    break;
-	  case 26: /* securityError */
+	  case err_security_error: /* securityError */
 	    p7_dissector = dissect_x411_SecurityProblem;
 	    p7_op_name = "Security-Error";
 	    break;
-	  case 27: /* serviceError*/
+	  case err_service_error: /* serviceError*/
 	    p7_dissector = dissect_p7_ServiceErrorParameter;
 	    p7_op_name = "Service-Error";
 	    hf_p7_index = hf_p7_ServiceErrorParameter_PDU;
 	    break;
-	  case 28: /* sequenceNumberError */
+	  case err_sequence_number_error: /* sequenceNumberError */
 	    p7_dissector = dissect_p7_SequenceNumberErrorParameter;
 	    p7_op_name = "Sequence-Number-Error";
 	    hf_p7_index = hf_p7_SequenceNumberErrorParameter_PDU;
 	    break;
-	  case 29: /* invalidParametersError */
+	  case err_invalid_parameters_error: /* invalidParametersError */
 	    p7_dissector = NULL;
 	    p7_op_name = "Invalid-Parameters-Error";
 	    break;
-	  case 30: /* messageGroupError */
+	  case err_message_group_error: /* messageGroupError */
 	    p7_dissector = dissect_p7_MessageGroupErrorParameter;
 	    p7_op_name = "Message-Group-Error";
 	    hf_p7_index = hf_p7_MessageGroupErrorParameter_PDU;
 	    break;
-	  case 31: /* msExtensioError */
+	  case err_ms_extension_error: /* msExtensioError */
 	    p7_dissector = dissect_p7_MSExtensionErrorParameter;
 	    p7_op_name = "MS-Extension-Error";
 	    hf_p7_index = hf_p7_MSExtensionErrorParameter_PDU;
 	    break;
-	  case 32: /* registerMSError */
+	  case err_register_ms_error: /* registerMSError */
 	    p7_dissector = dissect_p7_RegisterMSErrorParameter;
 	    p7_op_name = "Register-MS-Error";
 	    hf_p7_index = hf_p7_RegisterMSErrorParameter_PDU;
 	    break;
-	  case 33: /* sequenceNumberError */
+	  case err_modify_error: /* modifyError */
 	    p7_dissector = dissect_p7_ModifyErrorParameter;
 	    p7_op_name = "Modify-Error";
 	    hf_p7_index = hf_p7_ModifyErrorParameter_PDU;
 	    break;
-	  case 34: /* entryClassError */
+	  case err_entry_class_error: /* entryClassError */
 	    p7_dissector = dissect_p7_EntryClassErrorParameter;
 	    p7_op_name = "Entry-Class-Error";
 	    hf_p7_index = hf_p7_EntryClassErrorParameter_PDU;
diff --git a/asn1/p7/packet-p7-template.h b/asn1/p7/packet-p7-template.h
index 1b2fcfdeea..1b2fcfdeea 100755..100644
--- a/asn1/p7/packet-p7-template.h
+++ b/asn1/p7/packet-p7-template.h