3GPP AVP updates.

svn path=/trunk/; revision=30939

1 files changed, 132 insertions, 132 deletions

diff --git a/diameter/imscxdx.xml b/diameter/imscxdx.xml
index b05d007767..9dd7103da8 100644
--- a/diameter/imscxdx.xml
+++ b/diameter/imscxdx.xml
@@ -16,138 +16,138 @@
 	These AVP:s collide(share AVP code number) with other 3GPP AVP:s (TGPPGmb.xml)
 	comment out 1 - 28 here and uncomment the ones in TGPPGmb.xml if you want to use them.
 -->
-		<avp name="Visited-Network-Identifier" code="1" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Public-Identity" code="2" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-			<type type-name="UTF8String"/>
-		</avp>
-		<avp name="Server-Name" code="3" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-			<type type-name="UTF8String"/>
-		</avp>
-		<avp name="Server-Capabilities" code="4" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-                        <grouped>
-                                <gavp name="Mandatory-Capability"/>
-                                <gavp name="Optional-Capability"/>
-                                <gavp name="Server-Name"/>
-                        </grouped>
-		</avp>
-		<avp name="Mandatory-Capability" code="5" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
-			<type type-name="Unsigned32"/>
-		</avp>
-		<avp name="Optional-Capability" code="6" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-			<type type-name="Unsigned32"/>
-		</avp>
-		<avp name="User-Data" code="7" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="SIP-Number-Auth-Items" code="8" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
-			<type type-name="Unsigned32"/>
-		</avp>
-		<avp name="SIP-Authentication-Scheme" code="9" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-			<type type-name="UTF8String"/>
-		</avp>
-		<avp name="SIP-Authenticate" code="10" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="SIP-Authorization" code="11" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="SIP-Authentication-Context" code="12" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-			<type type-name="OctetString"/>
-		</avp>
-		<!-- GROUPED -->
-		<avp name="SIP-Auth-Data-Item" code="13" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-                        <grouped>
-                                <gavp name="SIP-Item-Number"/>
-                                <gavp name="SIP-Authentication-Scheme"/>
-                                <gavp name="SIP-Authenticate"/>
-                                <gavp name="SIP-Authorization"/>
-                                <gavp name="SIP-Authentication-Context"/>
-                                <gavp name="Confidentiality-Key"/>
-                                <gavp name="Integrity-Key"/>
-                        </grouped>
-		</avp>
-		<avp name="SIP-Item-Number" code="14" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-			<type type-name="Unsigned32"/>
-		</avp>
-		<avp name="Server-Assignment-Type" code="15" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-                        <type type-name="Unsigned32"/>
-                        <enum name="No-Assignment" code="0"/>
-                        <enum name="Registration" code="1"/>
-                        <enum name="Re-Registration" code="2"/>
-                        <enum name="Unregistered-User" code="3"/>
-                        <enum name="Timeout-Deregistration" code="4"/>
-                        <enum name="User-Deregistration" code="5"/>
-                        <enum name="Timeout-Deregistration-Store-Server-Name" code="6"/>
-                        <enum name="User-Deregistration-Store-Server-Name" code="7"/>
-                        <enum name="Administrative-Deregistration" code="8"/>
-                        <enum name="Authentication-Failure" code="9"/>
-                        <enum name="Authentication-Timeout" code="10"/>
-                        <enum name="Deregistration-Too-Much-Data" code="11"/>
-		</avp>
-		<!-- GROUPED -->
-		<avp name="Deregistration-Reason" code="16" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-                        <grouped>
-                                <gavp name="Reason-Code"/>
-                                <gavp name="Reason-Info"/>
-                        </grouped>
-		</avp>
-		<avp name="Reason-Code" code="17" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-			<type type-name="Unsigned32"/>
-                        <enum name="Permanent-Termination" code="0"/>
-                        <enum name="New-Server-Assigned" code="1"/>
-                        <enum name="Server-Change" code="2"/>
-                        <enum name="Remove-S-CSCF" code="3"/>
-		</avp>
-		<avp name="Reason-Info" code="18" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-			<type type-name="UTF8String"/>
-		</avp>
-		<!-- GROUPED -->
-		<avp name="Charging-Information" code="19" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-                        <grouped>
-                                <gavp name="Primary-Event-Charging-Function-Name"/>
-                                <gavp name="Secondary-Event-Charging-Function-Name"/>
-                                <gavp name="Primary-Charging-Collection-Function-Name"/>
-                                <gavp name="Secondary-Charging-Collection-Function-Name"/>
-                        </grouped>
-		</avp>
-		<avp name="Primary-Event-Charging-Function-Name" code="20" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-			<type type-name="DiameterURI"/>
-		</avp>
-		<avp name="Secondary-Event-Charging-Function-Name" code="21" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-			<type type-name="DiameterURI"/>
-		</avp>
-		<avp name="Primary-Charging-Collection-Function-Name" code="22" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-			<type type-name="DiameterURI"/>
-		</avp>
-		<avp name="Secondary-Charging-Collection-Function-Name" code="23" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-			<type type-name="DiameterURI"/>
-		</avp>
-		<avp name="User-Authorization-Type" code="24" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-			<type type-name="Unsigned32"/>
-                        <enum name="Registration" code="0"/>
-                        <enum name="De-Registration" code="1"/>
-                        <enum name="Registration-And-Capabilities" code="2"/>
-		</avp>
-		<avp name="User-Data-Request-Type" code="25" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-			<type type-name="Unsigned32"/>
-                        <enum name="Complete-Profile" code="0"/>
-                        <enum name="Registered-Profile" code="1"/>
-                        <enum name="Unregistered-Profile" code="2"/>
-		</avp>
-		<avp name="User-Data-Already-Available" code="26" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-			<type type-name="Unsigned32"/>
-                        <enum name="User-Data-Not-Available" code="0"/>
-                        <enum name="User-Data-Already-Available" code="1"/>
-		</avp>
-		<avp name="Confidentiality-Key" code="27" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Integrity-Key" code="28" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-			<type type-name="OctetString"/>
-		</avp>
-		<!-- ************************ END IMS Cx Dx AVPS ******************* -->
+    <avp name="Visited-Network-Identifier(Obsolete CN#25)" code="1" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Public-Identity(Obsolete CN#25)" code="2" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Server-Name(Obsolete CN#25)" code="3" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Server-Capabilities(Obsolete CN#25)" code="4" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <grouped>
+        <gavp name="Mandatory-Capability"/>
+        <gavp name="Optional-Capability"/>
+        <gavp name="Server-Name"/>
+      </grouped>
+    </avp>
+    <avp name="Mandatory-Capability(Obsolete CN#25)" code="5" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Optional-Capability(Obsolete CN#25)" code="6" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="User-Data(Obsolete CN#25)" code="7" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="SIP-Number-Auth-Items(Obsolete CN#25)" code="8" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="SIP-Authentication-Scheme(Obsolete CN#25)" code="9" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="SIP-Authenticate(Obsolete CN#25)" code="10" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="SIP-Authorization(Obsolete CN#25)" code="11" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="SIP-Authentication-Context(Obsolete CN#25)" code="12" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <!-- GROUPED -->
+    <avp name="SIP-Auth-Data-Item(Obsolete CN#25)" code="13" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <grouped>
+        <gavp name="SIP-Item-Number"/>
+        <gavp name="SIP-Authentication-Scheme"/>
+        <gavp name="SIP-Authenticate"/>
+        <gavp name="SIP-Authorization"/>
+        <gavp name="SIP-Authentication-Context"/>
+        <gavp name="Confidentiality-Key"/>
+        <gavp name="Integrity-Key"/>
+      </grouped>
+    </avp>
+    <avp name="SIP-Item-Number(Obsolete CN#25)" code="14" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Server-Assignment-Type(Obsolete CN#25)" code="15" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+      <enum name="No-Assignment" code="0"/>
+      <enum name="Registration" code="1"/>
+      <enum name="Re-Registration" code="2"/>
+      <enum name="Unregistered-User" code="3"/>
+      <enum name="Timeout-Deregistration" code="4"/>
+      <enum name="User-Deregistration" code="5"/>
+      <enum name="Timeout-Deregistration-Store-Server-Name" code="6"/>
+      <enum name="User-Deregistration-Store-Server-Name" code="7"/>
+      <enum name="Administrative-Deregistration" code="8"/>
+      <enum name="Authentication-Failure" code="9"/>
+      <enum name="Authentication-Timeout" code="10"/>
+      <enum name="Deregistration-Too-Much-Data" code="11"/>
+    </avp>
+    <!-- GROUPED -->
+    <avp name="Deregistration-Reason(Obsolete CN#25)" code="16" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <grouped>
+        <gavp name="Reason-Code"/>
+        <gavp name="Reason-Info"/>
+      </grouped>
+    </avp>
+    <avp name="Reason-Code(Obsolete CN#25)" code="17" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+      <enum name="Permanent-Termination" code="0"/>
+      <enum name="New-Server-Assigned" code="1"/>
+      <enum name="Server-Change" code="2"/>
+      <enum name="Remove-S-CSCF" code="3"/>
+    </avp>
+    <avp name="Reason-Info(Obsolete CN#25)" code="18" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <!-- GROUPED -->
+    <avp name="Charging-Information(Obsolete CN#25)" code="19" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <grouped>
+        <gavp name="Primary-Event-Charging-Function-Name"/>
+        <gavp name="Secondary-Event-Charging-Function-Name"/>
+        <gavp name="Primary-Charging-Collection-Function-Name"/>
+        <gavp name="Secondary-Charging-Collection-Function-Name"/>
+      </grouped>
+    </avp>
+    <avp name="Primary-Event-Charging-Function-Name(Obsolete CN#25)" code="20" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <type type-name="DiameterURI"/>
+    </avp>
+    <avp name="Secondary-Event-Charging-Function-Name(Obsolete CN#25)" code="21" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <type type-name="DiameterURI"/>
+    </avp>
+    <avp name="Primary-Charging-Collection-Function-Name(Obsolete CN#25)" code="22" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <type type-name="DiameterURI"/>
+    </avp>
+    <avp name="Secondary-Charging-Collection-Function-Name(Obsolete CN#25)" code="23" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <type type-name="DiameterURI"/>
+    </avp>
+    <avp name="User-Authorization-Type(Obsolete CN#25)" code="24" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+      <enum name="Registration" code="0"/>
+      <enum name="De-Registration" code="1"/>
+      <enum name="Registration-And-Capabilities" code="2"/>
+    </avp>
+    <avp name="User-Data-Request-Type(Obsolete CN#25)" code="25" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+      <enum name="Complete-Profile" code="0"/>
+      <enum name="Registered-Profile" code="1"/>
+      <enum name="Unregistered-Profile" code="2"/>
+    </avp>
+    <avp name="User-Data-Already-Available(Obsolete CN#25)" code="26" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+      <enum name="User-Data-Not-Available" code="0"/>
+      <enum name="User-Data-Already-Available" code="1"/>
+    </avp>
+    <avp name="Confidentiality-Key(Obsolete CN#25)" code="27" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Integrity-Key(Obsolete CN#25)" code="28" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <!-- ************************ END IMS Cx Dx AVPS ******************* -->
 		<!-- ************************** IMS Cx Dx AVPS 3GPP TS 29.229 version 6.7.0 Release 6 ********************* -->
 		<!-- Note: The AVP codes from 633 to 699 are reserved for TS 29.229. -->
 		<avp name="Visited-Network-Identifier" code="600" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">