Minor AVP edits.

svn path=/trunk/; revision=24355

2 files changed, 60 insertions, 14 deletions

diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index a4ed079535..119835bb5b 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -1911,6 +1911,19 @@ Note: The AVP codes from 900 to 999 are reserved for TS 29.061
 		<type type-name="OctetString"/>
 		</avp>
 <!--
+  1016 QoS-Information Grouped   
+  1018 Charging-Rule-Report Grouped   
+  1019 PCC-Rule-Status Enumerated   
+  1020 Bearer-Identifier OctetString   
+  1021 Bearer-Operation Enumerated   
+  1022 Access-Network-Charging-Identifier-Gx Grouped   
+  1023 Bearer-Control-Mode Enumerated   
+  1024 Network-Request-Support Enumerated   
+  1025 Guaranteed-Bitrate-DL Unsigned32   
+  1026 Guaranteed-Bitrate-UL Unsigned32   
+  1027 IP-CAN-Type Enumerated   
+  1028 QoS-Class-Identifier Enumerated 
+
 29.210 [15]
 Note: The AVP codes from 1015 to 1099 are reserved for TS 29.210
 
@@ -2283,9 +2296,16 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
 			<type type-name="UTF8String"/>
 		</avp>
 <!--
-1252 Reserved
-1253 Reserved
-1254 Reserved
+		<avp name="PoC-User-Role" code="1252" vendor-bit="must" vendor-id="TGPP">
+			<grouped>
+			</grouped>
+		</avp>
+		<avp name="PoC-User-Role-IDs" code="1253" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="UTF8String"/>
+		</avp>
+		<avp name="PoC-User-Role-info-Units" code="1254" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Enumerated"/>
+		</avp>
 -->
 		<avp name="Talk-Burst-Exchange" code="1255" vendor-bit="must" vendor-id="TGPP">
 			<grouped>
@@ -2313,25 +2333,37 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
 			<type type-name="Time"/>
 		</avp>
 <!--
-		<avp name="Access-Network-Information" code="1263" vendor-bit="must" vendor-id="TGPP"><type type-name="OctetString"/></avp>
+		<avp name="Access-Network-Information" code="1263" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="OctetString"/>
+		</avp>
 		<avp name="Trigger" code="1264" vendor-bit="must" vendor-id="TGPP">
 					<grouped>
 					</grouped>
 
 		</avp>
-		<avp name="Base-Time-Interval" code="1265" vendor-bit="must" vendor-id="TGPP"><type type-name="Unsigned32"/></avp>
+		<avp name="Base-Time-Interval" code="1265" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Unsigned32"/>
+		</avp>
 		<avp name="Envelope" code="1266" vendor-bit="must" vendor-id="TGPP">
 					<grouped>
 					</grouped>
 		</avp>
-		<avp name="Envelope-End-Time" code="1267" vendor-bit="must" vendor-id="TGPP"><type type-name="Time"/></avp>
-		<avp name="Envelope-Reporting" code="1268" vendor-bit="must" vendor-id="TGPP"><type type-name="Enumerated"/></avp>
-		<avp name="Envelope-Start-Time" code="1269" vendor-bit="must" vendor-id="TGPP"><type type-name="Time"/></avp>
+		<avp name="Envelope-End-Time" code="1267" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Time"/>
+		</avp>
+		<avp name="Envelope-Reporting" code="1268" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Enumerated"/>
+		</avp>
+		<avp name="Envelope-Start-Time" code="1269" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Time"/>
+		</avp>
 		<avp name="Time-Quota-Mechanism" code="1270" vendor-bit="must" vendor-id="TGPP">
 					<grouped>
 					</grouped>
 		</avp>	
-		<avp name="Time-Quota-Type" code="1271" vendor-bit="must" vendor-id="TGPP"><type type-name="Enumerated"/></avp>
+		<avp name="Time-Quota-Type" code="1271" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Enumerated"/>
+		</avp>
 		<avp name="Early-Media-Description" code="1272" vendor-bit="must" vendor-id="TGPP">
 					<grouped>
 					</grouped>
@@ -2340,19 +2372,29 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
 					<grouped>
 					</grouped>
 		</avp>
-		<avp name="SDP-Offer-Timestamp" code="1274" vendor-bit="must" vendor-id="TGPP"><type type-name="Time"/></avp>
-		<avp name="SDP-Answer-Timestamp" code="1275" vendor-bit="must" vendor-id="TGPP"><type type-name="Time"/></avp>
+		<avp name="SDP-Offer-Timestamp" code="1274" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Time"/>
+		</avp>
+		<avp name="SDP-Answer-Timestamp" code="1275" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Time"/>
+		</avp>
 		<avp name="AF-Correlation-Information" code="1276" vendor-bit="must" vendor-id="TGPP">
 					<grouped>
 					</grouped>
 		</avp>	
-		<avp name="PoC-Session-Initiation-type" code="1277"><type type-name="Enumerated"/></avp>
+		<avp name="PoC-Session-Initiation-type" code="1277" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Enumerated"/>
+		</avp>
 		<avp name="Offline-Charging" code="1278" vendor-bit="must" vendor-id="TGPP">
 					<grouped>
 					</grouped>
 		</avp>
-		<avp name="User-Participating-Type" code="1279" vendor-bit="must" vendor-id="TGPP"><type type-name="Enumerated"/></avp>	
-		<avp name="Alternate-Charged-Party-Address" code="1280" vendor-bit="must" vendor-id="TGPP"><type type-name="UTF8String"/></avp>
+		<avp name="User-Participating-Type" code="1279" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Enumerated"/>
+		</avp>	
+		<avp name="Alternate-Charged-Party-Address" code="1280" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="UTF8String"/>
+		</avp>
 Note: The AVP codes from 1281 to 1299 are reserved for TS 32.299
 -->
 <!--- 3GPP2 AVP's X.S0013-014-0 
diff --git a/diameter/gqpolicy.xml b/diameter/gqpolicy.xml
index d98aa83628..980305ea8c 100644
--- a/diameter/gqpolicy.xml
+++ b/diameter/gqpolicy.xml
@@ -105,6 +105,10 @@
                     <gavp name="Flow-Status"/>
                     <gavp name="RS-Bandwidth"/>
                     <gavp name="RR-Bandwidth"/>
+					<!-- ETSI ES 283 026 V1.6.0 (2008-02) -->
+                    <gavp name="Reservation-Priority"/>
+                    <gavp name="Reservation-Class"/>
+                    <gavp name="Transport-Class"/>
             </grouped>
         </avp>