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>

1 files changed, 39 insertions, 39 deletions

diff --git a/diameter/TGPP.xml b/diameter/TGPP.xml
index 251ecab823..9dda48b239 100644
--- a/diameter/TGPP.xml
+++ b/diameter/TGPP.xml
@@ -200,61 +200,61 @@
 <!--
 	These AVPs collide(share AVP code number) with other 3GPP AVPs (above).
 	Uncomment 1 - 28 here and comment out the ones above if you want to use these.
-	<avp name="Visited-Network-Identifier(Obsolete CN#25)" code="1" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
+	<avp name="Visited-Network-Identifier-OBSOLETE-CN25" code="1" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
 		<type type-name="OctetString"/>
 	</avp>
-	<avp name="Public-Identity(Obsolete CN#25)" code="2" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Public-Identity-OBSOLETE-CN25" code="2" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="UTF8String"/>
 	</avp>
-	<avp name="Server-Name(Obsolete CN#25)" code="3" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Server-Name-OBSOLETE-CN25" code="3" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="UTF8String"/>
 	</avp>
-	<avp name="Server-Capabilities(Obsolete CN#25)" code="4" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Server-Capabilities-OBSOLETE-CN25" code="4" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<grouped>
 			<gavp name="Mandatory-Capability"/>
 			<gavp name="Optional-Capability"/>
 			<gavp name="Server-Name"/>
 		</grouped>
 	</avp>
-	<avp name="Mandatory-Capability(Obsolete CN#25)" code="5" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
+	<avp name="Mandatory-Capability-OBSOLETE-CN25" code="5" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
 		<type type-name="Unsigned32"/>
 	</avp>
-	<avp name="Optional-Capability(Obsolete CN#25)" code="6" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Optional-Capability-OBSOLETE-CN25" code="6" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="Unsigned32"/>
 	</avp>
-	<avp name="User-Data(Obsolete CN#25)" code="7" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="User-Data-OBSOLETE-CN25" code="7" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="OctetString"/>
 	</avp>
-	<avp name="SIP-Number-Auth-Items(Obsolete CN#25)" code="8" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
+	<avp name="SIP-Number-Auth-Items-OBSOLETE-CN25" code="8" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
 		<type type-name="Unsigned32"/>
 	</avp>
-	<avp name="SIP-Authentication-Scheme(Obsolete CN#25)" code="9" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="SIP-Authentication-Scheme-OBSOLETE-CN25" code="9" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="UTF8String"/>
 	</avp>
-	<avp name="SIP-Authenticate(Obsolete CN#25)" code="10" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="SIP-Authenticate-OBSOLETE-CN25" code="10" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="OctetString"/>
 	</avp>
-	<avp name="SIP-Authorization(Obsolete CN#25)" code="11" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="SIP-Authorization-OBSOLETE-CN25" code="11" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="OctetString"/>
 	</avp>
-	<avp name="SIP-Authentication-Context(Obsolete CN#25)" code="12" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="SIP-Authentication-Context-OBSOLETE-CN25" code="12" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="OctetString"/>
 	</avp>
-	<avp name="SIP-Auth-Data-Item(Obsolete CN#25)" code="13" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="SIP-Auth-Data-Item-OBSOLETE-CN25" code="13" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<grouped>
-			<gavp name="SIP-Item-Number(Obsolete CN#25)"/>
-			<gavp name="SIP-Authentication-Scheme(Obsolete CN#25)"/>
-			<gavp name="SIP-Authenticate(Obsolete CN#25)"/>
-			<gavp name="SIP-Authorization(Obsolete CN#25)"/>
-			<gavp name="SIP-Authentication-Context(Obsolete CN#25)"/>
-			<gavp name="Confidentiality-Key(Obsolete CN#25)"/>
-			<gavp name="Integrity-Key(Obsolete CN#25)"/>
+			<gavp name="SIP-Item-Number-OBSOLETE-CN25"/>
+			<gavp name="SIP-Authentication-Scheme-OBSOLETE-CN25"/>
+			<gavp name="SIP-Authenticate-OBSOLETE-CN25"/>
+			<gavp name="SIP-Authorization-OBSOLETE-CN25"/>
+			<gavp name="SIP-Authentication-Context-OBSOLETE-CN25"/>
+			<gavp name="Confidentiality-Key-OBSOLETE-CN25"/>
+			<gavp name="Integrity-Key-OBSOLETE-CN25"/>
 		</grouped>
 	</avp>
-	<avp name="SIP-Item-Number(Obsolete CN#25)" code="14" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="SIP-Item-Number-OBSOLETE-CN25" code="14" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="Unsigned32"/>
 	</avp>
-	<avp name="Server-Assignment-Type(Obsolete CN#25)" code="15" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Server-Assignment-Type-OBSOLETE-CN25" code="15" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="Enumerated"/>
 		<enum name="No-Assignment" code="0"/>
 		<enum name="Registration" code="1"/>
@@ -269,23 +269,23 @@
 		<enum name="Authentication-Timeout" code="10"/>
 		<enum name="Deregistration-Too-Much-Data" code="11"/>
 	</avp>
