Update some OID:s and add some ASN1 code from ETSI TS 129 002 V5.7.0.

Will regenerate later.

svn path=/trunk/; revision=14704

2 files changed, 89 insertions, 32 deletions

diff --git a/asn1/gsmmap/GSMMAP.asn b/asn1/gsmmap/GSMMAP.asn
index 72f90a3216..5d40e2bbf6 100644
--- a/asn1/gsmmap/GSMMAP.asn
+++ b/asn1/gsmmap/GSMMAP.asn
@@ -465,35 +465,35 @@ IntraCUG-Options ::= ENUMERATED {
   cugOG-CallBarred      ( 2 ) }
 
 Odb-GeneralData ::= BIT STRING {
-  allOGCallsBarred(0), 
-  internationalOGCallsBarred(1), 
-  internationalOGCallsNotToHPLMNCountryBarred(2), 
-  premiumRateInformationOGCallsBarred  (3 ), 
-  premiumRateEntertainementOGCallsBarred  (4 ), 
-  ssAccessBarred  (5 ), 
-  interzonalOGCallsBarred  (6 ), 
-  interzonalOGCallsNotToHPLMNCountryBarred  (7 ), 
-  interzonalOGCallsAndIntOGCallsNotToHPLMNCountryBarred  (8 ), 
-  allECTBarred  (9 ), 
-  chargeableECTBarred  (10 ), 
-  internationalECTBarred  (11 ), 
-  interzonalECTBarred  (12 ), 
-  doublyChargeableECTBarred  (13 ), 
-  multipleECTBarred  (14 ),
-  allPacketOrientedServicesBarred  (15 ), 
-  roamerAccessToHPLMN-AP-Barred  (16 ), 
-  roamerAccessToVPLMN-AP-Barred  (17 ), 
-  roamingOutsidePLMNOG-CallsBarred  (18 ), 
-  allIC-CallsBarred  (19 ), 
-  roamingOutsidePLMNIC-CallsBarred  (20 ), 
-  roamingOutsidePLMNICountryIC-CallsBarred  (21 ), 
-  roamingOutsidePLMN-Barred  (22 ), 
-  roamingOutsidePLMN-CountryBarred  (23 ), 
-  registrationAllCF-Barred  (24 ), 
-  registrationCFNotToHPLMN-Barred  (25 ), 
-  registrationInterzonalCF-Barred  (26 ), 
-  registrationInterzonalCFNotToHPLMN-Barred  (27 ), 
-  registrationInternationalCF-Barred  (28 )}
+allOG-CallsBarred (0),
+internationalOGCallsBarred (1),
+internationalOGCallsNotToHPLMN-CountryBarred (2),
+interzonalOGCallsBarred (6),
+interzonalOGCallsNotToHPLMN-CountryBarred (7),
+interzonalOGCallsAndInternationalOGCallsNotToHPLMN-CountryBarred (8),
+premiumRateInformationOGCallsBarred (3),
+premiumRateEntertainementOGCallsBarred (4),
+ss-AccessBarred (5),
+allECT-Barred (9),
+chargeableECT-Barred (10),
+internationalECT-Barred (11),
+interzonalECT-Barred (12),
+doublyChargeableECT-Barred (13),
+multipleECT-Barred (14),
+allPacketOrientedServicesBarred (15),
+roamerAccessToHPLMN-AP-Barred (16),
+roamerAccessToVPLMN-AP-Barred (17),
+roamingOutsidePLMNOG-CallsBarred (18),
+allIC-CallsBarred (19),
+roamingOutsidePLMNIC-CallsBarred (20),
+roamingOutsidePLMNICountryIC-CallsBarred (21),
+roamingOutsidePLMN-Barred (22),
+roamingOutsidePLMN-CountryBarred (23),
+registrationAllCF-Barred (24),
+registrationCFNotToHPLMN-Barred (25),
+registrationInterzonalCF-Barred (26),
+registrationInterzonalCFNotToHPLMN-Barred (27),
+registrationInternationalCF-Barred (28)}
 Odb-HPLMN-Data ::= BIT STRING {
   plmnSpecificBarringType1  (0 ), 
   plmnSpecificBarringType2  (1 ), 
@@ -617,7 +617,9 @@ InsertSubscriberDataArg ::= SEQUENCE {
                   qos-Subscribed        [18] IMPLICIT Qos-Subscribed, 
                   vplmnAddressAllowed   [19] IMPLICIT NULL OPTIONAL, 
                   apn                   [20] IMPLICIT OCTET STRING ( SIZE( 2 .. 63 ) ), 
-                  extensionContainer    [21] IMPLICIT ExtensionContainer OPTIONAL, 
+                  extensionContainer    [21] IMPLICIT ExtensionContainer OPTIONAL,
+				  ext-QoS-Subscribed	[0]	 IMPLICIT Ext-QoS-Subscribed OPTIONAL,
+				  pdp-ChargingCharacteristics [1] IMPLICIT ChargingCharacteristics OPTIONAL,
                   ... }, 
             extensionContainer         [2] IMPLICIT ExtensionContainer OPTIONAL, 
             ... } OPTIONAL, 
