Bug 9704: GSM_MAP SendRoutingInfoForSM incomplete

Added the field information for Phase 1 for the Send Routing Info
For Sm message per request of ticket 9704. Code per the suggestion of
Anders Broman. Adding Phase 1 code to GSMMAP.asn.

Did not have any data to verify that the change worked.

Change-Id: Ic387e2e12e8893abb0f453f5010909ffbfd1808c
Reviewed-on: https://code.wireshark.org/review/147
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

2 files changed, 47 insertions, 2 deletions

diff --git a/asn1/gsm_map/GSMMAP.asn b/asn1/gsm_map/GSMMAP.asn
index 12df716916..fc43bf48db 100644
--- a/asn1/gsm_map/GSMMAP.asn
+++ b/asn1/gsm_map/GSMMAP.asn
@@ -25,7 +25,8 @@ IMPORTS
 	IMSI-WithLMSI,
 	LMSI,
 	ProtocolId,
-	SignalInfo
+	SignalInfo,
+	TeleserviceCode
 FROM MAP-CommonDataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
    gsm-Network (1) modules (3) map-CommonDataTypes (18) version11 (11)}
@@ -41,6 +42,20 @@ FROM MAP-ExtensionDataTypes {
 FROM MAP-CH-DataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
    gsm-Network (1) modules (3) map-CH-DataTypes (13) version11 (11)}
+
+   CUG-Interlock
+FROM MAP-MS-DataTypes {
+   itu-t identified-organization (4) etsi (0) mobileDomain (0)
+   gsm-Network (1) modules (3) map-MS-DataTypes (11) version15 (15)}
+
+   CorrelationID,
+   SM-DeliveryNotIntended,
+   SM-RP-MTI,
+   SM-RP-SMEA
+FROM MAP-SM-DataTypes {
+   itu-t identified-organization (4) etsi (0) mobileDomain (0)
+   gsm-Network (1) modules (3) map-SM-DataTypes (16) version15 (15)}
+
 ;
 
 -- ROS def's
@@ -633,11 +648,37 @@ SendRoutingInfoResV2 ::= SEQUENCE {
 -- cug-CheckInfo must be absent in version 1 
 	...
 	} 
+
 -- Removed from SS-DataTypes.asn in Rel 9.0.0
 BeginSubscriberActivityArg ::= SEQUENCE {
     imsi            IMSI,
     originatingEntityNumber ISDN-AddressString,
     msisdn                  [PRIVATE 28] AddressString OPTIONAL,
     ... }
+
+RoutingInfoForSM-ArgV1 ::= SEQUENCE {
+    msisdn      [0] ISDN-AddressString,
+    sm-RP-PRI       [1] BOOLEAN,
+    serviceCentreAddress    [2] AddressString,
+    -- WS specific change to be backwards compatible with phase 1 (See Bug 9704)
+    cug-Interlock       [3]  CUG-Interlock  OPTIONAL,
+    --teleserviceCode         [5] TeleserviceCode OPTIONAL,
+    -- END Ws specific change
+    --extensionContainer  [6] ExtensionContainer  OPTIONAL,
+    --... ,
+    --gprsSupportIndicator    [7] NULL        OPTIONAL,
+    -- gprsSupportIndicator is set only if the SMS-GMSC supports
+    -- receiving of two numbers from the HLR
+    --sm-RP-MTI       [8] SM-RP-MTI   OPTIONAL,
+    --sm-RP-SMEA  [9] SM-RP-SMEA  OPTIONAL,
+    --sm-deliveryNotIntended  [10] SM-DeliveryNotIntended OPTIONAL,
+    --ip-sm-gwGuidanceIndicator   [11] NULL       OPTIONAL,
+    imsi            [12] IMSI       OPTIONAL  --,
+    --t4-Trigger-Indicator    [14] NULL       OPTIONAL,
+    --singleAttemptDelivery   [13]    NULL        OPTIONAL,
+    --correlationID   [15] CorrelationID  OPTIONAL
+    }
+
+
 END
 
diff --git a/asn1/gsm_map/packet-gsm_map-template.c b/asn1/gsm_map/packet-gsm_map-template.c
index d930acd711..c351b74aa4 100644
--- a/asn1/gsm_map/packet-gsm_map-template.c
+++ b/asn1/gsm_map/packet-gsm_map-template.c
@@ -1157,7 +1157,11 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
     }
     break;
   case 45: /*sendRoutingInfoForSM*/
-    offset=dissect_gsm_map_sm_RoutingInfoForSM_Arg(FALSE, tvb, offset, actx, tree, -1);
+    if (application_context_version == 1) {
+      offset=dissect_gsm_old_RoutingInfoForSM_ArgV1(FALSE, tvb, offset, actx, tree, -1);
+    } else {
+      offset=dissect_gsm_map_sm_RoutingInfoForSM_Arg(FALSE, tvb, offset, actx, tree, -1);
+    }
     break;
   case 46: /*mo-forwardSM(v3) or ForwardSM(v1/v2)*/
     if (application_context_version == 3)