From Michael Lum:

- new service options
- one comment was incorrect
- Expanded a profile in one of the messages

svn path=/trunk/; revision=26905

2 files changed, 70 insertions, 4 deletions

diff --git a/asn1/ansi_map/ansi_map.asn b/asn1/ansi_map/ansi_map.asn
index 35f662d54b..e620f03088 100644
--- a/asn1/ansi_map/ansi_map.asn
+++ b/asn1/ansi_map/ansi_map.asn
@@ -2085,6 +2085,63 @@ QualificationRequestRes ::= [PRIVATE 18] SET {
 	mscid									[21] IMPLICIT MSCID OPTIONAL,
 	-- (HLR) O 6.5.2.82 f
 --	Profile **Macro** O 6.5.2.97 g	
+	authenticationCapability				[78] IMPLICIT AuthenticationCapability OPTIONAL,
+	-- O 6.5.2.8 a
+	callingFeaturesIndicator				[25] IMPLICIT CallingFeaturesIndicator OPTIONAL,
+	-- O 6.5.2.20 b
+	carrierDigits							[86] IMPLICIT CarrierDigits OPTIONAL,
+	-- O 6.5.2.28 c
+	cdmaServiceOptionList					[176] IMPLICIT CDMAServiceOptionList OPTIONAL,
+	-- O 6.5.2.g f, g
+	controlNetworkID						[307] IMPLICIT ControlNetworkID OPTIONAL,
+	-- O 6.5.2.ek u
+	dmh-AccountCodeDigits					[140] IMPLICIT DMH-AccountCodeDigits OPTIONAL,
+	-- O 6.5.2.59 d
+	dmh-AlternateBillingDigits				[141] IMPLICIT DMH-AlternateBillingDigits OPTIONAL,
+	-- O 6.5.2.60 d
+	dmh-BillingDigits						[142] IMPLICIT DMH-BillingDigits OPTIONAL,
+	-- O 6.5.2.61 d
+	geographicAuthorization					[143] IMPLICIT GeographicAuthorization OPTIONAL,
+	-- O 6.5.2.68 e
+	meidValidated							[401] IMPLICIT MEIDValidated OPTIONAL,
+	-- O 3.2.2.98
+	messageWaitingNotificationCount			[92] IMPLICIT MessageWaitingNotificationCount OPTIONAL,
+	-- O 6.5.2.78 f
+	messageWaitingNotificationType			[289] IMPLICIT MessageWaitingNotificationType OPTIONAL,
+	-- O 6.5.2.79 g
+	mobileDirectoryNumber					[93] IMPLICIT MobileDirectoryNumber OPTIONAL,
+	--  O 6.5.2.80 d
+	originationIndicator					[23] IMPLICIT OriginationIndicator OPTIONAL,
+	-- O 6.5.2.89 h
+	originationTriggers						[98] IMPLICIT OriginationTriggers OPTIONAL,
+	-- O 6.5.2.90 i
+	pACAIndicator							[146] IMPLICIT PACAIndicator OPTIONAL,
+	-- O 6.5.2.91 j
+	preferredLanguageIndicator				[147] IMPLICIT PreferredLanguageIndicator OPTIONAL,
+	-- O 6.5.2.96 k
+	restrictionDigits						[227] IMPLICIT RestrictionDigits OPTIONAL,
+	-- O 6.5.2.113 l
+	routingDigits							[150] IMPLICIT RoutingDigits OPTIONAL,
+	-- O 6.5.2.114 m
+	sms-OriginationRestrictions				[115] IMPLICIT SMS-OriginationRestrictions OPTIONAL,
+	-- O 6.5.2.136 n
+	sms-TerminationRestrictions				[117] IMPLICIT SMS-TerminationRestrictions OPTIONAL,
+	-- O 6.5.2.138 o
+	spinipin								[154] IMPLICIT SPINIPIN OPTIONAL,
+	-- O 6.5.2.139 p
+	spiniTriggers							[155] IMPLICIT SPINITriggers OPTIONAL,
+	-- O 6.5.2.140 q
+	terminationRestrictionCode				[24] IMPLICIT TerminationRestrictionCode OPTIONAL,
+	-- O 6.5.2.157 r
+	terminationTriggers						[122] IMPLICIT TerminationTriggers OPTIONAL,
+	-- O 6.5.2.159 s
+	triggerAddressList						[276] IMPLICIT TriggerAddressList OPTIONAL,
+	-- O 6.5.2.de t
+	callingPartyCategory					[355] IMPLICIT CallingPartyCategory OPTIONAL,
+	-- O 6.5.2.gl z
+	lirMode									[369] IMPLICIT LIRMode OPTIONAL,
+	-- O 6.5.2.gz z
+-- END MACRO
 	serviceRedirectionInfo					[238] IMPLICIT ServiceRedirectionInfo OPTIONAL,
 	-- O 6.5.2.bq h, i
 	roamingIndication						[239] IMPLICIT RoamingIndication OPTIONAL
@@ -6247,7 +6304,7 @@ CDMAServiceOption ::=  OCTET STRING
 --		Service Option in TSB74 and J-STD-008.
 
 -- 6.5.2.g N.S0010-0 v 1.0
--- 1 0 1 1 1 1 1 1 (0x9f)
+-- 1 0 1 1 1 1 1 1 (0xbf)
 -- 1 0 0 0 0 0 0 1 (0x81)
 -- 0 0 1 1 0 0 0 0 (0x30)(176)
 CDMAServiceOptionList ::= SEQUENCE OF [175] IMPLICIT CDMAServiceOption
diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c
index df7fc1c6a2..9ddfbef222 100644
--- a/asn1/ansi_map/packet-ansi_map-template.c
+++ b/asn1/ansi_map/packet-ansi_map-template.c
@@ -5,7 +5,7 @@
  * Michael Lum <mlum [AT] telostech.com>
  * In association with Telos Technology Inc.
  *
- * Copyright 2005 - 2007, Anders Broman <anders.broman@ericsson.com>
+ * Copyright 2005 - 2008, Anders Broman <anders.broman@ericsson.com>
  *
  * $Id$
  *
@@ -2779,7 +2779,7 @@ same as that of Service Configuration Record in TSB74, and J-STD-008.
 
 /* 6.5.2.f CDMAServiceOption N.S0010-0 v 1.0 */
 
-/* values copied from old ANSi map dissector */
+/* values copied from old ANSI map dissector */
 static const range_string cdmaserviceoption_vals[] = {
 	{ 1, 1, "Basic Variable Rate Voice Service (8 kbps)" }, 
 	{ 2, 2, "Mobile Station Loopback (8 kbps)" }, 
@@ -2831,7 +2831,16 @@ static const range_string cdmaserviceoption_vals[] = {
 	{ 59, 59, "HRPD Accounting Records Identifier" }, 
 	{ 60, 60, "Link Layer Assisted Robust Header Compression (LLA ROHC) - Header Removal" }, 
 	{ 61, 61, "Link Layer Assisted Robust Header Compression (LLA ROHC) - Header Compression" }, 
-	{ 62, 4099, "None Reserved for standard service options" }, 
+	{ 62, 62, "Source-Controlled Variable-Rate Multimode Wideband Speech Codec (VMR-WB) Rate Set 2" },
+	{ 63, 63, "Source-Controlled Variable-Rate Multimode Wideband Speech Codec (VMR-WB) Rate Set 1" },
+	{ 64, 64, "HRPD auxiliary Packet Data Service instance" },
+	{ 65, 65, "cdma2000/GPRS Inter-working" },
+	{ 66, 66, "cdma2000 High Speed Packet Data Service, Internet or ISO Protocol Stack" },
+	{ 67, 67, "HRPD Packet Data IP Service where Higher Layer Protocol is IP or ROHC" },
+	{ 68, 68, "Enhanced Variable Rate Voice Service (EVRC-B)" }, 
+	{ 69, 69, "HRPD Packet Data Service, which when used in paging over the 1x air interface, a page response is required" },
+	{ 70, 70, "Enhanced Variable Rate Voice Service (EVRC-WB)" }, 
+	{ 71, 4099, "None Reserved for standard service options" }, 
 	{ 4100, 4100, "Asynchronous Data Service, Revision 1 (9.6 or 14.4 kbps)" }, 
 	{ 4101, 4101, "Group 3 Facsimile, Revision 1 (9.6 or 14.4 kbps)" }, 
 	{ 4102, 4102, "Reserved for standard service option" },