Try to fix some GCC warnings.

svn path=/trunk/; revision=22172

2 files changed, 33 insertions, 8 deletions

diff --git a/asn1/ansi_map/ansi_map.asn b/asn1/ansi_map/ansi_map.asn
index 93fdd1b876..962af98910 100644
--- a/asn1/ansi_map/ansi_map.asn
+++ b/asn1/ansi_map/ansi_map.asn
@@ -4206,6 +4206,18 @@ PositionRequestForwardRes ::= [PRIVATE 18] SET {
 	-- O 6.5.2.117 c, e
 	}
 
+-- J-STD-036-AD-2
+CallTerminationReport ::= [PRIVATE 18] SET {
+	billingID								[1] IMPLICIT BillingID OPTIONAL,
+	-- O 6.5.2.16 a
+	imsi									[242] IMPLICIT IMSI OPTIONAL,
+	-- O 6.5.2.bu
+	mobileIdentificationNumber				[8] IMPLICIT MobileIdentificationNumber OPTIONAL,
+	-- O 6.5.2.81 b, c
+	networkTMSI								[233] IMPLICIT NetworkTMSI OPTIONAL
+	-- O 6.5.2.117 c
+}
+
 -- 6.4.2.am GeoPositionRequest (See J-STD-036, page 8-7) X.S0002-0 v2.0
 GeoPositionRequest ::= [PRIVATE 18] SET {
 	positionRequestType						[337] IMPLICIT PositionRequestType,
@@ -7829,7 +7841,7 @@ IMSIType ::= OCTET STRING
 -- Definition to support ASN2WRS generating hf_indices
 
 InvokeData ::= SEQUENCE {
-        handoffMeasurementRequest HandoffMeasurementRequest,
+    handoffMeasurementRequest HandoffMeasurementRequest,
 	facilitiesDirective FacilitiesDirective,
 	handoffBack HandoffBack,
 	facilitiesRelease FacilitiesRelease,
@@ -7884,6 +7896,7 @@ InvokeData ::= SEQUENCE {
 	changeService ChangeService,
 	parameterRequest ParameterRequest,
 	tMSIDirective TMSIDirective,
+	numberPortabilityRequest NumberPortabilityRequest,
 	serviceRequest ServiceRequest,
 	analyzedInformation AnalyzedInformation,
 	connectionFailureReport ConnectionFailureReport,
@@ -7908,6 +7921,10 @@ InvokeData ::= SEQUENCE {
 	oNoAnswer ONoAnswer,
 	positionRequest PositionRequest,
 	positionRequestForward PositionRequestForward,
+	callTerminationReport CallTerminationReport,
+	geoPositionRequest GeoPositionRequest,
+	interSystemPositionRequest InterSystemPositionRequest,
+	interSystemPositionRequestForward InterSystemPositionRequestForward,
 	aCGDirective ACGDirective,
 	roamerDatabaseVerificationRequest RoamerDatabaseVerificationRequest,
 	addService AddService,
@@ -7935,6 +7952,7 @@ ReturnData ::= SEQUENCE {
 	handoffToThirdRes HandoffToThirdRes,
 	authenticationDirectiveRes AuthenticationDirectiveRes,
 	authenticationRequestRes AuthenticationRequestRes,
+	baseStationChallengeRes BaseStationChallengeRes,
 	authenticationFailureReportRes AuthenticationFailureReportRes,
 	countRequestRes CountRequestRes,
 	interSystemPageRes InterSystemPageRes,
@@ -7945,6 +7963,7 @@ ReturnData ::= SEQUENCE {
 	handoffToThird2Res HandoffToThird2Res,
 	authenticationDirectiveForwardRes AuthenticationDirectiveForwardRes,
 	authenticationStatusReportRes AuthenticationStatusReportRes,
+	informationDirectiveRes InformationDirectiveRes,
 	informationForwardRes InformationForwardRes,
 	interSystemPage2Res InterSystemPage2Res,
 	interSystemSetupRes InterSystemSetupRes,
diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c
index 45a4d3ae2c..6d422af202 100644
--- a/asn1/ansi_map/packet-ansi_map-template.c
+++ b/asn1/ansi_map/packet-ansi_map-template.c
@@ -512,7 +512,7 @@ const value_string ansi_map_opr_code_strings[] = {
     { 59,	"Change Service" },
     { 60,	"Parameter Request" },
     { 61,	"TMSI Directive" },
-    { 62,	"Reserved 62" },
+    { 62,	"NumberPortabilityRequest" },
     { 63,	"Service Request" },
     { 64,	"Analyzed Information Request" },
     { 65,	"Connection Failure Report" },
@@ -3814,8 +3814,8 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
 	  offset = dissect_ansi_map_TMSIDirective(TRUE, tvb, offset, actx, tree, hf_ansi_map_tMSIDirective);
 	  break;
 	  /*End  N.S0010-0 v 1.0 */
-  case  62: /*Reserved 62*/
-	  proto_tree_add_text(tree, tvb, offset, -1, "Unknown invokeData blob(Reserved 62)");
+  case  62: /*NumberPortabilityRequest 62*/
+	  offset = dissect_ansi_map_NumberPortabilityRequest(TRUE, tvb, offset, actx, tree, hf_ansi_map_numberPortabilityRequest);
 	  break;
   case  63: /*Service Request N.S0012-0 v 1.0*/
 	  offset = dissect_ansi_map_ServiceRequest(TRUE, tvb, offset, actx, tree, hf_ansi_map_serviceRequest);
@@ -3913,19 +3913,19 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
 	  break;
 	   /*END N.S0004 */
   case  92: /*Call Termination Report*/
-	  offset = offset;
+	  offset = dissect_ansi_map_CallTerminationReport(TRUE, tvb, offset, actx, tree, hf_ansi_map_callTerminationReport);
 	  break;
   case  93: /*Geo Position Directive*/
 	  offset = offset;
 	  break;
   case  94: /*Geo Position Request*/
-	  offset = offset;
+	  offset = dissect_ansi_map_GeoPositionRequest(TRUE, tvb, offset, actx, tree, hf_ansi_map_interSystemPositionRequest);
 	  break;
   case  95: /*Inter System Position Request*/
-	  offset = offset;
+	  offset = dissect_ansi_map_InterSystemPositionRequest(TRUE, tvb, offset, actx, tree, hf_ansi_map_interSystemPositionRequest);
 	  break;
   case  96: /*Inter System Position Request Forward*/
-	  offset = offset;
+	  offset = dissect_ansi_map_InterSystemPositionRequestForward(TRUE, tvb, offset, actx, tree, hf_ansi_map_interSystemPositionRequestForward);
 	  break;
 	  /* 3GPP2 N.S0023-0 */
   case  97: /*ACG Directive*/
@@ -4017,6 +4017,9 @@ static int dissect_returnData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
    case  28: /*Authentication Request*/
 	   offset = dissect_ansi_map_AuthenticationRequestRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_authenticationRequestRes);
 	   break;
+   case  29: /*Base Station Challenge*/
+	   offset = dissect_ansi_map_BaseStationChallengeRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_baseStationChallengeRes);
+	   break;
    case  30: /*Authentication Failure Report*/
 	   offset = dissect_ansi_map_AuthenticationFailureReportRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_authenticationFailureReportRes);
 	   break;
@@ -4048,6 +4051,9 @@ static int dissect_returnData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
 	   offset = dissect_ansi_map_AuthenticationStatusReportRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_authenticationStatusReportRes);
 	   break;
 			 /*Reserved 41*/
+   case  42: /*Information Directive*/
+	   offset = dissect_ansi_map_InformationDirectiveRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_informationDirectiveRes);
+	   break;
    case  43: /*Information Forward*/
 	   offset = dissect_ansi_map_InformationForwardRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_informationForwardRes);
 	   break;