Restore edits lost in previous checkin.
[obnox/wireshark/wip.git] / diameter / dictionary.xml
index af5ffef8c72f33d549f2fae8641d9791cd1bc429..a4ed0795356ddabeba07d693cce1bd5e61bb93e8 100644 (file)
        <!ENTITY chargecontrol SYSTEM "chargecontrol.xml">
        <!ENTITY sunping SYSTEM "sunping.xml">
        <!ENTITY imscxdx SYSTEM "imscxdx.xml">
+       <!ENTITY TGPPGmb SYSTEM "TGPPGmb.xml">
        <!ENTITY TGPPSh SYSTEM "TGPPSh.xml">
        <!ENTITY sip SYSTEM "sip.xml">
        <!ENTITY gqpolicy SYSTEM "gqpolicy.xml">
        <!ENTITY etsie2e4 SYSTEM "etsie2e4.xml">
+       <!ENTITY Ericsson SYSTEM "Ericsson.xml">
 ]>
 <dictionary>
        <base uri="http://www.ietf.org/rfc/rfc3588.txt">
@@ -24,6 +26,9 @@
   dictionary as an XML file rather than building it in, and various
   Diameter updates.
 
+  Revision 1.8  2008/01/06 02:49:24  grzegorz  Added missing RFC 3588   
+  AVP 299 by Grzegorz Szczytowski 
+
   Revision 1.7  2001/08/24 18:03:24  chaos
   Mark's Changes
 
 -->
                <!-- *********************** Commands ***************************** -->
                <!-- Diameter Base Protocol Command Codes -->
+               <command name="Capabilities-Exchange" code="257" vendor-id="None"/>
+               <command name="Re-Auth" code="258" vendor-id="None"/>
+               <command name="Accounting" code="271" vendor-id="None"/>
                <command name="Abort-Session" code="274" vendor-id="None">
-                       <!-- Maybe some avp stuff here one day -->
                </command>
-               <command name="Accounting" code="271" vendor-id="None"/>
-               <command name="Capabilities-Exchange" code="257" vendor-id="None"/>
+               <command name="Session-Termination" code="275" vendor-id="None"/>
                <command name="Device-Watchdog" code="280" vendor-id="None"/>
                <command name="Disconnect-Peer" code="282" vendor-id="None"/>
-               <command name="Re-Auth" code="258" vendor-id="None"/>
-               <command name="Session-Termination" code="275" vendor-id="None"/>
                <!-- ********************** End Commands ************************** -->
                <!-- ************************* Vendors **************************** -->
                <vendor vendor-id="None" code="0" name="None"/>
                <vendor vendor-id="Merit" code="61" name="Merit Networks"/>
                <vendor vendor-id="Sun" code="42" name="Sun Microsystems, Inc."/>
                <vendor vendor-id="USR" code="429" name="US Robotics Corp."/>
+               <vendor vendor-id="3GPP2" code="5535" name="3GPP2"/>
                <vendor vendor-id="TGPP"  code="10415" name="3GPP"/>
                <vendor vendor-id="TGPPCX" code="16777216" name="3GPP CX/DX"/>
                <vendor vendor-id="Ericsson"  code="193" name="Ericsson"/>
                <vendor vendor-id="ETSI"  code="13019" name="ETSI"/>
+               <vendor vendor-id="Vodafone" code="12645" name="Vodafone"/>
                <!-- *********************** End Vendors ************************** -->
                <!-- ************************ typedefn's ************************** -->
                <typedefn type-name="OctetString"/>
                </avp>
                <avp name="Auth-Application-Id" code="258" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
                        <type type-name="AppId"/>
+                       <enum name="Diameter Common Messages" code="0"/>
+                       <enum name="Diameter NASREQ Application" code="1"/>
+                       <enum name="Diameter Mobile IPv4 Application" code="2"/>
+                       <enum name="Diameter Base Accounting" code="3"/>
+                       <enum name="3GPP CX/DX" code="16777216"/>
+                       <enum name="3GPP Sh" code="16777217"/>
+                       <enum name="3GPP Re/Rf" code="16777218"/>
+                       <enum name="3GPP Wx" code="16777219"/>
+                       <enum name="GPP Zn" code="16777220"/>
+                       <enum name="3GPP Zh" code="16777221"/>
+                       <enum name="3GPP Gq" code="16777222"/>
+                       <enum name="3GPP Gmb" code="16777223"/>
+                       <enum name="3GPP Gx" code="16777224"/>
+                       <enum name="3GPP Gx over Gy" code="16777225"/>
+                       <enum name="3GPP MM10" code="16777226"/>
+                       <enum name="Ericsson MSI" code="16777227"/>
+                       <enum name="Ericsson Zx" code="16777228"/>
+                       <enum name="3GPP Rx" code="16777229"/>
+                       <enum name="3GPP Pr" code="16777230"/>
+                       <enum name="ETSI e4" code="16777231"/>
+                       <enum name="Ericsson Charging-CIP" code="16777232"/>
+                       <enum name="Ericsson Mm" code="16777233"/>
+                       <enum name="Vodafone Gx+" code="16777234"/>
+                       <enum name="ITU-T Rs" code="16777235"/>
+                       <enum name="3GPP Rx" code="16777236"/>
+                       <enum name="3GPP2 Ty" code="16777237"/>
+                       <enum name="3GPP Gx" code="16777238"/>
+                       <enum name="Juniper Cluster" code="16777239"/>
+                       <enum name="Juniper Policy-Control-AAA" code="16777240"/>
+                       <enum name="iptego USPI" code="16777241"/>
+                       <enum name="Covergence-specific SIP routing" code="16777242"/>   
+                       <enum name="Policy Processing" code="16777243"/>   
+                       <enum name="Juniper Policy-Control-JSRC" code="16777244"/>   
+                       <enum name="ITU-T S-TC1" code="16777245"/>                                              <!-- ITU-T Rec. Q.3221 --> 
+                       <enum name="Relay" code="4294967295"/>
+
                </avp>          
                <avp name="Acct-Application-Id" code="259" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
                        <type type-name="AppId"/>
                        <enum name="Ericsson Mm" code="16777233"/>
                        <enum name="Vodafone Gx+" code="16777234"/>
                        <enum name="ITU-T Rs" code="16777235"/>
