Remove AVPs that aren't really 3GPP2 (they are 3GPP).

(The 3GPP2 Ty trace in the menagerie wrongly marks several of these AVPs
as being 3GPP2.)

Change-Id: I27963fbf8e1da51e430c609784e0c8bb4575549d
Reviewed-on: https://code.wireshark.org/review/3912
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>

1 files changed, 1 insertions, 231 deletions

diff --git a/diameter/TGPP2.xml b/diameter/TGPP2.xml
index ce6d31c703..49583b600d 100644
--- a/diameter/TGPP2.xml
+++ b/diameter/TGPP2.xml
@@ -4,117 +4,6 @@
 	<!--- TGPP2 AVPs X.S0013-013-0 (Tx):
 		http://www.3gpp2.org/Public_html/specs/X.S0013-013-0_v1.0_080224.pdf
 	-->
-	<avp name="Abort-Cause" code="500" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="Enumerated"/>
-		<enum name="FLOW_RELEASED" code="0"/>
-		<enum name="INSUFFICIENT_SERVER_RESOURCES" code="1"/>
-		<enum name="INSUFFICIENT_BEARER_RESOURCES" code="2"/>
-	</avp>
-	<avp name="Access-Network-Charging-Address" code="501" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="IPAddress"/>
-	</avp>
-	<avp name="Access-Network-Charging-Identifier" code="502" vendor-bit="must" vendor-id="TGPP2">
-		<grouped>
-			<gavp name="Access-Network-Charging-Identifier-Value"/>
-			<gavp name="Flows"/>
-		</grouped>
-	</avp>
-	<avp name="Access-Network-Charging-Identifier-Value" code="503" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="OctetString"/>
-	</avp>
-	<avp name="AF-Application-Identifier" code="504" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="OctetString"/>
-	</avp>
-	<avp name="AF-Charging-Identifier" code="505" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="OctetString"/>
-	</avp>
-	<avp name="Flow-Description" code="507" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="IPFilterRule"/>
-	</avp>
-	<avp name="Flow-Number" code="509" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="Unsigned32"/>
-	</avp>
-	<avp name="Flow-Status" code="511" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="Enumerated"/>
-		<enum name="ENABLED-UPLINK" code="0"/>
-		<enum name="ENABLED-DOWNLINK" code="1"/>
-		<enum name="ENABLED" code="2"/>
-		<enum name="DISABLED" code="3"/>
-		<enum name="REMOVED" code="4"/>
-	</avp>
-	<avp name="Flow-Usage" code="512" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="Enumerated"/>
-		<enum name="NO_INFORMATION" code="0"/>
-		<enum name="RTCP" code="1"/>
-		<enum name="AF_SIGNALING" code="2"/>
-	</avp>
-	<avp name="Specific-Action" code="513" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="Enumerated"/>
-		<enum name="SERVICE_INFORMATION_REQUEST" code="0"/>
-		<enum name="CHARGING_CORRELATION_EXCHANGE" code="1"/>
-		<enum name="INDICATION_OF_LOSS_OF_FLOW" code="2"/>
-		<enum name="INDICATION_OF_RECOVERY_OF_FLOW" code="3"/>
-		<enum name="INDICATION_OF_RELEASE_OF_FLOW" code="4"/>
-		<enum name="INDICATION_OF_ESTABLISHMENT_OF_FLOW" code="5"/>
-	</avp>
-	<avp name="Max-Requested-Bandwidth-DL" code="515" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="Unsigned32"/>
-	</avp>
-	<avp name="Max-Requested-Bandwidth-UL" code="516" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="Unsigned32"/>
-	</avp>
-	<avp name="Media-Component-Description" code="517" vendor-bit="must" vendor-id="TGPP2">
-		<grouped>
-			<gavp name="Media-Component-Number"/>
-			<gavp name="Media-Sub-Component"/>
-			<gavp name="AF-Application-Identifier"/>
-			<gavp name="Media-Type"/>
-			<gavp name="Max-Requested-Bandwidth-UL"/>
-			<gavp name="Max-Requested-Bandwidth-DL"/>
-			<gavp name="Flow-Status"/>
-			<gavp name="RS-Bandwidth"/>
-			<gavp name="RR-Bandwidth"/>
-			<gavp name="Codec-Data"/>
-		</grouped>
-	</avp>
-	<avp name="Media-Component-Number" code="518" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="Unsigned32"/>
-	</avp>
-	<avp name="Media-Sub-Component" code="519" vendor-bit="must" vendor-id="TGPP2">
-		<grouped>
-			<gavp name="Flow-Number"/>
-			<gavp name="Flow-Description"/>
-			<gavp name="Flow-Status"/>
-			<gavp name="Flow-Usage"/>
-			<gavp name="Max-Requested-Bandwidth-UL"/>
-			<gavp name="Max-Requested-Bandwidth-DL"/>
-		</grouped>
-	</avp>
-	<avp name="Media-Type" code="520" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="Enumerated"/>
-		<enum name="AUDIO" code="0"/>
-		<enum name="VIDEO" code="1"/>
-		<enum name="DATA" code="2"/>
-		<enum name="APPLICATION" code="3"/>
-		<enum name="CONTROL" code="4"/>
-		<enum name="TEXT" code="5"/>
-		<enum name="MESSAGE" code="6"/>
-		<enum name="OTHER" code="0xFFFFFFFF"/>
-	</avp>
-	<avp name="RR-Bandwidth" code="521" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="Unsigned32"/>
-	</avp>
-	<avp name="RS-Bandwidth" code="522" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="Unsigned32"/>
-	</avp>
-	<avp name="SIP-Forking-Indication" code="523" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="Enumerated"/>
-		<enum name="SINGLE_DIALOGUE" code="0"/>
-		<enum name="SEVERAL_DIALOGUES" code="1"/>
-	</avp>
-	<avp name="Codec-Data" code="524" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="OctetString"/>
-	</avp>
 	<avp name="Access-Network-Physical-Access-ID-Realm" code="898" vendor-bit="must" vendor-id="TGPP2">
 		<type type-name="OctetString"/>
 	</avp>
