Add the remaining asn1 files "CODE global" not handled yet.

svn path=/trunk/; revision=47746

13 files changed, 1145 insertions, 12 deletions

diff --git a/asn1/isdn-sup/Advice-of-Charge-Operations.asn b/asn1/isdn-sup/Advice-of-Charge-Operations.asn
index f80474f456..820d506eab 100644
--- a/asn1/isdn-sup/Advice-of-Charge-Operations.asn
+++ b/asn1/isdn-sup/Advice-of-Charge-Operations.asn
@@ -21,7 +21,7 @@ IMPORTS		OPERATION, ERROR
 				{ccitt identified-organization etsi (0) 196 general-errors (2)}
 			PartyNumber
 			FROM Addressing-Data-Elements
-				{ccitt identified-organization etsi (0) 196 addressing-data-elements (6)};
+				{itu-t(0) identified-organization(4) 196 addressing-data-elements (6)};
 
 	chargingRequest OPERATION ::= {
 			ARGUMENT ChargingRequestArg
diff --git a/asn1/isdn-sup/CCBS-Operations-and-Errors.asn b/asn1/isdn-sup/CCBS-Operations-and-Errors.asn
new file mode 100644
index 0000000000..8bfa53c95c
--- /dev/null
+++ b/asn1/isdn-sup/CCBS-Operations-and-Errors.asn
@@ -0,0 +1,171 @@
+-- $Id$
+--
+-- EN 300 359-1 Ver. 1.3.2
+--
+CCBS-Operations-and-Errors {ccitt identified-organization etsi(0) 359 operations-and-errors(1)}
+
+DEFINITIONS EXPLICIT TAGS ::=
+
+BEGIN
+
+EXPORTS             CallInfoRetain, EraseCallLinkageID,
+                    CCBSRequest, CCBSDeactivate, CCBSInterrogate, CCBSErase,
+                    CCBSRemoteUserFree, CCBSCall, CCBSStatusRequest, CCBSBFree,
+                    CCBSStopAlerting,
+                    InvalidCallLinkageID, InvalidCCBSReference, LongTermDenial, ShortTermDenial,
+                    CCBSIsAlreadyActivated, AlreadyAccepted, OutgoingCCBSQueueFull,
+                    CallFailureReasonNotBusy, NotReadyForCall;
+
+IMPORTS             OPERATION, ERROR
+                    FROM Remote-Operations-Information-Objects 
+                        {joint-iso-itu-t (2) remote-operations (4) informationObjects(5) version1(0)}
+
+                    notSubscribed, supplementaryServiceInteractionNotAllowed
+                    FROM General-Errors
+                        {ccitt identified-organization etsi(0) 196 general-errors(2)}
+
+                    Address, PartyNumber, PartySubaddress
+                    FROM Addressing-Data-Elements
+                        {ccitt identified-organization etsi(0) 196 addressing-data-elements(6)}
+
+                    Q931InformationElement
+                    FROM Embedded-Q931-Types
+                        {ccitt identified-organization etsi(0) 196 embedded-q931-types(7)};
+
+CallInfoRetain              ::= OPERATION
+                                ARGUMENT    callLinkageID       CallLinkageID
+
+EraseCallLinkageID          ::= OPERATION
+                                ARGUMENT    callLinkageID       CallLinkageID
+
+CCBSRequest                 ::= OPERATION
+                                ARGUMENT    callLinkageID       CallLinkageID
+                                RESULT SEQUENCE {
+                                            recallMode          RecallMode,
+                                            cCBSReference       CCBSReference}
+                                ERRORS     {notSubscribed, InvalidCallLinkageID, ShortTermDenial,
+                                            LongTermDenial, CCBSIsAlreadyActivated,
+                                            supplementaryServiceInteractionNotAllowed,
+                                            OutgoingCCBSQueueFull, CallFailureReasonNotBusy}
+
+CCBSInterrogate             ::= OPERATION
+                                ARGUMENT SEQUENCE {
+                                            cCBSReference       CCBSReference OPTIONAL,
+                                            partyNumberOfA      PartyNumber OPTIONAL}
+                                RESULT SEQUENCE {
+                                            recallMode          RecallMode,
+                                            callDetails         CallDetails OPTIONAL}
+                                ERRORS     {InvalidCCBSReference, notSubscribed}
+
+CCBSDeactivate              ::= OPERATION
+                                ARGUMENT    cCBSReference       CCBSReference
+                                RESULT
+                                ERRORS {InvalidCCBSReference}
+CCBSErase                   ::= OPERATION
+                                ARGUMENT SEQUENCE {
+                                            recallMode          RecallMode,
+                                            cCBSReference       CCBSReference,
+                                            addressOfB          Address,
+                                            q931InfoElement     Q931InformationElement,
+                                            eraseReason         CCBSEraseReason}
+
+-- The Bearer capability, High layer compatibility (optional) and Low layer compatibility 
+-- (optional) information elements shall be embedded in q931InfoElement.
+
+CCBSRemoteUserFree          ::= OPERATION
+                                ARGUMENT SEQUENCE {
+                                            recallMode          RecallMode,
+                                            cCBSReference       CCBSReference,
+                                            addressOfB          Address,
+                                            q931InfoElement     Q931InformationElement}
+
+-- The Bearer capability, High layer compatibility (optional) and Low layer compatibility 
+-- (optional) information elements shall be embedded in q931InfoElement.
+
+CCBSBFree                   ::= OPERATION
+                                ARGUMENT SEQUENCE {
+                                            recallMode          RecallMode,
+                                            cCBSReference       CCBSReference,
+                                            addressOfB          Address,
+                                            q931InfoElement     Q931InformationElement}
+
+-- The Bearer capability, High layer compatibility (optional) and Low layer compatibility 
+-- (optional) information elements shall be embedded in q931InfoElement.
+
+CCBSCall                    ::= OPERATION
+                                ARGUMENT    cCBSReference       CCBSReference
+                                ERRORS     {InvalidCCBSReference, AlreadyAccepted, 
+                                            NotReadyForCall}
+
+CCBSStatusRequest           ::= OPERATION
+                                ARGUMENT SEQUENCE {
+                                            recallMode          RecallMode,
+                                            cCBSReference       CCBSReference,
+                                            q931InfoElement     Q931InformationElement}
+                                RESULT BOOLEAN -- free=TRUE, busy=FALSE
+
+-- The Bearer capability, High layer compatibility (optional) and Low layer compatibility 
+-- (optional) information elements shall be embedded in q931InfoElement.
+
+CCBSStopAlerting            ::= OPERATION
+                                ARGUMENT    cCBSReference       CCBSReference
+
+CallDetails                 ::= SEQUENCE SIZE(1..5) OF CallInformation
+
+CallInformation             ::= SEQUENCE {
+                                    addressOfB          Address,
+                                    q931InfoElement     Q931InformationElement,
+                                    cCBSReference       CCBSReference,
+                                    subAddressOfA       PartySubaddress OPTIONAL}
+
+-- The Bearer capability, High layer compatibility (optional) and Low layer compatibility 
+-- (optional) information elements shall be embedded in q931InfoElement.
+
+InvalidCallLinkageID        ::= ERROR
+InvalidCCBSReference        ::= ERROR
+LongTermDenial              ::= ERROR
+ShortTermDenial             ::= ERROR
+CCBSIsAlreadyActivated      ::= ERROR
+AlreadyAccepted             ::= ERROR
+OutgoingCCBSQueueFull       ::= ERROR
+CallFailureReasonNotBusy    ::= ERROR
+NotReadyForCall             ::= ERROR
+
+CallLinkageID               ::= INTEGER (0..127)
+CCBSReference               ::= INTEGER (0..127)
+CCBSEraseReason             ::= ENUMERATED {
+                                    normal-unspecified (0),
+                                    t-CCBS2-timeout    (1),
+                                    t-CCBS3-timeout    (2),
+                                    basic-call-failed  (3)}
+
+RecallMode                  ::= ENUMERATED {
+                                    globalRecall   (0),
+                                    specificRecall (1)}
+
+cCBSOID OBJECT IDENTIFIER   ::= {ccitt identified-organization etsi(0) 359
+                                 operations-and-errors(1)}
+
+callInfoRetain              CallInfoRetain              ::= globalValue {cCBSOID 1}
+cCBSRequest                 CCBSRequest                 ::= globalValue {cCBSOID 2}
+cCBSDeactivate              CCBSDeactivate              ::= globalValue {cCBSOID 3}
+cCBSInterrogate             CCBSInterrogate             ::= globalValue {cCBSOID 4}
+cCBSErase                   CCBSErase                   ::= globalValue {cCBSOID 5}
+cCBSRemoteUserFree          CCBSRemoteUserFree          ::= globalValue {cCBSOID 6}
+cCBSCall                    CCBSCall                    ::= globalValue {cCBSOID 7}
+cCBSStatusRequest           CCBSStatusRequest           ::= globalValue {cCBSOID 8}
+cCBSBFree                   CCBSBFree                   ::= globalValue {cCBSOID 9}
+eraseCallLinkageID          EraseCallLinkageID          ::= globalValue {cCBSOID 10}
+cCBSStopAlerting            CCBSStopAlerting            ::= globalValue {cCBSOID 11}
+invalidCallLinkageID        InvalidCallLinkageID        ::= globalValue {cCBSOID 20}
+invalidCCBSReference        InvalidCCBSReference        ::= globalValue {cCBSOID 21}
+longTermDenial              LongTermDenial              ::= globalValue {cCBSOID 22}
+shortTermDenial             ShortTermDenial             ::= globalValue {cCBSOID 23}
+cCBSIsAlreadyActivated      CCBSIsAlreadyActivated      ::= globalValue {cCBSOID 24}
+alreadyAccepted             AlreadyAccepted             ::= globalValue {cCBSOID 25}
+outgoingCCBSQueueFull       OutgoingCCBSQueueFull       ::= globalValue {cCBSOID 26}
+callFailureReasonNotBusy    CallFailureReasonNotBusy    ::= globalValue {cCBSOID 27}
+notReadyForCall             NotReadyForCall             ::= globalValue {cCBSOID 28}
+
+
+END -- of CCBS-Operations-and-Errors
diff --git a/asn1/isdn-sup/CCBS-private-networks-Operations-and-Errors.asn b/asn1/isdn-sup/CCBS-private-networks-Operations-and-Errors.asn
new file mode 100644
index 0000000000..8914a6be2f
--- /dev/null
+++ b/asn1/isdn-sup/CCBS-private-networks-Operations-and-Errors.asn
@@ -0,0 +1,70 @@
+-- $Id$
+--
+-- EN 300 359-1 Ver. 1.3.2
+--
+CCBS-private-networks-Operations-and-Errors {ccitt identified-organization etsi(0) 359
+                                             private-networks-operations-and-errors(2)}
+
+DEFINITIONS EXPLICIT TAGS ::=
+
+BEGIN
+
+EXPORTS             CCBS-T-Request, CCBS-T-Call, CCBS-T-Suspend, CCBS-T-Resume,
+                    CCBS-T-RemoteUserFree, CCBS-T-Available, LongTermDenial, ShortTermDenial;
+
+IMPORTS             OPERATION, ERROR
+                    FROM Remote-Operations-Information-Objects 
+                        {joint-iso-itu-t (2) remote-operations (4) informationObjects(5) version1(0)}
+
+                    notSubscribed
+                    FROM General-Errors
+                        {ccitt identified-organization etsi(0) 196 general-errors(2)}
+
+                    Address
+                    FROM Addressing-Data-Elements
+                        {ccitt identified-organization etsi(0) 196 addressing-data-elements(6)}
+                    Q931InformationElement
+                    FROM Embedded-Q931-Types
+                        {ccitt identified-organization etsi(0) 196 embedded-q931-types(7)};
+
+CCBS-T-Request              ::= OPERATION
+                                ARGUMENT SEQUENCE {
+                                            destinationAddress           Address,
+                                            q931InfoElement              Q931InformationElement,
+                                            -- contains HLC, LLC and BC information
+                                            retentionSupported           [1] IMPLICIT BOOLEAN
+                                                                             DEFAULT FALSE,
+                                            presentationAllowedIndicator [2] IMPLICIT BOOLEAN
+                                                                             OPTIONAL,
+                                            -- The use of this parameter is specified in 
+                                            -- EN 300 195-1 for interaction of CCBS with CLIP
+                                            originatingAddress           Address OPTIONAL}
+                                            -- The use of this parameter is specified in 
+                                            -- EN 300 195-1 for interaction of CCBS with CLIP
+                                RESULT      retentionSupported BOOLEAN   -- Default False
+                                ERRORS     {ShortTermDenial, notSubscribed, LongTermDenial}
+
+CCBS-T-Call                 ::= OPERATION
+CCBS-T-Suspend              ::= OPERATION
+CCBS-T-Resume               ::= OPERATION
+CCBS-T-RemoteUserFree       ::= OPERATION
+CCBS-T-Available            ::= OPERATION
+
+ShortTermDenial             ::= ERROR
+LongTermDenial              ::= ERROR
+
+cCBS-T-OID OBJECT IDENTIFIER   ::= {ccitt identified-organization etsi(0) 359
+                                    private-networks-operations-and-errors(2)}
+
+cCBS-T-Request              CCBS-T-Request          ::= globalValue {cCBS-T-OID 1}
+cCBS-T-Call                 CCBS-T-Call             ::= globalValue {cCBS-T-OID 2}
+cCBS-T-Suspend              CCBS-T-Suspend          ::= globalValue {cCBS-T-OID 3}
+cCBS-T-Resume               CCBS-T-Resume           ::= globalValue {cCBS-T-OID 4}
+cCBS-T-RemoteUserFree       CCBS-T-RemoteUserFree   ::= globalValue {cCBS-T-OID 5}
+cCBS-T-Available            CCBS-T-Available        ::= globalValue {cCBS-T-OID 6}
+
+longTermDenial              LongTermDenial          ::= globalValue {cCBS-T-OID 20}
+shortTermDenial             ShortTermDenial         ::= globalValue {cCBS-T-OID 21}
+
+
+END -- of CCBS-private-networks-operations-and-errors
diff --git a/asn1/isdn-sup/Conference-Add-On-Operations.asn b/asn1/isdn-sup/Conference-Add-On-Operations.asn
index cb93f13f6e..894f9062e9 100644
--- a/asn1/isdn-sup/Conference-Add-On-Operations.asn
+++ b/asn1/isdn-sup/Conference-Add-On-Operations.asn
@@ -1,5 +1,5 @@
 --
--- $Id: MCID-Operations.asn 47730 2013-02-18 06:26:09Z etxrab $
+-- $Id$
 --
 -- EN 300 185-1 Ver. 1.2.4
 --
diff --git a/asn1/isdn-sup/Explicit-Call-Transfer-Operations-and-Errors.asn b/asn1/isdn-sup/Explicit-Call-Transfer-Operations-and-Errors.asn
new file mode 100644
index 0000000000..9406727401
--- /dev/null
+++ b/asn1/isdn-sup/Explicit-Call-Transfer-Operations-and-Errors.asn
@@ -0,0 +1,151 @@
+-- $Id$
+--
+-- EN 300 369-1 V1.2.4 (1998-10)
+--
+Explicit-Call-Transfer-Operations-and-Errors {ccitt identified-organization etsi(0) 369
+version(2) operations-and-errors(1)}
+
+DEFINITIONS ::=
+
+ 
+BEGIN
+
+ 
+  EXPORTS
+      ectLinkIdRequest,
+      ectExecute,
+      requestSubaddress,
+      subaddressTransfer,
+      explicitEctExecute,
+      linkIdNotAssignedByNetwork,
+      ectLoopTest,
+      ectInform;
+
+ 
+  IMPORTS
+      OPERATION,
+      ERROR
+    FROM Remote-Operations-Information-Objects
+    {joint-iso-itu-t remote-operations (4) notation (0)} 
+
+ 
+      notAvailable,
+      notSubscribed,
+      resourceUnavailable,
+      supplementaryServiceInteractionNotAllowed,
+      invalidCallState
+    FROM General-Errors
+    {itu-t(0) identified-organization(4) etsi (0) 196 general-errors (2)}
+
+ 
+      PartySubaddress,
+      PresentedNumberUnscreened
+    FROM Addressing-Data-Elements
+    {itu-t(0) identified-organization(4) etsi (0) 196 addressing-data-elements (6)};
+
+ 
+  ectExecute OPERATION::=
+    {
+      ERRORS {
+        notAvailable |
+        notSubscribed |
+        invalidCallState |
+        supplementaryServiceInteractionNotAllowed }  
+        
+      CODE local:6        
+    }
+
+  ectInform OPERATION::=
+    {
+      ARGUMENT SEQUENCE {
+          en ENUMERATED {
+            alerting (0),
+            active   (1) },
+          redirectionNumber    PresentedNumberUnscreened OPTIONAL }   
+          
+      CODE global:{eCTOID ectInform-operation (5)}           
+    }
+
+  ectLinkIdRequest OPERATION::=
+    {  
+      RESULT EctLinkIdRequestRes
+      ERRORS {
+        resourceUnavailable }  
+        
+      CODE global:{eCTOID ectLinkIdRequest-operation (4)}      
+    }
+
+ EctLinkIdRequestRes ::= LinkId
+
+ ectLoopTest OPERATION::=
+    {
+      ARGUMENT
+          CallTransferIdentity
+
+ 
+      RESULT
+        LoopResult
+
+ 
+      ERRORS {
+        notAvailable }   
+        
+      CODE global:{eCTOID ectLoopTest-operation (6)}       
+    }
+
+
+  explicitEctExecute OPERATION::=
+    {  
+      ARGUMENT
+        LinkId        
+        
+      ERRORS {
+        notAvailable |
+        notSubscribed |
+        invalidCallState |
+        supplementaryServiceInteractionNotAllowed |    
+        linkIdNotAssignedByNetwork }
+        
+      CODE global:{eCTOID explicitEctExecute-operation (1)}          
+    }
+
+ 
+  requestSubaddress OPERATION::=
+    {
+      CODE global:{eCTOID requestSubAddress-operation (2)}
+    }      
+
+ 
+  subaddressTransfer OPERATION::=
+     {
+      ARGUMENT  PartySubaddress   
+      
+      CODE global:{eCTOID subaddressTransfer-operation (3)}     
+     }
+
+  CallTransferIdentity ::= INTEGER (-128..127) 
+  LinkId ::= INTEGER (-32768..32767)
+
+  LoopResult ::=
+      ENUMERATED {
+        insufficientInformation (0),
+        noLoopExists            (1),
+        simultaneousTransfer    (2) }
+
+ 
+  eCTOID OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi (0) 369
+                                operation-and-errors (1)}
+
+ 
+  linkIdNotAssignedByNetwork ERROR ::= {CODE global:{eCTOID linkIdNotAssignedByNetwork-error (21)}}
+
+
+--  ectExecute EctExecute ::= localValue 6
+	explicitEctExecute			ExplicitEctExecute			::=	globalValue {eCTOID explicitEctExecute-operation(1)}
+	requestSubaddress			RequestSubaddress			::=	globalValue {eCTOID requestSubaddress-operation (2)}
+	subaddressTransfer			SubaddressTransfer			::=	globalValue {eCTOID subaddressTransfer-operation(3)}
+	ectLinkIdRequest			EctLinkIdRequest			::=	globalValue {eCTOID ectLinkIdRequest-operation (4)}
+	ectInform					EctInform					::= globalValue {eCTOID ectInform-operation (5)}
+	ectLoopTest					EctLoopTest					::= globalValue {eCTOID ectLoopTest-operation (6)}
+	linkIdNotAssignedByNetwork	LinkIdNotAssignedByNetwork	::= globalValue {eCTOID 	linkIdNotAssignedByNetwork-error(21)}
+END --Explicit-Call-Transfer-Operations-And-Errors
diff --git a/asn1/isdn-sup/Freephone-Operations.asn b/asn1/isdn-sup/Freephone-Operations.asn
new file mode 100644
index 0000000000..c647174736
--- /dev/null
+++ b/asn1/isdn-sup/Freephone-Operations.asn
@@ -0,0 +1,77 @@
+--
+-- $Id$
+--
+-- EN 300 210-1 Ver. 1.2.4
+--
+Freephone-Operations {ccitt identified-organization etsi(0) 210 operations-and-errors(1)}
+
+DEFINITIONS EXPLICIT TAGS ::=
+
+BEGIN
+
+EXPORTS         CallFPH, Monitor-T-FPH, Free-T-FPH, Call-T-FPH;
+
+IMPORTS         OPERATION, ERROR
+                FROM Remote-Operations-Information-Objects 
+					{joint-iso-itu-t remote-operations (4) notation (0)}    
+
+                notAvailable, notImplemented
+                FROM General-Errors
+                    {itu-t(0) identified-organization(4) etsi(0) 196 general-errors(2)}
+
+                PartyNumber
+                FROM Addressing-Data-Elements
+                    {itu-t(0) identified-organization(4) etsi(0) 196 addressing-data-elements(6)}
+
+                Q931InformationElement
+                FROM Embedded-Q931-Types
+                    {itu-t(0) identified-organization(4) etsi(0) 196 embedded-q931-types(7)};
+
+--CallFPH         ::= OPERATION
+--                    ARGUMENT    calledFreephoneNr       CalledFreephoneNr - - optional
+
+  callFPH OPERATION ::=
+    {
+        ARGUMENT CalledFreephoneNrArg -- optional    
+        
+        CODE global:{fPHOID callFPH-operation (1)}   
+    }
+
+CalledFreephoneNrArg ::= CalledFreephoneNr
+
+--Monitor-T-FPH   ::= OPERATION
+--                    ARGUMENT SEQUENCE {
+--                                q931InfoElement         Q931InformationElement,
+--                                servedUserDestination   PartyNumber,
+--                                queueIdentity           QueueIdentity OPTIONAL}
+--                    RESULT
+--                    ERRORS {    notAvailable, 
+--                                notImplemented}
+
+-- the Bearer capability, High layer compatibility (optional) and Low layer compatibility 
+-- (optional) information elements shall be embedded in q931InfoElement.
+
+--Free-T-FPH      ::= OPERATION
+--                    ARGUMENT SEQUENCE {
+--                                servedUserDestination   PartyNumber,
+--                                fPHReference            FPHReference}
+--
+--Call-T-FPH      ::= OPERATION
+--                    ARGUMENT SEQUENCE {
+--                                fPHReference            FPHReference,
+--                                calledFreephoneNr       CalledFreephoneNr OPTIONAL}
+
+--FPHReference		::= INTEGER (0..127)
+CalledFreephoneNr	::= PartyNumber
+--QueueIdentity		::= INTEGER (0..127)
+
+fPHOID	OBJECT IDENTIFIER		::= {itu-t(0) identified-organization(4) etsi(0) 210
+								     freephone-operations(1)}
+
+--callFPH			CallFPH			::= globalValue {fPHOID callFPH-operation(1)}
+--monitor-T-FPH	Monitor-T-FPH	::= globalValue {fPHOID monitor-T-FPH-operation(2)}
+--free-T-FPH		Free-T-FPH		::= globalValue {fPHOID free-T-FPH-operation(3)}
+--call-T-FPH		Call-T-FPH		::= globalValue {fPHOID call-T-FPH-operation(4)}
+
+END -- Freephone-Operations
+
diff --git a/asn1/isdn-sup/MWI-Operations-and-Errors.asn b/asn1/isdn-sup/MWI-Operations-and-Errors.asn
new file mode 100644
index 0000000000..3a4f35607a
--- /dev/null
+++ b/asn1/isdn-sup/MWI-Operations-and-Errors.asn
@@ -0,0 +1,145 @@
+-- $Id$
+--
+-- prETS 300 745-1
+--
+MWI-Operations-and-Errors {itu-t(0) identified-organization(4) etsi(0) 745 operations-and-errors(1)}
+
+DEFINITIONS EXPLICIT TAGS ::=
+
+BEGIN
+
+EXPORTS		MWIActivate,
+			MWIDeactivate,
+			MWIIndicate,
+			InvalidReceivingUserNr,
+			ReceivingUserNotSubscribed,
+			ControllingUserNotRegistered,
+			MaxNumOfControllingUsersReached,
+			MaxNumOfActiveInstancesReached
+;
+IMPORTS		OPERATION,
+			ERROR
+			FROM Remote-Operations-Information-Objects 
+    {joint-iso-itu-t (2) remote-operations (4) informationObjects(5) version1(0)}
+
+			notSubscribed,
+			supplementaryServiceInteractionNotAllowed,
+			resourceUnavailable,
+			invalidServedUserNr
+			FROM General-Errors
+				{itu-t(0) identified-organization(4) etsi(0) 196 general-errors(2)}
+
+			BasicService
+			From Basic-Service-Elements
+				{itu-t(0) identified-organization(4) etsi(0) 196 basic-service-elements(8)}
+
+			PartyNumber
+			FROM Addressing-Data-Element
+				{itu-t(0) identified-organization(4) etsi(0) 196 addressing-data-elements(6)}
+;
+
+  mWIActivate OPERATION::=
+    {  
+        ARGUMENT SEQUENCE {
+          receivingUserNr             PartyNumber,
+          basicService                BasicService,
+          controllingUserNr           [1] PartyNumber OPTIONAL,
+          numberOfMessages            [2] MessageCounter OPTIONAL,
+          controllingUserProvidedNr   [3] PartyNumber OPTIONAL,
+          time                        [4] GeneralizedTime OPTIONAL,
+          messageId                   [5] MessageID OPTIONAL,
+          mode                        [6] InvocationMode OPTIONAL }
+ 
+        ERRORS {
+          notSubscribed |
+          supplementaryServiceInteractionNotAllowed |
+          resourceUnavailable |
+          invalidReceivingUserNr |
+          invalidServedUserNr |
+          receivingUserNotSubscribed |
+          controllingUserNotRegistered |
+          indicationNotDelivered |
+          maxNumOfControllingUsersReached |
+          maxNumOfActiveInstancesReached }     
+          
+        CODE global:{mWIOID 1}       
+    }
+-- End of MWIActivate operation definition
+
+  mWIDeactivate OPERATION::=
+    {  
+        ARGUMENT SEQUENCE {
+          receivingUserNr     PartyNumber,
+          basicService        BasicService,
+          controllingUserNr   PartyNumber OPTIONAL,
+          mode                InvocationMode OPTIONAL }
+ 
+        ERRORS {
+          notSubscribed |
+          supplementaryServiceInteractionNotAllowed |
+          resourceUnavailable |
+          invalidReceivingUserNr |
+          invalidServedUserNr |
+          receivingUserNotSubscribed |
+          controllingUserNotRegistered |
+          indicationNotDelivered }    
+          
+        CODE global:{mWIOID 2}         
+    }
+-- End of MWIDeactivate operation definition
+
+  mWIIndicate OPERATION::=
+    {  
+        ARGUMENT SEQUENCE {
+          controllingUserNr           [1] PartyNumber OPTIONAL,
+          basicService                [2] BasicService OPTIONAL,
+          numberOfMessages            [3] MessageCounter OPTIONAL,
+          controllingUserProvidedNr   [4] PartyNumber OPTIONAL,
+          time                        [5] GeneralizedTime OPTIONAL,
+          messageId                   [6] MessageID OPTIONAL }  
+          
+        CODE global:{mWIOID 3}            
+    }
+-- End of MWIIndicate operation definition
+
+  invalidReceivingUserNr           ERROR ::= {CODE global:{mWIOID 10}}   
+  receivingUserNotSubscribed       ERROR ::= {CODE global:{mWIOID 11}}
+  controllingUserNotRegistered     ERROR ::= {CODE global:{mWIOID 12}}
+  indicationNotDelivered           ERROR ::= {CODE global:{mWIOID 13}}
+  maxNumOfControllingUsersReached  ERROR ::= {CODE global:{mWIOID 14}}
+  maxNumOfActiveInstancesReached   ERROR ::= {CODE global:{mWIOID 15}}
+
+MessageCounter					::= INTEGER (0..65535)
+
+GeneralizedTime					::= [UNIVERSAL 24] IMPLICIT VisibleString
+
+MessageID						::= SEQUENCE {
+										messageRef	MessageRef,
+										status		MessageStatus}
+
+MessageRef						::= INTEGER (0..65535)
+
+MessageStatus					::= ENUMERATED (
+										addedMessage	(0),
+										removedMessage	(1)}
+
+InvocationMode					::= ENUMERATED (
+										deferred	(0),
+										immediate	(1),
+										combined	(2))
+
+mWIOID OBJECT IDENTIFIER 		::= {itu-t(0) identified-organization(4) etsi(0) 745
+								     operations-and-errors(1)}
+
+mWIActivate						MWIActivate						::= globalValue {mWIOID 1}
+mWIDeactivate					MWIDeactivate					::= globalValue {mWIOID 2}
+mWIIndicate						MWIIndicate						::= globalValue {mWIOID 3}
+
+invalidReceivingUserNr			InvalidReceivingUserNr			::= globalValue {mWIOID 10}
+receivingUserNotSubscribed		ReceivingUserNotSubscribed		::= globalValue {mWIOID 11}
+controllingUserNotRegistered	ControllingUserNotRegistered	::= globalValue {mWIOID 12}
+indicationNotDelivered			IndicationNotDelivered			::= globalValue {mWIOID 13}
+maxNumOfControllingUsersReached	MaxNumOfControllingUsersReached	::= globalValue {mWIOID 14}
+maxNumOfActiveInstancesReached	MaxNumOfActiveInstancesReached	::= globalValue	{mWIOID 15}
+
+END -- MWI-Operations-and-Errors
diff --git a/asn1/isdn-sup/Outgoing-Call-Barring-Operations-and-Errors.asn b/asn1/isdn-sup/Outgoing-Call-Barring-Operations-and-Errors.asn
new file mode 100644
index 0000000000..aefe67d7ba
--- /dev/null
+++ b/asn1/isdn-sup/Outgoing-Call-Barring-Operations-and-Errors.asn
@@ -0,0 +1,202 @@
+-- $Id$
+--
+-- EN 301 001-1 Ver. 1.2.2
+--
+Outgoing-Call-Barring-Operations-and-Errors {itu-t(0) identified-organization(4) etsi(0) 1001
+                                             operations-and-errors(1)}
+
+DEFINITIONS EXPLICIT TAGS ::=
+
+BEGIN
+
+EXPORTS
+        ActivationOcb,
+        ActivationStatusNotificationOcb,
+        DeactivationOcb,
+        DeactivationStatusNotificationOcb,
+        InterrogationOcb,
+        DisableOcb,
+        OcbInvoked,
+        InvalidBarringProgram,
+        NoBarringProgram
+;
+
+IMPORTS
+        OPERATION, ERROR
+        FROM Remote-Operations-Information-Objects 
+            {joint-iso-itu-t (2) remote-operations (4) informationObjects(5) version1(0)}
+
+        PartyNumber
+        FROM Addressing-Data-Elements
+            {itu-t(0) identified-organization(4) etsi(0) 196 addressing-data-elements(6)}
+
+        BasicService
+        FROM Basic-Service-Elements
+            {itu-t(0) identified-organization(4) etsi(0) 196 basic-service-elements(8)}
+
+        notSubscribed, notAvailable, basicServiceNotProvided, invalidServedUserNr,
+        resourceUnavailable, notImplemented, supplementaryServiceInteractionNotAllowed
+        FROM General-Errors
+            {itu-t(0) identified-organization(4) etsi(0) 196 general-errors(2)}
+
+        NotActivated
+        FROM Diversion-Operations
+            {itu-t(0) identified-organization(4) etsi(0) 207 operations-and errors(1)}
+
+        Pin, invalidPin, userControlBlocked, changeOfPinRequired
+        FROM Pin-Set-Operations-and-Errors
+            {itu-t(0) identified-organization(4) etsi(0) 1002 operations-and-errors(1)}
+;
+
+  activationOcb OPERATION::=
+    {  
+      ARGUMENT
+          ActivationOcbArgument
+ 
+      ERRORS {
+          notSubscribed |
+          notAvailable |
+          basicServiceNotProvided |
+          invalidServedUserNr |
+          invalidPin |
+          invalidBarringProgram |
+          noBarringProgram |
+          userControlBlocked |
+          supplementaryServiceInteractionNotAllowed |
+          resourceUnavailable |
+          changeOfPinRequired }   
+          
+       CODE global:{oCBOID  1}         
+      }
+
+  deactivationOcb OPERATION::=
+     {
+       ARGUMENT
+         DeactivationOcbArgument
+
+       ERRORS {
+         notSubscribed |
+         notAvailable |
+         basicServiceNotProvided |
+         invalidServedUserNr |
+         notActivated |
+         invalidPin |
+         userControlBlocked |
+         changeOfPinRequired }      
+         
+       CODE global:{oCBOID  2}             
+     }
+
+  interrogationOcb OPERATION::=
+    {
+       ARGUMENT
+         InterrogationOcbArgument
+
+ 
+       RESULT 
+         IntOcbResultList
+
+ 
+       ERRORS {
+         notSubscribed |
+         notAvailable |
+         basicServiceNotProvided |
+         invalidServedUserNr }    
+         
+       CODE global:{oCBOID  5}                
+     }
+
+  activationStatusNotificationOcb OPERATION::=
+    {
+       ARGUMENT
+         ActStatusNotificationOcbArg   
+         
+       CODE global:{oCBOID  3}                 
+    }
+
+  deactivationStatusNotificationOcb OPERATION::=
+    {
+       ARGUMENT
+         DeactStatusNotificationOcbArg  
+         
+       CODE global:{oCBOID  4}                  
+    }
+
+  disableOcb OPERATION::=
+    {
+       ARGUMENT
+         Pin  
+  
+       ERRORS {
+         notImplemented |
+         invalidPin |
+         userControlBlocked |
+         changeOfPinRequired }  
+         
+       CODE global:{oCBOID  6}                  
+    }
+
+  ocbInvoked OPERATION::=
+    {
+       CODE global:{oCBOID  7}        
+    } 
+
+ActivationOcbArgument				::=  SEQUENCE {
+											basicService		BasicService,
+											pin					Pin,
+											barringProgram		BarringProgram	OPTIONAL,
+											servedUserNr		ServedUserNr	OPTIONAL}
+
+DeactivationOcbArgument				::= SEQUENCE {
+											basicService		BasicService,
+											pin					Pin,
+											barringProgram		BarringProgram	OPTIONAL,
+											servedUserNr		ServedUserNr	OPTIONAL}
+
+InterrogationOcbArgument			::= SEQUENCE {
+											basicService		BasicService,
+											servedUserNr		ServedUserNr		OPTIONAL}
+
+ActStatusNotificationOcbArg			::= SEQUENCE {
+											basicService		BasicService,
+											barringProgram		BarringProgram,
+											servedUserNr		ServedUserNr}
+
+DeactStatusNotificationOcbArg		::= SEQUENCE {
+											basicService		BasicService,
+											barringProgram		BarringProgram	OPTIONAL,
+											servedUserNr		ServedUserNr}
+
+ServedUserNr						::= CHOICE {
+											individualNumber	PartyNumber,
+											allNumbers			NULL}
+
+IntOcbResultList					::= SET SIZE(0..30) OF IntOcbResult
+
+IntOcbResult						::= SEQUENCE {
+											servedUserNr		ServedUserNr,
+											basicService		BasicService,
+											barringProgramList	BarringProgramList}
+
+BarringProgram						::= INTEGER (0..255)
+BarringProgramList					::= SET SIZE(0...255) OF BarringProgram
+
+invalidBarringProgram ERROR ::={CODE global:{oCBOID 10}}
+noBarringProgram      ERROR ::={CODE global:{oCBOID 11}}
+
+oCBOID OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) 1001 operations-and-errors(1)}
+
+activationOcb						ActivationOcb						::= globalValue {oCBOID  1}
+deactivationOcb						DeactivationOcb						::= globalValue {oCBOID  2}
+activationStatusNotificationOcb		ActivationStatusNotificationOcb		::= globalValue {oCBOID  3}
+deactivationStatusNotificationOcb	DeactivationStatusNotificationOcb	::= globalValue {oCBOID  4}
+interrogationOcb					InterrogationOcb					::= globalValue {oCBOID  5}
+disableOcb							DisableOcb							::= globalValue {oCBOID  6}
+ocbInvoked							OcbInvoked							::= globalValue {oCBOID  7}
+invalidBarringProgram				InvalidBarringProgram				::= globalValue {oCBOID 10}
+noBarringProgram					NoBarringProgram					::= globalValue {oCBOID 11}
+
+notActivated						NotActivated						::= localValue 46
+
+END -- of Outgoing-Call-Barring-Operations-and-Errors
+
diff --git a/asn1/isdn-sup/Set-Operations-and-Errors.asn b/asn1/isdn-sup/Set-Operations-and-Errors.asn
new file mode 100644
index 0000000000..6517b4abdc
--- /dev/null
+++ b/asn1/isdn-sup/Set-Operations-and-Errors.asn
@@ -0,0 +1,99 @@
+-- $Id$
+--
+-- EN 301 002-1 Ver. 1.3.1
+--
+Set-Operations-and-Errors {ITU-T identified-organization etsi(0) 1002 operations-and-errors(1)}
+
+DEFINITIONS EXPLICIT TAGS ::=
+
+BEGIN
+
+EXPORTS
+        ModifyPin,
+        Pin,
+		Tan,
+        InvalidPin,
+		InvalidTan,
+        PinNotProvided,
+        InvalidNewPin,
+        ChangeOfPinRequired,
+        PrimitivePin,
+        NewPinIsOldPin,
+        UserControlBlocked;
+
+IMPORTS
+        OPERATION, ERROR
+        FROM Remote-Operations-Information-Objects 
+    {joint-iso-itu-t (2) remote-operations (4) informationObjects(5) version1(0)}
+
+        PartyNumber
+        FROM Addressing-Data-Elements
+            {itu-t(0) identified-organization(4) etsi(0) 196 addressing-data-elements(6)}
+
+        invalidServedUserNr
+        FROM General-Errors
+            {itu-t(0) identified-organization(4) etsi(0) 196 general-errors(2)};
+
+ModifyPin				::= OPERATION
+								ARGUMENT	ModifyPinArgument
+								RESULT
+								ERRORS     {InvalidPin,
+											PinNotProvided,
+											InvalidNewPin,
+											invalidServedUserNr,
+											PrimitivePin,
+											NewPinIsOldPin,
+											UserControlBlocked}
+
+PossibleFraudulentPinUse	::= OPERATION
+PossibleFraudulentTanUse	::= OPERATION
+ModifyPinArgument		::= SEQUENCE {
+								oldPin			Pin,
+								newPin			Pin,
+								servedUserNr	PartyNumber}
+
+Pin						::= IA5String (SIZE(4..12)) (FROM ("0"|"1"|"2"|"3"|"4"|"5"|"6"|"7"|"8"|"9"
+                                                          |"A"|"B"|"C"|"D"|"E"|"F"|"G"|"H"|"I"|"J"
+                                                          |"K"|"L"|"M"|"N"|"O"|"P"|"Q"|"R"|"S"|"T"
+                                                          |"U"|"V"|"W"|"X"|"Y"|"Z"
+                                                          |"a"|"b"|"c"|"d"|"e"|"f"|"g"|"h"|"i"|"j"
+                                                          |"k"|"l"|"m"|"n"|"o"|"p"|"q"|"r"|"s"|"t"
+                                                          |"u"|"v"|"w"|"x"|"y"|"z"))
+
+Tan						::= IA5String (SIZE(6..12)) (FROM ("0"|"1"|"2"|"3"|"4"|"5"|"6"|"7"|"8"|"9"
+                                                          |"A"|"B"|"C"|"D"|"E"|"F"|"G"|"H"|"I"|"J"
+                                                          |"K"|"L"|"M"|"N"|"O"|"P"|"Q"|"R"|"S"|"T"
+                                                          |"U"|"V"|"W"|"X"|"Y"|"Z"
+                                                          |"a"|"b"|"c"|"d"|"e"|"f"|"g"|"h"|"i"|"j"
+                                                          |"k"|"l"|"m"|"n"|"o"|"p"|"q"|"r"|"s"|"t"
+                                                          |"u"|"v"|"w"|"x"|"y"|"z"))
+
+
+invalidPin            ERROR ::= {CODE global:{sETOID 10}}
+invalidTan            ERROR ::= {CODE global:{sETOID 11}}
+pinNotProvided        ERROR ::= {CODE global:{sETOID 17}}
+invalidNewPin         ERROR ::= {CODE global:{sETOID 12}}
+userControlBlocked    ERROR ::= {CODE global:{sETOID 13}}
+changeOfPinRequired   ERROR ::= {CODE global:{sETOID 14}}
+primitivePin          ERROR ::= {CODE global:{sETOID 15}}
+newPinIsOldPin        ERROR ::= {CODE global:{sETOID 16}}
+
+
+sETOID OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) 1002 operations-and-errors(1)}
+
+modifyPin				ModifyPin 				::= globalValue {sETOID  1}
+possibleFraudulentPinUse	PossibleFraudulentPinUse	::= globalValue {sETOID  2}
+possibleFraudulentTanUse	PossibleFraudulentTanUse	::= globalValue {sETOID  3}
+
+invalidPin				InvalidPin 				::= globalValue {sETOID 10}
+pinNotProvided			PinNotProvided 			::= globalValue {sETOID 11}
+invalidNewPin			InvalidNewPin        	::= globalValue {sETOID 12}
+userControlBlocked		UserControlBlocked   	::= globalValue {sETOID 13}
+changeOfPinRequired		ChangeOfPinRequired 	::= globalValue {sETOID 14}
+primitivePin			PrimitivePin			::= globalValue {sETOID 15}
+newPinIsOldPin			NewPinIsOldPin			::= globalValue {sETOID 16}
+invalidTan				InvalidTan 				::= globalValue {sETOID 17}
+
+
+END -- of Set-Function-Operations-and-Errors
+
diff --git a/asn1/isdn-sup/Three-Party-Operations.asn b/asn1/isdn-sup/Three-Party-Operations.asn
new file mode 100644
index 0000000000..be55704a28
--- /dev/null
+++ b/asn1/isdn-sup/Three-Party-Operations.asn
@@ -0,0 +1,55 @@
+--
+-- $Id$
+--
+-- EN 300 188-1 V1.2.4 (1998-06)
+--
+Three-Party-Operations {ccitt identified-organization etsi (0) 188 operations-and-types (1)}
+
+DEFINITIONS EXPLICIT TAGS ::=
+
+BEGIN
+
+EXPORTS
+  begin3PTY,
+  end3PTY;
+  
+IMPORTS
+    OPERATION
+  FROM Remote-Operations-Information-Objects
+  {joint-iso-itu-t remote-operations (4) notation (0)}
+
+ 
+    notSubscribed,
+    notAvailable,
+    invalidCallState,
+    resourceUnavailable,
+    supplementaryServiceInteractionNotAllowed
+  FROM General-Errors
+  {itu-t identified-organization etsi (0) 196 general-errors (2)};
+  
+  begin3PTY OPERATION ::=
+    {
+      ERRORS {
+        notSubscribed |
+        notAvailable |
+        invalidCallState |
+        resourceUnavailable |
+        supplementaryServiceInteractionNotAllowed }
+        -- ETS 300 188, aug 1993 does not provide procedures for the generation
+        -- of the error 'notAvailable'
+        
+      CODE local:4          
+    }
+    
+ 
+  end3PTY OPERATION ::=
+    {
+      ERRORS {
+        invalidCallState }
+        
+      CODE local:5  
+    }
+
+
+ 
+END 
\ No newline at end of file
diff --git a/asn1/isdn-sup/User-To-User-Signalling-Operations.asn b/asn1/isdn-sup/User-To-User-Signalling-Operations.asn
new file mode 100644
index 0000000000..b276c2de2a
--- /dev/null
+++ b/asn1/isdn-sup/User-To-User-Signalling-Operations.asn
@@ -0,0 +1,50 @@
+--
+-- $Id$
+--
+-- EN 300 286-1 Ver. 1.2.4
+--
+
+User-To-User-Signalling-Operations {ccitt identified-organization etsi(0) 286
+                                    operations-and-errors(1)}
+
+DEFINITIONS ::=
+BEGIN
+
+EXPORTS                 UserUserService, RejectedByUser, RejectedByNetwork, Service, Preferred;
+
+IMPORTS                 OPERATION, ERROR 
+                        FROM Remote-Operations-Information-Objects 
+    {joint-iso-itu-t (2) remote-operations (4) informationObjects(5) version1(0)};
+
+  userUserService OPERATION ::=
+    {
+      ARGUMENT UserUserServiceArg 
+      ERRORS {
+        rejectedByTheUser |
+        rejectedByTheNetwork }   
+        
+      CODE local:1       
+    }
+
+UserUserServiceArg ::= SEQUENCE {
+          service   [1] IMPLICIT Service,
+          preferred [2] IMPLICIT Preferred }
+
+Service                 ::= INTEGER {
+                                service1 (1), 
+                                service2 (2), 
+                                service3 (3)}
+                                (1..3)
+
+Preferred               ::= BOOLEAN     -- True  = preferred request
+                                        -- False = required request
+rejectedByTheNetwork ERROR ::= {CODE local:1}
+rejectedByTheUser    ERROR ::= {CODE local:2}
+
+
+--userUserService UserUserService     ::= 1
+--rejectedByNetwork RejectedByNetwork ::= 1
+--rejectedByUser RejectedByUser       ::= 2
+
+END -- of User-To-User-Signalling-Operations
+
diff --git a/asn1/isdn-sup/packet-isdn-sup-template.c b/asn1/isdn-sup/packet-isdn-sup-template.c
index 30a40f1333..b9eecc6841 100644
--- a/asn1/isdn-sup/packet-isdn-sup-template.c
+++ b/asn1/isdn-sup/packet-isdn-sup-template.c
@@ -37,6 +37,8 @@
 #define PSNAME "ISDN_SUP"
 #define PFNAME "isdn_sup"
 
