Update to 9.0.0

svn path=/trunk/; revision=32083

8 files changed, 55 insertions, 9 deletions

diff --git a/asn1/rua/RUA-CommonDataTypes.asn b/asn1/rua/RUA-CommonDataTypes.asn
index 26cd85093d..a5f93c1e3a 100644
--- a/asn1/rua/RUA-CommonDataTypes.asn
+++ b/asn1/rua/RUA-CommonDataTypes.asn
@@ -1,6 +1,6 @@
 -- RUA-CommonDataTypes.asn
 --
--- 3GPP TS 25.468 V8.1.0 (2009-12)
+-- 3GPP TS 25.468 V9.0.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/html-info/25468.htm
 --
 -- 9.3.5	Common definitions
diff --git a/asn1/rua/RUA-Constants.asn b/asn1/rua/RUA-Constants.asn
index ae65dd68ee..dbf85a52e9 100644
--- a/asn1/rua/RUA-Constants.asn
+++ b/asn1/rua/RUA-Constants.asn
@@ -1,6 +1,6 @@
 -- RUA-Constants.asn
 --
--- 3GPP TS 25.468 V8.1.0 (2009-12)
+-- 3GPP TS 25.468 V9.0.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/html-info/25468.htm
 --
 -- 9.3.6	Constant definitions
@@ -60,6 +60,7 @@ id-RANAP-Message								ProtocolIE-ID ::= 4
 id-IntraDomainNasNodeSelector					ProtocolIE-ID ::= 5
 id-Establishment-Cause							ProtocolIE-ID ::= 6
 id-CN-DomainIndicator							ProtocolIE-ID ::= 7
+id-CSGMembershipStatus 							ProtocolIE-ID ::= 9
 
  
 END
diff --git a/asn1/rua/RUA-Containers.asn b/asn1/rua/RUA-Containers.asn
index 1b6b719db4..d5e798a08e 100644
--- a/asn1/rua/RUA-Containers.asn
+++ b/asn1/rua/RUA-Containers.asn
@@ -1,6 +1,6 @@
 -- RUA-Containers.asn
 --
--- 3GPP TS 25.468 V8.1.0 (2009-12)
+-- 3GPP TS 25.468 V9.0.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/html-info/25468.htm
 --
 -- 9.3.7	Container definitions
diff --git a/asn1/rua/RUA-IEs.asn b/asn1/rua/RUA-IEs.asn
index 1842c3e15e..7d8ce01408 100644
--- a/asn1/rua/RUA-IEs.asn
+++ b/asn1/rua/RUA-IEs.asn
@@ -1,6 +1,6 @@
 -- RUA-IEs.asn
 --
--- 3GPP TS 25.468 V8.1.0 (2009-12)
+-- 3GPP TS 25.468 V9.0.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/html-info/25468.htm
 --
 -- 9.3.4	Information Element definitions
@@ -43,6 +43,12 @@ CN-DomainIndicator ::= ENUMERATED {
 	ps-domain 
 }
 
