Updates according to ETSI ES 283 026 V1.6.0 (2008-02)

svn path=/trunk/; revision=24305

3 files changed, 78 insertions, 1 deletions

diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index 49579ce245..bb35e3a1c7 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -1187,6 +1187,8 @@
 			<enum name="DIAMETER_ERROR_W-APN_UNUSED_BY_USER" code="5042"/>
 			<enum name="DIAMETER_ERROR_W-DIAMETER_ERROR_NO_ACCESS_INDEPENDENT_SUBSCRIPTION" code="5043"/>
 			<enum name="DIAMETER_ERROR_USER_NO_W-APN_SUBSCRIPTION" code="5044"/>
+			<enum name="INVALID_SERVICE_INFORMATION" code="5061"/>
+			<enum name="FILTER_RESTRICTIONS" code="5062"/>
 			<enum name="DIAMETER_ERROR_USER_DATA_NOT_RECOGNIZED" code="5100"/>
 			<enum name="DIAMETER_ERROR_OPERATION_NOT_ALLOWED" code="5101"/>
 			<enum name="DIAMETER_ERROR_USER_DATA_CANNOT_BE_READ" code="5102"/>
@@ -1406,6 +1408,9 @@ Note: TThe AVP codes from 410 to 499 are reserved for TS 29.109
 				<gavp name="MFlow-Status"/>
 				<gavp name="RS-Bandwidth"/>
 				<gavp name="RR-Bandwidth"/>
+				<gavp name="Reservation-Priority"/>
+				<gavp name="Reservation-Class"/>
+				<gavp name="Transport-Class"/>
 			</grouped>
 		</avp>
 		<avp name="Media-Component-Number" code="518" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
diff --git a/diameter/etsie2e4.xml b/diameter/etsie2e4.xml
index 5e6d6de260..2892219daf 100644
--- a/diameter/etsie2e4.xml
+++ b/diameter/etsie2e4.xml
@@ -3,6 +3,22 @@
 <!-- ETSI ES 283 034 V1.2.0 (2007-05) -->
 <!-- ETSI ES 283 035 V1.2.1 (2007-06) -->
 
+<!-- ETSI ES 283 026 V1.6.0 (2008-02) Specifies some eperimental resultcodes with vendor id ETSI 
+6.3.2 Experimental-Result-Code AVP values defined in the present
+document
+This clause defines the specific values of the Experimental-Result-Code AVP (vendor-id is ETSI):
+-->
+		<avp name="Experimental-Result-Code" code="298" mandatory="must" protected="mustnot" vendor-bit="must" vendor-id="ETSI" may-encrypt="no" >
+			<type type-name="Unsigned32"/>
+			<enum name="INSUFFICIENT_RESOURCES" code="4041"/>
+			<enum name="COMMIT_FAILURE"			code="4043"/>
+			<enum name="REFRESH_FAILURE"		code="4044"/>
+			<enum name="QOS_PROFILE_FAILURE"	code="4045"/>
+			<enum name="ACCESS_PROFILE_FAILURE" code="4046"/>
+			<enum name="PRIORITY_NOT_GRANTED"	code="4047"/>
+			<enum name="MODIFICATION_FAILURE"	code="5041"/>
+
+
 	<application id="16777231" name="Diameter e2e4 Application" uri="http://pda.etsi.org">
 
 		<!-- User-Data (306) already defined by Sh -->
@@ -107,6 +123,62 @@
 				<enum name="QOS-PROFILE" code="9"/>
 				<enum name="IP-CONNECTIVITY-STATUS" code="10"/>
 		</avp>
+		<!--- ETSI ES 283 026 V1.6.0 (2008-02) -->
+		<avp name="Session-Bundle-Id" code="400" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes">
+			<type type-name="Unsigned32"/>
+		</avp>
+		<!-- ETSI TS 183 017 V1.4.0 (2007-08) -->
+		<avp name="Binding-information" code="450" mandatory="mustnot" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes">
+			<grouped>
+				<gavp name="Binding-Input-List"/>
+				<gavp name="Binding-Output-List"/>
+			</grouped>
+		</avp>
+		<avp name="Binding-Input-List" code="451" mandatory="mustnot" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes">
+			<grouped>
+				<gavp name="V6-Transport-Address"/>
+				<gavp name="V4-Transport-Address"/>
+			</grouped>
+		</avp>
+		<avp name="Binding-Output-List" code="452" mandatory="mustnot" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes">
+			<grouped>
+				<gavp name="V6-Transport-Address"/>
+				<gavp name="V4-Transport-Address"/>
+			</grouped>
+		</avp>
+		<avp name="V6-Transport-address" code="453" mandatory="mustnot" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes">
+			<grouped>
+				<gavp name="Framed-IPv6-Prefix"/>
+				<gavp name="Port-Number"/>
+			</grouped>
+		</avp>
+		<avp name="V4-Transport-Address" code="454" mandatory="mustnot" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes">
+			<grouped>
+				<gavp name="Framed-IP-Address"/>
+				<gavp name="Port-Number"/>
+			</grouped>
+		</avp>
+		<avp name="Port-Number" code="455" mandatory="may" vendor-bit="must" vendor-id="ETSI" may-encrypt="no">
+			<type type-name="Unsigned32"/>
+		</avp>
+		<avp name="Reservation-Class" code="456" mandatory="may" vendor-bit="must" vendor-id="ETSI" may-encrypt="no">
+			<type type-name="Unsigned32"/>
+		</avp>
+		<avp name="Requested-Information" code="457" mandatory="mustnot" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes">
+			<type type-name="Enumerated"/>
+				<enum name="LATCH" code="0"/>
+				<enum name="RELATCH" code="1"/>
+		</avp>
+		<avp name="Reservation-priority" code="458" mandatory="mustnot" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes">
+			<type type-name="Enumerated"/>
+				<enum name="PRIORITY-ONE" code="1"/>
+				<enum name="PRIORITY-TWO" code="2"/>
+				<enum name="PRIORITY-THREE" code="3"/>
+				<enum name="PRIORITY-FOUR" code="4"/>
+				<enum name="PRIORITY-FIVE" code="5"/>
+				<enum name="PRIORITY-SIX" code="6"/>
+				<enum name="PRIORITY-SEVEN" code="7"/>
+		</avp>
 		<!--- ETSI TS 183 033 V1.2.0 (2007-10) -->
 		<!-- The Line-Identifier AVP has a Vendor-Id header set to ETSI (13019). 
 		6.3.34 Line-Identifier AVP
diff --git a/diameter/nasreq.xml b/diameter/nasreq.xml
index 8c5f48dbef..9375d874b7 100644
--- a/diameter/nasreq.xml
+++ b/diameter/nasreq.xml
@@ -2,7 +2,7 @@
 
 	<application id="1" name="NASREQ Application" uri="http://www.ietf.org/rfc/rfc4005.txt">
 
-		<command name="AA" code="265" vendor-id="None"/>
+		<command name="AA-Answer" code="265" vendor-id="None"/>
 		<command name="Diameter-EAP" code="268" vendor-id="None"/>
 
 		<avp name="Accounting-Input-Octets" code="363">