ARGUMENT and RESULT types of OPERATION can be used with new asn2wrs and need not to be redefined as assignment

svn path=/trunk/; revision=22231

3 files changed, 38 insertions, 181 deletions

diff --git a/asn1/qsig/packet-qsig-template.c b/asn1/qsig/packet-qsig-template.c
index 868986e177..d7ad4354ed 100644
--- a/asn1/qsig/packet-qsig-template.c
+++ b/asn1/qsig/packet-qsig-template.c
@@ -498,15 +498,15 @@ static qsig_op qsig_tab[] = {
   /*  12 */ { 13869, FNA( 12), FNR( 12), NULL, NULL },
   /*  13 */ { 13869, FNA( 13), FNR( 13), NULL, NULL },
   /*  14 */ { 13869, FNA( 14), FNR( 14), NULL, NULL },
-  /*  15 */ { 13873, FNA( 15), FNR( 15), dissect_ActivateDivArg_PDU, dissect_ActivateDivRes_PDU },
-  /*  16 */ { 13873, FNA( 16), FNR( 16), dissect_DeactivateDivArg_PDU, dissect_DeactivateDivRes_PDU },
-  /*  17 */ { 13873, FNA( 17), FNR( 17), dissect_InterrDivArg_PDU, dissect_IntResultList_PDU },
-  /*  18 */ { 13873, FNA( 18), FNR( 18), dissect_ChkResArg_PDU, dissect_ChkResRes_PDU },
-  /*  19 */ { 13873, FNA( 19), FNR( 19), dissect_CallRrArg_PDU, dissect_CallRrArg_PDU },
-  /*  20 */ { 13873, FNA( 20), FNR( 20), dissect_DivLegInf1Arg_PDU, NULL },
-  /*  21 */ { 13873, FNA( 21), FNR( 21), dissect_DivLegInf2Arg_PDU, NULL },
-  /*  22 */ { 13873, FNA( 22), FNR( 22), dissect_DivLegInf3Arg_PDU, NULL },
-  /*  23 */ { 13873, FNA( 23), FNR( 23), dissect_DivLegFailArg_PDU, NULL },
+  /*  15 */ { 13873, FNA( 15), FNR( 15), dissect_ARG_activateDiversionQ_PDU, dissect_RES_activateDiversionQ_PDU },
+  /*  16 */ { 13873, FNA( 16), FNR( 16), dissect_ARG_deactivateDiversionQ_PDU, dissect_RES_deactivateDiversionQ_PDU },
+  /*  17 */ { 13873, FNA( 17), FNR( 17), dissect_ARG_interrogateDiversionQ_PDU, dissect_IntResultList_PDU },
+  /*  18 */ { 13873, FNA( 18), FNR( 18), dissect_ARG_checkRestriction_PDU, dissect_RES_checkRestriction_PDU },
+  /*  19 */ { 13873, FNA( 19), FNR( 19), dissect_ARG_callRerouteing_PDU, dissect_RES_callRerouteing_PDU },
+  /*  20 */ { 13873, FNA( 20), FNR( 20), dissect_ARG_divertingLegInformation1_PDU, NULL },
+  /*  21 */ { 13873, FNA( 21), FNR( 21), dissect_ARG_divertingLegInformation2_PDU, NULL },
+  /*  22 */ { 13873, FNA( 22), FNR( 22), dissect_ARG_divertingLegInformation3_PDU, NULL },
+  /*  23 */ { 13873, FNA( 23), FNR( 23), dissect_ARG_cfnrDivertedLegFailed_PDU, NULL },
   /*  24 */ { NO_SRV,     NULL,     NULL, NULL, NULL },
   /*  25 */ { NO_SRV,     NULL,     NULL, NULL, NULL },
   /*  26 */ { NO_SRV,     NULL,     NULL, NULL, NULL },
diff --git a/asn1/qsig/qsig-cf.asn b/asn1/qsig/qsig-cf.asn
index be2b950aa9..0792bf7f9b 100644
--- a/asn1/qsig/qsig-cf.asn
+++ b/asn1/qsig/qsig-cf.asn
@@ -65,26 +65,6 @@ activateDiversionQ OPERATION ::= {
       notAuthorized | unspecified}
   CODE      local:15}
 
