Fix some asn2eth warnings.

svn path=/trunk/; revision=13485

3 files changed, 65 insertions, 29 deletions

diff --git a/asn1/gsmmap/GSMMAP.asn b/asn1/gsmmap/GSMMAP.asn
index 88bec9f05c..7579fd2ba2 100644
--- a/asn1/gsmmap/GSMMAP.asn
+++ b/asn1/gsmmap/GSMMAP.asn
@@ -51,14 +51,14 @@ Vlr-Capability ::= SEQUENCE {
             lcsCapabilitySet2  (1 ), 
             lcsCapabilitySet3  (2 ), 
             lcsCapabilitySet4  (3 )} (  SIZE (2 .. 16 ) ) OPTIONAL, 
-         offeredCamel4CSIs                             [6] IMPLICIT BIT STRING {
-            ocsi  (0 ), 
-            dcsi  (1 ), 
-            vtcsi  (2 ), 
-            tcsi  (3 ), 
-            mtsmscsi  (4 ), 
-            mgcsi  (5 ), 
-            psienhancements  (6 )} (  SIZE (7 .. 16 ) ) OPTIONAL} 
+            offeredCamel4CSIs                             [6] IMPLICIT BIT STRING {
+            o-csi  (0 ), 
+            d-csi  (1 ), 
+            vt-csi  (2 ), 
+            t-csi  (3 ), 
+            mt-sms-csi  (4 ), 
+            mg-csi  (5 ), 
+            psi-enhancements  (6 )} (  SIZE (7 .. 16 ) ) OPTIONAL} 
 
 Imsi ::= OCTET STRING 
 Lmsi ::= OCTET STRING ( SIZE( 4 ) )
@@ -99,7 +99,7 @@ PrivateExtensionList ::= SEQUENCE OF PrivateExtension
 
 PrivateExtension ::=  SEQUENCE {
   extId      OBJECT IDENTIFIER,  -- MAP-EXTENSION .&extensionId
-  extType    OCTET STRING OPTIONAL -- { @extId   }
+  extType    ANY OPTIONAL -- { @extId   }
 } 
 
 
