From Ed Day via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5890 :

ASN.1 files in trunk/asn1/qsig contain syntax errors that prevent them from
being compiled by a standard ASN.1 compiler.  A patch of modified files is
attached along with General-Error-List.asn which was missing completely.

From me: add the new asn file to the list of source files.  Add SVN Id tag to
the new file.

svn path=/trunk/; revision=37005

6 files changed, 506 insertions, 419 deletions

diff --git a/asn1/qsig/General-Error-List.asn b/asn1/qsig/General-Error-List.asn
new file mode 100644
index 0000000000..9eb1cb1f5a
--- /dev/null
+++ b/asn1/qsig/General-Error-List.asn
@@ -0,0 +1,86 @@
+-- Module General-Error-List (Q.950:06/2000)
+-- See also ITU-T Q.950 (06/2000)
+-- See also the index of all ASN.1 assignments needed in this document
+--
+-- $Id$
+--
+
+General-Error-List {itu-t recommendation q 950 general-error-list(1)}
+DEFINITIONS ::=
+BEGIN
+
+EXPORTS
+  userNotSubscribed, rejectedByNetwork, rejectedByUser, notAvailable,
+    insufficientInformation, invalidServedUserNr, invalidCallState,
+    basicServiceNotProvided, notIncomingCall,
+    supplementaryServiceInteractionNotAllowed, resourceUnavailable,
+    callFailure, proceduralError;
+
+IMPORTS
+  ERROR
+    FROM Remote-Operations-Information-Objects {joint-iso-itu-t
+      remote-operations(4) informationObjects(5) version1(0)};
+
+userNotSubscribed ERROR ::= {CODE  local:0
+}
+
+--	is an indication that the user has not subscribed to this service.
+rejectedByNetwork ERROR ::= {CODE  local:1
+}
+
+--	is an indication that the requested service is rejected by the network.
+rejectedByUser ERROR ::= {CODE  local:2
+}
+
+--	is an indication that the requested service is provided by the network but that the remote user has rejected this
+--	service request.
+notAvailable ERROR ::= {CODE  local:3
+}
+
+--	is an indication that the user has subscribed to this service but the requested service is not available combined
+--	with the basic service or the other services (e.g. operation).
+insufficientInformation ERROR ::= {CODE  local:5
+}
+
+--	is an indication that the content of operation argument is incomplete, or absent entirely.
+invalidServedUserNr ERROR ::= {CODE  local:6
+}
+
+--	is an indication that the requested service cannot be performed because of the usage of an invalid served user
+--	number.
+invalidCallState ERROR ::= {CODE  local:7
+}
+
+--	is an indication that no match exists between the service request and the valid Basic, Call Control State; this
+--	applies also to invalid auxiliary states or an invalid combination of Basic call states and auxiliary states.
+basicServiceNotProvided ERROR ::= {CODE  local:8
+}
+
+--	is an indication that the service request is directed to a Basic Service which is not provided (e.g. this return
+--	error value is used when a supplementary service is invoked with a SETUP message).
+notIncomingCall ERROR ::= {CODE  local:9
+}
+
+--	is an indication that the service request has been invoked for an outgoing call, which is not permitted for that
+--	service.
+supplementaryServiceInteractionNotAllowed ERROR ::= {CODE  local:10
+}
+
+--	is an indication that the service request is not permitted in combination with either a further requested or active
+--	supplementary service.
+resourceUnavailable ERROR ::= {CODE  local:11
+}
+
+--	is an indication that the service provider has temporarily no resource available for the provision of the
+--	requested service.
+callFailure ERROR ::= {CODE  local:25
+}
+
+--	is an indication that the requested supplementary service was not executable by virtue of a Basic Call Failure.
+proceduralError ERROR ::= {CODE  local:43
+}
+
+--	is an indication that a transport message (e.g. SETUP, REGISTER etc.) is received which has one or more
+--	operation PDUs which have a valid content but which are not specified as valid information content of the
+--	transport message used.
+END
diff --git a/asn1/qsig/Makefile.common b/asn1/qsig/Makefile.common
index be839d4429..fac7ca3e8b 100644
--- a/asn1/qsig/Makefile.common
+++ b/asn1/qsig/Makefile.common
@@ -29,9 +29,10 @@ DISSECTOR_FILES = \
 
 EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
 
-EXT_ASN_FILE_LIST = 
+EXT_ASN_FILE_LIST =
 
 ASN_FILE_LIST = \
+	General-Error-List.asn \
 	qsig-gf-ext.asn	\
 	qsig-gf-gp.asn	\
 	qsig-gf-ade.asn	\
@@ -74,8 +75,8 @@ SRC_FILES = \
 	$(EXT_ASN_FILE_LIST)
 
 # need empty -p <proto> option, default is -p $(PROTOCOL_NAME)
-PROTO_OPT = 
+PROTO_OPT =
 A2W_FLAGS = -e
 
-EXTRA_CNF = 
+EXTRA_CNF =
 
diff --git a/asn1/qsig/QSIG-MCR.asn b/asn1/qsig/QSIG-MCR.asn
index 82c1fddfc8..fffdaea108 100644
--- a/asn1/qsig/QSIG-MCR.asn
+++ b/asn1/qsig/QSIG-MCR.asn
@@ -7,165 +7,165 @@
 -- $Id$
 --
 
