Consolidate several 3GPP Diameter xml files into one.

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

1 files changed, 0 insertions, 174 deletions

diff --git a/diameter/gqpolicy.xml b/diameter/gqpolicy.xml
deleted file mode 100644
index 7febfdbaac..0000000000
--- a/diameter/gqpolicy.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application id="16777222" name="3GPP Gq" uri="http://www.3GPP.org/ftp/Specs/html-info/29209.htm">
-
-    <!-- ETSI TS 129 209 V6.7.0 (2007-06) -->
-
-    <avp name="Abort-Cause" code="500" mandatory="must" vendor-bit="must" may-encrypt="yes" vendor-id="TGPP">
-        <type type-name="Enumerated"/>
-        <enum name="BEARER_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" may-encrypt="no" vendor-id="TGPP">
-        <type type-name="IPAddress"/>
-    </avp>
-
-    <avp name="Access-Network-Charging-Identifier" code="502" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-        <grouped>
-            <gavp name="Access-Network-Charging-Identifier-Value"/>
-            <gavp name="Flows"/>
-        </grouped>
-    </avp>
-
-    <avp name="Access-Network-Charging-Identifier-Value" code="503" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-        <type type-name="OctetString"/>
-    </avp>
-
-    <avp name="AF-Application-Identifier" code="504" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-        <type type-name="OctetString"/>
-    </avp>
-
-    <avp name="AF-Charging-Identifier" code="505" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-        <type type-name="OctetString"/>
-    </avp>
-
-    <avp name="Authorization-Token" code="506" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-        <type type-name="OctetString"/>
-    </avp>
-
-    <avp name="Flow-Description" code="507" vendor-id="TGPP" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must">
-        <type type-name="IPFilterRule"/>
-    </avp>
-
-    <avp name="Flow-Grouping" code="508" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-        <grouped>
-            <gavp name="Flows"/>
-        </grouped>
-    </avp>
-
-    <avp name="Flow-Number" code="509" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-        <type type-name="Unsigned32"/>
-    </avp>
-
-    <avp name="Flows" code="510" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-        <grouped>
-            <gavp name="Media-Component-Number"/>
-            <gavp name="Flow-Number"/>
-            <gavp name="Final-Unit-Action"/>
-        </grouped>
-    </avp>
-
-    <avp name="Flow-Status" code="511" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-        <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" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
-        <type type-name="Enumerated"/>
-            <enum name="NO_INFORMATION" code="0"/>
-            <enum name="RTCP" code="1"/>
-            <enum name="AF_SIGNALLING" code="2"/>
-    </avp>
-
-    <avp name="Specific-Action" code="513" mandatory="must" protected="may" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
-        <type type-name="Enumerated"/>
-      <!--ETSI TS 129 209 V6.7.0 (2007-06)-->
-            <enum name="SERVICE_INFORMATION_REQUEST (now void)" code="0"/>
-            <enum name="CHARGING_CORRELATION_EXCHANGE" code="1"/>
-            <enum name="INDICATION_OF_LOSS_OF_BEARER" code="2"/>
-            <enum name="INDICATION_OF_RECOVERY_OF_BEARER" code="3"/>
-            <enum name="INDICATION_OF_RELEASE_OF_BEARER" code="4"/>
-            <enum name="INDICATION_OF_ESTABLISHMENT_OF_BEARER (now void)" code="5"/>
-      <!-- ETSI ES 283 026 V2.4.1 (2008-11) defines these 2 events:
-        INDICATION_OF_SUBSCRIBER_DETACHMENT - 6
-        INDICATION_OF_RESERVATION_EXPIRATION - 7
-
-        But they are superceded by 3GPP 29.214 and ETSI 129 214 V10 with the
-        values below...
-      -->
-            <enum name="IP-CAN_CHANGE" code="6"/>
-            <enum name="INDICATION_OF_OUT_OF_CREDIT" code="7"/>
-      <!-- From 3GPP 29.214 v11.6.0: -->
-            <enum name="INDICATION_OF_SUCCESSFUL_RESOURCES_ALLOCATION" code="8"/>
-            <enum name="INDICATION_OF_FAILED_RESOURCES_ALLOCATION" code="9"/>
-            <enum name="INDICATION_OF_LIMITED_PCC_DEPLOYMENT" code="10"/>
-            <enum name="USAGE_REPORT" code="11"/>
-            <enum name="ACCESS_NETWORK_INFO_REPORT" code="12"/>
-    </avp>
-
-    <avp name="Max-Requested-Bandwidth-DL" code="515" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-        <type type-name="Unsigned32"/>
-    </avp>
-
-    <avp name="Max-Requested-Bandwidth-UL" code="516" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-        <type type-name="Unsigned32"/>
-    </avp>
-
-    <avp name="Media-Component-Description" code="517" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-        <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"/>
-        <!-- ETSI ES 283 026 V1.6.0 (2008-02) -->
-            <gavp name="Reservation-Priority"/>
-            <gavp name="Reservation-Class"/>
-            <gavp name="Transport-Class"/>
-            <gavp name="Media-Authorization-Context-Id"/>
-        </grouped>
-    </avp>
-
-    <avp name="Media-Component-Number" code="518" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-        <type type-name="Unsigned32"/>
-    </avp>
-
-    <avp name="Media-Sub-Component" code="519" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-        <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" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-        <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="4294967295"/>
-    </avp>
-
-    <avp name="RR-Bandwidth" code="521" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-        <type type-name="Unsigned32"/>
-    </avp>
-
-    <avp name="RS-Bandwidth" code="522" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-        <type type-name="Unsigned32"/>
-    </avp>
-
-    <avp name="SIP-Forking-Indication" code="523" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-        <type type-name="Enumerated"/>
-            <enum name="SINGLE_DIALOGUE" code="0"/>
-            <enum name="SEVERAL_DIALOGUES" code="1"/>
-    </avp>
-
-</application>