+CSGMembershipStatus ::= ENUMERATED { 
+	member, 
+	non-member,
+	...
+	}
+
 Establishment-Cause		::= ENUMERATED {
 							emergency-call,
 							normal-call,
diff --git a/asn1/rua/RUA-PDU-Contents.asn b/asn1/rua/RUA-PDU-Contents.asn
index 99b6d622e8..caeb8aad9c 100644
--- a/asn1/rua/RUA-PDU-Contents.asn
+++ b/asn1/rua/RUA-PDU-Contents.asn
@@ -1,6 +1,6 @@
 -- RUA-PDU-Contents.asn
 --
--- 3GPP TS 25.468 V8.1.0 (2009-12)
+-- 3GPP TS 25.468 V9.0.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/html-info/25468.htm
 --
 -- 9.3.3	PDU definitions
@@ -32,7 +32,8 @@ IMPORTS
 	Cause,
 	CriticalityDiagnostics,
 	Context-ID,
-	CN-DomainIndicator,
+	CN-DomainIndicator, 
+	CSGMembershipStatus,
 	IntraDomainNasNodeSelector,
 	RANAP-Message,
 	Establishment-Cause
@@ -53,7 +54,8 @@ FROM RUA-Containers
 	id-Cause,
 	id-CriticalityDiagnostics,
 	id-Context-ID,
-	id-CN-DomainIndicator,
+	id-CN-DomainIndicator, 
+ 	id-CSGMembershipStatus,
 	id-RANAP-Message,
 	id-IntraDomainNasNodeSelector,
 	id-Establishment-Cause
@@ -83,6 +85,8 @@ ConnectIEs RUA-PROTOCOL-IES ::= {
 }
 
 ConnectExtensions RUA-PROTOCOL-EXTENSION ::= {
+	{ ID id-CSGMembershipStatus		CRITICALITY	 ignore		EXTENSION CSGMembershipStatus		PRESENCE optional	},
+
 	...
 }
 
diff --git a/asn1/rua/RUA-PDU-Descriptions.asn b/asn1/rua/RUA-PDU-Descriptions.asn
index 95efe381ef..577ef61bb4 100644
--- a/asn1/rua/RUA-PDU-Descriptions.asn
+++ b/asn1/rua/RUA-PDU-Descriptions.asn
@@ -1,6 +1,6 @@
 -- RUA-PDU-Descriptions.asn
 --
--- 3GPP TS 25.468 V8.1.0 (2009-12)
+-- 3GPP TS 25.468 V9.0.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/html-info/25468.htm
 --
 -- 9.3.2	Elementary Procedure definitions
@@ -174,3 +174,4 @@ privateMessage RUA-ELEMENTARY-PROCEDURE ::= {
 
 
 END
+
diff --git a/asn1/rua/rua.cnf b/asn1/rua/rua.cnf
index 79b5455d86..18a503d489 100644
--- a/asn1/rua/rua.cnf
+++ b/asn1/rua/rua.cnf
@@ -84,6 +84,8 @@ IntraDomainNasNodeSelector		N rua.ies id-IntraDomainNasNodeSelector
 Establishment-Cause				N rua.ies id-Establishment-Cause
 CN-DomainIndicator				N rua.ies id-CN-DomainIndicator
 
+#RUA-PROTOCOL-EXTENSION
+CSGMembershipStatus				N rua.extension id-CSGMembershipStatus
 
 #RUA-ELEMENTARY-PROCEDURE
 Connect							N rua.proc.imsg id-Connect
diff --git a/epan/dissectors/packet-rua.c b/epan/dissectors/packet-rua.c
index fe140ea1e7..fe7e462ea5 100644
--- a/epan/dissectors/packet-rua.c
+++ b/epan/dissectors/packet-rua.c
@@ -81,7 +81,8 @@ typedef enum _ProtocolIE_ID_enum {
   id_RANAP_Message =   4,
   id_IntraDomainNasNodeSelector =   5,
   id_Establishment_Cause =   6,
-  id_CN_DomainIndicator =   7
+  id_CN_DomainIndicator =   7,
+  id_CSGMembershipStatus =   9
 } ProtocolIE_ID_enum;
 
 /*--- End of included file: packet-rua-val.h ---*/
@@ -94,6 +95,7 @@ static int proto_rua = -1;
 /*--- Included file: packet-rua-hf.c ---*/
 #line 1 "packet-rua-hf.c"
 static int hf_rua_CN_DomainIndicator_PDU = -1;    /* CN_DomainIndicator */
+static int hf_rua_CSGMembershipStatus_PDU = -1;   /* CSGMembershipStatus */
 static int hf_rua_Establishment_Cause_PDU = -1;   /* Establishment_Cause */
 static int hf_rua_Context_ID_PDU = -1;            /* Context_ID */
 static int hf_rua_IntraDomainNasNodeSelector_PDU = -1;  /* IntraDomainNasNodeSelector */
@@ -324,6 +326,7 @@ static const value_string rua_ProtocolIE_ID_vals[] = {
   { id_IntraDomainNasNodeSelector, "id-IntraDomainNasNodeSelector" },
   { id_Establishment_Cause, "id-Establishment-Cause" },
   { id_CN_DomainIndicator, "id-CN-DomainIndicator" },
+  { id_CSGMembershipStatus, "id-CSGMembershipStatus" },
   { 0, NULL }
 };
 
@@ -492,6 +495,22 @@ dissect_rua_CN_DomainIndicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 }
 
 
+static const value_string rua_CSGMembershipStatus_vals[] = {
+  {   0, "member" },
+  {   1, "non-member" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_rua_CSGMembershipStatus(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
+                                     2, NULL, TRUE, 0, NULL);
+
+  return offset;
+}
+
+
 static const value_string rua_Establishment_Cause_vals[] = {
   {   0, "emergency-call" },
   {   1, "normal-call" },
@@ -1184,6 +1203,14 @@ static int dissect_CN_DomainIndicator_PDU(tvbuff_t *tvb _U_, packet_info *pinfo
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_CSGMembershipStatus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_rua_CSGMembershipStatus(tvb, offset, &asn1_ctx, tree, hf_rua_CSGMembershipStatus_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_Establishment_Cause_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -1345,6 +1372,10 @@ void proto_register_rua(void) {
       { "CN-DomainIndicator", "rua.CN_DomainIndicator",
         FT_UINT32, BASE_DEC, VALS(rua_CN_DomainIndicator_vals), 0,
         "rua.CN_DomainIndicator", HFILL }},
+    { &hf_rua_CSGMembershipStatus_PDU,
+      { "CSGMembershipStatus", "rua.CSGMembershipStatus",
+        FT_UINT32, BASE_DEC, VALS(rua_CSGMembershipStatus_vals), 0,
+        "rua.CSGMembershipStatus", HFILL }},
     { &hf_rua_Establishment_Cause_PDU,
       { "Establishment-Cause", "rua.Establishment_Cause",
         FT_UINT32, BASE_DEC, VALS(rua_Establishment_Cause_vals), 0,
@@ -1698,6 +1729,7 @@ proto_reg_handoff_rua(void)
   dissector_add("rua.ies", id_IntraDomainNasNodeSelector, new_create_dissector_handle(dissect_IntraDomainNasNodeSelector_PDU, proto_rua));
   dissector_add("rua.ies", id_Establishment_Cause, new_create_dissector_handle(dissect_Establishment_Cause_PDU, proto_rua));
   dissector_add("rua.ies", id_CN_DomainIndicator, new_create_dissector_handle(dissect_CN_DomainIndicator_PDU, proto_rua));
+  dissector_add("rua.extension", id_CSGMembershipStatus, new_create_dissector_handle(dissect_CSGMembershipStatus_PDU, proto_rua));
   dissector_add("rua.proc.imsg", id_Connect, new_create_dissector_handle(dissect_Connect_PDU, proto_rua));
   dissector_add("rua.proc.imsg", id_DirectTransfer, new_create_dissector_handle(dissect_DirectTransfer_PDU, proto_rua));
   dissector_add("rua.proc.imsg", id_Disconnect, new_create_dissector_handle(dissect_Disconnect_PDU, proto_rua));