-SS-MCR-Operations-asn97 
-{iso (1) identified-organization (3) icd-ecma (12) standard (0)  
- qsig-make-call-request (344) make-call-request-operations (0)}  
- 
-DEFINITIONS EXPLICIT TAGS ::= 
- 
-BEGIN 
- 
-IMPORTS 
- 
-OPERATION,  
-ERROR 
-FROM Remote-Operations-Information-Objects 
-{ joint-iso-itu-t (2) remote-operations (4) informationObjects (5) version1 (0) } 
- 
-EXTENSION,  
-Extension {} 
-FROM Manufacturer-specific-service-extension-class-asn1-97 
-{ iso (1) standard (0) pss1-generic-procedures (11582) msi-class-asn1-97 (11) } 
- 
-Name 
-FROM Name-Operations-asn1-97 
-{ iso (1) standard (0) pss1-name (13868) name-operations-asn1-97 (1) }  
- 
-BasicService  
-FROM Call-Diversion-Operations-asn1-97 
-{ iso (1) standard (0) pss1-call-diversion (13873)  
-  call-diversion-operations-asn1-97 (1) } 
- 
-basicServiceNotProvided,  
-supplementaryServiceInteractionNotAllowed,  
-userNotSubscribed  
-FROM General-Error-List  
-{itu-t (0) recommendation (0) q (17) 950 general-error-list (1)} 
- 
-PresentedAddressUnscreened 
-FROM Addressing-Data-Elements-asn1-97 
-{ iso (1) standard (0) pss1-generic-procedures (11582)  
-  addressing-data-elements-asn1-97 (20) } 
- 
-CallIdentity, establishmentFailure  
-FROM Path-Replacement-Operations-asn1-97  
-{iso (1) standard (0) pss1-path-replacement (13874) pr-operations-asn1-97(1)} 
-; 
- 
-Make-Call-Request-Operations OPERATION::= { 
- mCRequest | mCAlerting | mCInform } 
-
-mCRequest   OPERATION ::= { 
-            ARGUMENT        MCRequestArg 
-            RESULT          MCRequestResult  
-            ERRORS         {userNotSubscribed| 
-                            basicServiceNotProvided| 
-                            supplementaryServiceInteractionNotAllowed| 
-                            invalidDestinationNumber| 
-                            invalidCooperationNumber| 
-                            mCRequestNotAllowed| 
-                            mCExecutionNotAllowed| 
-                            mCDestUserBusy| 
-                            mCCoopUserBusy| 
-                            mCCoopUserRejected| 
-                            establishmentFailure| 
-                            unspecified} 
-            CODE            local: 112 
-                         } 
- 
-mCInform    OPERATION ::= { 
-            ARGUMENT        MCInformArg 
-            RETURN RESULT   FALSE 
-            ALWAYS RESPONDS FALSE 
-            ERRORS         {userNotSubscribed| 
-                            basicServiceNotProvided| 
-                            supplementaryServiceInteractionNotAllowed| 
-                            invalidDestinationNumber| 
-                            mCExecutionNotAllowed| 
-                            mCDestUserBusy| 
-                            unspecified} 
-            CODE            local: 113 
-                           } 
- 
-mCAlerting  OPERATION ::= { 
-            ARGUMENT        MCAlertingArg 
-            RETURN RESULT   FALSE 
-            ALWAYS RESPONDS FALSE 
-            CODE            local: 114 
-                          } 
- 
-MCRequestArg    ::=     SEQUENCE 
-            { 
-            callType              CallType, 
-            retainOrigCall        BOOLEAN DEFAULT TRUE, 
-            destinationAddress    PresentedAddressUnscreened, 
-            requestingAddress     [0] PresentedAddressUnscreened OPTIONAL, 
-            cooperatingAddress    [1] PresentedAddressUnscreened OPTIONAL, 
-            correlation           Correlation, 
-            extensions            MCRExtensions     OPTIONAL, 
-            ... 
-            } 
- 
-MCRequestResult  ::=    SEQUENCE 
-            { 
-            extensions            MCRExtensions     OPTIONAL, 
-            ... 
-            } 
-
-MCInformArg        ::=    SEQUENCE 
-            { 
-            requestingAddress        [0] PresentedAddressUnscreened OPTIONAL, 
-            cooperatingAddress       [1] PresentedAddressUnscreened OPTIONAL, 
-            correlation              Correlation, 
-            extensions               MCRExtensions     OPTIONAL, 
-            ... 
-            } 
- 
-MCAlertingArg        ::=    SEQUENCE 
-            { 
-            correlation              Correlation, 
-            extensions               MCRExtensions     OPTIONAL, 
-            ... 
-            } 
-CallType        ::=    CHOICE  
-            { 
-            basicService             BasicService, 
-            cisc                     NULL 
-            } 
- 
-Correlation    ::=    SEQUENCE  
-            { 
-            correlationData          CallIdentity, 
-            correlationReason        CorrelationReason    OPTIONAL 
-            } 
-CorrelationReason    ::=    INTEGER 
-            { 
-            unknown             (0), 
-            mCACommunication    (1), 
-            cTIApplication      (2) 
-            } (0..255) 
- 
-MCRExtensions    ::= CHOICE  
-            { 
-            none        NULL, 
-            single      [0] IMPLICIT Extension   
-                            { { MakeCallRequestExtension } } ,  
-            multiple    [1] IMPLICIT SEQUENCE OF Extension  
-                            { { MakeCallRequestExtension } }  
-            }  
- 
-MakeCallRequestExtension EXTENSION::= {...} 
- 
-invalidDestinationNumber   ERROR ::= {CODE local : 1030}  
-invalidCooperationNumber   ERROR ::= {CODE local : 1031}  
-mCRequestNotAllowed        ERROR ::= {CODE local : 1032}  
-mCExecutionNotAllowed      ERROR ::= {CODE local : 1033}  
-mCDestUserBusy             ERROR ::= {CODE local : 1034}  
-mCCoopUserBusy             ERROR ::= {CODE local : 1035}  
-mCCoopUserRejected         ERROR ::= {CODE local : 1036}  
-unspecified                ERROR ::= {PARAMETER Extension  
-                               { { MakeCallRequestExtension } }  
-                           CODE local : 1008 
-                                      } 
- 
-END        -- of SS-MCR-Operations 
+SS-MCR-Operations-asn97
+{iso (1) identified-organization (3) icd-ecma (12) standard (0)
+ qsig-make-call-request (344) make-call-request-operations (0)}
+
+DEFINITIONS EXPLICIT TAGS ::=
+
+BEGIN
+
+IMPORTS
+
+OPERATION,
+ERROR
+FROM Remote-Operations-Information-Objects
+{ joint-iso-itu-t (2) remote-operations (4) informationObjects (5) version1 (0) }
+
+EXTENSION,
+Extension {}
+FROM Manufacturer-specific-service-extension-class-asn1-97
+{ iso (1) standard (0) pss1-generic-procedures (11582) msi-class-asn1-97 (11) }
+
+Name
+FROM Name-Operations-asn1-97
+{ iso (1) standard (0) pss1-name (13868) name-operations-asn1-97 (1) }
+
+BasicService
+FROM Call-Diversion-Operations-asn1-97
+{ iso (1) standard (0) pss1-call-diversion (13873)
+  call-diversion-operations-asn1-97 (1) }
+
+basicServiceNotProvided,
+supplementaryServiceInteractionNotAllowed,
+userNotSubscribed
+FROM General-Error-List
+{itu-t (0) recommendation (0) q (17) 950 general-error-list (1)}
+
+PresentedAddressUnscreened
+FROM Addressing-Data-Elements-asn1-97
+{ iso (1) standard (0) pss1-generic-procedures (11582)
+  addressing-data-elements-asn1-97 (20) }
+
+CallIdentity, establishmentFailure
+FROM Path-Replacement-Operations-asn1-97
+{iso (1) standard (0) pss1-path-replacement (13874) pr-operations-asn1-97(1)}
+;
+
+Make-Call-Request-Operations OPERATION::= {
+ mCRequest | mCAlerting | mCInform }
+
+mCRequest   OPERATION ::= {
+            ARGUMENT        MCRequestArg
+            RESULT          MCRequestResult
+            ERRORS         {userNotSubscribed|
+                            basicServiceNotProvided|
+                            supplementaryServiceInteractionNotAllowed|
+                            invalidDestinationNumber|
+                            invalidCooperationNumber|
+                            mCRequestNotAllowed|
+                            mCExecutionNotAllowed|
+                            mCDestUserBusy|
+                            mCCoopUserBusy|
+                            mCCoopUserRejected|
+                            establishmentFailure|
+                            unspecified}
+            CODE            local: 112
+                         }
+
+mCInform    OPERATION ::= {
+            ARGUMENT        MCInformArg
+            RETURN RESULT   FALSE
+            ERRORS         {userNotSubscribed|
+                            basicServiceNotProvided|
+                            supplementaryServiceInteractionNotAllowed|
+                            invalidDestinationNumber|
+                            mCExecutionNotAllowed|
+                            mCDestUserBusy|
+                            unspecified}
+            ALWAYS RESPONDS FALSE
+            CODE            local: 113
+                           }
+
+mCAlerting  OPERATION ::= {
+            ARGUMENT        MCAlertingArg
+            RETURN RESULT   FALSE
+            ALWAYS RESPONDS FALSE
+            CODE            local: 114
+                          }
+
+MCRequestArg    ::=     SEQUENCE
+            {
+            callType              CallType,
+            retainOrigCall        BOOLEAN DEFAULT TRUE,
+            destinationAddress    PresentedAddressUnscreened,
+            requestingAddress     [0] PresentedAddressUnscreened OPTIONAL,
+            cooperatingAddress    [1] PresentedAddressUnscreened OPTIONAL,
+            correlation           Correlation,
+            extensions            MCRExtensions     OPTIONAL,
+            ...
+            }
+
+MCRequestResult  ::=    SEQUENCE
+            {
+            extensions            MCRExtensions     OPTIONAL,
+            ...
+            }
+
+MCInformArg        ::=    SEQUENCE
+            {
+            requestingAddress        [0] PresentedAddressUnscreened OPTIONAL,
+            cooperatingAddress       [1] PresentedAddressUnscreened OPTIONAL,
+            correlation              Correlation,
+            extensions               MCRExtensions     OPTIONAL,
+            ...
+            }
+
+MCAlertingArg        ::=    SEQUENCE
+            {
+            correlation              Correlation,
+            extensions               MCRExtensions     OPTIONAL,
+            ...
+            }
+CallType        ::=    CHOICE
+            {
+            basicService             BasicService,
+            cisc                     NULL
+            }
+
+Correlation    ::=    SEQUENCE
+            {
+            correlationData          CallIdentity,
+            correlationReason        CorrelationReason    OPTIONAL
+            }
+CorrelationReason    ::=    INTEGER
+            {
+            unknown             (0),
+            mCACommunication    (1),
+            cTIApplication      (2)
+            } (0..255)
+
+MCRExtensions    ::= CHOICE
+            {
+            none        NULL,
+            single      [0] IMPLICIT Extension
+                            { { MakeCallRequestExtension } } ,
+            multiple    [1] IMPLICIT SEQUENCE OF Extension
+                            { { MakeCallRequestExtension } }
+            }
+
+MakeCallRequestExtension EXTENSION::= {...}
+
+invalidDestinationNumber   ERROR ::= {CODE local : 1030}
+invalidCooperationNumber   ERROR ::= {CODE local : 1031}
+mCRequestNotAllowed        ERROR ::= {CODE local : 1032}
+mCExecutionNotAllowed      ERROR ::= {CODE local : 1033}
+mCDestUserBusy             ERROR ::= {CODE local : 1034}
+mCCoopUserBusy             ERROR ::= {CODE local : 1035}
+mCCoopUserRejected         ERROR ::= {CODE local : 1036}
+unspecified                ERROR ::= {PARAMETER Extension
+                               { { MakeCallRequestExtension } }
+                           CODE local : 1008
+                                      }
+
+END        -- of SS-MCR-Operations
diff --git a/asn1/qsig/QSIG-PUMCH.asn b/asn1/qsig/QSIG-PUMCH.asn
index 6bbf4d0e3c..7944e5160e 100644
--- a/asn1/qsig/QSIG-PUMCH.asn
+++ b/asn1/qsig/QSIG-PUMCH.asn
@@ -7,131 +7,131 @@
 -- $Id$
 --
 
