Add Tekelec (now Oracle) AVPs.

Untested; taken from the document 910-6828-001 Revision A (found on the web).

Change-Id: Ibf312a0a15c5c64ec16e636814febb0e996fe5f2
Reviewed-on: https://code.wireshark.org/review/8110
Reviewed-by: Anders Broman <a.broman58@gmail.com>

2 files changed, 52 insertions, 26 deletions

diff --git a/diameter/Oracle.xml b/diameter/Oracle.xml
new file mode 100644
index 0000000000..fe5ab71671
--- /dev/null
+++ b/diameter/Oracle.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<application id="16777229" name="3GPP Rx Release 6" uri="http://www.3GPP.org/ftp/Specs/html-info/29211.htm">
+
+	<avp name="DSR-ApplicationInvoked" code="2468" vendor-bit="must" vendor-id="Oracle_Tekelec">
+		<type type-name="Enumerated"/>
+		<enum name="RBAR ID"		code="3"/>
+		<enum name="FABR ID"		code="4"/>
+		<enum name="CPA ID"		code="5"/>
+		<enum name="Policy DRA ID"	code="6"/>
+	</avp>
+	<avp name="PDRA-Early-Binding" code="2500" vendor-bit="must" vendor-id="Oracle_Tekelec">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="Session-Release-Reason" code="2501" vendor-bit="must" vendor-id="Oracle_Tekelec">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="MsgCopyAnswer" code="2516" vendor-bit="must" vendor-id="Oracle_Tekelec">
+		<grouped>
+			<gavp name="Session-Id"/>
+			<!-- This grouped AVP holds any AVP -->
+		</grouped>
+	</avp>
+</application>
diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index 974ffa3813..4a47e5b246 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -28,6 +28,7 @@
 	<!ENTITY ChinaTelecom		SYSTEM "ChinaTelecom.xml">
 	<!ENTITY VerizonWireless	SYSTEM "VerizonWireless.xml">
 	<!ENTITY HP			SYSTEM "HP.xml">
+	<!ENTITY Oracle			SYSTEM "Oracle.xml">
 	<!ENTITY Custom			SYSTEM "Custom.xml">
 ]>
 <dictionary>
@@ -170,30 +171,31 @@
 		<!-- ************************************************************** -->
 		<!-- ************************* Vendors **************************** -->
 		<!-- ************************************************************** -->
-		<vendor vendor-id="None" code="0" name="None"/>
-		<vendor vendor-id="HP"    code="11"    name="Hewlett Packard"/>
-		<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="NokiaSolutionsAndNetworks" code="28458" name="Nokia Solutions and 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"/>
-		<vendor vendor-id="Lucent" code="1751" name="Lucent Technologies"/>
-		<vendor vendor-id="Huawei" code="2011" name="Huawei"/>
-		<vendor vendor-id="Deutsche_Telekom_AG" code="2937" name="Deutsche Telekom AG"/>
-		<vendor vendor-id="TGPP2" code="5535" name="3GPP2"/>
-		<vendor vendor-id="Cisco" code="5771" name="Cisco"/>
-		<vendor vendor-id="SKT" code="5806" name="SK Telecom"/>
-		<vendor vendor-id="Starent" code="8164" name="Starent"/>
-		<vendor vendor-id="TGPP"  code="10415" name="3GPP"/>
-		<vendor vendor-id="Vodafone" code="12645" name="Vodafone"/>
-		<vendor vendor-id="VerizonWireless" code="12951" name="Verizon Wireless"/>
-		<vendor vendor-id="ETSI"  code="13019" name="ETSI"/>
-		<vendor vendor-id="Tango" code="13421" name="Tango Telecom Limited"/>
-		<vendor vendor-id="ChinaTelecom" code="81000" name="China Telecom"/>
-		<vendor vendor-id="TGPPCX" code="16777216" name="3GPP CX/DX"/>
-		<vendor vendor-id="Acision" code="3830" name="Acision"/>
+		<vendor vendor-id="None"			code="0"	name="None"/>
+		<vendor vendor-id="HP"				code="11"	name="Hewlett Packard"/>
+		<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="Ericsson"			code="193"	name="Ericsson"/>
+		<vendor vendor-id="Oracle_Tekelec"		code="323"	name="Oracle_Tekelec"/>
+		<vendor vendor-id="USR"				code="429"	name="US Robotics Corp."/>
+		<vendor vendor-id="ALU"				code="637"	name="ALU Network"/>
+		<vendor vendor-id="Lucent"			code="1751"	name="Lucent Technologies"/>
+		<vendor vendor-id="Huawei"			code="2011"	name="Huawei"/>
+		<vendor vendor-id="Deutsche_Telekom_AG"		code="2937"	name="Deutsche Telekom AG"/>
+		<vendor vendor-id="Acision"			code="3830"	name="Acision"/>
+		<vendor vendor-id="TGPP2"			code="5535"	name="3GPP2"/>
+		<vendor vendor-id="Cisco"			code="5771"	name="Cisco"/>
+		<vendor vendor-id="SKT"				code="5806"	name="SK Telecom"/>
+		<vendor vendor-id="Starent"			code="8164"	name="Starent"/>
+		<vendor vendor-id="TGPP"			code="10415"	name="3GPP"/>
+		<vendor vendor-id="Vodafone"			code="12645"	name="Vodafone"/>
+		<vendor vendor-id="VerizonWireless"		code="12951"	name="Verizon Wireless"/>
+		<vendor vendor-id="ETSI"			code="13019"	name="ETSI"/>
+		<vendor vendor-id="Tango"			code="13421"	name="Tango Telecom Limited"/>
+		<vendor vendor-id="NokiaSolutionsAndNetworks"	code="28458"	name="Nokia Solutions and Networks"/>
+		<vendor vendor-id="ChinaTelecom"		code="81000"	name="China Telecom"/>
+		<vendor vendor-id="TGPPCX"			code="16777216"	name="3GPP CX/DX"/>
 		<!-- *********************** End Vendors ************************** -->
 
 
@@ -6644,6 +6646,7 @@
 	16777224 is defined in ChinaTelecom.xml
 	16777227 is defined in Ericsson.xml
 	16777228 is defined in starent.xml
+	16777229 is defined in Oracle.xml
 	16777234 is defined in Vodafone.xml
 	16777236 is defined in TGPP.xml
 	16777237 is defined in TGPP2.xml
@@ -6656,8 +6659,7 @@
 	-->
 	<application id="0"		name="Diameter Common Messages"	uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588"></application>
 	<application id="3"		name="Diameter Base Accounting"	uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588"></application>
-	<application id="16777219"	name="3GPP Wx"	uri="http://www.3GPP.org/ftp/Specs/html-info/29234.htm"></application>
-	<application id="16777229"	name="3GPP Rx Release 6" 	uri="http://www.3GPP.org/ftp/Specs/html-info/29211.htm"></application>
+	<application id="16777219"	name="3GPP Wx"			uri="http://www.3GPP.org/ftp/Specs/html-info/29234.htm"></application>
 	<application id="16777232"	name="Ericsson Charging-CIP"	uri="http://www.3gpp.org/ftp/Specs/html-info/29210.htm"></application>
 	<application id="16777250"	name="3GPP STa"			uri="http://www.3gpp.org/ftp/Specs/html-info/29273.htm"></application>
 	<application id="16777251"	name="3GPP S6a/S6d"		uri="http://www.ietf.org/rfc/rfc5516.txt?number=5516"></application>
@@ -6694,5 +6696,6 @@
 	&ChinaTelecom;
 	&VerizonWireless;
 	&HP;
+	&Oracle;
 	&Custom;
 </dictionary>