+                       <enum name="3GPP Rx" code="16777236"/>
+                       <enum name="3GPP2 Ty" code="16777237"/>
+                       <enum name="3GPP Gx" code="16777238"/>
+                       <enum name="Juniper Cluster" code="16777239"/>
+                       <enum name="Juniper Policy-Control-AAA" code="16777240"/>
+                       <enum name="iptego USPI" code="16777241"/>
+                       <enum name="Covergence-specific SIP routing" code="16777242"/>   
+                       <enum name="Policy Processing" code="16777243"/>   
+                       <enum name="Juniper Policy-Control-JSRC" code="16777244"/>   
+                       <enum name="ITU-T S-TC1" code="16777245"/>                                              <!-- ITU-T Rec. Q.3221 --> 
+                       <enum name="Relay" code="4294967295"/>
                </avp>
                <avp name="Vendor-Specific-Application-Id" code="260" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
                        <grouped>
                        <enum name="DIAMETER_INVALID_MESSAGE_LENGTH" code="5015"/>
                        <enum name="DIAMETER_INVALID_AVP_BIT_COMBO" code="5016"/>
                        <enum name="DIAMETER_NO_COMMON_SECURITY" code="5017"/>
+                       <enum name="DIAMETER_RADIUS_AVP_UNTRANSLATABLE" code="5018"/>
                        <enum name="DIAMETER_ERROR_NO_FOREIGN_HA_SERVICE" code="5024"/>
                        <enum name="DIAMETER_ERROR_END_TO_END_MIP_KEY_ENCRYPTION" code="5025"/>
                        <enum name="DIAMETER_USER_UNKNOWN" code="5030"/>
                </avp>
                <avp name="Proxy-Info" code="284" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
                        <grouped>
-                               <gavp name="Proxy-Host">
-                               <gavp name="Proxy-State">
+                               <gavp name="Proxy-Host"/>
+                               <gavp name="Proxy-State"/>
                        </grouped>
                </avp>
                <avp name="Re-Auth-Request-Type" code="285" mandatory="must" may-encrypt="no" vendor-bit="mustnot">
                <avp name="Accounting-Sub-Session-Id" code="287" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
                        <type type-name="Unsigned64"/>
                </avp>
-<!-- 286 & 288-290    Unallocated http://www.iana.org/assignments/aaa-parameters (last updated 20 September 2005)?? -->
+<!-- 288-290    Unallocated http://www.iana.org/assignments/aaa-parameters (last updated 20 September 2005)?? -->
                <avp name="Authorization-Lifetime" code="291" mandatory="must" may-encrypt="no" vendor-bit="mustnot">
                        <type type-name="Integer32"/>
                </avp>
                        <enum name="SDIAMETER_SERVER_SELECTION" code="2005"/>
                        <enum name="DIAMETER_USER_DATA_NOT_AVAILABLE" code="4100"/>
                        <enum name="DIAMETER_PRIOR_UPDATE_IN_PROGRESS" code="4101"/>
+                       <enum name="DIAMETER_ERROR_OUT_OF_RESOURCES" code="4121"/>
                        <enum name="DIAMETER_ERROR_USER_UNKNOWN" code="5001"/>
                        <enum name="DIAMETER_ERROR_IDENTITIES_DONT_MATCH" code="5002"/>
                        <enum name="DIAMETER_ERROR_IDENTITY_NOT_REGISTERED" code="5003"/>
                        <enum name="DIAMETER_ERROR_INITIAL_PARAMETERS" code="5140"/>
                        <enum name="DIAMETER_ERROR_TRIGGER_EVENT" code="5141"/>
                </avp>
+               <!-- RFC3588 AVP -->   
+               <avp name="Inband-Security-Id" code="299" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot">   
+                       <type type-name="Unsigned32"/>   
+                               <enum name="NO_INBAND_SECURITY" code="0"/>   
+                               <enum name="TLS" code="1"/>   
+               </avp> 
+
                <avp name="E2E-Sequence" code="300" mandatory="must">
                        <grouped>
                                <gavp name="foo"/>
                        </grouped>
                </avp>
                <!-- 301-317    Unallocated -->
-<!-- AVP:s 317 - 348 Belongs to Diameter Mobile IPv4 Application and is defined in mobileipv4.xml --> 
+<!-- AVP:s 318 - 348 Belongs to Diameter Mobile IPv4 Application and is defined in mobileipv4.xml --> 
+<!-- AVP:s 349-362        Unassigned -->
 <!-- AVP:s 363 - 408 Belongs to Diameter Network Access Server Application and is defined in nasreq.xml -->
 <!-- AVP:s 411 - 461 Belongs to Carge Control and is defined in chargecontrol.xml --> 
 <!-- 466-479    Unallocated -->
                        </grouped>
                </avp>
                <!-- ************************ END DIAMETER BASE PROTOCOL AVPS ******************* -->
-               <!-- Definition from SH specs -->
-               <avp name="MSISDN" code="701" mandatory="must" vendor-bit="mustnot" may-encrypt="yes" vendor-id="TGPP">
+<!--
+3GPP TS 29.230 version 7.7.0 Release 7  Table 7.1: 3GPP specific AVP codes
+Note: The AVP codes from 1 to 255 are reserved for backwards compatibility with 3GPP RADIUS Vendor
+Specific Attributes (See TS 29.061 [13])
+Note: The AVP codes from 256 to 299 are reserved for future use.
+300 Authentication-Method Enumerated
+301 Authentication-Information-SIM OctetString
+302 Authorization -Information-SIM OctetString
+303 WLAN-User-Data Grouped
+304 Charging-Data Grouped
+305 WLAN-Access Enumerated
+306 WLAN- 3GPP-IP-Access Enumerated
+307 APN-Authorized Grouped
+308 APN-Id
+309 APN-Barring-Type Enumerated
+310 WLAN-Direct-IP-Access Enumerated
+311 Session-Request-Type Enumerated
+312 Routing-Policy IPFilterRule
+313 Max-Requested-Bandwidth OctetString
+314 Charging-Characteristics Integer
+315 Charging-Nodes Grouped
+316 Primary-OCS-Charging-Function-Name DiameterIdentity
+317 Secondary-OCS-Charging-Function-Name DiameterIdentity
+318 3GPP-AAA-Server-Name DiameterIdentity
+29.234 [6]
+319 Maximum-Number-Accesses Unsigned32
+Note: The AVP codes from 320 to 399 are reserved for TS 29.234
+-->
+               <avp name="GBA-UserSecSettings" code="400" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+
+               <avp name="Transaction-Identifier" code="401" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="NAF-Hostname" code="402" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="GAA-Service-Identifier" code="403" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Key-ExpiryTime" code="404" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Time"/>
+               </avp>
+               <avp name="ME-Key-Material" code="405" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="UICC-Key-Material" code="406" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <type type-name="OctetString"/>
                </avp>
