Move 3GPP AVP:s to dictionary.xml chnge some AVP types to 'Time' as per 3GPP spec.

svn path=/trunk/; revision=22251

2 files changed, 141 insertions, 226 deletions

diff --git a/diameter/chargecontrol.xml b/diameter/chargecontrol.xml
index 6394d555ae..63577a94d1 100644
--- a/diameter/chargecontrol.xml
+++ b/diameter/chargecontrol.xml
@@ -275,211 +275,6 @@
 			<type type-name="UTF8String"/>
 		</avp>
 
-		<!-- Definition from SH specs -->
-		<avp name="MSISDN" code="701" mandatory="must" vendor-bit="mustnot" may-encrypt="yes" vendor-id="TGPP">
-			<type type-name="OctetString"/>
-		</avp>
-
-		<avp name="Time-Quota-Threshold" code="868" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="Unsigned32"/>
-		</avp>
-		<avp name="Volume-Quota-Threshold" code="869" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="Unsigned32"/>
-		</avp>
-		<avp name="Trigger-Type" code="870" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="Enumerated"/>
-			<enum name="CHANGE_IN_SGSN_IP_ADDRESS" code="1"/>
-			<enum name="CHANGE_IN_QOS" code="2"/>
-			<enum name="CHANGE_IN_LOCATION" code="3"/>
-			<enum name="CHANGE_IN_RAT" code="4"/>
-			<enum name="CHANGEINQOS_TRAFFIC_CLASS" code="10"/>
-			<enum name="CHANGEINQOS_RELIABILITY_CLASS" code="11"/>
-			<enum name="CHANGEINQOS_DELAY_CLASS" code="12"/>
-			<enum name="CHANGEINQOS_PEAK_THROUGHPUT" code="13"/>
-			<enum name="CHANGEINQOS_PRECEDENCE_CLASS" code="14"/>
-			<enum name="CHANGEINQOS_MEAN_THROUGHPUT" code="15"/>
-			<enum name="CHANGEINQOS_MAXIMUM_BIT_RATE_FOR_UPLINK" code="16"/>
-			<enum name="CHANGEINQOS_MAXIMUM_BIT_RATE_FOR_DOWNLINK" code="17"/>
-			<enum name="CHANGEINQOS_RESIDUAL_BER" code="18"/>
-			<enum name="CHANGEINQOS_SDU_ERROR_RATIO" code="19"/>
-			<enum name="CHANGEINQOS_TRANSFER_DELAY" code="20"/>
-			<enum name="CHANGEINQOS_TRAFFIC_HANDLING_PRIORITY" code="21"/>
-			<enum name="CHANGEINQOS_GUARANTEED_BIT_RATE_FOR_UPLINK" code="22"/>
-			<enum name="CHANGEINQOS_GUARANTEED_BIT_RATE_FOR_DOWNLINK" code="23"/>
-			<enum name="CHANGEINLOCATION_MCC" code="30"/>
-			<enum name="CHANGEINLOCATION_MNC" code="31"/>
-			<enum name="CHANGEINLOCATION_RAC" code="32"/>
-			<enum name="CHANGEINLOCATION_LAC" code="33"/>
-			<enum name="CHANGEINLOCATION_CellId" code="34"/>
-			<enum name="CHANGEINPARTICIPANTS_Number" code="50"/>
-		</avp>
-		<avp name="Quota-Holding-Time" code="871" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="Unsigned32"/>
-		</avp>
-		<avp name="Reporting-Reason" code="872" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="Enumerated"/>
-			<enum name="THRESHOLD" code="0"/>
-			<enum name="QHT" code="1"/>
-			<enum name="FINAL" code="2"/>
-			<enum name="QUOTA_EXHAUSTED" code="3"/>
-			<enum name="VALIDITY_TIME" code="4"/>
-			<enum name="OTHER_QUOTA_TYPE" code="5"/>
-			<enum name="RATING_CONDITION_CHANGE" code="6"/>
-			<enum name="FORCED_REAUTHORISATION" code="7"/>
-			<enum name="POOL_EXHAUSTED" code="8"/>
-		</avp>
-		<avp name="Service-Information" code="873" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-			<grouped>
-				<gavp name="PS-Information"/>
-				<gavp name="WLAN-Information"/>
-				<gavp name="IMS-Information"/>
-				<gavp name="MMS-Information"/>
-				<gavp name="LCS-Information"/>
-				<gavp name="PoC-Information"/>
-				<gavp name="MBMS-Information"/>
-			</grouped>
-		</avp>
-		<avp name="PS-Information" code="874" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-			<grouped>
-				<gavp name="3GPP-Charging-Id"/>
-				<gavp name="3GPP-PDP Type"/>
-				<gavp name="PDP-Address"/>
-				<gavp name="3GPP-GPRS-Negotiated-QoS-Profile"/>
-				<gavp name="SGSN-Address"/>
-				<gavp name="GGSN-Address"/>
-				<gavp name="CG-Address"/>
-				<gavp name="3GPP-IMSI-MCC-MNC"/>
-				<gavp name="3GPP-GGSN- MCC-MNC"/>
-				<gavp name="3GPP-NSAPI"/>
-				<gavp name="Called-Station-Id"/>
-				<gavp name="3GPP-Session-Stop-Indicator"/>
-				<gavp name="3GPP-Selection-Mode"/>
-				<gavp name="3GPP-Charging-Characteristics"/>
-				<gavp name="3GPP-SGSN-MCC-MNC"/>
-				<gavp name="3GPP-MS-TimeZone"/>
-				<gavp name="3GPP-CAMEL-Charging-Info"/>
-				<gavp name="Charging-Rule-Base-Name"/>
-				<gavp name="3GPP-User-Location-Info"/>
-				<gavp name="3GPP-RAT-Type"/>
-				<gavp name="PS-Furnish-Charging-Information"/>
-			</grouped>
-		</avp>
-		<avp name="WLAN-Information" code="875" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="UTF8String"/>
-		</avp>
-		<avp name="IMS-Information" code="876" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="UTF8String"/>
-		</avp>
-		<avp name="MMS-Information" code="877" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="UTF8String"/>
-		</avp>
-		<avp name="LCS-Information" code="878" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-			<grouped>
-				<gavp name="LCS-Client-ID"/>
-				<gavp name="Location-Type"/>
-				<gavp name="Location-Estimate"/>
-				<gavp name="Positioning-Data"/>
-				<gavp name="IMSI"/>
-				<gavp name="MSISDN"/>
-			</grouped>
-		</avp>
-		<avp name="PoC-Information" code="879" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="UTF8String"/>
-		</avp>
-		<avp name="MBMS-Information" code="880" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="UTF8String"/>
-		</avp>
-		<avp name="Quota-Consumption-Time" code="881" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="Unsigned32"/>
-		</avp>
-		<avp name="Expires" code="888" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="Unsigned32"/>
-		</avp>
 
