Fix the asn1 code for WIN-TriggerList and systemMyTypeCode plus

a copy-paste error in the hf fields.

svn path=/trunk/; revision=22796

2 files changed, 21 insertions, 15 deletions

diff --git a/asn1/ansi_map/ansi_map.asn b/asn1/ansi_map/ansi_map.asn
index b2c6c41078..3ff28fb921 100644
--- a/asn1/ansi_map/ansi_map.asn
+++ b/asn1/ansi_map/ansi_map.asn
@@ -3875,7 +3875,7 @@ OAnswer ::= [PRIVATE 18] SET {
 	-- O 6.5.2.83 l
 	servingCellID							[2] IMPLICIT ServingCellID OPTIONAL,
 	-- O 6.5.2.117 h, m
-	systemMyTypeCode						[22] IMPLICIT SystemMyTypeCode
+	systemMyTypeCode						[22] IMPLICIT SystemMyTypeCode OPTIONAL
 	-- O 6.5.2.147
 	}
 
@@ -3910,7 +3910,7 @@ ODisconnect ::= [PRIVATE 18] SET {
 	-- O 6.5.2.83 l
 	servingCellID							[2] IMPLICIT ServingCellID OPTIONAL,
 	-- O 6.5.2.117 i, m
-	systemMyTypeCode						[22] IMPLICIT SystemMyTypeCode
+	systemMyTypeCode						[22] IMPLICIT SystemMyTypeCode OPTIONAL
 	-- O 6.5.2.147
 }
 
@@ -3997,7 +3997,7 @@ TDisconnect ::= [PRIVATE 18] SET {
 	-- O 6.5.2.el l
 	servingCellID							[2] IMPLICIT ServingCellID OPTIONAL,
 	-- O 6.5.2.117 h, m
-	systemMyTypeCode						[22] IMPLICIT SystemMyTypeCode
+	systemMyTypeCode						[22] IMPLICIT SystemMyTypeCode OPTIONAL
 	-- O 6.5.2.147
 	}
 
@@ -6926,10 +6926,10 @@ SpecializedResource ::= OCTET STRING
 TimeDateOffset ::= OCTET STRING
 
 -- 6.5.2.de
--- 1 0 1 1 1 1 1 1 (0x9f)
+-- 1 0 1 1 1 1 1 1 (0xbf)
 -- 1 0 0 0 0 0 1 0 (0x82)
 -- 0 0 0 1 0 1 0 0 (0x14)(276)
-TriggerAddressList ::= SET OF SET{
+TriggerAddressList ::= SET{
 	triggerList			[278] IMPLICIT TriggerList,
 --	M 6.5.2.dg
 	triggerListOpt		[278] IMPLICIT TriggerList OPTIONAL
@@ -6944,14 +6944,19 @@ TriggerCapability ::= OCTET STRING
 --see 6.5.2.gg for encoding
 
 -- 6.5.2.dg
--- 1 0 1 1 1 1 1 1 (0x9f) (0xbf)
+-- 1 0 1 1 1 1 1 1 (0xbf) (0xbf)
 -- 1 0 0 0 0 0 1 0 (0x82)
 -- 0 0 0 1 0 1 1 0 (0x16)(278)
+-- 6.5.2.ck DestinationAddress N.S0013-0 v 1.0
+--DestinationAddress ::= CHOICE {
+--	globalTitle	[261] IMPLICIT GlobalTitle, 
+--	pC-SSN		[32] IMPLICIT PC-SSN
+--	}
+
 TriggerList ::= SET{
-	destinationAddress		DestinationAddress OPTIONAL,
---	M 6.5.2.ck a
+	destinationAddress		DestinationAddress,
 	wIN-TriggerList			[283] IMPLICIT WIN-TriggerList
---	M 6.5.2.dk
+	--	M 6.5.2.dk
 }
 
 -- 6.5.2.dh
@@ -7041,11 +7046,12 @@ WIN-Trigger ::= SEQUENCE {
 	detectionPointType	DetectionPointType
 	}
 
---6.5.2.dk
+--6.5.2.dk N.S0013-0 v 1.0,X.S0004-550-E v1.0 2.301
 -- 1 0 0 1 1 1 1 1 (0x9f)
 -- 1 0 0 0 0 0 1 0 (0x82)
 -- 0 0 0 1 1 0 1 1 (0x1b)(283)
-WIN-TriggerList ::= SET OF WIN-Trigger
+-- WIN-TriggerList ::= SET OF WIN-Trigger
+WIN-TriggerList ::= OCTET STRING
 
 -- 6.5.2.do
 -- 1 0 0 1 1 1 1 1 (0x9f)
diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c
index a62651bbab..2b740c99f8 100644
--- a/asn1/ansi_map/packet-ansi_map-template.c
+++ b/asn1/ansi_map/packet-ansi_map-template.c
@@ -5054,13 +5054,13 @@ void proto_register_ansi_map(void) {
         FT_BOOLEAN, 8, TFS(&ansi_map_winoperationscapability_conn_bool_val),0x01,
         "ConnectResource (CONN)", HFILL }},
 	{ &hf_ansi_map_winoperationscapability_ccdir,
-      { "ConnectResource (CONN)", "ansi_map.winoperationscapability.ccdir",
+      { "CallControlDirective(CCDIR)", "ansi_map.winoperationscapability.ccdir",
         FT_BOOLEAN, 8, TFS(&ansi_map_winoperationscapability_ccdir_bool_val),0x02,
-        "ConnectResource (CONN)", HFILL }},
+        "CallControlDirective(CCDIR)", HFILL }},
 	{ &hf_ansi_map_winoperationscapability_pos,
-      { "ConnectResource (CONN)", "ansi_map.winoperationscapability.pos",
+      { "PositionRequest (POS)", "ansi_map.winoperationscapability.pos",
         FT_BOOLEAN, 8, TFS(&ansi_map_winoperationscapability_pos_bool_val),0x04,
-        "ConnectResource (CONN)", HFILL }},
+        "PositionRequest (POS)", HFILL }},
 	{ &hf_ansi_map_pacaindicator_pa,
       { "Permanent Activation (PA)", "ansi_map.pacaindicator_pa",
         FT_BOOLEAN, 8, TFS(&ansi_map_pacaindicator_pa_bool_val),0x01,