+               <avp name="GBA_U-Awareness-Indicator" code="407" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="NO" code="0"/>
+                       <enum name="YES" code="1"/>
+               </avp>
+               <avp name="BootstrapInfoCreationTime" code="408" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Time"/>
+               </avp>
+               <avp name="GUSS-Timestamp" code="409" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Time"/>
+               </avp>
+               <avp name="GBA-Type" code="410" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="3G GBA" code="0"/>
+                       <enum name="2G GBA" code="1"/>
+               </avp>
+<!--
+29.109 [7]
+Note: TThe AVP codes from 410 to 499 are reserved for TS 29.109
+-->
+<!-- Ref 3GPP TS 29.209 version 6.7.0 Release 6 
+ NOTE AVP 500 - 523 is in gqpolicy.xml
+Note: The AVP codes from 524 to 599 are reserved for TS 29.209 and TS 29.211
+-->
+<!--
+600 Visited-Network-Identifier OctetString
+601 Public-Identity UTF8String
+602 Server-Name UTF8String
+603 Server-Capabilities Grouped
+604 Mandatory-Capability Unsigned32
+605 Optional-Capability Unsigned32
+606 User-Data OctetString
+607 SIP-Number-Auth-Items Unsigned32
+608 SIP-Authentication-Scheme UTF8String
+609 SIP-Authenticate OctetString
+610 SIP-Authorization OctetString
+611 SIP-Authentication-Context OctetString
+29.229 [2]
+612 SIP-Auth-Data-Item Grouped 29.229 [2], 29.234 [6]
+613 SIP-Item-Number Unsigned32
+614 Server-Assignment-Type Enumerated
+615 Deregistration-Reason Grouped
+616 Reason-Code Enumerated
+617 Reason-Info UTF8String
+618 Charging-Information Grouped
+619 Primary-Event-Charging-Function-Name DiameterURI
+620 Secondary-Event-Charging-Function-Name DiameterURI
+621 Primary-Charging-Collection-Function-Name DiameterURI
+622 Secondary-Charging-Collection-Function-Name DiameterURI
+623 User-Authorization-Type Enumerated
+624 User-Data-Already-Available Enumerated
+625 Confidentiality-Key OctetString
+626 Integrity-Key OctetString
+627 User-Data-Request-Type Enumerated
+628 Supported-Features Grouped
+629 Feature-List-ID Unsigned32
+630 Feature-List Unsigned32
+631 Supported-Applications Grouped
+632 Associated-Identities Grouped
+633 Originating-Request Enumerated
+634 Wildcarded-PSI UTF8String
+29.229 [2]
+Note: The AVP codes from 634 to 699 are reserved for TS 29.229.
+
+ ************************** 3GPP Sh AVPS        **************************
+ ************************** NOTE see TGPPSh.xml **************************
+ ************************** 3GPP TS 29.329      **************************
+ **************************      700 - 711         **************************
+Note: The AVP codes from 800 to 822 are reserved for TS 32.299.
+-->
                <!-- 3GPP Diameter charging applications (3GPP TS 32.299 version 7.0.0 Release 7)-->
                <!-- Note: The AVP codes from 800 to 822 are reserved for TS 32.299. -->
                <avp name="Event-Type" code="823" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot" vendor-id="TGPP" >
                <avp name="Quota-Consumption-Time" code="881" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Media-Initiator-Flag" code="882" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="Media-Initiator-Flag" code="882" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
                        <enum name="called party" code="0"/>
                        <enum name="calling party" code="1"/>
                        <enum name="unknown" code="2"/>
                </avp>
 
-               <avp name="PoC-Server-Role" code="883" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="PoC-Server-Role" code="883" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
                        <enum name="Participating PoC Server" code="0"/>
                        <enum name="Controlling PoC Server" code="1"/>
                </avp>
 
-               <avp name="PoC-Server-Role" code="884" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="PoC-Server-Role" code="884" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
                        <enum name="1 to 1 PoC session" code="0"/>
                        <enum name="chat PoC group session" code="1"/>
                        <type type-name="Unsigned32"/>
                </avp>
 
-               <avp name="Message-Body" code="889" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="Message-Body" code="889" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="Content-Type"/>
                                <gavp name="Content-Length"/>
                                <gavp name="Originator"/>
                        </grouped>
                </avp>
-<avp name="WAG-Address" code="890"><type type-name="Address"/></avp>
-<avp name="WAG-PLMN-Id" code="891"><type type-name="OctetString"/></avp>
-<avp name="WLAN-Radio-Container" code="892"><type type-name="Grouped"/></avp>
-<avp name="WLAN-Technology" code="893"><type type-name="Unsigned32"/></avp>
-<avp name="WLAN-UE-Local-IPAddress" code="894"><type type-name="Address"/></avp>
-<avp name="PDG-Address" code="895"><type type-name="Address"/></avp>
-<avp name="PDG-Charging-Id" code="896"><type type-name="Unsigned32"/></avp>
-<avp name="Address-Data" code="897"><type type-name="UTF8String"/></avp>
-<avp name="Address-Domain" code="898"><type type-name="Grouped"/></avp>
-<avp name="Address-Type" code="899"><type type-name="Enumerated"/></avp>
-
-               <!-- 3GPP TS 29.061 version 6.5.0 Release 6 -->
-
-               <avp name="TMGI" code="900" mandatory="must">
+               <avp name="WAG-Address" code="890" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+                       <type type-name="IPAddress"/>
+               </avp>
+               <avp name="WAG-PLMN-Id" code="891">
                        <type type-name="OctetString"/>
                </avp>
-
-               <avp name="Required-MBMSBearer-Capabilities" code="901" mandatory="must">
-                       <type type-name="UTF8String"/>
+               <avp name="WLAN-Radio-Container" code="892" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                       </grouped>
                </avp>