-		<avp name="Charging-Rule-Base-Name" code="1004" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="UTF8String"/>
-		</avp>
 
-		<avp name="PDP-Address" code="1227" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="IPAddress"/>
-		</avp>
-		<avp name="SGSN-Address" code="1228" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="IPAddress"/>
-		</avp>
-		<avp name="LCS-Client-Name" code="1231" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must">
-			<type type-name="UTF8String"/>
-		</avp>
-		<avp name="LCS-Client-ID" code="1232" mandatory="may">
-			<grouped>
-				<gavp name="LCS-Client-Type"/>
-				<gavp name="LCS-Client-External-ID"/>
-				<gavp name="LCS-Client-Dialed-By-MS"/>
-				<gavp name="LCS-Client-Name"/>
-				<gavp name="LCS-APN"/>
-				<gavp name="LCS-Requestor-ID"/>
-			</grouped>
-		</avp>
-		<avp name="LCS-Client-Dialed-By-MS" code="1233" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must">
-			<type type-name="UTF8String"/>
-		</avp>
-		<avp name="LCS-Client-External-ID" code="1234" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must">
-			<type type-name="UTF8String"/>
-		</avp>
-		<avp name="LCS-Client-Name" code="1235" mandatory="may">
-			<grouped>
-				<gavp name="LCS-Data-Coding-Scheme"/>
-				<gavp name="LCS-Name-String"/>
-				<gavp name="LCS-Format-Indicator"/>
-			</grouped>
-		</avp>
-		<avp name="LCS-Data-Coding-Scheme" code="1236" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
-			<type type-name="UTF8String"/>
-		</avp>
-		<avp name="LCS-Format-Indicator" code="1237" mandatory="may">
-			<type type-name="Enumerated"/>
-			<enum name="LOGICAL_NAME" code="0"/>
-			<enum name="EMAIL_ADDRESS" code="1"/>
-			<enum name="MSISDN" code="2"/>
-			<enum name="URL" code="3"/>
-			<enum name="SIP_URL" code="4"/>
-		</avp>
-		<avp name="LCS-Name-String" code="1238" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
-			<type type-name="UTF8String"/>
-		</avp>
-		<avp name="LCS-Requestor-ID" code="1239" mandatory="may">
-			<grouped>
-				<gavp name="LCS-Data-Coding-Scheme"/>
-				<gavp name="LCS-Requestor-ID-String"/>
-			</grouped>
-		</avp>
-		<avp name="LCS-Requestor-ID-String" code="1240" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
-			<type type-name="UTF8String"/>
-		</avp>
-		<avp name="LCS-Client-Type" code="1241" mandatory="may">
-			<type type-name="Enumerated"/>
-			<enum name="EMERGENCY_SERVICES" code="0"/>
-			<enum name="VALUE_ADDED_SERVICES" code="1"/>
-			<enum name="PLMN_OPERATOR_SERVICES" code="2"/>
-			<enum name="LAWFUL_INTERCEPT_SERVICES" code="3"/>
-		</avp>
-		<avp name="Location-Estimate" code="1242" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
-			<type type-name="UTF8String"/>
-		</avp>
-		<avp name="Location-Estimate-Type" code="1243" mandatory="may">
-			<type type-name="Enumerated"/>
-			<enum name="CURRENT_LOCATION" code="0"/>
-			<enum name="CURRENT_LAST_KNOWN_LOCATION" code="1"/>
-			<enum name="INITIAL_LOCATION" code="2"/>
-			<enum name="ACTIVATE_DEFERRED_LOCATION" code="3"/>
-			<enum name="CANCEL_DEFERRED_LOCATION" code="4"/>
-		</avp>
-		<avp name="Location-Type" code="1244" mandatory="may">
-			<grouped>
-				<gavp name="Location-Estimate-Type"/>
-				<gavp name="Deferred-Location-Event-Type"/>
-			</grouped>
-		</avp>
-		<avp name="Positioning-Data" code="1245" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
-			<type type-name="UTF8String"/>
-		</avp>
 	</application>
diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index 4e6da2cc4e..da3affcf98 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -1176,6 +1176,10 @@
 			</grouped>
 		</avp>
 		<!-- ************************ END DIAMETER BASE PROTOCOL AVPS ******************* -->
+		<!-- Definition from SH specs -->
+		<avp name="MSISDN" code="701" mandatory="must" vendor-bit="mustnot" may-encrypt="yes" vendor-id="TGPP">
+			<type type-name="OctetString"/>
+		</avp>
 		<!-- 3GPP Diameter charging applications (3GPP TS 32.299 version 7.0.0 Release 7)-->
 		<!-- Note: The AVP codes from 800 to 822 are reserved for TS 32.299. -->
 		<avp name="Event-Type" code="823" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot" vendor-id="TGPP" >
@@ -1229,10 +1233,10 @@
 			</grouped>
 		</avp>
 		<avp name="SIP-Request-Timestamp" code="834" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
-			<type type-name="UTF8String"/>
+			<type type-name="Time"/>
 		</avp>
 		<avp name="SIP-Response-Timestamp" code="835" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
-			<type type-name="UTF8String"/>
+			<type type-name="Time"/>
 		</avp>
 		<avp name="Application-Server" code="836" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
 			<type type-name="UTF8String"/>
@@ -1410,6 +1414,9 @@
 			<enum name="Append" code="0"/>
 			<enum name="Overwrite" code="1"/>
 		</avp>
+		<avp name="Time-Quota-Threshold" code="868" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Unsigned32"/>
+		</avp>
 		<avp name="Trigger-Type" code="870" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
 			<type type-name="Enumerated"/>
 			<enum name="CHANGE_IN_SGSN_IP_ADDRESS" code="1"/>
@@ -1435,6 +1442,7 @@
 			<enum name="CHANGEINLOCATION_RAC" code="32"/>
 			<enum name="CHANGEINLOCATION_LAC" code="33"/>
 			<enum name="CHANGEINLOCATION_CellId" code="34"/>
+			<enum name="CHANGEINPARTICIPANTS_Number" code="50"/>
 		</avp>
 		<avp name="Quota-Holding-Time" code="871" mandatory="must">
 			<type type-name="Unsigned32"/>