+#include "packet-isdn-sup-val.h"
+
 /* Initialize the protocol and registered fields */
 static int proto_isdn_sup = -1;
 static int hf_isdn_sup_operation = -1;
diff --git a/epan/dissectors/packet-isdn-sup.c b/epan/dissectors/packet-isdn-sup.c
index 31052f2b6a..83832ddd4e 100644
--- a/epan/dissectors/packet-isdn-sup.c
+++ b/epan/dissectors/packet-isdn-sup.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-isdn-sup.c                                                          */
-/* ../../tools/asn2wrs.py -b -p isdn-sup -c ./isdn-sup.cnf -s ./packet-isdn-sup-template -D . -O ../../epan/dissectors Addressing-Data-Elements.asn Basic-Service-Elements.asn Embedded-Q931-Types.asn General-Errors.asn Advice-of-Charge-Operations.asn Closed-User-Group-Service-Operations.asn Conference-Add-On-Operations.asn Diversion-Operations.asn MCID-Operations.asn */
+/* ../../tools/asn2wrs.py -b -k -p isdn-sup -c ./isdn-sup.cnf -s ./packet-isdn-sup-template -D . -O ../../epan/dissectors Addressing-Data-Elements.asn Basic-Service-Elements.asn Embedded-Q931-Types.asn General-Errors.asn Advice-of-Charge-Operations.asn Closed-User-Group-Service-Operations.asn Conference-Add-On-Operations.asn Diversion-Operations.asn Freephone-Operations.asn MCID-Operations.asn User-To-User-Signalling-Operations.asn */
 
 /* Input file: packet-isdn-sup-template.c */
 
