Change the application Ids to avoid duplicates.

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

8 files changed, 21 insertions, 14 deletions

diff --git a/diameter/ChinaTelecom.xml b/diameter/ChinaTelecom.xml
index f8a9c8ec06..63a5e1c0ac 100644
--- a/diameter/ChinaTelecom.xml
+++ b/diameter/ChinaTelecom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-  <application id="4" name="Diameter Credit Control Application" uri="http://www.ietf.org/rfc/rfc4006.txt">
+<!-- Dummy application Id picked from the list to avoid duplicates-->
+  <application id="16777224" name="3GPP Cx" uri="http://www.ietf.org/rfc/rfc4006.txt">
 
 		<avp name="Dummy" code="0" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="ChinaTelecom">
 			<type type-name="OctetString"/>
diff --git a/diameter/Ericsson.xml b/diameter/Ericsson.xml
index a25b25c8ef..85cf9dcb31 100644
--- a/diameter/Ericsson.xml
+++ b/diameter/Ericsson.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<application id="0" name="Diameter Common Messages" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588">
+<!-- Dummy application Id picked from the list to avoid duplicates-->
+<application id="16777227" name="Ericsson MSI" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588">
 <!-- *********** Last updated 2007-04-12 ************ -->
 	<avp name="Acc-Service-Type" code="261" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
 	   <type type-name="Enumerated"/>
diff --git a/diameter/Nokia.xml b/diameter/Nokia.xml
index 83e2465814..d569287dfe 100644
--- a/diameter/Nokia.xml
+++ b/diameter/Nokia.xml
@@ -2,7 +2,7 @@
 
 <!-- Nokia verndor-specific AVPs. Simple encoding, by old (oleksandr.darchuk[AT]gmail.com). 02.03.2009 -->
 
-<application id="4" name="Diameter Credit Control Application" uri="http://www.ietf.org/rfc/rfc4006.txt">
+<application id="16777246" name="NSN Unified Charging Trigger Function (UCTF)" uri="http://www.ietf.org/rfc/rfc4006.txt">
 
 	<avp name="Nokia-IMS-Media-Component-Id" code="5101" vendor-id="Nokia">
 		<type type-name="Unsigned32"/>
diff --git a/diameter/NokiaSiemensNetworks.xml b/diameter/NokiaSiemensNetworks.xml
index 5087322c53..6662af0129 100644
--- a/diameter/NokiaSiemensNetworks.xml
+++ b/diameter/NokiaSiemensNetworks.xml
@@ -2,7 +2,7 @@
 
 <!-- Nokia Siemens Networks verndor-specific AVPs.  -->
 
-<application id="16777238" name="3GPP Gx" uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm">
+<application id="16777317" name="Nokia Siemens Networks (NSN) Hd Application" 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"/>
diff --git a/diameter/Starent.xml b/diameter/Starent.xml
index 31d3c955b4..81bcd15a2c 100644
--- a/diameter/Starent.xml
+++ b/diameter/Starent.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Cisco ASR 5x00 AAA Interface Administration and Reference, Version 14.0 -->
-
-<application id="16777238" name="3GPP Gx" uri="http://www.ietf.org/internet-drafts/draft-ietf-aaa-diameter-cc-06.txt">
+<!-- Dummy application Id picked from the list to avoid duplicates-->
+<application id="16777228" name="Ericsson Zx" uri="http://www.ietf.org/internet-drafts/draft-ietf-aaa-diameter-cc-06.txt">
 
     <avp name="Access-Network-Charging-Physical-Access-Id" code="1472" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
         <grouped>
diff --git a/diameter/VerizonWireless.xml b/diameter/VerizonWireless.xml
index 4c49bc7154..c0fabc8495 100644
--- a/diameter/VerizonWireless.xml
+++ b/diameter/VerizonWireless.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-  <application id="4" name="Diameter Credit Control Application" uri="http://www.ietf.org/rfc/rfc4006.txt">
+  <application id="16777322" name="Verizon Session Recovery" uri="http://www.ietf.org/rfc/rfc4006.txt">
 
 		<avp name="Dummy" code="0" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="VerizonWireless">
 			<type type-name="OctetString"/>
diff --git a/diameter/Vodafone.xml b/diameter/Vodafone.xml
index 173376b63f..499e031ac8 100644
--- a/diameter/Vodafone.xml
+++ b/diameter/Vodafone.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<application id="16777238" name="3GPP Gx" uri="http://www.ietf.org/internet-drafts/draft-ietf-aaa-diameter-cc-06.txt">
+<application id="16777234" name="Vodafone Gx+" uri="http://www.ietf.org/internet-drafts/draft-ietf-aaa-diameter-cc-06.txt">
 
 	<avp name="Context-Type" code="256" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
 		<type type-name="Unsigned32"/>
diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index 06b08c80e6..68bfd3ffa5 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -6719,15 +6719,21 @@
 		</avp>
 	</base>
 
+  <!---
+  Duplicates should be avoided
+  16777216 is defined in imscxdx.xml
+  16777224 is defined in ChinaTelecom.xml
+  16777227 is defined in Ericsson.xml
+  16777228 is defined in starent.xml
+  16777234 is defined in Vodafone.xml
+  16777238 is Cisco.xml
+  16777304 is defined in SKT.xml
+  16777317 is defined in NokiaSiemensNetworks.xml
+  -->
 	<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="16777216"	name="3GPP Cx"			uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588"></application>
-	<application id="16777224"	name="3GPP Gx"			uri="http://www.3gpp.org/ftp/Specs/html-info/29210.htm"></application>
-	<application id="16777227"	name="Ericsson MSI"		uri="http://www.iana.org/assignments/aaa-parameters/aaa-parameters.xml"></application>
-	<application id="16777228"	name="Ericsson Zx"		uri="http://www.3GPP.org/ftp/Specs/html-info/29229.htm"></application>
 	<application id="16777229"	name="3GPP RX"		 	uri="http://www.3GPP.org/ftp/Specs/html-info/29229.htm"></application>
 	<application id="16777232"	name="Ericsson Charging-CIP"	uri="http://www.3gpp.org/ftp/Specs/html-info/29210.htm"></application>
-	<application id="16777238"	name="3GPP Gx"			uri="http://www.3gpp.org/ftp/Specs/html-info/29212.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>
 	<application id="16777252"	name="3GPP S13/S13'"		uri="http://www.ietf.org/rfc/rfc5516.txt?number=5516"></application>
@@ -6740,7 +6746,6 @@
 	<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="16777315"	name="Ericsson Diameter Signalling Controller Application (DSC)"	uri="http://www.iana.org/assignments/aaa-parameters/aaa-parameters.xml"></application>
   <application id="16777327"	name="Ericsson Sx"		uri="http://www.iana.org/assignments/aaa-parameters/aaa-parameters.xml"></application>
 	<application id="4294967295"	name="Relay"			uri="http://www.ietf.org/rfc/rfc6733.txt?number=6733"></application>