@@ -789,7 +791,19 @@ Ss-SubscriptionOption ::= CHOICE {
 ForwardingOptions ::= OCTET STRING ( SIZE( 1 ) )
 --  noReplyConditionTime    [7] IMPLICIT INTEGER ( 1 .. 100 ) OPTIONAL, 
 -- Changed to no size
+
+Ext-QoS-Subscribed ::= OCTET STRING (SIZE (1..9))
+-- OCTET 1:
+-- Allocation/Retention Priority (This octet encodes each priority level defined in
+-- 23.107 as the binary value of the priority level, declaration in 29.060)
+-- Octets 2-9 are coded according to 3GPP TS 24.008[35] Quality of Service Octets
+-- 6-13.
+
+ChargingCharacteristics ::= OCTET STRING (SIZE (2))
+-- Octets are coded according to 3GPP TS 32.015.
 -- End Ethereal adaptation --
+
+
 --deleteSubscriberData OPERATION
 --   ARGUMENT
 DeleteSubscriberDataArg ::= SEQUENCE {
@@ -1555,6 +1569,32 @@ Ussd-Res ::=  SEQUENCE {
 -- ussd-Busy   localValue : 72}
 -- ::= localValue : 61
 
+AuthenticationFailureReportArg ::= SEQUENCE {
+      imsi                 Imsi, 
+      failureCause         ENUMERATED {
+         wrongUserResponse        (0 ), 
+         wrongNetworkSignature    (1 )}, 
+      extensionContainer   ExtensionContainer OPTIONAL, 
+      ... , 
+      re-attempt           BOOLEAN OPTIONAL, 
+      accessType           ENUMERATED {
+         call                      (0 ), 
+         emergencyCall             (1 ), 
+         locationUpdating          (2 ), 
+         supplementaryService      (3 ), 
+         shortMessage              (4 ), 
+         gprsAttach                (5 ), 
+         routingAreaUpdating       (6 ), 
+         serviceRequest            (7 ), 
+         pdpContextActivation      (8 ), 
+         pdpContextDeactivation    (9 ), 
+         ... , 
+         gprsDetach                (10 )} OPTIONAL, 
+      rand                 OCTET STRING (  SIZE (16 ) ) OPTIONAL, 
+      vlr-Number           [0] IMPLICIT Vlr-Number OPTIONAL, 
+      sgsn-Number          [1] IMPLICIT Sgsn-Number OPTIONAL}
+
+
 --registerPassword OPERATION
 --   ARGUMENT
 Ss-Code  ::=  OCTET STRING
diff --git a/asn1/gsmmap/packet-gsm_map-template.c b/asn1/gsmmap/packet-gsm_map-template.c
index 6465450451..76b5e1c9ef 100644
--- a/asn1/gsmmap/packet-gsm_map-template.c
+++ b/asn1/gsmmap/packet-gsm_map-template.c
@@ -188,6 +188,7 @@ const value_string gsm_map_opr_code_strings[] = {
   {  12, "activateSS" },
   {  13, "deactivateSS" },
   {  14, "interrogateSS" },
+  {	 15, "authenticationFailureReport" },	
   {  17, "registerPassword" },
   {  18, "getPassword" },
   {  19, "processUnstructuredSS-Data" },		/* map-ac networkFunctionalSs (18) version1 (1) */
@@ -1235,12 +1236,15 @@ void proto_reg_handoff_gsm_map(void) {
   register_ber_oid_dissector_handle("0.4.0.0.1.0.5.3", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) locInfoRetrieval(5) version3(3)" );
   register_ber_oid_dissector_handle("0.4.0.0.1.0.5.2", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) locInfoRetrieval(5) version2(2)" );
   register_ber_oid_dissector_handle("0.4.0.0.1.0.5.1", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) locInfoRetrieval(5) version1(1)" );
+  register_ber_oid_dissector_handle("0.4.0.0.1.0.6.4", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) callControlTransfer(6) version4(4)" );
+  register_ber_oid_dissector_handle("0.4.0.0.1.0.7.3", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) reporting(7) version3(3)" );
+  register_ber_oid_dissector_handle("0.4.0.0.1.0.8.3", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) callCompletion(8) version3(3)" );
   register_ber_oid_dissector_handle("0.4.0.0.1.0.10.2", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) reset(10) version2(2)" );
   register_ber_oid_dissector_handle("0.4.0.0.1.0.10.1", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) reset(10) version1(1)" );
   register_ber_oid_dissector_handle("0.4.0.0.1.0.11.3", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) handoverControl(11) version3(3)" );
   register_ber_oid_dissector_handle("0.4.0.0.1.0.11.2", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) handoverControl(11) version2(2)" );
   register_ber_oid_dissector_handle("0.4.0.0.1.0.11.1", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) handoverControl(11) version1(1)" );
-  register_ber_oid_dissector_handle("0.4.0.0.1.0.26.2", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) imsiRetrieval(26) version2(2)" );
+  register_ber_oid_dissector_handle("0.4.0.0.1.0.12.3", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) sIWFSAllocation(12) version3(3)" );
   register_ber_oid_dissector_handle("0.4.0.0.1.0.13.2", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) equipmentMngt(13) version2(2)" );
   register_ber_oid_dissector_handle("0.4.0.0.1.0.13.1", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) equipmentMngt(13) version1(1)" );
   register_ber_oid_dissector_handle("0.4.0.0.1.0.14.3", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) infoRetrieval(14) version3(3)" );
@@ -1260,14 +1264,27 @@ void proto_reg_handoff_gsm_map(void) {
   register_ber_oid_dissector_handle("0.4.0.0.1.0.20.1", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) shortMsgGateway(20) version1(1)" );
   register_ber_oid_dissector_handle("0.4.0.0.1.0.21.2", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) shortMsgMO-Relay(21) version2(2)" );
   register_ber_oid_dissector_handle("0.4.0.0.1.0.21.1", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) --shortMsgRelay--21 version1(1)" );
+  register_ber_oid_dissector_handle("0.4.0.0.1.0.22.3", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) subscriberDataModificationNotification(22) version3(3)" );
   register_ber_oid_dissector_handle("0.4.0.0.1.0.23.2", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) shortMsgAlert(23) version2(2)" );
   register_ber_oid_dissector_handle("0.4.0.0.1.0.23.1", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) shortMsgAlert(23) version1(1)" );
   register_ber_oid_dissector_handle("0.4.0.0.1.0.24.2", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) mwdMngt(24) version2(2)" );
   register_ber_oid_dissector_handle("0.4.0.0.1.0.24.1", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) mwdMngt(24) version1(1)" );
   register_ber_oid_dissector_handle("0.4.0.0.1.0.25.3", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) shortMsgMT-Relay(25) version3(3)" );
   register_ber_oid_dissector_handle("0.4.0.0.1.0.25.2", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) shortMsgMT-Relay(25) version2(2)" );
+  register_ber_oid_dissector_handle("0.4.0.0.1.0.26.2", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) imsiRetrieval(26) version2(2)" );
   register_ber_oid_dissector_handle("0.4.0.0.1.0.25.1", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) msPurging(27) version2(2)" );
-
+  register_ber_oid_dissector_handle("0.4.0.0.1.0.29.3", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) anyTimeInfoEnquiry(29) version3(3)" );
+  register_ber_oid_dissector_handle("0.4.0.0.1.0.31.2", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) oupCallControl(31) version3(3)" );
+  register_ber_oid_dissector_handle("0.4.0.0.1.0.32.3", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) gprsLocationUpdate(32) version3(3)" );
+  register_ber_oid_dissector_handle("0.4.0.0.1.0.33.4", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) rsLocationInfoRetrieval(33) version4(4)" );
+  register_ber_oid_dissector_handle("0.4.0.0.1.0.34.3", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) failureReport(34) version3(3)" );
+  register_ber_oid_dissector_handle("0.4.0.0.1.0.36.3", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) ss-InvocationNotification(36) version3(3)" );
+  register_ber_oid_dissector_handle("0.4.0.0.1.0.37.3", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) locationSvcGateway(37) version3(3)" );
+  register_ber_oid_dissector_handle("0.4.0.0.1.0.38.3", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) locationSvcEnquiry(38) version3(3)" );
+  register_ber_oid_dissector_handle("0.4.0.0.1.0.39.3", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) authenticationFailureReport(39) version3(3)" );
+  register_ber_oid_dissector_handle("0.4.0.0.1.0.40.3", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) secureTransportHandling(40) version3(3)" );
+  register_ber_oid_dissector_handle("0.4.0.0.1.0.42.3", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) mm-EventReporting(42) version3(3)" );
+  register_ber_oid_dissector_handle("0.4.0.0.1.0.43.3", map_handle, proto_gsm_map,"itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) anyTimeInfoHandling(43) version3(3)" );
     }
     else {
 	range_foreach(ssn_range, range_delete_callback);