-Private-User-Mobility-Call-Handling-Operations-asn1-97 
-  { iso (1) standard (0) pss1-pum-call-handling (17878) pum-call-handling-operations-asn1-97 (1)} 
- 
-DEFINITIONS EXPLICIT TAGS ::= 
- 
-BEGIN 
-IMPORTS  OPERATION, ERROR FROM Remote-Operations-Information-Objects 
-    { joint-iso-itu-t remote-operations (4) informationObjects (5) version1 (0) } 
-  EXTENSION, Extension{} FROM Manufacturer-specific-service-extension-class-asn1-97 
-    { iso (1) standard (0) 
-    pss1-generic-procedures (11582) msi-class-asn1-97(11) } 
-  PSS1InformationElement FROM PSS1-generic-parameters-definition-asn1-97 
-    { iso (1) standard (0) 
-    pss1-generic-procedures (11582) pss1-generic-parameters-asn1-97 (17) } 
-  Name FROM Name-Operations-asn1-97 
-    { iso (1) standard (0) 
-    pss1-name (13868) name-operations-asn1-97 (1) } 
- basicServiceNotProvided, invalidServedUserNr, notAvailable FROM  
-   General-Error-List 
-    { ccitt recommendation q 950 general-error-list (1) } 
-  Address, PartyNumber, PartySubaddress, PresentedNumberScreened FROM  
-   Addressing-Data-Elements-asn1-97 
-    { iso (1) standard (0) pss1-generic-procedures (11582)  
-    addressing-data-elements-asn1-97 (20) }; 
- 
-Private-User-Mobility-Call-Handling-Operations OPERATION ::= { pumiEnquiry | pumiDivert | pumiInform | 
-pumoCall } 
- 
--- Operations for ANF-PUMI: -- 
-pumiEnquiry     OPERATION ::= { 
-  -- Sent from the PUMI-detect PINX to the Home PINX. 
-   ARGUMENT  EnquiryArg 
-   RESULT  EnquiryRes 
-    ERRORS  { invalidServedUserNr | locationNotKnown |  
-      notAvailable | basicServiceNotProvided | unspecified } 
-   CODE  local: 93} 
-pumiDivert     OPERATION ::= { 
-  -- Sent from the PUMI-detect PINX to the Rerouteing PINX. 
-   ARGUMENT  DivertArg 
-   RESULT  DummyRes 
-    ERRORS  { notAvailable | unspecified } 
-   CODE  local: 94} 
+Private-User-Mobility-Call-Handling-Operations-asn1-97
+  { iso (1) standard (0) pss1-pum-call-handling (17878) pum-call-handling-operations-asn1-97 (1)}
 