-
-               <avp name="MBMS-StartStop-Indication" code="902" mandatory="must">
-                       <type type-name="Enumerated"/>
-                       <enum name="START" code="0"/>
-                       <enum name="STOP" code="1"/>
+               <avp name="WLAN-Technology" code="893" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-
-               <avp name="MBMS-Service-Area" code="903" mandatory="must">
-                       <type type-name="OctetString"/>
+               <avp name="WLAN-UE-Local-IPAddress" code="894" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPAddress"/>
                </avp>
-
-               <avp name="MBMS-Session-Duration" code="904" mandatory="must">
+               <avp name="PDG-Address" code="895" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPAddress"/>
+               </avp>
+               <avp name="PDG-Charging-Id" code="896" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
-
-               <avp name="Alternative-APN" code="905" mandatory="must">
+               <avp name="Address-Data" code="897" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-
-               <avp name="MBMS-Service-Type" code="906" mandatory="must">
+               <avp name="Address-Domain" code="898" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                       </grouped>
+               </avp>
+               <avp name="Address-Type" code="899" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-                       <enum name="MULTICAST" code="0"/>
-                       <enum name="BROADCAST" code="1"/>
                </avp>
 
-               <avp name="MBMS-2G-3G-Indicator AVP" code="907" mandatory="must">
+<!--
+Note: The AVP codes from 900 to 999 are reserved for TS 29.061
+29.210
+******** Found in TGPPGmb.xml ********
+-->
+               <avp name="Bearer-Usage" code="1000" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-                       <enum name="2G" code="0"/>
-                       <enum name="3G" code="1"/>
-                       <enum name="2G-AND-3G" code="2"/>
+                       <enum name="GENERAL" code="0"/>
+                       <enum name="IMS SIGNALLING" code="1"/>
+                       <enum name="DEDICATED" code="2"/>
                </avp>
-
-               <avp name="RAI" code="909" mandatory="must">
+               <avp name="Charging-Rule-Install" code="1001" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Charging-Rule-Definition"/>
+                       </grouped>
+               </avp>
+               <avp name="Charging-Rule-Remove" code="1002" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Charging-Rule-Name"/>
+                       </grouped>
+               </avp>
+               <avp name="Charging-Rule-Definition" code="1003" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Rating-Group"/>
+                               <gavp name="Charging-Rule-Name"/>
+                               <gavp name="Flow-Description"/>
+                               <gavp name="Flow-Status"/>
+                               <gavp name="Precedence"/>
+                               <gavp name="Reporting-Level"/>
+                       </grouped>
+               </avp>
+               <avp name="Charging-Rule-Base-Name" code="1004" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-
-               <avp name="Additional-MBMS-Trace-Info" code="910" mandatory="must">
+               <avp name="Charging-Rule-Name" code="1005" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="OctetString"/>
                </avp>
-
-               <avp name="MBMS-Time-To-Data-Transfer" code="911" mandatory="must">
-                       <type type-name="OctetString"/>
+               <avp name="Event-Trigger" code="1006" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <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"/>
+                         <enum name="PLMN CHANGE" code="4"/>
+                         <enum name="TFT DELETED" code="1000"/>
+                         <enum name="LOSS OF BEARER" code="1001"/>
+                         <enum name="RECOVERY OF BEARER" code="1002"/>
+                         <enum name="POLICY ENFORCEMENT FAILED" code="1003"/>
+               </avp>
+               <avp name="Metering-Method" code="1007" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
                </avp>
-
-               <avp name="MBMS-Session-Identity-Repetition-Number " code="912" mandatory="must">
+               <avp name="Offline" code="1008" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="DISABLE_OFFLINE" code="0"/>
+                       <enum name="ENABLE_OFFLINE" code="1"/>
+               </avp>
+               <avp name="Online" code="1009">
+                       <type type-name="Enumerated"/>
+                       <enum name="DISABLE_ONLINE" code="0"/>
+                       <enum name="ENABLE_ONLINE" code="1"/>
+               </avp>
+               <avp name="Precedence" code="1010" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
-<avp name="MBMS-Required-QoS" code="913"><type type-name="UTF8String"/></avp>
-<avp name="MBMS-Counting-Information" code="914"><type type-name="Enumerated"/></avp>
-<!--
-Note: The AVP codes from 915 to 999 are reserved for TS 29.061
-29.210
--->
-<avp name="Bearer-Usage" code="1000"><type type-name="Enumerated"/></avp>
-<avp name="Charging-Rule-Install" code="1001"><type type-name="Grouped"/></avp>
-<avp name="Charging-Rule-Remove" code="1002"><type type-name="Grouped"/></avp>
-<avp name="Charging-Rule-Definition" code="1003"><type type-name="Grouped"/></avp>
-               <avp name="Charging-Rule-Base-Name" code="1004" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="Reporting-Level" code="1011" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="CHARGING RULE LEVEL" code="0"/>
+                       <enum name="RATING GROUP LEVEL" code="1"/>
+               </avp>
+               <avp name="TFT-Filter" code="1012">
+                       <type type-name="IPFilterRule"/>
+               </avp>
+               <avp name="TFT-Packet-Filter-Information" code="1013" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Precedence"/>
+                               <gavp name="TFT-Filter"/>
+                               <gavp name="TOS-Traffic-Class"/>
+                       </grouped>              
+               </avp>
+               <avp name="ToS-Traffic-Class" code="1014" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <type type-name="OctetString"/>
                </avp>
-<avp name="Charging-Rule-Name" code="1005"><type type-name="OctetString"/></avp>
-<avp name="Event-Trigger" code="1006"><type type-name="Enumerated"/></avp>
-<avp name="Metering-Method" code="1007"><type type-name="Enumerated"/></avp>
-<avp name="Offline" code="1008"><type type-name="Enumerated"/></avp>
-<avp name="Online" code="1009"><type type-name="Enumerated"/></avp>
-<avp name="Precedence" code="1010"><type type-name="Unsigned32"/></avp>
-<avp name="Reporting-Level" code="1011"><type type-name="Enumerated"/></avp>
-<avp name="TFT-Filter" code="1012"><type type-name="IPFilterRule"/></avp>
-<avp name="TFT-Packet-Filter-Information" code="1013"><type type-name="Enumerated"/></avp>
-<avp name="ToS-Traffic-Class" code="1014"><type type-name="OctetString"/></avp>
 <!--
 29.210 [15]
 Note: The AVP codes from 1015 to 1099 are reserved for TS 29.210
 
 -->
 <!-- Note: The AVP codes from 1015 to 1099 are reserved for TS 29.210 -->
