From b223d649fed632d10b356f66c3a286740cec9e7d Mon Sep 17 00:00:00 2001
From: Jeff Morriss <jeff.morriss.ws@gmail.com>
Date: Thu, 16 Jun 2016 00:04:36 -0400
Subject: Make the rest of the Diameter AVP names unique.

In most cases this means prepending the application- or vendor-name to force
uniqueness.  A few vendors have duplicates within their namespace--append the
AVP code to these.

Also fix a few other invalid names (with spaces or parentheses in the names).

Change-Id: I5bb78d31526122dd5782055638af410cc497e49d
Reviewed-on: https://code.wireshark.org/review/15960
Reviewed-by: Anders Broman <a.broman58@gmail.com>
---
 diameter/Ericsson.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'diameter/Ericsson.xml')

diff --git a/diameter/Ericsson.xml b/diameter/Ericsson.xml
index d47fc13418..56718fad77 100644
--- a/diameter/Ericsson.xml
+++ b/diameter/Ericsson.xml
@@ -135,8 +135,8 @@
 	</avp>
 	<avp name="SCAP-Unit-Value" code="612" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
 		<grouped>
-			<gavp name="Value-Digits"/>
-			<gavp name="Exponent"/>
+			<gavp name="SCAP-Value-Digits"/>
+			<gavp name="SCAP-Exponent"/>
 		</grouped>
 	</avp>
 	<avp name="SCAP-Used-Service-Unit" code="613" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
@@ -161,7 +161,7 @@
 	<avp name="SCAP-Exponent" code="616" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
 		<type type-name="Integer32"/>
 	</avp>
-	<avp name="Value-Digits" code="617" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+	<avp name="SCAP-Value-Digits" code="617" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
 		<type type-name="Unsigned64"/>
 	</avp>
 	<!-- ************************ END SCAP AVPS ******************* -->
@@ -201,7 +201,7 @@
 	<avp name="Gx-Capability-List" code="1060" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
 		<type type-name="Unsigned32"/>
 	</avp>
-	<avp name="Customer-Id" code="1146" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
+	<avp name="Ericsson-Customer-Id" code="1146" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
 		<type type-name="UTF8String"/>
 	</avp>
 
-- 
cgit v1.2.1