From 7f6fe7a1fd9db03a48b044e2966561336fa39298 Mon Sep 17 00:00:00 2001
From: Jeff Morriss <jeff.morriss.ws@gmail.com>
Date: Tue, 28 Apr 2015 20:29:28 -0400
Subject: Reorganize some of the Diameter XML files, taking advantage of the
 fact that AVPs can be grouped by Vendor now (not just by Application).

Move a bunch of vendor-specific Application IDs to the vendor's XML file.

Delete the (basically empty) SKT.xml, ChinaTelecom.xml, and VerizonWireless.xml
files.

Fix a typo: 16777224 is 3GPP Gx, not 3GPP Cx.

Use (derived) type Enumerated (rather than Unsigned32 or Integer32) when the
AVP is of type Enumerated.

Change-Id: I7a9702c0c48dc3fe751ad74413d8ecc040984f1f
Reviewed-on: https://code.wireshark.org/review/8235
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
---
 diameter/chargecontrol.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'diameter/chargecontrol.xml')

diff --git a/diameter/chargecontrol.xml b/diameter/chargecontrol.xml
index 9404cebdf7..05261a9b04 100644
--- a/diameter/chargecontrol.xml
+++ b/diameter/chargecontrol.xml
@@ -27,7 +27,7 @@
 		<type type-name="Unsigned32"/>
 	</avp>
 	<avp name="CC-Request-Type" code="416" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
-		<type type-name="Unsigned32"/>
+		<type type-name="Enumerated"/>
 		<enum name="INITIAL_REQUEST"     code="1"/>
 		<enum name="UPDATE_REQUEST"      code="2"/>
 		<enum name="TERMINATION_REQUEST" code="3"/>
@@ -126,7 +126,7 @@
 		<type type-name="UTF8String"/>
 	</avp>
 	<avp name="Requested-Action" code="436" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
-		<type type-name="Unsigned32"/>
+		<type type-name="Enumerated"/>
 		<enum name="DIRECT_DEBITING"  code="0"/>
 		<enum name="REFUND_ACCOUNT"   code="1"/>
 		<enum name="CHECK_BALANCE"    code="2"/>
@@ -200,7 +200,7 @@
 		<enum name="RESTRICT_ACCESS" code="2"/>
 	</avp>
 	<avp name="Subscription-Id-Type" code="450" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
-		<type type-name="Unsigned32"/>
+		<type type-name="Enumerated"/>
 		<enum name="END_USER_E164"    code="0"/>
 		<enum name="END_USER_IMSI"    code="1"/>
 		<enum name="END_USER_SIP_URI" code="2"/>
-- 
cgit v1.2.1