@@ -45,6 +45,14 @@
 #define PSNAME "ISDN_SUP"
 #define PFNAME "isdn_sup"
 
+
+/*--- Included file: packet-isdn-sup-val.h ---*/
+#line 1 "../../asn1/isdn-sup/packet-isdn-sup-val.h"
+#define fPHOID                         "0.4.0.210.1"
+
+/*--- End of included file: packet-isdn-sup-val.h ---*/
+#line 41 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
+
 /* Initialize the protocol and registered fields */
 static int proto_isdn_sup = -1;
 static int hf_isdn_sup_operation = -1;
@@ -100,10 +108,12 @@ static const value_string isdn_sup_str_operation[] = {
   {  18, "divertingLegInformation1" },
   {  15, "divertingLegInformation2" },
   {  19, "divertingLegInformation3" },
+  { fPHOID".1", "callFPH" },
   {   3, "mCIDRequest" },
+  {   1, "userUserService" },
 
 /*--- End of included file: packet-isdn-sup-table10.c ---*/
-#line 66 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
+#line 68 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
   {   0, NULL}
 };
 
@@ -140,9 +150,11 @@ static const value_string isdn_sup_str_error[] = {
   {   24, "numberOfDiversionsExceeded" },
   {   46, "notActivated" },
   {   48, "requestAlreadyAccepted" },
+  {    1, "rejectedByTheNetwork" },
+  {    2, "rejectedByTheUser" },
 
 /*--- End of included file: packet-isdn-sup-table20.c ---*/
-#line 72 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
+#line 74 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
   {   0, NULL}
 };
 