@@ -1462,6 +1470,34 @@
 				<gavp name="MBMS-Information"/>
 			</grouped>
 		</avp>
+		<avp name="PS-Information" code="874" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<grouped>
+				<gavp name="3GPP-Charging-Id"/>
+				<gavp name="3GPP-PDP Type"/>
+				<gavp name="PDP-Address"/>
+				<gavp name="3GPP-GPRS-Negotiated-QoS-Profile"/>
+				<gavp name="SGSN-Address"/>
+				<gavp name="GGSN-Address"/>
+				<gavp name="CG-Address"/>
+				<gavp name="3GPP-IMSI-MCC-MNC"/>
+				<gavp name="3GPP-GGSN- MCC-MNC"/>
+				<gavp name="3GPP-NSAPI"/>
+				<gavp name="Called-Station-Id"/>
+				<gavp name="3GPP-Session-Stop-Indicator"/>
+				<gavp name="3GPP-Selection-Mode"/>
+				<gavp name="3GPP-Charging-Characteristics"/>
+				<gavp name="3GPP-SGSN-MCC-MNC"/>
+				<gavp name="3GPP-MS-TimeZone"/>
+				<gavp name="3GPP-CAMEL-Charging-Info"/>
+				<gavp name="Charging-Rule-Base-Name"/>
+				<gavp name="3GPP-User-Location-Info"/>
+				<gavp name="3GPP-RAT-Type"/>
+				<gavp name="PS-Furnish-Charging-Information"/>
+			</grouped>
+		</avp>
+		<avp name="WLAN-Information" code="875" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="UTF8String"/>
+		</avp>
 		<avp name="IMS-Information" code="876" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
 			<grouped>
 				<gavp name="Event-Type"/>
@@ -1487,7 +1523,19 @@
 				<gavp name="Cause-Code"/>
 			</grouped>
 		</avp>
-
+		<avp name="MMS-Information" code="877" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="UTF8String"/>
+		</avp>
+		<avp name="LCS-Information" code="878" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<grouped>
+				<gavp name="LCS-Client-ID"/>
+				<gavp name="Location-Type"/>
+				<gavp name="Location-Estimate"/>
+				<gavp name="Positioning-Data"/>
+				<gavp name="IMSI"/>
+				<gavp name="MSISDN"/>
+			</grouped>
+		</avp>
 		<avp name="PoC-Information" code="879" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
 			<grouped>
 				<gavp name="PoC-Server-Role"/>
@@ -1499,7 +1547,12 @@
 				<gavp name="PoC-Group-Name"/>
 			</grouped>
 		</avp>
-
+		<avp name="MBMS-Information" code="880" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="UTF8String"/>
+		</avp>
+		<avp name="Quota-Consumption-Time" code="881" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Unsigned32"/>
+		</avp>
 		<avp name="Media-Initiator-Flag" code="882" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
 			<type type-name="Enumerated"/>
 			<enum name="called party" code="0"/>
@@ -1609,8 +1662,12 @@ Note: The AVP codes from 915 to 999 are reserved for TS 29.061
 1000 Bearer-Usage Enumerated
 1001 Charging-Rule-Install Grouped
 1002 Charging-Rule-Remove Grouped
+-->
 1003 Charging-Rule-Definition Grouped
-1004 Charging-Rule-Base-Name OctetString
+		<avp name="Charging-Rule-Base-Name" code="1004" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="UTF8String"/>
+		</avp>
+<--
 1005 Charging-Rule-Name OctetString
 1006 Event-Trigger Enumerated
 1007 Metering-Method Enumerated
@@ -1660,9 +1717,13 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
 		<avp name="Content-Size" code="1205" mandatory="must">
 			<type type-name="Unsigned32"/>
 		</avp>
+		<avp name="PDP-Address" code="1227" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="IPAddress"/>
+		</avp>
+		<avp name="SGSN-Address" code="1228" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="IPAddress"/>
+		</avp>
 <!--
-1207 Additional-Content-Information Grouped
-1208 Addressee-Type Enumerated
 1209 Priority Enumerated
 1210 Message-ID UTF8String
 1211 Message-Type Enumerated
@@ -1693,21 +1754,80 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
 		<avp name="LCS-Client-Name" code="1231" mandatory="must">
 			<type type-name="UTF8String"/>
 		</avp>