-pumiInform     OPERATION ::= { 
-  -- Sent from the Rerouteing PINX to the Visitor PINX. 
-   ARGUMENT      InformArg 
-    RETURN RESULT     FALSE 
-    ALWAYS RESPONDS   FALSE 
-   CODE      local: 95} 
-EnquiryArg ::=    SEQUENCE   { pisnNumber    PartyNumber, 
-     -- The PISN number of the PUM user 
-     qSIGInfoElement  PSS1InformationElement, 
-  -- The basic call information elements Bearer capability, High layer compatibility, 
-  -- Low layer compatibility can be embedded in the qSIGInfoElement 
-  -- in accordance with clause 6.5.2.1. 
-      argExtension    PumiExtension OPTIONAL } 
-DivertArg ::=  SEQUENCE   { hostingAddr    PartyNumber, 
-     -- The PISN number of the hosting user, 
-      -- always a Complete Number.  
-     callingNumber    PresentedNumberScreened, 
-     pumIdentity    PumIdentity, 
-     -- The PISN number (always a Complete Number) 
-      -- and/or an alternative identifier of the PUM user. 
-     qSIGInfoElement  PSS1InformationElement, 
-  -- The basic call information elements Bearer capability, High layer compatibility, 
-  -- Low layer compatibility, and Progress indicator  
-  -- can be embedded in the qSIGInfoElement in accordance with clause 6.5.2.1. 
-      callingUserSub   [ 1 ] PartySubaddress OPTIONAL, 
-      callingUserName  [ 2 ] Name OPTIONAL, 
-      pumUserSub    [ 3 ] PartySubaddress OPTIONAL, 
-      argExtension    PumiExtension OPTIONAL } 
-InformArg ::=  SEQUENCE  { pumIdentity  PumIdentity, 
-     -- The PISN number (always a Complete Number) 
-      -- and/or an alternative identifier of the PUM user. 
-      argExtension    PumiExtension OPTIONAL } 
-EnquiryRes ::=  CHOICE  { currLocation    [ 1 ] IMPLICIT CurrLocation, 
-      cfuActivated    [ 2 ] IMPLICIT CfuActivated } 
-CurrLocation  ::=  SEQUENCE  { hostingAddr    PartyNumber, 
-     -- The PISN number of the hosting user, 
-      -- always a Complete Number.  
-     pumIdentity    PumIdentity, 
-     -- The PISN number (always a Complete Number) 
-      -- and/or an alternative identifier of the PUM user.  
-      argExtension    PumiExtension OPTIONAL } 
-CfuActivated  ::=  SEQUENCE  { divToAddress   Address, 
-     divOptions    SubscriptionOption, 
-      pumName    [ 1 ] Name OPTIONAL,  
-      argExtension     PumiExtension OPTIONAL } 
-SubscriptionOption ::=ENUMERATED  { noNotification (0), 
-     notificationWithoutDivertedToNr (1), 
-      notificationWithDivertedToNr (2) } 
+DEFINITIONS EXPLICIT TAGS ::=
+
+BEGIN
+IMPORTS  OPERATION, ERROR FROM Remote-Operations-Information-Objects
+    { joint-iso-itu-t remote-operations (4) informationObjects (5) version1 (0) }
+  EXTENSION, Extension{} FROM Manufacturer-specific-service-extension-class-asn1-97
+    { iso (1) standard (0)
+    pss1-generic-procedures (11582) msi-class-asn1-97(11) }
+  PSS1InformationElement FROM PSS1-generic-parameters-definition-asn1-97
+    { iso (1) standard (0)
+    pss1-generic-procedures (11582) pss1-generic-parameters-asn1-97 (17) }
+  Name FROM Name-Operations-asn1-97
+    { iso (1) standard (0)
+    pss1-name (13868) name-operations-asn1-97 (1) }
+ basicServiceNotProvided, invalidServedUserNr, notAvailable FROM
+   General-Error-List
+    { ccitt recommendation q 950 general-error-list (1) }
+  Address, PartyNumber, PartySubaddress, PresentedNumberScreened FROM
+   Addressing-Data-Elements-asn1-97
+    { iso (1) standard (0) pss1-generic-procedures (11582)
+    addressing-data-elements-asn1-97 (20) };
+
+Private-User-Mobility-Call-Handling-Operations OPERATION ::= { pumiEnquiry | pumiDivert | pumiInform |
+pumoCall }
+
+-- Operations for ANF-PUMI: --
+pumiEnquiry     OPERATION ::= {
+  -- Sent from the PUMI-detect PINX to the Home PINX.
+   ARGUMENT  EnquiryArg
+   RESULT  EnquiryRes
+    ERRORS  { invalidServedUserNr | locationNotKnown |
+      notAvailable | basicServiceNotProvided | unspecified }
+   CODE  local: 93}
+pumiDivert     OPERATION ::= {
+  -- Sent from the PUMI-detect PINX to the Rerouteing PINX.
+   ARGUMENT  DivertArg
+   RESULT  DummyRes
+    ERRORS  { notAvailable | unspecified }
+   CODE  local: 94}
+
+pumiInform     OPERATION ::= {
+  -- Sent from the Rerouteing PINX to the Visitor PINX.
+   ARGUMENT      InformArg
+    RETURN RESULT     FALSE
+    ALWAYS RESPONDS   FALSE
+   CODE      local: 95}
+EnquiryArg ::=    SEQUENCE   { pisnNumber    PartyNumber,
+     -- The PISN number of the PUM user
+     qSIGInfoElement  PSS1InformationElement,
+  -- The basic call information elements Bearer capability, High layer compatibility,
+  -- Low layer compatibility can be embedded in the qSIGInfoElement
+  -- in accordance with clause 6.5.2.1.
+      argExtension    PumiExtension OPTIONAL }
+DivertArg ::=  SEQUENCE   { hostingAddr    PartyNumber,
+     -- The PISN number of the hosting user,
+      -- always a Complete Number.
+     callingNumber    PresentedNumberScreened,
+     pumIdentity    PumIdentity,
+     -- The PISN number (always a Complete Number)
+      -- and/or an alternative identifier of the PUM user.
+     qSIGInfoElement  PSS1InformationElement,
+  -- The basic call information elements Bearer capability, High layer compatibility,
+  -- Low layer compatibility, and Progress indicator
+  -- can be embedded in the qSIGInfoElement in accordance with clause 6.5.2.1.
+      callingUserSub   [ 1 ] PartySubaddress OPTIONAL,
+      callingUserName  [ 2 ] Name OPTIONAL,
+      pumUserSub    [ 3 ] PartySubaddress OPTIONAL,
+      argExtension    PumiExtension OPTIONAL }
+InformArg ::=  SEQUENCE  { pumIdentity  PumIdentity,
+     -- The PISN number (always a Complete Number)
+      -- and/or an alternative identifier of the PUM user.
+      argExtension    PumiExtension OPTIONAL }
+EnquiryRes ::=  CHOICE  { currLocation    [ 1 ] IMPLICIT CurrLocation,
+      cfuActivated    [ 2 ] IMPLICIT CfuActivated }
+CurrLocation  ::=  SEQUENCE  { hostingAddr    PartyNumber,
+     -- The PISN number of the hosting user,
+      -- always a Complete Number.
+     pumIdentity    PumIdentity,
+     -- The PISN number (always a Complete Number)
+      -- and/or an alternative identifier of the PUM user.
+      argExtension    PumiExtension OPTIONAL }
+CfuActivated  ::=  SEQUENCE  { divToAddress   Address,
+     divOptions    SubscriptionOption,
+      pumName    [ 1 ] Name OPTIONAL,
+      argExtension     PumiExtension OPTIONAL }
+SubscriptionOption ::=ENUMERATED  { noNotification (0),
+     notificationWithoutDivertedToNr (1),
+      notificationWithDivertedToNr (2) }
+
+DummyRes ::=  CHOICE  { null    NULL,
+      extension  [ 1 ] IMPLICIT Extension{{PUMCHExtSet}},
+      sequOfExtn  [ 2 ] IMPLICIT SEQUENCE OF
+             Extension{{PUMCHExtSet}} }
+PumiExtension ::= CHOICE  { extension  [ 4 ] IMPLICIT Extension{{PUMCHExtSet}},
+      sequOfExtn  [ 5 ] IMPLICIT SEQUENCE OF
+             Extension{{PUMCHExtSet}} }
+PumIdentity  ::=  CHOICE  { pisnNumber  PartyNumber,
+      alternativeId  [ 10 ] IMPLICIT AlternativeId,
+      both    [ 11 ] IMPLICIT SEQUENCE
+         { pisnNumber  PartyNumber,
+            alternativeId  AlternativeId } }
+AlternativeId ::=  OCTET STRING(SIZE(1..20))
+-- Operation for ANF-PUMO --
+pumoCall   OPERATION ::= {
+ ARGUMENT  PumoArg
+ RETURN RESULT  FALSE
+ ALWAYS RESPONDS  FALSE
+ CODE   local: 96}
+PumoArg ::=   SEQUENCE   { destinationNumber  [0]  PartyNumber  OPTIONAL,
+      pumIdentity    [1]  PumIdentity    OPTIONAL,
+     -- The PISN number (always a Complete Number)
+      -- and/or an alternative identifier of the PUM user.
+      sendingComplete  [2]  IMPLICIT NULL  OPTIONAL,
+      extension    CHOICE
+      {single    [3] IMPLICIT Extension{{PUMCHExtSet}},
+      multiple    [4] IMPLICIT SEQUENCE OF
+             Extension{{PUMCHExtSet}} }
+              OPTIONAL    }
+PUMCHExtSet EXTENSION ::= {...}
+
+locationNotKnown   ERROR  ::=  {  CODE    local: 1015}
+unspecified    ERROR  ::=   {  PARAMETER  Extension{{PUMCHExtSet}}
+         CODE   local: 1008}
 