-<avp name="Served-User-Identity" code="1100"><type type-name="Groupe"/></avp>
-<avp name="VASP-ID" code="1101"><type type-name="UTF8Str"/></avp>
-<avp name="VAS-ID" code="1102"><type type-name="UTF8Str"/></avp>
-<avp name="Trigger-Event" code="1103"><type type-name="Enumer"/></avp>
-<avp name="Sender-Address" code="1104"><type type-name="UTF8Str"/></avp>
-<avp name="Initial-Recipient-Address" code="1105"><type type-name="Groupe"/></avp>
-<avp name="Result-Recipient-Address" code="1106"><type type-name="Groupe"/></avp>
-<avp name="Sequence-Number" code="1107"><type type-name="Unsigne"/></avp>
-<avp name="Recipient-Address" code="1108"><type type-name="UTF8Str"/></avp>
-<avp name="Routeing-Address" code="1109"><type type-name="UTF8Str"/></avp>
-<avp name="Originating-Interface" code="1110"><type type-name="Enumer"/></avp>
-<avp name="Delivery-Report" code="1111"><type type-name="Enumer"/></avp>
-<avp name="Read-Reply" code="1112"><type type-name="Enumer"/></avp>
-<avp name="Sender-Visibility" code="1113"><type type-name="Enumer"/></avp>
-<avp name="Service-Key" code="1114"><type type-name="UTF8Str"/></avp>
-<avp name="Billing-Information" code="1115"><type type-name="UTF8Str"/></avp>
-<avp name="Status" code="1116"><type type-name="Group"/></avp>
-<avp name="Status-Code" code="1117"><type type-name="UTF8Str"/></avp>
-<avp name="Status-Text" code="1118"><type type-name="UTF8Str"/></avp>
+<!-- ETSI TS 129 140 V6.3.0 (2005-12) -->
+               <avp name="Served-User-Identity" code="1100" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="MSISDN"/>
+                               <gavp name="VASP-ID"/>
+                               <gavp name="VAS-ID"/>
+                       </grouped>              
+               </avp>
+               <avp name="VASP-ID" code="1101" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="VAS-ID" code="1102" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Trigger-Event" code="1103" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="MM1 Message Submission, Profile based" code="0"/>
+                       <enum name="MM1 Message Submission, Address based" code="1"/>
+                       <enum name="MM1 Message Delivery" code="2"/>
+                       <enum name="MM7 Message Submission, Profile based" code="3"/>
+                       <enum name="MM7 Message Submission, Address based" code="4"/>
+               </avp>
+               <avp name="Sender-Address" code="1104" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Initial-Recipient-Address" code="1105" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Sequence-Number"/>
+                               <gavp name="Recipient-Address"/>
+                       </grouped>              
+               </avp>
+               <avp name="Result-Recipient-Address" code="1106" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Sequence-Number"/>
+                               <gavp name="Recipient-Address"/>
+                               <gavp name="Routeing-Address"/>
+                               <gavp name="Sender-Address"/>
+                       </grouped>              
+               </avp>
+               <avp name="Sequence-Number" code="1107" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Recipient-Address" code="1108" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Routeing-Address" code="1109" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Originating-Interface" code="1110" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="MM1" code="0"/>
+                       <enum name="MM3" code="1"/>
+                       <enum name="MM4" code="2"/>
+                       <enum name="MM7" code="3"/>
+               </avp>
+               <avp name="Delivery-Report" code="1111" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="No Delivery Report Requested" code="0"/>
+                       <enum name="Delivery Report Requested" code="1"/>
+               </avp>
+               <avp name="Read-Reply" code="1112" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="No Read Reply Requested" code="0"/>
+                       <enum name="Read Reply Requested" code="1"/>
+               </avp>
+               <avp name="Sender-Visibility" code="1113" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="Sender Identification requested not to be hidden" code="0"/>
+                       <enum name="Sender Identification requested to be hidden" code="1"/>
+               </avp>
+               <avp name="Service-Key" code="1114" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Billing-Information" code="1115" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Status" code="1116" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Status-Code"/>
+                               <gavp name="Status-Text"/>
+                       </grouped>              
+               </avp>
+               <avp name="Status-Code" code="1117" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Status-Text" code="1118" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Routeing-Address-Resolution" code="1119" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="unresolved" code="0"/>
+                       <enum name="resolved" code="1"/>
+               </avp>
+
 <!--29.140 [16]
 Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
 32.299
 -->
-<avp name="Domain-Name" code="1200"><type type-name="UTF8String"/></avp>
-<avp name="Recipient-Address" code="1201"><type type-name="Grouped"/></avp>
-<avp name="Submission-Time" code="1202"><type type-name="Time"/></avp>
-<avp name="MM-Content-Type" code="1203"><type type-name="Grouped"/></avp>
-<avp name="Type-Number" code="1204"><type type-name="Enumerated"/></avp>
-<avp name="Additional-Type-Information" code="1205"><type type-name="UTF8String"/></avp>
-<avp name="Content-Size" code="1206"><type type-name="Unsigned32"/></avp>
-               <avp name="Content-Size" code="1205" mandatory="must">
+               <avp name="Domain-Name" code="1200" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Recipient-Address" code="1201" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Address-Type"/>
+                               <gavp name="Address-Data"/>
+                               <gavp name="Address-Domain"/>
+                               <gavp name="Addressee-Type"/>
+                       </grouped>              
+               </avp>
+               <avp name="Submission-Time" code="1202" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Time"/>
+               </avp>
+               <avp name="MM-Content-Type" code="1203" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Type-Number"/>
+                               <gavp name="Additional-Type-Information"/>
+                               <gavp name="Content-Size"/>
+                               <gavp name="Additional-Content-Information"/>
+                       </grouped>
+               </avp>
+<!-- The Type-Number AVP (AVP code1204) is of type Enumerated and identifies the well-known -->
+<!-- media types. The values are taken from OMNA WSP Content Type Codes database -->
+<!-- http://www.openmobilealliance.org/tech/omna/omna-wsp-content-type.htm -->
+               <avp name="Type-Number" code="1204" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="text/*" code="0"/>
+                       <enum name="text/html" code="2"/> 
+                       <enum name="text/plain" code="3"/> 
+                       <enum name="text/x-hdml" code="4"/> 
+                       <enum name="text/x-ttml" code="5"/>
+                       <enum name="text/x-vCalendar" code="6"/>
+                       <enum name="text/x-vCard" code="7"/>
+                       <enum name="text/vnd.wap.wml" code="9"/>
+                       <enum name="text/vnd.wap.wmlscript" code="9"/>
+                       <enum name="text/vnd.wap.wta-event" code="10"/>
+                       <enum name="multipart/*" code="11"/>
+                       <enum name="multipart/mixed" code="12"/>
+                       <enum name="multipart/form-data" code="13"/>
+                       <enum name="multipart/byterantes" code="14"/>
+                       <enum name="multipart/alternative" code="15"/>
+                       <enum name="application/*" code="16"/>
+                       <enum name="application/java-vm" code="17"/> 
+                       <enum name="application/x-www-form-urlencoded" code="18"/>
+               </avp>
+               <avp name="Additional-Type-Information" code="1205" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Content-Size" code="1206" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Content-Size" code="1205" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
                <avp name="PDP-Address" code="1227" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