@@ -1898,19 +1898,7 @@ AnyTimeSubscriptionInterrogationRes ::= SEQUENCE {
          ... } OPTIONAL, 
       camel-SubscriptionInfo       [4] IMPLICIT SEQUENCE {
          o-CSI                               [0] IMPLICIT O-CSI OPTIONAL, 
-         o-BcsmCamelTDP-CriteriaList         [1] IMPLICIT SEQUENCE  (  SIZE (1 .. 10 ) ) OF
-            SEQUENCE {
-               o-BcsmTriggerDetectionPoint   ENUMERATED {
-                  collectedInfo         (2 ), 
-                  ... , 
-                  routeSelectFailure    (4 )}, 
-               destinationNumberCriteria     [0] IMPLICIT DestinationNumberCriteria OPTIONAL, 
-               basicServiceCriteria          [1] IMPLICIT BasicServiceCriteria OPTIONAL, 
-               callTypeCriteria              [2] IMPLICIT CallTypeCriteria OPTIONAL, 
-               ... , 
-               o-CauseValueCriteria          [3] IMPLICIT O-CauseValueCriteria OPTIONAL, 
-               extensionContainer            [4] IMPLICIT ExtensionContainer OPTIONAL
-			   } OPTIONAL, 
+         o-BcsmCamelTDP-CriteriaList         [1] IMPLICIT O-BcsmCamelTDP-CriteriaList OPTIONAL, 
          d-CSI                               [2] IMPLICIT SEQUENCE {
             dp-AnalysedInfoCriteriaList   [0] IMPLICIT Dp-AnalysedInfoCriteriaList OPTIONAL, 
             camelCapabilityHandling       [1] IMPLICIT INTEGER ( 1 .. 16 ) OPTIONAL, 
@@ -2052,10 +2040,7 @@ AnyTimeSubscriptionInterrogationRes ::= SEQUENCE {
             csiActive                 [2] IMPLICIT NULL OPTIONAL} OPTIONAL, 
          o-IM-BcsmCamelTDP-CriteriaList      [19] IMPLICIT SEQUENCE  (  SIZE (1 .. 10 ) ) OF
             SEQUENCE {
-               o-BcsmTriggerDetectionPoint   ENUMERATED {
-                  collectedInfo         (2 ), 
-                  ... , 
-                  routeSelectFailure    (4 )}, 
+               o-BcsmTriggerDetectionPoint   BcsmTriggerDetectionPoint, 
                destinationNumberCriteria     [0] IMPLICIT DestinationNumberCriteria OPTIONAL, 
                basicServiceCriteria          [1] IMPLICIT BasicServiceCriteria OPTIONAL, 
                callTypeCriteria              [2] IMPLICIT CallTypeCriteria OPTIONAL, 
@@ -2237,6 +2222,10 @@ AnyTimeModificationArg ::= SEQUENCE {
          ... } OPTIONAL}
 
 --   RESULT     SEQUENCE {
+AnyTimeModificationRes ::= SEQUENCE {
+
+
+}
 ModifyNotificationToCSE ::= ENUMERATED {
             deactivate    (0 ), 
             activate      (1 )}
diff --git a/asn1/gsmmap/gsmmap.cnf b/asn1/gsmmap/gsmmap.cnf
index c2660f6fd3..ba218eab1c 100644
--- a/asn1/gsmmap/gsmmap.cnf
+++ b/asn1/gsmmap/gsmmap.cnf
@@ -19,16 +19,38 @@ InsertSubscriberDataRes/ss-List ss_List
 DeleteSubscriberDataArg/ss-List ss_List
 SendRoutingInfoRes/ss-List ss_List
 SendIdentificationRes/authenticationSetList SendId_authenticationSetList
-
+AnyTimeModificationArg/modificationRequestFor-CF-Info/basicService BasicService_ext
+AnyTimeModificationArg/modificationRequestFor-CB-Info/basicService BasicService_ext
+
+AnyTimeSubscriptionInterrogationRes/camel-SubscriptionInfo/mt-smsCAMELTDP-CriteriaList/_item/sms-TriggerDetectionPoint sms_TriggerDetectionPoint
+Sms-CAMEL-TDP-DataList/_item/sms-TriggerDetectionPoint sms_TriggerDetectionPoint
+InsertSubscriberDataArg/vlrCamelSubscriptionInfo/ss-CSI ss_CSI
+AnyTimeSubscriptionInterrogationRes/camel-SubscriptionInfo/ss-CSI ss_CSI
+SendRoutingInfoRes/extendedRoutingInfo/camelRoutingInfo/gmscCamelSubscriptionInfo/t-CSI t_CSI
+AnyTimeSubscriptionInterrogationRes/camel-SubscriptionInfo/t-CSI t_CSI
+
+AnyTimeSubscriptionInterrogationRes/camel-SubscriptionInfo/t-BCSM-CAMEL-TDP-CriteriaList/_item/t-BCSM-TriggerDetectionPoint t_BCSM_TriggerDetectionPoint
+AnyTimeSubscriptionInterrogationRes/camel-SubscriptionInfo/vt-BCSM-CAMEL-TDP-CriteriaList/_item/t-BCSM-TriggerDetectionPoint t_BCSM_TriggerDetectionPoint
+AnyTimeSubscriptionInterrogationRes/camel-SubscriptionInfo/vt-IM-BCSM-CAMEL-TDP-CriteriaList/_item/t-BCSM-TriggerDetectionPoint t_BCSM_TriggerDetectionPoint
 #.FIELD_RENAME
 RequestedInfo/locationInformation  locationInformationFlag
 RequestedInfo/subscriberState      subscriberStateFlag
 AdditionalSignalInfo/signalInfo    ext_signalInfo
 ForwardingInfo/forwardingFeatureList forwardingFeatureList_1_32
 SendIdentificationRes/authenticationSetList sendId_authenticationSetList
-AnyTimeSubscriptionInterrogationArg/requestedSubscriptionInfo/supportedVLR-CAMEL-Phases supportedVLR-CAMEL-Phases_flg
-AnyTimeSubscriptionInterrogationArg/requestedSubscriptionInfo/supportedSGSN-CAMEL-Phases supportedSGSN-CAMEL-Phases_flg
+AnyTimeSubscriptionInterrogationArg/requestedSubscriptionInfo/supportedVLR-CAMEL-Phases supportedVLR_CAMEL_Phases_flg
+AnyTimeSubscriptionInterrogationArg/requestedSubscriptionInfo/supportedSGSN-CAMEL-Phases supportedSGSN_CAMEL_Phases_flg
 RequestedInfo/imei imei_flg
+AnyTimeModificationArg/modificationRequestFor-CF-Info/basicService basicService_ext
+AnyTimeModificationArg/modificationRequestFor-CB-Info/basicService basicService_ext
+
+O-BcsmCamelTDP-CriteriaList/_item/basicServiceCriteria basicServiceCriteria_lst
+
+InterrogateSS-Res/forwardingFeatureList forwardingFeatureList_1_13
+AnyTimeModificationArg/modificationRequestFor-CF-Info/noReplyConditionTime noReplyConditionTime_1_100
+
+AnyTimeSubscriptionInterrogationRes/camel-SubscriptionInfo/o-IM-BcsmCamelTDP-CriteriaList/_item/o-BcsmTriggerDetectionPoint o-BcsmTriggerDetectionPoint
+O-BcsmCamelTDP-CriteriaList/_item/o-BcsmTriggerDetectionPoint o-BcsmTriggerDetectionPoint
 #----------------------------------------------------------------------------------------
 #.FN_BODY Sm-RP-UI
 
@@ -255,7 +277,14 @@ RequestedInfo/imei imei_flg
 	default:
 		break;
 }
+#----------------------------------------------------------------------------------------
+#.FN_BODY PrivateExtension/extType
+
+  proto_tree_add_text(tree, tvb, offset, -1, "Extension Data");
+  call_dissector(data_handle, tvb, pinfo, tree);	
+  offset = tvb_length_remaining(tvb,offset);		
 
+#.END
 #----------------------------------------------------------------------------------------
 #.TYPE_ATTR
 Ss-Code  TYPE = FT_UINT8  DISPLAY = BASE_DEC  STRINGS = VALS(ssCode_vals)
diff --git a/asn1/gsmmap/packet-gsm_map-template.c b/asn1/gsmmap/packet-gsm_map-template.c
index a653b976e4..f730342b63 100644
--- a/asn1/gsmmap/packet-gsm_map-template.c
+++ b/asn1/gsmmap/packet-gsm_map-template.c
@@ -97,6 +97,8 @@ static gint ett_gsm_map_GSMMAPPDU = -1;
 #include "packet-gsm_map-ett.c"
 
 static dissector_table_t	sms_dissector_table;	/* SMS TPDU */
+static dissector_handle_t data_handle;
+
 /* Preferenc settings default */
 static guint tcap_itu_ssn1 = 6;
 static guint tcap_itu_ssn2 = 7;
@@ -109,6 +111,7 @@ static guint global_tcap_itu_ssn3 = 8;
 static guint global_tcap_itu_ssn4 = 9;
 
 /* Global variables */
+
 static proto_tree *top_tree;
 int application_context_version;
 gint protocolId;
@@ -227,8 +230,10 @@ const value_string gsm_map_opr_code_strings[] = {
   {  59, "processUnstructuredSS-Request" },
   {  60, "unstructuredSS-Request" },
   {  61, "unstructuredSS-Notify" },
+  {  62, "anyTimeSubscriptionInterrogation" },
   {  63, "informServiceCentre" },
   {  64, "alertServiceCentre" },
+  {  65, "anyTimeModification" },
   {  66, "readyForSM" },
   {  67, "purgeMS" },
   {  68, "prepareHandover" },
@@ -518,12 +523,18 @@ static int dissect_invokeData(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
   case 61: /*unstructuredSS-Notify*/
     offset=dissect_gsm_map_Ussd_Arg(FALSE, tvb, offset, pinfo, tree, -1);
     break;
+  case 62: /*AnyTimeSubscriptionInterrogation*/
+	  offset=dissect_gsm_map_AnyTimeSubscriptionInterrogationArg(FALSE, tvb, offset, pinfo, tree, -1);
+	  break;
   case 63: /*informServiceCentre*/
     offset=dissect_gsm_map_InformServiceCentreArg(FALSE, tvb, offset, pinfo, tree, -1);
     break;
   case 64: /*alertServiceCentre*/
     offset=dissect_gsm_map_AlertServiceCentreArg(FALSE, tvb, offset, pinfo, tree, -1);
     break;
+  case 65: /*AnyTimeModification*/
+	  offset=dissect_gsm_map_AnyTimeModificationArg(FALSE, tvb, offset, pinfo, tree, -1);
+	  break;
   case 66: /*readyForSM*/
     offset=dissect_gsm_map_ReadyForSM_Arg(FALSE, tvb, offset, pinfo, tree, -1);
     break;
@@ -704,6 +715,12 @@ static int dissect_returnResultData(packet_info *pinfo, proto_tree *tree, tvbuff
     /* TRUE ? */
     proto_tree_add_text(tree, tvb, offset, -1, "Unknown returnResultData blob");
     break;
+  case 62: /*AnyTimeSubscriptionInterrogation*/
+	  offset=dissect_gsm_map_AnyTimeSubscriptionInterrogationRes(FALSE, tvb, offset, pinfo, tree, -1);
+	  break;
+  case 65: /*AnyTimeModification*/
+	  offset=dissect_gsm_map_AnyTimeModificationRes(FALSE, tvb, offset, pinfo, tree, -1);
+	  break;
   case 66: /*readyForSM*/
     offset=dissect_gsm_map_ReadyForSM_Res(FALSE, tvb, offset, pinfo, tree, -1);
     break;
@@ -1102,6 +1119,7 @@ void proto_reg_handoff_gsm_map(void) {
 	static int map_prefs_initialized = FALSE;
 
     map_handle = create_dissector_handle(dissect_gsm_map, proto_gsm_map);
+	data_handle = find_dissector("data");
 
 	if (!map_prefs_initialized) {
 		map_prefs_initialized = TRUE;