-DummyRes ::=  CHOICE  { null    NULL, 
-      extension  [ 1 ] IMPLICIT Extension{{PUMCHExtSet}}, 
-      sequOfExtn  [ 2 ] IMPLICIT SEQUENCE OF  
-             Extension{{PUMCHExtSet}} } 
-PumiExtension ::= CHOICE  { extension  [ 4 ] IMPLICIT Extension{{PUMCHExtSet}}, 
-      sequOfExtn  [ 5 ] IMPLICIT SEQUENCE OF  
-             Extension{{PUMCHExtSet}} } 
-PumIdentity  ::=  CHOICE  { pisnNumber  PartyNumber, 
-      alternativeId  [ 10 ] IMPLICIT AlternativeId, 
-      both    [ 11 ] IMPLICIT SEQUENCE 
-         { pisnNumber  PartyNumber, 
-            alternativeId  AlternativeId } } 
-AlternativeId ::=  OCTET STRING(SIZE(1..20)) 
--- Operation for ANF-PUMO -- 
-pumoCall   OPERATION ::= { 
- ARGUMENT  PumoArg 
- ALWAYS RESPONDS  FALSE 
- RETURN RESULT  FALSE 
- CODE   local: 96} 
-PumoArg ::=   SEQUENCE   { destinationNumber  [0]  PartyNumber  OPTIONAL, 
-      pumIdentity    [1]  PumIdentity    OPTIONAL, 
-     -- The PISN number (always a Complete Number) 
-      -- and/or an alternative identifier of the PUM user.  
-      sendingComplete  [2]  IMPLICIT NULL  OPTIONAL, 
-      extension    CHOICE     
-      {single    [3] IMPLICIT Extension{{PUMCHExtSet}}, 
-      multiple    [4] IMPLICIT SEQUENCE OF  
-             Extension{{PUMCHExtSet}} } 
-              OPTIONAL    } 
-PUMCHExtSet EXTENSION ::= {...} 
- 
-locationNotKnown   ERROR  ::=  {  CODE    local: 1015} 
-unspecified    ERROR  ::=   {  PARAMETER  Extension{{PUMCHExtSet}} 
-         CODE   local: 1008} 
- 
 END  -- of Private-User-Mobility-Call-Handling-Operations-asn1-97