@@ -1750,36 +2075,119 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
                <avp name="SGSN-Address" code="1228" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="IPAddress"/>
                </avp>
-<avp name="Priority" code="1209"><type type-name="Enumerated"/></avp>
-<avp name="Message-ID" code="1210"><type type-name="UTF8String"/></avp>
-<avp name="Message-Type" code="1211"><type type-name="Enumerated"/></avp>
-<avp name="Message-Size" code="1212"><type type-name="Unsigned32"/></avp>
-<avp name="Message-Class" code="1213"><type type-name="Grouped"/></avp>
-<avp name="Class-Identifier" code="1214"><type type-name="Enumerated"/></avp>
-<avp name="Token-Text" code="1215"><type type-name="UTF8String"/></avp>
-<avp name="Delivery-Report-Requested" code="1216"><type type-name="Enumerated"/></avp>
-<avp name="Adaptations" code="1217"><type type-name="Enumerated"/></avp>
-<avp name="Applic-ID" code="1218"><type type-name="UTF8String"/></avp>
-<avp name="Aux-Applic-Info" code="1219"><type type-name="UTF8String"/></avp>
-<avp name="Content-Class" code="1220"><type type-name="Enumerated"/></avp>
-<avp name="DRM-Content" code="1221"><type type-name="Enumerated"/></avp>
-<avp name="Read-Reply-Report-Requested" code="1222"><type type-name="Enumerated"/></avp>
-<avp name="Reply-Applic-ID" code="1223"><type type-name="UTF8String"/></avp>
-<avp name="File-Repair-Supported" code="1224"><type type-name="Enumerated"/></avp>
-<avp name="MBMS-User-Service-Type" code="1225"><type type-name="Enumerated"/></avp>
-<avp name="Unit-Quota-Threshold" code="1226"><type type-name="Unsigned32"/></avp>
-<avp name="PDP-Address" code="1227"><type type-name="Address"/></avp>
-<avp name="SGSN-Address" code="1228"><type type-name="Address"/></avp>
+               <avp name="Priority" code="1209" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="Low" code="0"/>
+                       <enum name="Normal" code="2"/> 
+                       <enum name="High" code="3"/> 
+               </avp>
+               <avp name="Message-ID" code="1210" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Message-Type" code="1211" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="m-send-req" code="1"/>
+                       <enum name="m-send-conf" code="2"/>
+                       <enum name="m-notification-ind" code="3"/>
+                       <enum name="m-notifyresp-ind" code="4"/>
+                       <enum name="m-retrieve-conf" code="5"/>
+                       <enum name="m-acknowledge-ind" code="6"/>
+                       <enum name="m-delivery-ind" code="7"/>
+                       <enum name="m-read-rec-ind" code="8"/>
+                       <enum name="m-read-orig-ind" code="9"/>
+                       <enum name="m-forward-req" code="10"/>
+                       <enum name="m-forward-conf" code="11"/>
+                       <enum name="m-mbox-store-conf" code="12"/>
+                       <enum name="m-mbox-view-conf" code="13"/>
+                       <enum name="m-mbox-upload-conf" code="14"/>
+                       <enum name="m-mbox-delete-conf" code="15"/>
+               </avp>
+               <avp name="Message-Size" code="1212" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Message-Class" code="1213" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Class-Identifier"/>
+                               <gavp name="Token-Text"/>
+                       </grouped>
+               </avp>
+               <avp name="Class-Identifier" code="1214" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="Personal" code="0"/>
+                       <enum name="Advertisement" code="1"/>
+                       <enum name="Informational" code="2"/>
+                       <enum name="Auto" code="3"/>
+               </avp>
+               <avp name="Token-Text" code="1215">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Delivery-Report-Requested" code="1216" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="No" code="0"/>
+                       <enum name="Yes" code="1"/>
+               </avp>
+               <avp name="Adaptations" code="1217" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="No" code="0"/>
+                       <enum name="Yes" code="1"/>
+               </avp>
+               <avp name="Applic-ID" code="1218" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Aux-Applic-Info" code="1219" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Content-Class" code="1220" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="text" code="0"/>
+                       <enum name="image-basic" code="1"/>
+                       <enum name="image-rich" code="2"/>
+                       <enum name="video-basic" code="3"/>
+                       <enum name="video-rich" code="4"/>
+                       <enum name="megapixel" code="5"/>
+                       <enum name="content-basic" code="6"/>
+                       <enum name="content-rich" code="7"/>
+               </avp>
+               <avp name="DRM-Content" code="1221">
+                       <type type-name="Enumerated"/>
+                       <enum name="No" code="0"/>
+                       <enum name="Yes" code="1"/>
+               </avp>
+               <avp name="Read-Reply-Report-Requested" code="1222" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+               </avp>
+               <avp name="Reply-Applic-ID" code="1223" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="File-Repair-Supported" code="1224" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="SUPPORTED" code="1"/>
+                       <enum name="NOT_SUPPORTED" code="2"/>
+               </avp>
+               <avp name="MBMS-User-Service-Type" code="1225" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="DOWNLOAD" code="1"/>
+                       <enum name="STREAMING" code="2"/>
+               </avp>
+               <avp name="Unit-Quota-Threshold" code="1226" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="PDP-Address" code="1227" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPAddress"/>
+               </avp>
+               <avp name="SGSN-Address" code="1228" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPAddress"/>
+               </avp>
                <avp name="PoC-Session-Id" code="1229" mandatory="must" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="Deferred-Location-Even-Type" code="1230" mandatory="must">
