From 9f38a46974b023df3a66ff4facc1dbc277b66a74 Mon Sep 17 00:00:00 2001
From: Anders Broman <anders.broman@ericsson.com>
Date: Mon, 8 Oct 2012 14:20:34 +0000
Subject: [PATCH] From GeorgiaK: Add Nokia AVP:s

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7799

svn path=/trunk/; revision=45385
---
 Makefile.am                  |  3 +-
 diameter/Nokia.xml           | 59 ++++++++++++++++++++++++++++++++++++
 diameter/dictionary.xml      | 27 +++++++++--------
 packaging/nsis/wireshark.nsi |  1 +
 4 files changed, 77 insertions(+), 13 deletions(-)
 create mode 100644 diameter/Nokia.xml

diff --git a/Makefile.am b/Makefile.am
index d4c86e6aca..282ea209d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,7 +83,8 @@ diameter_DATA = \
 	diameter/TGPPS9.xml \
 	diameter/TGPPSh.xml	\
 	diameter/Vodafone.xml \
-	diameter/AlcatelLucent.xml
+	diameter/AlcatelLucent.xml \
+	diameter/Nokia.xml
 
 #
 # Install the DTDs directory files in the "dtds" subdirectory
diff --git a/diameter/Nokia.xml b/diameter/Nokia.xml
new file mode 100644
index 0000000000..c70a3b816c
--- /dev/null
+++ b/diameter/Nokia.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id$ -->
+<!-- Nokia verndor-specific AVPs. Simple encoding, by old (oleksandr.darchuk@gmail.com). 02.03.2009 -->
+
+<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>
+
+		<avp name="Time-Of-First-Usage" code="5103" vendor-id="Nokia">
+		   <type type-name="Time"/>
+		</avp>
+
+
+		<avp name="Time-Of-Last-Usage" code="5104" vendor-id="Nokia">
+		   <type type-name="Time"/>
+		</avp>
+
+		<avp name="Session-Start-Indicator" code="5105" vendor-id="Nokia">
+		   <type type-name="OctetString"/>
+		</avp>
+
+		<avp name="Rulebase-Id" code="5106" vendor-id="Nokia">
+		   <type type-name="UTF8String"/>
+		</avp>
+
+		<avp name="Quota-Consumption-Time" code="5109" vendor-id="Nokia">
+		   <type type-name="Unsigned32"/>
+		</avp>
+
+		<avp name="Quota-Holding-Time" code="5110" vendor-id="Nokia">
+		   <type type-name="Unsigned32"/>
+		</avp>
+
+		<avp name="Default-Quota" code="5111" vendor-id="Nokia">
+			<grouped>
+				<gavp name="CC-Time"/>
+				<gavp name="CC-Total-Octets"/>
+				<gavp name="CC-Input-Octets"/>
+				<gavp name="CC-Output-Octets"/>
+				<gavp name="CC-Service-Specific-Units"/>
+			</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>
+
+	</application>
\ No newline at end of file
diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index 680cc66862..aa8463e887 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -23,7 +23,8 @@
 	<!ENTITY mobileipv6	SYSTEM "mobileipv6.xml">
 	<!ENTITY Cisco		SYSTEM "Cisco.xml">
 	<!ENTITY Vodafone	SYSTEM "Vodafone.xml">
-	<!ENTITY AlcatelLucent	SYSTEM "AlcatelLucent.xml">
+  <!ENTITY AlcatelLucent	SYSTEM "AlcatelLucent.xml">
+  <!ENTITY Nokia	SYSTEM "Nokia.xml">
 ]>
 <dictionary>
 	<base uri="http://www.ietf.org/rfc/rfc3588.txt">
@@ -182,21 +183,22 @@
 		<!-- ************************************************************** -->
 		<vendor vendor-id="None" code="0" name="None"/>
 		<vendor vendor-id="HP"    code="11"    name="Hewlett Packard"/>
-		<vendor vendor-id="Merit" code="61" name="Merit Networks"/>
 		<vendor vendor-id="Sun" code="42" name="Sun Microsystems, Inc."/>
-		<vendor vendor-id="USR" code="429" name="US Robotics Corp."/>
-		<vendor vendor-id="Huawei" code="2011" name="Huawei"/>
-		<vendor vendor-id="Cisco" code="5771" name="Cisco"/>
+    <vendor vendor-id="Merit" code="61" name="Merit Networks"/>
+    <vendor vendor-id="Nokia" code="94" name="Nokia"/>
+    <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"/>
+    <vendor vendor-id="Huawei" code="2011" name="Huawei"/>
+    <vendor vendor-id="Deutsche_Telekom_AG" code="2937" name="Deutsche Telekom AG"/>
+    <vendor vendor-id="Cisco" code="5771" name="Cisco"/>
 		<vendor vendor-id="TGPP2" code="5535" name="3GPP2"/>
 		<vendor vendor-id="TGPP"  code="10415" name="3GPP"/>
-		<vendor vendor-id="TGPPCX" code="16777216" name="3GPP CX/DX"/>
-		<vendor vendor-id="Ericsson"  code="193" name="Ericsson"/>
-		<vendor vendor-id="ETSI"  code="13019" name="ETSI"/>
 		<vendor vendor-id="Vodafone" code="12645" name="Vodafone"/>
-		<vendor vendor-id="Deutsche_Telekom_AG" code="2937" name="Deutsche Telekom AG"/>
-		<vendor vendor-id="Tango" code="13421" name="Tango Telecom Limited"/>
-		<vendor vendor-id="ALU" code="637" name="ALU Network"/>
-		<!-- *********************** End Vendors ************************** -->
+    <vendor vendor-id="ETSI"  code="13019" name="ETSI"/>
+    <vendor vendor-id="Tango" code="13421" name="Tango Telecom Limited"/>
+    <vendor vendor-id="TGPPCX" code="16777216" name="3GPP CX/DX"/>
+    <!-- *********************** End Vendors ************************** -->
 
 
 		<!-- ************************************************************** -->
@@ -6181,4 +6183,5 @@
 	&Cisco;
   &Vodafone;
   &AlcatelLucent;
+  &Nokia;
 </dictionary>
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 1f95a2c135..fba901e156 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -423,6 +423,7 @@ File "..\..\diameter\imscxdx.xml"
 File "..\..\diameter\mobileipv4.xml"
 File "..\..\diameter\mobileipv6.xml"
 File "..\..\diameter\nasreq.xml"
+File "..\..\diameter\Nokia.xml"
 File "..\..\diameter\sip.xml"
 File "..\..\diameter\sunping.xml"
 File "..\..\diameter\TGPPGmb.xml"