diff --git a/asn1/qsig/QSIG-WTMLR.asn b/asn1/qsig/QSIG-WTMLR.asn
index 8fcbe38e1d..9f94af59a8 100644
--- a/asn1/qsig/QSIG-WTMLR.asn
+++ b/asn1/qsig/QSIG-WTMLR.asn
@@ -7,118 +7,118 @@
 -- $Id$
 --
 
-WTM-Location-Registration-Operations-asn1-97 
-  {iso standard pss1-location-registration (15429) wtlr-operations-asn1-97 (1)} 
- 
-DEFINITIONS EXPLICIT TAGS ::= 
- 
-BEGIN 
-IMPORTS  OPERATION, ERROR FROM Remote-Operations-Information-Objects 
-   {joint-iso-itu-t remote-operations(4) informationObjects(5) version1(0)} 
-  EXTENSION, Extension{} FROM Manufacturer-specific-service-extension-class-asn1-97 
-   {iso standard 
-    pss1-generic-procedures (11582) msi-class-asn1-97(11)} 
-  notAvailable, invalidServedUserNr  
-   FROM General-Errors-List 
-    {ccitt recommendation q 950 general-error-list (1)} 
-  PartyNumber FROM Addressing-Data-Elements-asn1-97 
-    {iso(1) standard(0) pss1-generic-procedures(11582) 
-   addressing-data-elements-asn1-97(20)} 
-  BasicService FROM Call-Diversion-Operations-asn1-97 
-    { iso (1) standard (0) pss1-call-diversion (13873)  
-    call-diversion-operations-asn1-97 (1) };  
-WTMLR-Operations OPERATION ::= {locUpdate | locDelete | locDeReg | pisnEnquiry | getRRCInf | locInfoCheck} 
- 
-locUpdate   OPERATION ::={ 
-  -- Sent from the Visitor PINX to the Home PINX. 
-   ARGUMENT  LocUpdArg 
-   RESULT    DummyRes 
-    ERRORS    { invalidServedUserNr | notAuthorized | unspecified } 
-   CODE    local: 50} 
+WTM-Location-Registration-Operations-asn1-97
+  {iso standard pss1-location-registration (15429) wtlr-operations-asn1-97 (1)}
 
-locDelete   OPERATION ::= { 
-  -- Sent from the Home PINX to the previous Visitor PINX. 
-   ARGUMENT  LocDelArg 
-   RESULT    DummyRes 
-    ERRORS    { temporarilyUnavailable | unspecified } 
-   CODE    local: 51} 
-locDeReg   OPERATION ::= { 
-  -- Sent from the Visitor PINX to the Home PINX. 
-   ARGUMENT  LocDeRegArg 
-   RESULT    DummyRes 
-    ERRORS    { notAvailable | unspecified } 
-   CODE    local: 52} 
-pisnEnquiry   OPERATION ::= { 
-  -- Sent from the Visitor PINX to the previous Visitor PINX or a Directory PINX. 
-   ARGUMENT  PisnEnqArg 
-   RESULT    PisnEnqRes 
-    ERRORS    { invalidServedUserNr | unspecified} 
-   CODE    local: 53} 
-getRRCInf   OPERATION ::= { 
-  -- Sent from the Visitor PINX to the Home PINX. 
-   ARGUMENT  GetRRCInfArg 
-   RESULT    GetRRCInfRes 
-    ERRORS    { notAvailable | unspecified } 
-   CODE    local: 97} 
-locInfoCheck   OPERATION ::= { 
-  -- Sent from the Visitor PINX to the Home PINX or vice versa. 
-   ARGUMENT  LocInfoCheckArg 
-   RESULT    LocInfoCheckRes 
-    ERRORS    { notAvailable | unspecified } 
-   CODE    local: 98} 
-LocUpdArg ::=  SEQUENCE   { wtmUserId   WtmUserId, 
-      basicService  BasicService DEFAULT allServices, 
-      visitPINX    PartyNumber,  
-        -- The pisnNumber of the Visitor PINX,  
-        -- always a Complete Number.  
-      argExtension  LrExtension OPTIONAL } 
-DummyRes ::=  CHOICE     { null    NULL, 
-        extension  [ 1 ] IMPLICIT Extension{{WTMLRExtSet}}, 
-        sequOfExtn [ 2 ] IMPLICIT SEQUENCE OF  
-           Extension{{WTMLRExtSet}} } 
-LocDelArg ::=  SEQUENCE   { wtmUserId   WtmUserId, 
-      basicService  BasicService DEFAULT allServices, 
-      argExtension  LrExtension OPTIONAL } 
-LocDeRegArg ::=  SEQUENCE   { wtmUserId   WtmUserId, 
-      basicService  BasicService DEFAULT allServices, 
-      argExtension  LrExtension OPTIONAL } 
+DEFINITIONS EXPLICIT TAGS ::=
 