@@ -250,126 +139,7 @@
 	<avp name="AGW-MCC-MNC" code="815" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP2">
 		<type type-name="UTF8String"/>
 	</avp>
-	<avp name="Bearer-Usage" code="1000" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="Enumerated"/>
-		<enum name="GENERAL" code="0"/>
-		<enum name="IMS_SIGNALLING" code="1"/>
-	</avp>
-	<avp name="Charging-Rule-Install" code="1001" vendor-bit="must" vendor-id="TGPP2">
-		<grouped>
-			<gavp name="Charging-Rule-Definition"/>
-			<gavp name="Charging-Rule-Name"/>
-			<gavp name="Charging-Rule-Base-Name"/>
-		</grouped>
-	</avp>
-	<avp name="Charging-Rule-Remove" code="1002" vendor-bit="must" vendor-id="TGPP2">
-		<grouped>
-			<gavp name="Charging-Rule-Name"/>
-			<gavp name="Charging-Rule-Base-Name"/>
-		</grouped>
-	</avp>
-	<avp name="Charging-Rule-Definition" code="1003" vendor-bit="must" vendor-id="TGPP2">
-		<grouped>
-			<gavp name="Charging-Rule-Name"/>
-			<gavp name="Service-Identifier"/>
-			<gavp name="Rating-Group"/>
-			<gavp name="Flow-Description"/>
-			<gavp name="Reporting-Level"/>
-			<gavp name="Online"/>
-			<gavp name="Offline"/>
-			<gavp name="Metering-Method"/>
-			<gavp name="Precedence"/>
-			<gavp name="AF-Charging-Identifier"/>
-			<gavp name="Flows"/>
-		</grouped>
-	</avp>
-	<avp name="Charging-Rule-Base-Name" code="1004" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="OctetString"/>
-	</avp>
-	<avp name="Charging-Rule-Name" code="1005" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="OctetString"/>
-	</avp>
-	<avp name="Event-Trigger" code="1006" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="Enumerated"/>
-		<enum name="SGSN_CHANGE" code="0"/>
-		<enum name="QOS_CHANGE" code="1"/>
-		<enum name="RAT_CHANGE" code="2"/>
-		<enum name="TFT_CHANGE" code="3"/>
-	</avp>
-	<avp name="Metering-Method" code="1007" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="Enumerated"/>
-		<enum name="DURATION" code="0"/>
-		<enum name="VOLUME" code="1"/>
-		<enum name="DURATION_VOLUME" code="2"/>
-	</avp>
-	<avp name="Offline" code="1008" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="Enumerated"/>
-		<enum name="DISABLE_OFFLINE" code="0"/>
-		<enum name="ENABLE_OFFLINE" code="1"/>
-	</avp>
-	<avp name="Online" code="1009" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="Enumerated"/>
-		<enum name="DISABLE_ONLINE" code="0"/>
-		<enum name="ENABLE_ONLINE" code="1"/>
-	</avp>
-	<avp name="Precedence" code="1010" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="Unsigned32"/>
-	</avp>
-	<avp name="Primary-CCF-Address" code="1011" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="DiameterURI"/>
-	</avp>
-	<avp name="Primary-OCS-Address" code="1012" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="DiameterURI"/>
-	</avp>
-	<avp name="Reporting-Level" code="1014" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="Enumerated"/>
-		<enum name="CHARGING_RULE_LEVEL" code="0"/>
-		<enum name="RATING_GROUP_LEVEL" code="1"/>
-	</avp>
-	<avp name="Secondary-CCF-Address" code="1015" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="DiameterURI"/>
-	</avp>
-	<avp name="Secondary-OCS-Address" code="1016" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="DiameterURI"/>
-	</avp>
-	<avp name="TFT-Filter" code="1017" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="IPFilterRule"/>
-	</avp>
-	<avp name="TFT-Packet-Filter-Information" code="1018" vendor-bit="must" vendor-id="TGPP2">
-		<grouped>
-			<gavp name="Precedence"/>
-			<gavp name="TFT-Filter"/>
-			<gavp name="ToS-Traffic-Class"/>
-		</grouped>
-	</avp>
-	<avp name="ToS-Traffic-Class" code="1019" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="OctetString"/>
-	</avp>
-	<avp name="Access-Network-Charging-Identifier-Ty" code="1022" vendor-bit="must" vendor-id="TGPP2">
-		<grouped>
-			<gavp name="Access-Network-Charging-Identifier-Value"/>
-			<gavp name="Charging-Rule-Base-Name"/>
-			<gavp name="Charging-Rule-Name"/>
-		</grouped>
-	</avp>
-	<avp name="Guaranteed-Bitrate-DL" code="1025" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="Unsigned32"/>
-	</avp>
-	<avp name="Guaranteed-Bitrate-UL" code="1026" vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="Unsigned32"/>
-	</avp>
-	<avp name="QoS-Class-Identifier AVP" code="1028 vendor-bit="must" vendor-id="TGPP2">
-		<type type-name="Enumerated"/>
-		<enum name="Conversational1" code="0"/>
-		<enum name="Conversational2" code="1"/>
-		<enum name="Streaming1" code="2"/>
-		<enum name="Streaming2" code="3"/>
-		<enum name="Interactive1" code="4"/>
-		<enum name="Interactive2" code="5"/>
-		<enum name="Interactive3" code="6"/>
-		<enum name="Interactive4" code="7"/>
-		<enum name="Background" code="8"/>
-	</avp>
+
 	<avp name="3GPP2-BSID" code="9010" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP2">
 		<type type-name="UTF8String"/>
 	</avp>