Fill up enums, whitespace changes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34836 f5534014-38df-0310-8fa8-9805f1628bb7
This commit is contained in:
etxrab 2010-11-10 20:48:10 +00:00
parent a66b1ae833
commit fe3de1412b
2 changed files with 139 additions and 128 deletions

View File

@ -14,8 +14,8 @@
<!-- ************************** 3GPP Sh AVPS ********************* -->
<avp name="User-Identity" code="700" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
<grouped>
<gavp name="Public-Identity"/>
<gavp name="MSISDN"/>
<gavp name="Public-Identity"/>
<gavp name="MSISDN"/>
</grouped>
</avp>
<avp name="MSISDN" code="701" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
@ -27,6 +27,15 @@
<avp name="Data-Reference" code="703" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
<type type-name="Unsigned32"/>
<enum name="RepositoryData" code="0"/>
<enum name="Undefined" code="1"/>
<enum name="Undefined" code="2"/>
<enum name="Undefined" code="3"/>
<enum name="Undefined" code="4"/>
<enum name="Undefined" code="5"/>
<enum name="Undefined" code="6"/>
<enum name="Undefined" code="7"/>
<enum name="Undefined" code="8"/>
<enum name="Undefined" code="9"/>
<enum name="IMSPublicIdentity" code="10"/>
<enum name="IMSUserState" code="11"/>
<enum name="S-CSCFName" code="12"/>
@ -37,6 +46,7 @@
<enum name="MSISDN" code="17"/>
<enum name="PSIActivation" code="18"/>
<enum name="DSAI" code="19"/>
<enum name="Reserved" code="20"/>
<enum name="ServiceLevelTraceInfo" code="21"/>
<enum name="IPAddressSecureBindingInformation" code="22"/>
<enum name="ServicePriorityLevel" code="23"/>
@ -67,7 +77,8 @@
<enum name="ALL_IDENTITIES" code="0"/>
<enum name="REGISTERED_IDENTITIES" code="1"/>
<enum name="IMPLICIT_IDENTITIES" code="2"/>
</avp>
<enum name="ALIAS_IDENTITIES" code="3"/>
</avp>
<avp name="Expiry-Time" code="709" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
<type type-name="Time"/>
</avp>
@ -85,7 +96,7 @@
<type type-name="Unsigned32"/>
</avp>
<!-- Note: The AVP codes from 714 to799 are reserved for TS 29.329. -->
<!-- Note: The AVP codes from 715 to799 are reserved for TS 29.329. -->
<!-- ************************ END 3GPP Sh AVPS ******************* -->
</application>

View File

@ -17,150 +17,150 @@
<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" 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="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-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="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="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-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-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="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="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-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="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" 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" code="5"/>
<!-- ETSI ES 283 026 V2.4.1 (2008-11) In addition, the present document defines two new events:-->
<enum name="INDICATION_OF_SUBSCRIBER_DETACHMENT" code="6"/>
<enum name="INDICATION_OF_RESERVATION_EXPIRATION" code="7"/>
</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" 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" code="5"/>
<!-- ETSI ES 283 026 V2.4.1 (2008-11) In addition, the present document defines two new events:-->
<enum name="INDICATION_OF_SUBSCRIBER_DETACHMENT" code="6"/>
<enum name="INDICATION_OF_RESERVATION_EXPIRATION" code="7"/>
</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-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="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-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-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-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="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="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>
<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>
<!-- ************************ END Gq AVPS ******************* -->