-PisnEnqArg ::=  SEQUENCE   { alternativeId AlternativeId, 
-        -- Can be a temporary identifier, e.g. Network Assigned 
-      -- Identity structure, or a fixed handset identifier. 
-      argExtension  LrExtension OPTIONAL } 
-PisnEnqRes ::=  SEQUENCE   { wtmUserId   WtmUserId, 
-      resExtension  LrExtension OPTIONAL } 
-GetRRCInfArg ::=  SEQUENCE   { wtmUserId   WtmUserId, 
-      basicService  BasicService DEFAULT allServices, 
-      argExtension  LrExtension OPTIONAL } 
-GetRRCInfRes ::=  SEQUENCE   { alternativeId AlternativeId OPTIONAL, 
-      rrClass    RRClass OPTIONAL,  
-      argExtension  LrExtension OPTIONAL } 
-LocInfoCheckArg ::=  SEQUENCE   { wtmUserId   WtmUserId, 
-      basicService  BasicService DEFAULT allServices, 
-      visitPINX    PartyNumber,  
-        -- The PISN number of the Visitor PINX, 
-        -- always a Complete Number.  
-      argExtension  LrExtension OPTIONAL } 
-LocInfoCheckRes ::=  SEQUENCE  { checkResult  CheckResult, 
-      argExtension  LrExtension OPTIONAL } 
-WtmUserId ::=  CHOICE    { pisnNumber  PartyNumber, 
-        -- The PISN number of the WTM user, 
-        -- always a Complete Number.  
-      alternativeId   AlternativeId } 
-AlternativeId ::=  OCTET STRING(SIZE(1..20)) 
-LrExtension ::=  CHOICE  { extension  [ 1 ] IMPLICIT Extension{{WTMLRExtSet}}, 
-      sequOfExtn [ 2 ] IMPLICIT SEQUENCE OF  
-         Extension{{WTMLRExtSet}} } 
-RRClass ::=  INTEGER (0..99)  
-CheckResult ::=  ENUMERATED  { locInfChk-correct (0), 
-      locInfChk-incorrect (1) } 
-WTMLRExtSet EXTENSION ::= {...} 
-notAuthorized    ERROR  ::=  {CODE local: 1007} 
-temporarilyUnavailable    ERROR  ::=  {CODE local: 1000} 
- 
-unspecified     ERROR ::=  { 
-     PARAMETER   Extension{{WTMLRExtSet}} 
-     CODE   local: 1008} 
-END  -- of WTM-Location-Registration-Operations-asn1-97 
+BEGIN
+IMPORTS  OPERATION, ERROR FROM Remote-Operations-Information-Objects
+   {joint-iso-itu-t remote-operations(4) informationObjects(5) version1(0)}
+  EXTENSION, Extension{} FROM Manufacturer-specific-service-extension-class-asn1-97
+   {iso standard
+    pss1-generic-procedures (11582) msi-class-asn1-97(11)}
+  notAvailable, invalidServedUserNr
+   FROM General-Error-List
+    {ccitt recommendation q 950 general-error-list (1)}
+  PartyNumber FROM Addressing-Data-Elements-asn1-97
+    {iso(1) standard(0) pss1-generic-procedures(11582)
+   addressing-data-elements-asn1-97(20)}
+  BasicService FROM Call-Diversion-Operations-asn1-97
+    { iso (1) standard (0) pss1-call-diversion (13873)
+    call-diversion-operations-asn1-97 (1) };
+WTMLR-Operations OPERATION ::= {locUpdate | locDelete | locDeReg | pisnEnquiry | getRRCInf | locInfoCheck}
+
+locUpdate   OPERATION ::={
+  -- Sent from the Visitor PINX to the Home PINX.
+   ARGUMENT  LocUpdArg
+   RESULT    DummyRes
+    ERRORS    { invalidServedUserNr | notAuthorized | unspecified }
+   CODE    local: 50}
+
+locDelete   OPERATION ::= {
+  -- Sent from the Home PINX to the previous Visitor PINX.
+   ARGUMENT  LocDelArg
+   RESULT    DummyRes
+    ERRORS    { temporarilyUnavailable | unspecified }
+   CODE    local: 51}
+locDeReg   OPERATION ::= {
+  -- Sent from the Visitor PINX to the Home PINX.
+   ARGUMENT  LocDeRegArg
+   RESULT    DummyRes
+    ERRORS    { notAvailable | unspecified }
+   CODE    local: 52}
+pisnEnquiry   OPERATION ::= {
+  -- Sent from the Visitor PINX to the previous Visitor PINX or a Directory PINX.
+   ARGUMENT  PisnEnqArg
+   RESULT    PisnEnqRes
+    ERRORS    { invalidServedUserNr | unspecified}
+   CODE    local: 53}
+getRRCInf   OPERATION ::= {
+  -- Sent from the Visitor PINX to the Home PINX.
+   ARGUMENT  GetRRCInfArg
+   RESULT    GetRRCInfRes
+    ERRORS    { notAvailable | unspecified }
+   CODE    local: 97}
+locInfoCheck   OPERATION ::= {
+  -- Sent from the Visitor PINX to the Home PINX or vice versa.
+   ARGUMENT  LocInfoCheckArg
+   RESULT    LocInfoCheckRes
+    ERRORS    { notAvailable | unspecified }
+   CODE    local: 98}
+LocUpdArg ::=  SEQUENCE   { wtmUserId   WtmUserId,
+      basicService  BasicService DEFAULT allServices,
+      visitPINX    PartyNumber,
+        -- The pisnNumber of the Visitor PINX,
+        -- always a Complete Number.
+      argExtension  LrExtension OPTIONAL }
+DummyRes ::=  CHOICE     { null    NULL,
+        extension  [ 1 ] IMPLICIT Extension{{WTMLRExtSet}},
+        sequOfExtn [ 2 ] IMPLICIT SEQUENCE OF
+           Extension{{WTMLRExtSet}} }
+LocDelArg ::=  SEQUENCE   { wtmUserId   WtmUserId,
+      basicService  BasicService DEFAULT allServices,
+      argExtension  LrExtension OPTIONAL }
+LocDeRegArg ::=  SEQUENCE   { wtmUserId   WtmUserId,
+      basicService  BasicService DEFAULT allServices,
+      argExtension  LrExtension OPTIONAL }
+
+PisnEnqArg ::=  SEQUENCE   { alternativeId AlternativeId,
+        -- Can be a temporary identifier, e.g. Network Assigned
+      -- Identity structure, or a fixed handset identifier.
+      argExtension  LrExtension OPTIONAL }
+PisnEnqRes ::=  SEQUENCE   { wtmUserId   WtmUserId,
+      resExtension  LrExtension OPTIONAL }
+GetRRCInfArg ::=  SEQUENCE   { wtmUserId   WtmUserId,
+      basicService  BasicService DEFAULT allServices,
+      argExtension  LrExtension OPTIONAL }
+GetRRCInfRes ::=  SEQUENCE   { alternativeId AlternativeId OPTIONAL,
+      rrClass    RRClass OPTIONAL,
+      argExtension  LrExtension OPTIONAL }
+LocInfoCheckArg ::=  SEQUENCE   { wtmUserId   WtmUserId,
+      basicService  BasicService DEFAULT allServices,
+      visitPINX    PartyNumber,
+        -- The PISN number of the Visitor PINX,
+        -- always a Complete Number.
+      argExtension  LrExtension OPTIONAL }
+LocInfoCheckRes ::=  SEQUENCE  { checkResult  CheckResult,
+      argExtension  LrExtension OPTIONAL }
+WtmUserId ::=  CHOICE    { pisnNumber  PartyNumber,
+        -- The PISN number of the WTM user,
+        -- always a Complete Number.
+      alternativeId   AlternativeId }
+AlternativeId ::=  OCTET STRING(SIZE(1..20))
+LrExtension ::=  CHOICE  { extension  [ 1 ] IMPLICIT Extension{{WTMLRExtSet}},
+      sequOfExtn [ 2 ] IMPLICIT SEQUENCE OF
+         Extension{{WTMLRExtSet}} }
+RRClass ::=  INTEGER (0..99)
+CheckResult ::=  ENUMERATED  { locInfChk-correct (0),
+      locInfChk-incorrect (1) }
+WTMLRExtSet EXTENSION ::= {...}
+notAuthorized    ERROR  ::=  {CODE local: 1007}
+temporarilyUnavailable    ERROR  ::=  {CODE local: 1000}
+
+unspecified     ERROR ::=  {
+     PARAMETER   Extension{{WTMLRExtSet}}
+     CODE   local: 1008}
+END  -- of WTM-Location-Registration-Operations-asn1-97
diff --git a/asn1/qsig/SYNC-SIG.asn b/asn1/qsig/SYNC-SIG.asn
index 5032e4a3f5..fa5fbe3859 100644
--- a/asn1/qsig/SYNC-SIG.asn
+++ b/asn1/qsig/SYNC-SIG.asn
@@ -16,19 +16,19 @@ DEFINITIONS EXPLICIT TAGS::=
 
 BEGIN
 