-ActivateDivArg ::=
-    SEQUENCE {procedure          Procedure,
-              basicService       BasicService,
-              divertedToAddress  Address,
-              servedUserNr       PartyNumber,
-              activatingUserNr   PartyNumber,
-              extension
-                CHOICE {single
-                          [1] IMPLICIT Extension --{{DiversionExtensionSet}}--,
-                        multiple
-                          [2] IMPLICIT SEQUENCE OF
-                                         Extension --{{DiversionExtensionSet}}--}
-                  OPTIONAL}
-
-ActivateDivRes ::=
-    CHOICE {null      NULL,
-            single    [1] IMPLICIT Extension --{{DiversionExtensionSet}}--,
-            multiple
-              [2] IMPLICIT SEQUENCE OF Extension --{{DiversionExtensionSet}}--}
-
 
 deactivateDiversionQ OPERATION ::= {
  -- Sent from the Deactivating PINX to the Served User PINX 
@@ -110,25 +90,6 @@ deactivateDiversionQ OPERATION ::= {
       temporarilyUnavailable | notAuthorized | unspecified}
   CODE      local:16}
 
-DeactivateDivArg ::=
-    SEQUENCE {procedure           Procedure,
-              basicService        BasicService,
-              servedUserNr        PartyNumber,
-              deactivatingUserNr  PartyNumber,
-              extension
-                CHOICE {single
-                          [1] IMPLICIT Extension --{{DiversionExtensionSet}}--,
-                        multiple
-                          [2] IMPLICIT SEQUENCE OF
-                                         Extension --{{DiversionExtensionSet}}--}
-                  OPTIONAL}
-
-DeactivateDivRes ::=
-    CHOICE {null      NULL,
-            single    [1] IMPLICIT Extension --{{DiversionExtensionSet}}--,
-            multiple
-              [2] IMPLICIT SEQUENCE OF Extension --{{DiversionExtensionSet}}--}
-
 
 interrogateDiversionQ OPERATION ::= { 
  -- Sent from the Interrogating PINX to the Served User PINX 
@@ -150,18 +111,6 @@ interrogateDiversionQ OPERATION ::= {
       temporarilyUnavailable | notAuthorized | unspecified}
   CODE      local:17}
 
-InterrDivArg ::=
-    SEQUENCE {procedure            Procedure,
-              basicService         BasicService DEFAULT allServices,
-              servedUserNr         PartyNumber,
-              interrogatingUserNr  PartyNumber,
-              extension
-                CHOICE {single
-                          [1] IMPLICIT Extension --{{DiversionExtensionSet}}--,
-                        multiple
-                          [2] IMPLICIT SEQUENCE OF
-                                         Extension --{{DiversionExtensionSet}}--}
-                  OPTIONAL}
 
 checkRestriction OPERATION ::= {
  -- Sent from the Served User PINX to the Diverted-to PINX 
@@ -186,24 +135,6 @@ checkRestriction OPERATION ::= {
       specialServiceNr | unspecified}
   CODE      local:18}
 