@@ -182,6 +194,8 @@ static int hf_isdn_sup_CallRerouteingArg_PDU = -1;  /* CallRerouteingArg */
 static int hf_isdn_sup_DivertingLegInformation1Arg_PDU = -1;  /* DivertingLegInformation1Arg */
 static int hf_isdn_sup_DivertingLegInformation2Arg_PDU = -1;  /* DivertingLegInformation2Arg */
 static int hf_isdn_sup_DivertingLegInformation3Arg_PDU = -1;  /* DivertingLegInformation3Arg */
+static int hf_isdn_sup_CalledFreephoneNrArg_PDU = -1;  /* CalledFreephoneNrArg */
+static int hf_isdn_sup_UserUserServiceArg_PDU = -1;  /* UserUserServiceArg */
 static int hf_isdn_sup_presentationAllowedAddress = -1;  /* AddressScreened */
 static int hf_isdn_sup_presentationRestricted = -1;  /* NULL */
 static int hf_isdn_sup_numberNotAvailableDueToInterworking = -1;  /* NULL */
@@ -296,9 +310,11 @@ static int hf_isdn_sup_IntResultList_item = -1;   /* IntResult */
 static int hf_isdn_sup_individualNumber = -1;     /* PartyNumber */
 static int hf_isdn_sup_allNumbers = -1;           /* NULL */
 static int hf_isdn_sup_ServedUserNumberList_item = -1;  /* PartyNumber */