-IMPORTS           OPERATION, ERROR FROM 
-                       Remote-Operations-Information-Objects 
-                       {joint-iso-itu-t remote-operations (4) informationObjects (5) 
-                       version1 (0)} 
- 
-                  EXTENSION, Extension{} FROM  
-                       Manufacturer-specific-service-extension-class-asn1-97 
-                       {iso standard pss1-generic-procedures (11582)   
+IMPORTS           OPERATION, ERROR FROM
+                       Remote-Operations-Information-Objects
+                       {joint-iso-itu-t remote-operations (4) informationObjects (5)
+                       version1 (0)}
+
+                  EXTENSION, Extension{} FROM
+                       Manufacturer-specific-service-extension-class-asn1-97
+                       {iso standard pss1-generic-procedures (11582)
                        msi-class-asn1-97 (11)} ;
 
 -- The following two operations shall apply to SYNC-SIG
 
-Synchronization-Operations OPERATION ::= { synchronizationRequest | synchronizationInfo } 
+Synchronization-Operations OPERATION ::= { synchronizationRequest | synchronizationInfo }
 
 synchronizationRequest OPERATION ::= {
   ARGUMENT  SynchronizationReqArg
@@ -40,7 +40,7 @@ synchronizationRequest OPERATION ::= {
 synchronizationInfo OPERATION ::= {
   ARGUMENT  SynchronizationInfoArg
   CODE      local:79
-} 
+}
 
 SynchronizationReqArg ::= SEQUENCE {
   action        Action,
@@ -61,14 +61,14 @@ SynchronizationInfoArg ::= SEQUENCE {
 Action ::= INTEGER { enslavement(0), holdon (1)}
 
 ArgExtension::= CHOICE{
-  extension  [1] IMPLICIT Extension,
-  sequOfExtn [2] IMPLICIT SEQUENCE OF Extension 
+  extension  [1] IMPLICIT Extension{{SYNCExtSet}},
+  sequOfExtn [2] IMPLICIT SEQUENCE OF Extension{{SYNCExtSet}}
 }
 
-unspecified            ERROR ::= { 
-                       PARAMETER    Extension{{SYNCExtSet}} 
-                       CODE        local:1008} 
+unspecified            ERROR ::= {
+                       PARAMETER    Extension{{SYNCExtSet}}
+                       CODE        local:1008}
 
-SYNCExtSet     EXTENSION ::= {...} 
+SYNCExtSet     EXTENSION ::= {...}
 
 END -- of Synchronization-Operations-asn1-97