-ChkResArg ::=
-    SEQUENCE {servedUserNr  PartyNumber,
-              basicService  BasicService,
-              divertedToNr  PartyNumber,
-              extension
-                CHOICE {single
-                          [1] IMPLICIT Extension --{{DiversionExtensionSet}}--,
-                        multiple
-                          [2] IMPLICIT SEQUENCE OF
-                                         Extension --{{DiversionExtensionSet}}--}
-                  OPTIONAL}
-
-ChkResRes ::=
-    CHOICE {null      NULL,
-            single    [1] IMPLICIT Extension --{{DiversionExtensionSet}}--,
-            multiple
-              [2] IMPLICIT SEQUENCE OF Extension --{{DiversionExtensionSet}}--}
-
 
 callRerouteing OPERATION ::= {
  -- Sent from the Served User PINX to the Rerouteing PINX 
@@ -244,37 +175,6 @@ callRerouteing OPERATION ::= {
  -- The error value numberOfDiversionsExceeded applies only in case of partial rerouteing. 
   CODE      local:19}
 
-CallRrArg ::=
-    SEQUENCE {rerouteingReason          DiversionReason,
-              originalRerouteingReason  [0] IMPLICIT DiversionReason OPTIONAL,
-              calledAddress             Address,
-              diversionCounter          INTEGER(1..15),
-              pSS1InfoElement           PSS1InformationElement,
-              -- The basic call information elements Bearer capability, High layer compatibility, Low 
-              -- layer compatibity and Progress indicator can be embedded in the 
-              -- pSS1InfoElement in accordance with 6.5.3.1.5. 
-              lastRerouteingNr          [1]  PresentedNumberUnscreened,
-              subscriptionOption        [2] IMPLICIT SubscriptionOption,
-              callingPartySubaddress    [3]  PartySubaddress OPTIONAL,
-              callingNumber             [4]  PresentedNumberScreened,
-              callingName               [5]  Name OPTIONAL,
-              originalCalledNr          [6]  PresentedNumberUnscreened OPTIONAL,
-              redirectingName           [7]  Name OPTIONAL,
-              originalCalledName        [8]  Name OPTIONAL,
-              extension
-                CHOICE {single
-                          [9] IMPLICIT Extension --{{DiversionExtensionSet}}--,
-                        multiple
-                          [10] IMPLICIT SEQUENCE OF
-                                          Extension --{{DiversionExtensionSet}}--}
-                  OPTIONAL}
-
-CallRrRes ::=
-    CHOICE {null      NULL,
-            single    [1] IMPLICIT Extension --{{DiversionExtensionSet}}--,
-            multiple
-              [2] IMPLICIT SEQUENCE OF Extension --{{DiversionExtensionSet}}--}
-
 
 divertingLegInformation1 OPERATION ::= {
  -- Sent from the Rerouteing PINX to the Originating PINX 
@@ -293,18 +193,6 @@ divertingLegInformation1 OPERATION ::= {
   ALWAYS RESPONDS  FALSE
   CODE             local:20}
 
-DivLegInf1Arg ::=
-    SEQUENCE {diversionReason     DiversionReason,
-              subscriptionOption  SubscriptionOption,
-              nominatedNr         PartyNumber,
-              extension
-                CHOICE {single
-                          [9] IMPLICIT Extension --{{DiversionExtensionSet}}--,
-                        multiple
-                          [10] IMPLICIT SEQUENCE OF
-                                          Extension --{{DiversionExtensionSet}}--}
-                  OPTIONAL}
-
 
 divertingLegInformation2 OPERATION ::= {
  -- Sent from the Rerouteing PINX to the Diverted-to PINX 
@@ -328,21 +216,6 @@ divertingLegInformation2 OPERATION ::= {
   ALWAYS RESPONDS  FALSE
   CODE             local:21}
 
-DivLegInf2Arg ::=
-    SEQUENCE {diversionCounter         INTEGER(1..15),
-              diversionReason          DiversionReason,
-              originalDiversionReason  [0] IMPLICIT DiversionReason OPTIONAL,
-              divertingNr              [1]  PresentedNumberUnscreened OPTIONAL,
-              originalCalledNr         [2]  PresentedNumberUnscreened OPTIONAL,
-              redirectingName          [3]  Name OPTIONAL,
-              originalCalledName       [4]  Name OPTIONAL,
-              extension
-                CHOICE {single
-                          [5] IMPLICIT Extension --{{DiversionExtensionSet}}--,
-                        multiple
-                          [6] IMPLICIT SEQUENCE OF
-                                         Extension --{{DiversionExtensionSet}}--}
-                  OPTIONAL}
 
 divertingLegInformation3 OPERATION ::= {
  -- Sent from the Diverted-to PINX to the Originating PINX 
@@ -360,16 +233,6 @@ divertingLegInformation3 OPERATION ::= {
   ALWAYS RESPONDS  FALSE
   CODE             local:22}
 
-DivLegInf3Arg ::=
-    SEQUENCE {presentationAllowedIndicator  PresentationAllowedIndicator,
-              redirectionName               [0]  Name OPTIONAL,
-              extension
-                CHOICE {single
-                          [1] IMPLICIT Extension --{{DiversionExtensionSet}}--,
-                        multiple
-                          [2] IMPLICIT SEQUENCE OF
-                                         Extension --{{DiversionExtensionSet}}--}
-                  OPTIONAL}
 
 cfnrDivertedLegFailed OPERATION ::= {
   -- Sent from the Rerouteing PINX to the Served User PINX
@@ -383,12 +246,6 @@ cfnrDivertedLegFailed OPERATION ::= {
   ALWAYS RESPONDS  FALSE
   CODE             local:23}
 
-DivLegFailArg ::=
-    CHOICE {null      NULL,
-            single    [1] IMPLICIT Extension --{{DiversionExtensionSet}}--,
-            multiple
-              [2] IMPLICIT SEQUENCE OF Extension --{{DiversionExtensionSet}}--}
-
 
 -- Definitions of general used data types: 
 DiversionReason ::= ENUMERATED {unknown(0), cfu(1), cfb(2), cfnr(3)}
diff --git a/asn1/qsig/qsig.cnf b/asn1/qsig/qsig.cnf
index 663925bc31..916dcf6e00 100644
--- a/asn1/qsig/qsig.cnf
+++ b/asn1/qsig/qsig.cnf
@@ -19,45 +19,45 @@ Name
 NameArg
 
 #--- ECMA-174 QSIG-CF --------------------------------
-ActivateDivArg
-ActivateDivRes
-DeactivateDivArg
-DeactivateDivRes
-InterrDivArg
-ChkResArg
-ChkResRes
-CallRrArg
-CallRrRes
-DivLegInf1Arg
-DivLegInf2Arg
-DivLegInf3Arg
-DivLegFailArg
+ARG-activateDiversionQ
+RES-activateDiversionQ
+ARG-deactivateDiversionQ
+RES-deactivateDiversionQ
+ARG-interrogateDiversionQ
+ARG-checkRestriction
+RES-checkRestriction
+ARG-callRerouteing
+RES-callRerouteing
+ARG-divertingLegInformation1
+ARG-divertingLegInformation2
+ARG-divertingLegInformation3
+ARG-cfnrDivertedLegFailed
 IntResultList
 
 #.END
 
 #.TYPE_RENAME
-ActivateDivArg/extension    ADExtension
-DeactivateDivArg/extension  DDExtension
-InterrDivArg/extension      IDExtension
-ChkResArg/extension         CHRExtension
-CallRrArg/extension         CRRExtension
-DivLegInf1Arg/extension DLI1Extension
-DivLegInf2Arg/extension DLI2Extension
-DivLegInf3Arg/extension DLI3Extension
+ARG-activateDiversionQ/extension    ADExtension
+ARG-deactivateDiversionQ/extension  DDExtension
+ARG-interrogateDiversionQ/extension      IDExtension
+ARG-checkRestriction/extension         CHRExtension
+ARG-callRerouteing/extension         CRRExtension
+ARG-divertingLegInformation1/extension DLI1Extension
+ARG-divertingLegInformation2/extension DLI2Extension
+ARG-divertingLegInformation3/extension DLI3Extension
 IntResult/extension     IRExtension
 #.END
 
 #.FIELD_RENAME
 NameArg/nameSequence/extension extensionNA
-ActivateDivArg/extension       extensionAD
-DeactivateDivArg/extension     extensionDD
-InterrDivArg/extension         extensionID
-ChkResArg/extension            extensionCHR
-CallRrArg/extension            extensionCRR
-DivLegInf1Arg/extension        extensionDLI1
-DivLegInf2Arg/extension        extensionDLI2
-DivLegInf3Arg/extension        extensionDLI3
+ARG-activateDiversionQ/extension       extensionAD
+ARG-deactivateDiversionQ/extension     extensionDD
+ARG-interrogateDiversionQ/extension         extensionID
+ARG-checkRestriction/extension            extensionCHR
+ARG-callRerouteing/extension            extensionCRR
+ARG-divertingLegInformation1/extension        extensionDLI1
+ARG-divertingLegInformation2/extension        extensionDLI2
+ARG-divertingLegInformation3/extension        extensionDLI3
 IntResult/extension            extensionIR
 #.END