+		<avp name="LCS-Client-ID" code="1232" mandatory="may">
+			<grouped>
+				<gavp name="LCS-Client-Type"/>
+				<gavp name="LCS-Client-External-ID"/>
+				<gavp name="LCS-Client-Dialed-By-MS"/>
+				<gavp name="LCS-Client-Name"/>
+				<gavp name="LCS-APN"/>
+				<gavp name="LCS-Requestor-ID"/>
+			</grouped>
+		</avp>
+		<avp name="LCS-Client-Dialed-By-MS" code="1233" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must">
+			<type type-name="UTF8String"/>
+		</avp>
+		<avp name="LCS-Client-External-ID" code="1234" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must">
+			<type type-name="UTF8String"/>
+		</avp>
+		<avp name="LCS-Client-Name" code="1235" mandatory="may">
+			<grouped>
+				<gavp name="LCS-Data-Coding-Scheme"/>
+				<gavp name="LCS-Name-String"/>
+				<gavp name="LCS-Format-Indicator"/>
+			</grouped>
+		</avp>
+		<avp name="LCS-Data-Coding-Scheme" code="1236" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+			<type type-name="UTF8String"/>
+		</avp>
+		<avp name="LCS-Format-Indicator" code="1237" mandatory="may">
+			<type type-name="Enumerated"/>
+			<enum name="LOGICAL_NAME" code="0"/>
+			<enum name="EMAIL_ADDRESS" code="1"/>
+			<enum name="MSISDN" code="2"/>
+			<enum name="URL" code="3"/>
+			<enum name="SIP_URL" code="4"/>
+		</avp>
+		<avp name="LCS-Name-String" code="1238" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+			<type type-name="UTF8String"/>
+		</avp>
+		<avp name="LCS-Requestor-ID" code="1239" mandatory="may">
+			<grouped>
+				<gavp name="LCS-Data-Coding-Scheme"/>
+				<gavp name="LCS-Requestor-ID-String"/>
+			</grouped>
+		</avp>
+		<avp name="LCS-Requestor-ID-String" code="1240" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+			<type type-name="UTF8String"/>
+		</avp>
+		<avp name="LCS-Client-Type" code="1241" mandatory="may">
+			<type type-name="Enumerated"/>
+			<enum name="EMERGENCY_SERVICES" code="0"/>
+			<enum name="VALUE_ADDED_SERVICES" code="1"/>
+			<enum name="PLMN_OPERATOR_SERVICES" code="2"/>
+			<enum name="LAWFUL_INTERCEPT_SERVICES" code="3"/>
+		</avp>
+		<avp name="Location-Estimate" code="1242" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+			<type type-name="UTF8String"/>
+		</avp>
+		<avp name="Location-Estimate-Type" code="1243" mandatory="may">
+			<type type-name="Enumerated"/>
+			<enum name="CURRENT_LOCATION" code="0"/>
+			<enum name="CURRENT_LAST_KNOWN_LOCATION" code="1"/>
+			<enum name="INITIAL_LOCATION" code="2"/>
+			<enum name="ACTIVATE_DEFERRED_LOCATION" code="3"/>
+			<enum name="CANCEL_DEFERRED_LOCATION" code="4"/>
+		</avp>
+		<avp name="Location-Type" code="1244" mandatory="may">
+			<grouped>
+				<gavp name="Location-Estimate-Type"/>
+				<gavp name="Deferred-Location-Event-Type"/>
+			</grouped>
+		</avp>
+		<avp name="Positioning-Data" code="1245" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+			<type type-name="UTF8String"/>
+		</avp>
 <!--
-1232 LCS-Client-Id Grouped
-1233 LCS-Client-Dialed-By-MS UTF8String
-1234 LCS-Client-External-ID UTF8String
-1235 LCS-Client-Name Grouped
-1236 LCS-Data-Coding-Scheme UTF8String
-1237 LCS-Format-Indicator Enumerated
-1238 LCS-Name-String UTF8String
-1239 LCS-Requestor-Id Grouped
-1240 LCS-Requestor-Id-String UTF8String
-1241 LCS-Client-Type UTF8String
-1242 Location-Estimate UTF8String
-1243 Location-Estimate-Type UTF8String
-1244 Location-Type Grouped
-1245 Positioning-Data UTF8String
 1246 WLAN-Session-Id UTF8String
 1247 PDP-Context-Type Enumerated
 1248 MMBox-Storage-Requested Enumerated