- Add Nokai Siemens Networks AVP.

- Add a few enums to Event-Trigger
- Reformat the Nokia file a bit.

svn path=/trunk/; revision=45427

3 files changed, 30 insertions, 14 deletions

diff --git a/diameter/Nokia.xml b/diameter/Nokia.xml
index c70a3b816c..85391ad834 100644
--- a/diameter/Nokia.xml
+++ b/diameter/Nokia.xml
@@ -5,8 +5,6 @@
 
 <application id="4" name="Diameter Credit Control Application" uri="http://www.ietf.org/rfc/rfc4006.txt">
 
-		<command name="Credit-Control" code="272" vendor-id="None"/>
-
 		<avp name="Nokia-IMS-Media-Component-Id" code="5101" vendor-id="Nokia">
 	   		<type type-name="Unsigned32"/>
 		</avp>
@@ -15,7 +13,6 @@
 		   <type type-name="Time"/>
 		</avp>
 
-
 		<avp name="Time-Of-Last-Usage" code="5104" vendor-id="Nokia">
 		   <type type-name="Time"/>
 		</avp>
@@ -46,12 +43,10 @@
 			</grouped>				   		
 		</avp>
 
-
 		<avp name="Nokia-URI" code="5112" vendor-id="Nokia">
 		   <type type-name="UTF8String"/>
 		</avp>
 
-
 		<avp name="NSN-Token-Value" code="5113" vendor-id="Nokia">
 		   <type type-name="OctetString"/>
 		</avp>
diff --git a/diameter/NokiaSiemensNetworks.xml b/diameter/NokiaSiemensNetworks.xml
new file mode 100644
index 0000000000..aa9fa30326
--- /dev/null
+++ b/diameter/NokiaSiemensNetworks.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id$ -->
+<!-- Nokia Siemens Networks verndor-specific AVPs.  -->
+
+<application id="16777238" name="3GPP Gx" uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm">
+  
+  <avp name="User-Agent-Type" code="2016" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="NokiaSiemensNetworks">
+    <type type-name="Enumerated"/>
+    <enum name="NON_MOBILE_BROWSER" code="0"/>
+    <enum name="MOBILE_BROWSER"     code="1"/>
+  </avp>
+</application>
diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index aa8463e887..b7c36dd234 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -25,6 +25,7 @@
 	<!ENTITY Vodafone	SYSTEM "Vodafone.xml">
   <!ENTITY AlcatelLucent	SYSTEM "AlcatelLucent.xml">
   <!ENTITY Nokia	SYSTEM "Nokia.xml">
+  <!ENTITY NokiaSiemensNetworks	SYSTEM "NokiaSiemensNetworks.xml">
 ]>
 <dictionary>
 	<base uri="http://www.ietf.org/rfc/rfc3588.txt">
@@ -186,6 +187,7 @@
 		<vendor vendor-id="Sun" code="42" name="Sun Microsystems, Inc."/>
     <vendor vendor-id="Merit" code="61" name="Merit Networks"/>
     <vendor vendor-id="Nokia" code="94" name="Nokia"/>
+    <vendor vendor-id="NokiaSiemensNetworks" code="28458" name="Nokia Siemens Networks"/>
     <vendor vendor-id="Ericsson"  code="193" name="Ericsson"/>
     <vendor vendor-id="USR" code="429" name="US Robotics Corp."/>
     <vendor vendor-id="ALU" code="637" name="ALU Network"/>
@@ -3500,15 +3502,20 @@
 			<enum name="CHARGING_CORRELATION_EXCHANGE"					code="28"/>
 			<enum name="APN-AMBR_MODIFICATION_FAILURE"			code="29"/>
 			<enum name="USER_CSG_INFORMATION_CHANGE"			code="30"/>
-			<enum name="USAGE_REPORT"					code="33"/>
-			<enum name="DEFAULT-EPS-BEARER-QOS_MODIFICATION_FAILURE"	code="34"/>
-			<enum name="USER_CSG_HYBRID_SUBSCRIBED_INFORMATION_CHANGE"	code="35"/>
+			<enum name="USAGE_REPORT"					                            code="33"/>
+			<enum name="DEFAULT-EPS-BEARER-QOS_MODIFICATION_FAILURE"	    code="34"/>
+			<enum name="USER_CSG_HYBRID_SUBSCRIBED_INFORMATION_CHANGE"	  code="35"/>
 			<enum name="USER_CSG_ HYBRID_UNSUBSCRIBED_INFORMATION_CHANGE"	code="36"/>
-			<enum name="ROUTING_RULE_CHANGE"				code="37"/>
-			<enum name="MAX_MBR_APN_AMBR_CHANGE"				code="38"/>
-			<enum name="APPLICATION_START"					code="39"/>
-			<enum name="APPLICATION_STOP"					code="40"/>
-			<enum name="TIME_CHANGE"					code="100"/>
+			<enum name="ROUTING_RULE_CHANGE"				      code="37"/>
+			<enum name="MAX_MBR_APN_AMBR_CHANGE"				  code="38"/>
+			<enum name="APPLICATION_START"					      code="39"/>
+			<enum name="APPLICATION_STOP"					        code="40"/>
+      <enum name="ADC_REVALIDATION_TIMEOUT"					code="41"/>
+      <enum name="CS_TO_PS_HANDOVER"					      code="42"/>
+      <enum name="UE_LOCAL_IP_ADDRESS_CHANGE"	      code="43"/>
+      <enum name="H(E)NB_LOCAL_IP_ADDRESS_CHANGE"   code="44"/>
+      <enum name="ACCESS_NETWORK_INFO_REPORT"	      code="45"/>
+      <enum name="TIME_CHANGE"					code="100"/>
 			<enum name="TFT DELETED"					code="1000"/>
 			<enum name="LOSS OF BEARER"					code="1001"/>
 			<enum name="RECOVERY OF BEARER"					code="1002"/>
@@ -6163,7 +6170,7 @@
 	<application id="16777291"	name="3GPP SLh"			uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588"></application>
 	<application id="16777292"	name="3GPP SGmb"		uri="http://www.3gpp.org/ftp/Specs/html-info/29061.htm"></application>
 	<application id="16777302"	name="3GPP Sy"			uri="http://www.3gpp.org/ftp/Specs/html-info/29219.htm"></application>
-	<application id="16777304"	name="Ericsson Sy"		uri="http://www.iana.org/assignments/aaa-parameters/aaa-parameters.xml"></application>
+	<application id="16777304"	name="Ericsson Sy"	uri="http://www.iana.org/assignments/aaa-parameters/aaa-parameters.xml"></application>
 
 	&nasreq;
 	&eap;
@@ -6184,4 +6191,5 @@
   &Vodafone;
   &AlcatelLucent;
   &Nokia;
+  &NokiaSiemensNetworks;
 </dictionary>