+               <avp name="Deferred-Location-Even-Type" code="1230" mandatory="must"  may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="LCS-Client-Name" code="1231" mandatory="must">
+               <avp name="LCS-Client-Name" code="1231" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="LCS-Client-ID" code="1232" mandatory="may">
+               <avp name="LCS-Client-ID" code="1232" mandatory="may" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="LCS-Client-Type"/>
                                <gavp name="LCS-Client-External-ID"/>
@@ -1789,23 +2197,23 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
                                <gavp name="LCS-Requestor-ID"/>
                        </grouped>
                </avp>
-               <avp name="LCS-Client-Dialed-By-MS" code="1233" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must">
+               <avp name="LCS-Client-Dialed-By-MS" code="1233" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="LCS-Client-External-ID" code="1234" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must">
+               <avp name="LCS-Client-External-ID" code="1234" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="LCS-Client-Name" code="1235" mandatory="may">
+               <avp name="LCS-Client-Name" code="1235" mandatory="may"  vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="LCS-Data-Coding-Scheme"/>
                                <gavp name="LCS-Name-String"/>
                                <gavp name="LCS-Format-Indicator"/>
                        </grouped>
                </avp>
-               <avp name="LCS-Data-Coding-Scheme" code="1236" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+               <avp name="LCS-Data-Coding-Scheme" code="1236" mandatory="must" may-encrypt="yes" protected="may"  vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="LCS-Format-Indicator" code="1237" mandatory="may">
+               <avp name="LCS-Format-Indicator" code="1237" mandatory="may"  vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
                        <enum name="LOGICAL_NAME" code="0"/>
                        <enum name="EMAIL_ADDRESS" code="1"/>
@@ -1813,29 +2221,29 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
                        <enum name="URL" code="3"/>
                        <enum name="SIP_URL" code="4"/>
                </avp>
-               <avp name="LCS-Name-String" code="1238" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+               <avp name="LCS-Name-String" code="1238" mandatory="must" may-encrypt="yes" protected="may"  vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="LCS-Requestor-ID" code="1239" mandatory="may">
+               <avp name="LCS-Requestor-ID" code="1239" mandatory="may" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="LCS-Data-Coding-Scheme"/>
                                <gavp name="LCS-Requestor-ID-String"/>
                        </grouped>
                </avp>
-               <avp name="LCS-Requestor-ID-String" code="1240" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+               <avp name="LCS-Requestor-ID-String" code="1240" mandatory="must" may-encrypt="yes" protected="may"  vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="LCS-Client-Type" code="1241" mandatory="may">
+               <avp name="LCS-Client-Type" code="1241" mandatory="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
                        <enum name="EMERGENCY_SERVICES" code="0"/>
                        <enum name="VALUE_ADDED_SERVICES" code="1"/>
                        <enum name="PLMN_OPERATOR_SERVICES" code="2"/>
                        <enum name="LAWFUL_INTERCEPT_SERVICES" code="3"/>
                </avp>
-               <avp name="Location-Estimate" code="1242" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+               <avp name="Location-Estimate" code="1242" mandatory="must" may-encrypt="yes" protected="may"  vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="Location-Estimate-Type" code="1243" mandatory="may">
+               <avp name="Location-Estimate-Type" code="1243" mandatory="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
                        <enum name="CURRENT_LOCATION" code="0"/>
                        <enum name="CURRENT_LAST_KNOWN_LOCATION" code="1"/>
@@ -1843,50 +2251,228 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
                        <enum name="ACTIVATE_DEFERRED_LOCATION" code="3"/>
                        <enum name="CANCEL_DEFERRED_LOCATION" code="4"/>
                </avp>
-               <avp name="Location-Type" code="1244" mandatory="may">
+               <avp name="Location-Type" code="1244" mandatory="may" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="Location-Estimate-Type"/>
                                <gavp name="Deferred-Location-Event-Type"/>
                        </grouped>
                </avp>
-               <avp name="Positioning-Data" code="1245" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+               <avp name="Positioning-Data" code="1245" mandatory="must" may-encrypt="yes" protected="may"  vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="WLAN-Session-Id" code="1246" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="PDP-Context-Type" code="1247" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="PRIMARY" code="0"/>
+                       <enum name="SECONDARY" code="1"/>
+               </avp>
+               <avp name="MMBox-Storage-Requested" code="1248" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="No" code="0"/>
+                       <enum name="Yes" code="1"/>
+               </avp>
+               <avp name="Number-Of-Talk-Burst" code="1249" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Called-Asserted-Identity" code="1250" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Requested-Party-Address" code="1251" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-<avp name="WLAN-Session-Id" code="1246"><type type-name="UTF8String"/></avp>
-<avp name="PDP-Context-Type" code="1247"><type type-name="Enumerated"/></avp>
-<avp name="MMBox-Storage-Requested" code="1248"><type type-name="Enumerated"/></avp>
-<avp name="Number-Of-Talk-Burst" code="1249"><type type-name="Unsigned32"/></avp>
-<avp name="Called-Asserted-Identity" code="1250"><type type-name="UTF8String"/></avp>
-<avp name="Requested-Party-Address" code="1251"><type type-name="UTF8String"/></avp>
 <!--
 1252 Reserved
 1253 Reserved
 1254 Reserved
 -->