+static int hf_isdn_sup_service = -1;              /* Service */
+static int hf_isdn_sup_preferred = -1;            /* Preferred */
 
 /*--- End of included file: packet-isdn-sup-hf.c ---*/
-#line 78 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
+#line 80 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
 
 
 /* Initialize the subtree pointers */
@@ -367,9 +383,10 @@ static gint ett_isdn_sup_IntResultList = -1;
 static gint ett_isdn_sup_IntResult = -1;
 static gint ett_isdn_sup_ServedUserNr = -1;
 static gint ett_isdn_sup_ServedUserNumberList = -1;
+static gint ett_isdn_sup_UserUserServiceArg = -1;
 
 /*--- End of included file: packet-isdn-sup-ett.c ---*/
-#line 84 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
+#line 86 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
 
 
 /* Preference settings default */
@@ -2083,6 +2100,65 @@ dissect_isdn_sup_DivertingLegInformation3Arg(gboolean implicit_tag _U_, tvbuff_t
   return offset;
 }
 
+
+
+static int
+dissect_isdn_sup_CalledFreephoneNr(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_isdn_sup_PartyNumber(implicit_tag, tvb, offset, actx, tree, hf_index);
+
+  return offset;
+}
+
+
+
+static int
+dissect_isdn_sup_CalledFreephoneNrArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_isdn_sup_CalledFreephoneNr(implicit_tag, tvb, offset, actx, tree, hf_index);
+
+  return offset;
+}
+
+
+static const value_string isdn_sup_Service_vals[] = {
+  {   1, "service1" },
+  {   2, "service2" },
+  {   3, "service3" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_isdn_sup_Service(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
+                                                NULL);
+
+  return offset;
+}
+
+
+
+static int
+dissect_isdn_sup_Preferred(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
+
+  return offset;
+}
+
+
+static const ber_sequence_t UserUserServiceArg_sequence[] = {
+  { &hf_isdn_sup_service    , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_isdn_sup_Service },
+  { &hf_isdn_sup_preferred  , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_isdn_sup_Preferred },
+  { NULL, 0, 0, 0, NULL }
+};
+
+static int
+dissect_isdn_sup_UserUserServiceArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
+                                   UserUserServiceArg_sequence, hf_index, ett_isdn_sup_UserUserServiceArg);
+
+  return offset;
+}
+
 /*--- PDUs ---*/
 
 static int dissect_ChargingRequestArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