-	<avp name="Deregistration-Reason(Obsolete CN#25)" code="16" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Deregistration-Reason-OBSOLETE-CN25" code="16" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<grouped>
 			<gavp name="Reason-Code"/>
 			<gavp name="Reason-Info"/>
 		</grouped>
 	</avp>
-	<avp name="Reason-Code(Obsolete CN#25)" code="17" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Reason-Code-OBSOLETE-CN25" code="17" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="Enumerated"/>
 		<enum name="Permanent-Termination" code="0"/>
 		<enum name="New-Server-Assigned" code="1"/>
 		<enum name="Server-Change" code="2"/>
 		<enum name="Remove-S-CSCF" code="3"/>
 	</avp>
-	<avp name="Reason-Info(Obsolete CN#25)" code="18" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Reason-Info-OBSOLETE-CN25" code="18" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="UTF8String"/>
 	</avp>
-	<avp name="Charging-Information(Obsolete CN#25)" code="19" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Charging-Information-OBSOLETE-CN25" code="19" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<grouped>
 			<gavp name="Primary-Event-Charging-Function-Name"/>
 			<gavp name="Secondary-Event-Charging-Function-Name"/>
@@ -293,39 +293,39 @@
 			<gavp name="Secondary-Charging-Collection-Function-Name"/>
 		</grouped>
 	</avp>
-	<avp name="Primary-Event-Charging-Function-Name(Obsolete CN#25)" code="20" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Primary-Event-Charging-Function-Name-OBSOLETE-CN25" code="20" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="DiameterURI"/>
 	</avp>
-	<avp name="Secondary-Event-Charging-Function-Name(Obsolete CN#25)" code="21" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Secondary-Event-Charging-Function-Name-OBSOLETE-CN25" code="21" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="DiameterURI"/>
 	</avp>
-	<avp name="Primary-Charging-Collection-Function-Name(Obsolete CN#25)" code="22" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Primary-Charging-Collection-Function-Name-OBSOLETE-CN25" code="22" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="DiameterURI"/>
 	</avp>
-	<avp name="Secondary-Charging-Collection-Function-Name(Obsolete CN#25)" code="23" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Secondary-Charging-Collection-Function-Name-OBSOLETE-CN25" code="23" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="DiameterURI"/>
 	</avp>
-	<avp name="User-Authorization-Type(Obsolete CN#25)" code="24" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="User-Authorization-Type-OBSOLETE-CN25" code="24" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="Enumerated"/>
 		<enum name="Registration" code="0"/>
 		<enum name="De-Registration" code="1"/>
 		<enum name="Registration-And-Capabilities" code="2"/>
 	</avp>
-	<avp name="User-Data-Request-Type(Obsolete CN#25)" code="25" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="User-Data-Request-Type-OBSOLETE-CN25" code="25" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="Enumerated"/>
 		<enum name="Complete-Profile" code="0"/>
 		<enum name="Registered-Profile" code="1"/>
 		<enum name="Unregistered-Profile" code="2"/>
 	</avp>
-	<avp name="User-Data-Already-Available(Obsolete CN#25)" code="26" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="User-Data-Already-Available-OBSOLETE-CN25" code="26" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="Enumerated"/>
 		<enum name="User-Data-Not-Available" code="0"/>
 		<enum name="User-Data-Already-Available" code="1"/>
 	</avp>
-	<avp name="Confidentiality-Key(Obsolete CN#25)" code="27" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Confidentiality-Key-OBSOLETE-CN25" code="27" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="OctetString"/>
 	</avp>
-	<avp name="Integrity-Key(Obsolete CN#25)" code="28" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Integrity-Key-OBSOLETE-CN25" code="28" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="OctetString"/>
 	</avp>
 -->
@@ -511,7 +511,7 @@
 
 <!-- The AVP codes from 500 to 599 are reserved for TS 29.209, 29.211, and 29.229. -->
 <application id="16777236" name="3GPP Rx" uri="http://www.3gpp.org/DynaReport/29214.htm">
-	<avp name="Codec-Data AVP" code="524" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Codec-Data" code="524" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="UTF8String" />
 	</avp>
 
@@ -656,7 +656,7 @@
 			<gavp name="Line-Identifier"/>
 			<gavp name="Authentication-Method"/>
 			<gavp name="Authentication-Information-SIM"/>
-			<gavp name="Authorization -Information-SIM"/>
+			<gavp name="Authorization-Information-SIM"/>
 		</grouped>
 	</avp>
 	<avp name="3GPP-SIP-Item-Number" code="613" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
@@ -732,7 +732,7 @@
 	<avp name="Integrity-Key" code="626" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="OctetString"/>
 	</avp>
-	<avp name="User-Data-Request-Type(Obsolete)" code="627" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="User-Data-Request-Type-OBSOLETE" code="627" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="Enumerated"/>
 		<enum name="Complete-Profile" code="0"/>
 		<enum name="Registered-Profile" code="1"/>
@@ -770,7 +770,7 @@
 	<avp name="Wildcarded-PSI" code="634" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
 		<type type-name="UTF8String"/>
 	</avp>
-	<avp name="SIP-Digest-Authenticate AVP" code="635" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
+	<avp name="SIP-Digest-Authenticate" code="635" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
 		<grouped>
 			<gavp name="Digest-Realm"/>
 			<gavp name="Digest-Algorithm"/>