-<avp name="Talk-Burst-Exchange" code="1255"><type type-name="Grouped"/></avp>
-<avp name="Talk-Burst-Volume" code="1256"><type type-name="Unsigned32"/></avp>
-<avp name="Talk-Burst-Time" code="1257"><type type-name="Unsigned32"/></avp>
-<avp name="Number-Of-Received-Talk-Bursts" code="1258"><type type-name="Enumerated"/></avp>
-<avp name="Received-Talk-Burst-Volume" code="1259"><type type-name="Unsigned32"/></avp>
-<avp name="Received-Talk-Burst-Time" code="1260"><type type-name="Unsigned32"/></avp>
-<avp name="PoC-Change-Conditions" code="1261"><type type-name="Enumerated"/></avp>
-<avp name="PoC-Change-Time" code="1262"><type type-name="Time"/></avp>
+               <avp name="Talk-Burst-Exchange" code="1255" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                       </grouped>
+               </avp>
+               <avp name="Talk-Burst-Volume" code="1256" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Talk-Burst-Time" code="1257" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Number-Of-Received-Talk-Bursts" code="1258" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+               </avp>
+               <avp name="Received-Talk-Burst-Volume" code="1259" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Received-Talk-Burst-Time" code="1260" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="PoC-Change-Conditions" code="1261" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+               </avp>
+               <avp name="PoC-Change-Time" code="1262" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Time"/>
+               </avp>
 <!--
-Note: The AVP codes from 1263 to 1299 are reserved for TS 32.299
+               <avp name="Access-Network-Information" code="1263" vendor-bit="must" vendor-id="TGPP"><type type-name="OctetString"/></avp>
+               <avp name="Trigger" code="1264" vendor-bit="must" vendor-id="TGPP">
+                                       <grouped>
+                                       </grouped>
+
+               </avp>
+               <avp name="Base-Time-Interval" code="1265" vendor-bit="must" vendor-id="TGPP"><type type-name="Unsigned32"/></avp>
+               <avp name="Envelope" code="1266" vendor-bit="must" vendor-id="TGPP">
+                                       <grouped>
+                                       </grouped>
+               </avp>
+               <avp name="Envelope-End-Time" code="1267" vendor-bit="must" vendor-id="TGPP"><type type-name="Time"/></avp>
+               <avp name="Envelope-Reporting" code="1268" vendor-bit="must" vendor-id="TGPP"><type type-name="Enumerated"/></avp>
+               <avp name="Envelope-Start-Time" code="1269" vendor-bit="must" vendor-id="TGPP"><type type-name="Time"/></avp>
+               <avp name="Time-Quota-Mechanism" code="1270" vendor-bit="must" vendor-id="TGPP">
+                                       <grouped>
+                                       </grouped>
+               </avp>  
+               <avp name="Time-Quota-Type" code="1271" vendor-bit="must" vendor-id="TGPP"><type type-name="Enumerated"/></avp>
+               <avp name="Early-Media-Description" code="1272" vendor-bit="must" vendor-id="TGPP">
+                                       <grouped>
+                                       </grouped>
+               </avp>
+               <avp name="SDP-TimeStamps" code="1273" vendor-bit="must" vendor-id="TGPP">
+                                       <grouped>
+                                       </grouped>
+               </avp>
+               <avp name="SDP-Offer-Timestamp" code="1274" vendor-bit="must" vendor-id="TGPP"><type type-name="Time"/></avp>
+               <avp name="SDP-Answer-Timestamp" code="1275" vendor-bit="must" vendor-id="TGPP"><type type-name="Time"/></avp>
+               <avp name="AF-Correlation-Information" code="1276" vendor-bit="must" vendor-id="TGPP">
+                                       <grouped>
+                                       </grouped>
+               </avp>  
+               <avp name="PoC-Session-Initiation-type" code="1277"><type type-name="Enumerated"/></avp>
+               <avp name="Offline-Charging" code="1278" vendor-bit="must" vendor-id="TGPP">
+                                       <grouped>
+                                       </grouped>
+               </avp>
+               <avp name="User-Participating-Type" code="1279" vendor-bit="must" vendor-id="TGPP"><type type-name="Enumerated"/></avp> 
+               <avp name="Alternate-Charged-Party-Address" code="1280" vendor-bit="must" vendor-id="TGPP"><type type-name="UTF8String"/></avp>
+Note: The AVP codes from 1281 to 1299 are reserved for TS 32.299
 -->
+<!--- 3GPP2 AVP's X.S0013-014-0 
+http://www.3gcn.org/3gpp2/TSGX/Projects/X.P0013-B%20IP%20Network%20-%20MMD/X.S0013-014%20v0.3.0%20SBBC%20Ty%20Stage-3.doc
+-->
+               <avp name="Bearer-Usage" code="1000" vendor-bit="must" vendor-id="3GPP2">
+                       <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="3GPP2">
+                       <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="3GPP2">
+                       <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="3GPP2">
+                       <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="3GPP2">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Charging-Rule-Name" code="1005" vendor-bit="must" vendor-id="3GPP2">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Event-Trigger" code="1006" vendor-bit="must" vendor-id="3GPP2">
+                       <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="3GPP2">
+                       <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="3GPP2">
+                       <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="3GPP2">
+                       <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="3GPP2">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Primary-CCF-Address" code="1011" vendor-bit="must" vendor-id="3GPP2">
+                       <type type-name="DiameterURI"/>
+               </avp>
+               <avp name="Primary-OCS-Address" code="1012" vendor-bit="must" vendor-id="3GPP2">
+                       <type type-name="DiameterURI"/>
+               </avp>
+               <avp name="Reporting-Level" code="1014" vendor-bit="must" vendor-id="3GPP2">
+                       <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="3GPP2">
+                       <type type-name="DiameterURI"/>
+               </avp>
+               <avp name="Secondary-OCS-Address" code="1016" vendor-bit="must" vendor-id="3GPP2">
+                       <type type-name="DiameterURI"/>
+               </avp>
+               <avp name="TFT-Filter" code="1017" vendor-bit="must" vendor-id="3GPP2">
+                       <type type-name="IPFilterRule"/>
+               </avp>
+               <avp name="TFT-Packet-Filter-Information" code="1018" vendor-bit="must" vendor-id="3GPP2">
+                       <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="3GPP2">
+                       <type type-name="OctetString"/>
+               </avp>
 
        </base>
        <application id="0" name="Diameter Common Messages" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588">
        </application>
+
        <application id="3" name="Diameter Base Accounting" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588">
        </application>
+
+       <application id="16777216" name="3GPP Cx" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588">
+       </application>
+
        &nasreq;
        &mobileipv4;
        &chargecontrol;
        &sunping;
        &imscxdx;
+       &TGPPGmb;
        &TGPPSh;
        &sip;
        &gqpolicy;
        &etsie2e4;
+       &Ericsson;
 </dictionary>