@@ -2302,10 +2378,24 @@ static int dissect_DivertingLegInformation3Arg_PDU(tvbuff_t *tvb _U_, packet_inf
   offset = dissect_isdn_sup_DivertingLegInformation3Arg(FALSE, tvb, offset, &asn1_ctx, tree, hf_isdn_sup_DivertingLegInformation3Arg_PDU);
   return offset;
 }
+static int dissect_CalledFreephoneNrArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
+  offset = dissect_isdn_sup_CalledFreephoneNrArg(FALSE, tvb, offset, &asn1_ctx, tree, hf_isdn_sup_CalledFreephoneNrArg_PDU);
+  return offset;
+}
+static int dissect_UserUserServiceArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
+  offset = dissect_isdn_sup_UserUserServiceArg(FALSE, tvb, offset, &asn1_ctx, tree, hf_isdn_sup_UserUserServiceArg_PDU);
+  return offset;
+}
 
 
 /*--- End of included file: packet-isdn-sup-fn.c ---*/
-#line 91 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
+#line 93 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
 
 static const isdn_sup_op_t isdn_sup_op_tab[] = {
 
@@ -2338,10 +2428,12 @@ static const isdn_sup_op_t isdn_sup_op_tab[] = {
   /* divertingLegInformation1 */ {  18, dissect_DivertingLegInformation1Arg_PDU, NULL },
   /* divertingLegInformation2 */ {  15, dissect_DivertingLegInformation2Arg_PDU, NULL },
   /* divertingLegInformation3 */ {  19, dissect_DivertingLegInformation3Arg_PDU, NULL },
+  /* callFPH                  */ { fPHOID".1", dissect_CalledFreephoneNrArg_PDU, NULL },
   /* mCIDRequest              */ {   3, NULL, NULL },
+  /* userUserService          */ {   1, dissect_UserUserServiceArg_PDU, NULL },
 
 /*--- End of included file: packet-isdn-sup-table11.c ---*/
-#line 94 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
+#line 96 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
 };
 
 
@@ -2377,9 +2469,11 @@ static const isdn_sup_err_t isdn_sup_err_tab[] = {
   /* numberOfDiversionsExceeded */ {   24, NULL },
   /* notActivated             */ {   46, NULL },
   /* requestAlreadyAccepted   */ {   48, NULL },
+  /* rejectedByTheNetwork     */ {    1, NULL },
+  /* rejectedByTheUser        */ {    2, NULL },
 
 /*--- End of included file: packet-isdn-sup-table21.c ---*/
-#line 99 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
+#line 101 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
 };
 
 
@@ -2723,6 +2817,14 @@ void proto_register_isdn_sup(void) {
       { "DivertingLegInformation3Arg", "isdn-sup.DivertingLegInformation3Arg",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_isdn_sup_CalledFreephoneNrArg_PDU,
+      { "CalledFreephoneNrArg", "isdn-sup.CalledFreephoneNrArg",
+        FT_UINT32, BASE_DEC, VALS(isdn_sup_PartyNumber_vals), 0,
+        NULL, HFILL }},
+    { &hf_isdn_sup_UserUserServiceArg_PDU,
+      { "UserUserServiceArg", "isdn-sup.UserUserServiceArg",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_isdn_sup_presentationAllowedAddress,
       { "presentationAllowedAddress", "isdn-sup.presentationAllowedAddress",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -3179,9 +3281,17 @@ void proto_register_isdn_sup(void) {
       { "PartyNumber", "isdn-sup.PartyNumber",
         FT_UINT32, BASE_DEC, VALS(isdn_sup_PartyNumber_vals), 0,
         NULL, HFILL }},
+    { &hf_isdn_sup_service,
+      { "service", "isdn-sup.service",
+        FT_UINT32, BASE_DEC, VALS(isdn_sup_Service_vals), 0,
+        NULL, HFILL }},
+    { &hf_isdn_sup_preferred,
+      { "preferred", "isdn-sup.preferred",
+        FT_BOOLEAN, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
 
 /*--- End of included file: packet-isdn-sup-hfarr.c ---*/
-#line 316 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
+#line 318 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
   };
 
   /* List of subtrees */
@@ -3251,9 +3361,10 @@ void proto_register_isdn_sup(void) {
     &ett_isdn_sup_IntResult,
     &ett_isdn_sup_ServedUserNr,
     &ett_isdn_sup_ServedUserNumberList,
+    &ett_isdn_sup_UserUserServiceArg,
 
 /*--- End of included file: packet-isdn-sup-ettarr.c ---*/
-#line 323 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
+#line 325 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
   };
 
   /* Register fields and subtrees */