From Josip Medved: Diameter dictionary has few invalid gavp definitions https://bugs...
[obnox/wireshark/wip.git] / diameter / dictionary.xml
index e4fc72749708d3cb0718e35b5c6f19e9f342e13e..4473dbb6266b6a776fe5d8b1f1ccbd2e890db8c5 100644 (file)
        <!ENTITY gqpolicy SYSTEM "gqpolicy.xml">
        <!ENTITY etsie2e4 SYSTEM "etsie2e4.xml">
        <!ENTITY Ericsson SYSTEM "Ericsson.xml">
-       <!ENTITY mobileipv6 SYSTEM "mobileipv6.xml">
+       <!ENTITY Tango SYSTEM "Tango.xml">
+  <!ENTITY mobileipv6 SYSTEM "mobileipv6.xml">
+  <!ENTITY Cisco SYSTEM "Cisco.xml">
+  <!ENTITY Vodafone SYSTEM "Vodafone.xml">
 ]>
 <dictionary>
        <base uri="http://www.ietf.org/rfc/rfc3588.txt">
@@ -29,8 +32,8 @@
   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.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 -->
-               <!-- 0-255 RADIUS compatability codes [http://www.iana.org/assignments/radius-types] -->
+               <!-- 0-255 RADIUS compatibility codes [http://www.iana.org/assignments/radius-types] -->
                <!--256 Unassigned -->
                <command name="Capabilities-Exchange"         code="257" vendor-id="None"/>
                <command name="Re-Auth"                       code="258" vendor-id="None"/>
-    <!-- 259 Unassigned  
-         260 AMR / AMA [RFC4004]     mobileipv4.xml
-         261 Unassigned  
-         262 HAR / HAA [RFC4004]     mobileipv4.xml
-         263-264 Unassigned  
-         265 AAR / AAA [RFC4005]     nasreq.xml
-         266-267 Unassigned  
-         268 DER / DEA [RFC4072]     eap.xml
-         269-270 Unassigned 
+               <!-- 259 Unassigned
+                    260 AMR / AMA [RFC4004]     mobileipv4.xml
+                    261 Unassigned
+                    262 HAR / HAA [RFC4004]     mobileipv4.xml
+                    263-264 Unassigned
+                    265 AAR / AAA [RFC4005]     nasreq.xml
+                    266-267 Unassigned
+                    268 DER / DEA [RFC4072]     eap.xml
+                    269-270 Unassigned
                -->
                <command name="Accounting"                    code="271" vendor-id="None"/>
-    <!-- 272 CCR / CCA [RFC4006]     chargecontrol.xml
-         273 Unassigned 
+               <!-- 272 CCR / CCA [RFC4006]     chargecontrol.xml
+                    273 Unassigned
                -->
                <command name="Abort-Session"                 code="274" vendor-id="None"/>
                <command name="Session-Termination"           code="275" vendor-id="None"/>
                <!--276-279 Unassigned -->
                <command name="Device-Watchdog"               code="280" vendor-id="None"/>
                <command name="Disconnect-Peer"               code="282" vendor-id="None"/>
-    <!--283 UAR / UAA [RFC4740]      sip.xml
-        284 SAR / SAA [RFC4740]      sip.xml
-        285 LIR / LIA [RFC4740]      sip.xml
-        286 MAR / MAA [RFC4740]      sip.xml
-        287 RTR / RTA [RFC4740]      sip.xml
-        288 PPR / PPA [RFC4740]      sip.xml
-        289-299 Unassigned  
-        300-313 Allocated for 3GPP [RFC3589] 
-           imscxdx.xml ( 300 - 305 )
-           300 User-Authorization-Request/-Answer      UAR/UAA 29.229 [2]
-           301 Server-Assignment-Request/-Answer       SAR/SAA 
-           302 Location-Info-Request/-Answer   LIR/LIA 
-           303 Multimedia-Auth-Request/-Answer MAR/MAA 
-           304 Registration-Termination-Request/-Answer        RTR/RTA 
-           305 Push-Profile-Request/-Answer    PPR/PPA 
-           TGPPSh.xml  ( 306 - 309 )
-           306 User-Data-Request/-Answer       UDR/UDA 
-           307 Profile-Update-Request/-Answer  PUR/PUA 
-           308 Subscribe-Notifications-Request/-Answer SNR/SNA 
-           309 Push-Notification-Request/-Answer       PNR/PNA 
+               <!--283 UAR / UAA [RFC4740]      sip.xml
+                   284 SAR / SAA [RFC4740]      sip.xml
+                   285 LIR / LIA [RFC4740]      sip.xml
+                   286 MAR / MAA [RFC4740]      sip.xml
+                   287 RTR / RTA [RFC4740]      sip.xml
+                   288 PPR / PPA [RFC4740]      sip.xml
+                   289-299 Unassigned
+                   300-313 Allocated for 3GPP [RFC3589]
+                     imscxdx.xml ( 300 - 305 )
+                     300       User-Authorization-Request/-Answer      UAR/UAA 29.229 [2]
+                     301       Server-Assignment-Request/-Answer       SAR/SAA
+                     302       Location-Info-Request/-Answer           LIR/LIA
+                     303       Multimedia-Auth-Request/-Answer         MAR/MAA
+                     304       Registration-Termination-Request/-Answer RTR/RTA
+                     305       Push-Profile-Request/-Answer            PPR/PPA
+                     TGPPSh.xml  ( 306 - 309 )
+                     306       User-Data-Request/-Answer               UDR/UDA
+                     307       Profile-Update-Request/-Answer          PUR/PUA
+                     308       Subscribe-Notifications-Request/-Answer SNR/SNA
+                     309       Push-Notification-Request/-Answer       PNR/PNA
                -->
 
                <command name="Boostrapping-Info"             code="310" vendor-id="None"/>        <!-- BIR/BIA 29.109 [7] -->
                <command name="Message-Process"               code="311" vendor-id="None"/>        <!-- MPR/MPA 29.140 [16] -->
                <command name="GBAPush-Info"                  code="312" vendor-id="None"/>        <!-- GPR/GPI 29.109 [7] -->
                <!-- 313 (Not used yet) -->
-               <command name="Policy-Data"                    code="314" vendor-id="None"/>         <!-- PDR / PDA [RFC5224] -->
-               <command name="Policy-Install"                 code="315" vendor-id="None"/>         <!--  (PIA) [ITU-T Rec. Q.3303.3][RFC5431] -->
+               <command name="Policy-Data"                   code="314" vendor-id="None"/>        <!-- PDR / PDA [RFC5224] -->
+               <command name="Policy-Install"                code="315" vendor-id="None"/>        <!-- (PIA) [ITU-T Rec. Q.3303.3][RFC5431] -->
 
                <!-- http://www.3gpp.org/ftp/Specs/html-info/29272.htm -->
                <command name="3GPP-Update-Location"            code="316" vendor-id="None"/>
                <command name="3GPP-Notify"                     code="323" vendor-id="None"/>         <!--[3GPP TS 29.272][RFC5516] -->
                <command name="3GPP-ME-Identity-Check"          code="324" vendor-id="None"/>         <!--(ECR/ECA) [3GPP TS 29.272][RFC5516] -->
                <command name="MIP6"                            code="325" vendor-id="None"/>         <!--(MIR/MIA) [RFC5778] -->
-               <command name="QoS-Authorization"               code="326" vendor-id="None"/>         <!--(QAR/QAA) [RFC-ietf-dime-diameter-qos-15] -->
-               <command name="QoS-Install"                     code="327" vendor-id="None"/>         <!--(QIR/QIA) [RFC-ietf-dime-diameter-qos-15] -->
-               <!-- 
-        328-8388607 Unassigned
-        8388608 WIMAX-HRPD-SFF Request/Answer [http://www.3gpp2.org/Public_html/specs/tsgx.cfm][3GPP2 X.S0058-0 v1.0][Avi_Lior]
-        8388609 WiMAX-Diameter-EAP-Request/Answer (WDER/WDEA) WDE [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
-        8388610 WiMAX-Change-of-Authorization-Request/Answer (WCAR/WCAA) WCA [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
-        8388611 WiMAX-Reauthentication-Request/Answer (WRAR/WRAA) WRA [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
-        8388612 WiMAX-Session-Termination-Request/Answer (WSTR/WSTA) WST [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
-        8388613 WiMAX-Abort-Session-Request/Answer (WASR/WASA) WAS [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
-        8388614 WiMAX-Home-Agent-IPv4-Request/Answer (WHA4R/WHA4A) WHA4 [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
-        8388615 WiMAX-Home-Agent-IPv6-Request/Answer (WHA6R/WHA6A) WHA6 [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
-        8388616 WiMAX-DHCP-Request/Answer (WDHCPR/WDHCPA) WDHCP [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
-        8388617 WiMAX-LAA-Request/Answer (WLAAR/WLAA) WLAA [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
-        8388618 WiMAX-Location-Accounting-Request/Answer (WLACR/WLACA) WLAC [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
-        8388619 WiMAX-Location-Measurement-Query-Request/Answer (WLMQR/WLMQA) WLMQ [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
-        8388620 3GPP-Provide-Location-Request/Answer (PLR/PLA) [http://www.3gpp.org/ftp/Specs/][3GPP TS 29.172][Kimmo_Kymalainen]
-        8388621 3GPP-Location-Report-Request/Answer (LRR/LRA) [http://www.3gpp.org/ftp/Specs/][3GPP TS 29.172][Kimmo_Kymalainen]
-        8388622 3GPP-LCS-Routing-Info-Request/Answer (RIR/RIA) [http://www.3gpp.org/ftp/Specs/][3GPP TS 29.173][Kimmo_Kymalainen]
-        8388623-16777213 Unassigned
-        16777214 Experimental code [RFC3588]
-        16777215 Experimental code [RFC3588]
-               -->
-               <!-- ********************** End Commands ************************** -->
+               <command name="QoS-Authorization"               code="326" vendor-id="None"/>         <!--(QAR/QAA) [RFC5866] -->
+    <command name="QoS-Install"                     code="327" vendor-id="None"/>         <!--(QIR/QIA) [RFC5866] -->
+    <command name="Capabilities-Update"             code="328" vendor-id="None"/>         <!--[RFC-ietf-dime-capablities-update-07] -->
+    <command name="IKEv2-SK"                        code="329" vendor-id="None"/>         <!--[RFC-ietf-dime-ikev2-psk-diameter-11] -->
+    <!--
+               330-8388607 Unassigned
+               8388608 WIMAX-HRPD-SFF Request/Answer [http://www.3gpp2.org/Public_html/specs/tsgx.cfm][3GPP2 X.S0058-0 v1.0][Avi_Lior]
+               8388609 WiMAX-Diameter-EAP-Request/Answer (WDER/WDEA) WDE [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
+               8388610 WiMAX-Change-of-Authorization-Request/Answer (WCAR/WCAA) WCA [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
+               8388611 WiMAX-Reauthentication-Request/Answer (WRAR/WRAA) WRA [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
+               8388612 WiMAX-Session-Termination-Request/Answer (WSTR/WSTA) WST [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
+               8388613 WiMAX-Abort-Session-Request/Answer (WASR/WASA) WAS [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
+               8388614 WiMAX-Home-Agent-IPv4-Request/Answer (WHA4R/WHA4A) WHA4 [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
+               8388615 WiMAX-Home-Agent-IPv6-Request/Answer (WHA6R/WHA6A) WHA6 [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
+               8388616 WiMAX-DHCP-Request/Answer (WDHCPR/WDHCPA) WDHCP [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
+               8388617 WiMAX-LAA-Request/Answer (WLAAR/WLAA) WLAA [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
+               8388618 WiMAX-Location-Accounting-Request/Answer (WLACR/WLACA) WLAC [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
+               8388619 WiMAX-Location-Measurement-Query-Request/Answer (WLMQR/WLMQA) WLMQ [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
+    -->
+    <command name="3GPP-Provide-Location"           code="8388620" vendor-id="None"/>         <!--(PLR/PLA) [http://www.3gpp.org/ftp/Specs/][3GPP TS 29.172 -->
+    <command name="3GPP-Location-Report"            code="8388621" vendor-id="None"/>         <!--(PLR/PLA) [http://www.3gpp.org/ftp/Specs/][3GPP TS 29.172 -->
+    <command name="3GPP-LCS-Routing-Info"           code="8388622" vendor-id="None"/>         <!--(PLR/PLA) [http://www.3gpp.org/ftp/Specs/][3GPP TS 29.172 -->
+<!-- 
+8388623 Notif-Request/Answer (NFR/NFA) [Tomas_Menzl] 
+8388624 Msg-Interface-Request/Answer (MIFR/MIFA) [Tomas_Menzl] 
+8388625 Mobile-Application-Request/Answer (MAPR/MAPA) [Tomas_Menzl] 
+8388626 Update Location Request/Answer (ULR / ULA) [3GPP2 publication X.S0057][Avi_Lior] 
+8388627 Cancel Location Request/Answer (CLR CLA) [3GPP2 publication X.S0057][Avi_Lior] 
+8388628 Juniper-Sync-Event (JSE) [Aleksey_Romanov] 
+8388629 Juniper-Session-Discovery (JSD) [Aleksey_Romanov] 
+8388630 Query Profile Request Answer (QPR/QPA) [3GPP2 publication X.S0057A E-UTRAN eHRPD7][Avi_Lior] 
+
+-->
+    <command name="Subscription Information Application" code="8388631" vendor-id="None"/>
+    <command name="Distributed Charging"                 code="8388632" vendor-id="None"/>
+    <command name="Ericsson-SL"                          code="8388633" vendor-id="None"/> <!-- Ericsson Spending Limit -->
+    <command name="Ericsson-SN"                          code="8388634" vendor-id="None"/> <!-- Ericsson Spending Status Notification -->
+    <!-- 
+    8388623-16777213 Unassigned
+    16777214 Experimental code [RFC3588]
+    16777215 Experimental code [RFC3588]
+    -->
+    <!-- ********************** End Commands ************************** -->
                <!-- ************************* Vendors **************************** -->
                <vendor vendor-id="None" code="0" name="None"/>
                <vendor vendor-id="HP"    code="11"    name="Hewlett Packard"/>
                <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="TGPP2" code="5535" name="3GPP2"/>
-               <vendor vendor-id="TGPP"  code="10415" name="3GPP"/>
+    <vendor vendor-id="Cisco" code="5771" name="Cisco"/>
+    <vendor vendor-id="TGPP2" 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"/>
                <vendor vendor-id="Deutsche_Telekom_AG" code="2937" name="Deutsche Telekom AG"/>
+               <vendor vendor-id="Tango" code="13421" name="Tango Telecom Limited"/>
                <!-- *********************** End Vendors ************************** -->
                <!-- ************************ typedefn's ************************** -->
                <typedefn type-name="OctetString"/>
                <!--
-         The data contains arbitrary data of variable length. Unless
-         otherwise noted, the AVP Length field MUST be set to at least 9
-         (13 if the 'V' bit is enabled).  Data used to transmit (human
-         readable) character string data uses the UTF-8 [24] character
-         set and is NOT NULL-terminated. The minimum Length field MUST
-         be 9, but can be set to any value up to 65504 bytes. AVP Values
-         of this type that do not align on a 32-bit boundary MUST have
-         the necessary padding.
+                       The data contains arbitrary data of variable length. Unless
+                       otherwise noted, the AVP Length field MUST be set to at least 9
+                       (13 if the 'V' bit is enabled).  Data used to transmit (human
+                       readable) character string data uses the UTF-8 [24] character
+                       set and is NOT NULL-terminated. The minimum Length field MUST
+                       be 9, but can be set to any value up to 65504 bytes. AVP Values
+                       of this type that do not align on a 32-bit boundary MUST have
+                       the necessary padding.
                -->
                <typedefn type-name="UTF8String" type-parent="OctetString"/>
                <!--
-         The UTF8String format is derived from the OctetString AVP Base
-         Format. This is a human readable string represented using the
-         ISO/IEC IS 10646-1 character set, encoded as an OctetString
-         using the UTF-8 [29] transformation format described in RFC
-         2279.
-
-         Since additional code points are added by amendments to the
-         10646 standard from time to time, implementations MUST be
-         prepared to encounter any code point from 0x00000001 to
-         0x7fffffff. Byte sequences that do not correspond to the valid
-         UTF-8 encoding of a code point or are outside this range are
-         prohibited. Note that since a code point of 0x00000000 is
-         prohibited, no octet will contain a value of 0x00.
-
-         The use of control codes SHOULD be avoided. When it is
-         necessary to represent a newline, the control code sequence CR
-         LF SHOULD be used.
-
-         The use of leading or trailing white space SHOULD be avoided.
-
-         For code points not directly supported by user interface
-         hardware or software, an alternative means of entry and
-         display, such as hexadecimal, MAY be provided.
-
-         For information encoded in 7-bit US-ASCII, the UTF-8 encoding
-         is identical to the US-ASCII encoding.
-
-         UTF-8 may require multiple bytes to represent a single
-         character / code point; thus the length of a UTF8String in
-         octets may be different from the number of characters encoded.
-
-         Note that the size of an UTF8String is measured in octets, not
-         characters.
-
-         The UTF8String MUST not contain any octets with a value of
-         zero.
+                       The UTF8String format is derived from the OctetString AVP Base
+                       Format. This is a human readable string represented using the
+                       ISO/IEC IS 10646-1 character set, encoded as an OctetString
+                       using the UTF-8 [29] transformation format described in RFC
+                       2279.
+
+                       Since additional code points are added by amendments to the
+                       10646 standard from time to time, implementations MUST be
+                       prepared to encounter any code point from 0x00000001 to
+                       0x7fffffff. Byte sequences that do not correspond to the valid
+                       UTF-8 encoding of a code point or are outside this range are
+                       prohibited. Note that since a code point of 0x00000000 is
+                       prohibited, no octet will contain a value of 0x00.
+
+                       The use of control codes SHOULD be avoided. When it is
+                       necessary to represent a newline, the control code sequence CR
+                       LF SHOULD be used.
+
+                       The use of leading or trailing white space SHOULD be avoided.
+
+                       For code points not directly supported by user interface
+                       hardware or software, an alternative means of entry and
+                       display, such as hexadecimal, MAY be provided.
+
+                       For information encoded in 7-bit US-ASCII, the UTF-8 encoding
+                       is identical to the US-ASCII encoding.
+
+                       UTF-8 may require multiple bytes to represent a single
+                       character / code point; thus the length of a UTF8String in
+                       octets may be different from the number of characters encoded.
+
+                       Note that the size of an UTF8String is measured in octets, not
+                       characters.
+
+                       The UTF8String MUST not contain any octets with a value of
+                       zero.
                -->
                <typedefn type-name="IPAddress" type-parent="OctetString"/>
                <!--
-         The IPAddress format is derived from the OctetString AVP Base
-         Format. It represents 32 bit (IPv4) [17] or 128 bit (IPv6) [16]
-         address, most significant octet first. The format of the
-         address (IPv4 or IPv6) is determined by the length. If the
-         attribute value is an IPv4 address, the AVP Length field MUST
-         be 12 (16 if 'V' bit is enabled), otherwise the AVP Length
-         field MUST be set to 24 (28 if the 'V' bit is enabled) for IPv6
-         addresses.
+                       The IPAddress format is derived from the OctetString AVP Base
+                       Format. It represents 32 bit (IPv4) [17] or 128 bit (IPv6) [16]
+                       address, most significant octet first. The format of the
+                       address (IPv4 or IPv6) is determined by the length. If the
+                       attribute value is an IPv4 address, the AVP Length field MUST
+                       be 12 (16 if 'V' bit is enabled), otherwise the AVP Length
+                       field MUST be set to 24 (28 if the 'V' bit is enabled) for IPv6
+                       addresses.
                -->
                <typedefn type-name="DiameterIdentity" type-parent="OctetString"/>
                <!--
-         The DiameterIdentity format is derived from the OctetString AVP
-         Base Format.  It uses the UTF-8 encoding and has the same
-         requirements as the UTF8String.  In addition, it must follow
-         the Uniform Resource Identifiers (URI) syntax [29] rules
-         specified below:
-
-            Diameter-Identity  = fqdn [ port ] [ transport ]
-                                 [ protocol ]
-
-            aaa-protocol       = ( "diameter" | "radius" | "tacacs+" )
-
-            protocol           = ";protocol=" aaa-protocol
-                                 ; If absent, the default AAA protocol
-                                 ; is diameter.
-
-            fqdn               = Fully Qualified Host Name
-
-            port               = ":" 1*DIGIT
-                                 ; One of the ports used to listen for
-                                 ; incoming connections. ; If absent,
-                                 ; the default Diameter port (TBD) is
-                                 ; assumed.
-
-            transport-protocol = ( "tcp" | "sctp" | "udp" )
-
-            transport          = ";transport=" transport-protocol
-
-                                 ; One of the transports used to listen
-                                 ; for incoming connections. If absent,
-                                 ; the default SCTP [26] protocol is
-                                 ; assumed. UDP MUST NOT be used when
-                                 ; the aaa-protocol field is set to
-                                 ; diameter.
-
-            The following are examples of valid Diameter host
-            identities:
-
-               host.abc.com;transport=tcp
-               host.abc.com:6666;transport=tcp
-               aaa://host.abc.com;protocol=diameter
-               aaa://host.abc.com:6666;protocol=diameter
-               aaa://host.abc.com:6666;transport=tcp;protocol=diameter
-               aaa://host.abc.com:1813;transport=udp;protocol=radius
-
-         Since multiple Diameter processes on a single host cannot
-         listen for incoming connections on the same port on a given
-         protocol, the DiameterIdentity is guaranteed to be unique per
-         host.
-
-         A Diameter node MAY advertise different identities on each
-         connection, via the CER and CEA's Origin-Host AVP, but the same
-         identity MUST be used throughout the duration of a connection.
-
-         When comparing AVPs of this format, it is necessary to add any
-         absent fields with the default values prior to the comparison.
-         For example, diameter-host.abc.com would be expanded to
-         aaa://diameter/diameter-host.abc.com:TBD;protocol=sctp.
-        -->
+                       The DiameterIdentity format is derived from the OctetString AVP
+                       Base Format.  It uses the UTF-8 encoding and has the same
+                       requirements as the UTF8String.  In addition, it must follow
+                       the Uniform Resource Identifiers (URI) syntax [29] rules
+                       specified below:
+
+                          Diameter-Identity  = fqdn [ port ] [ transport ]
+                                               [ protocol ]
+
+                          aaa-protocol       = ( "diameter" | "radius" | "tacacs+" )
+
+                          protocol           = ";protocol=" aaa-protocol
+                                               ; If absent, the default AAA protocol
+                                               ; is diameter.
+
+                          fqdn               = Fully Qualified Host Name
+
+                          port               = ":" 1*DIGIT
+                                               ; One of the ports used to listen for
+                                               ; incoming connections. ; If absent,
+                                               ; the default Diameter port (TBD) is
+                                               ; assumed.
+
+                          transport-protocol = ( "tcp" | "sctp" | "udp" )
+
+                          transport          = ";transport=" transport-protocol
+
+                                               ; One of the transports used to listen
+                                               ; for incoming connections. If absent,
+                                               ; the default SCTP [26] protocol is
+                                               ; assumed. UDP MUST NOT be used when
+                                               ; the aaa-protocol field is set to
+                                               ; diameter.
+
+                          The following are examples of valid Diameter host
+                          identities:
+
+                             host.abc.com;transport=tcp
+                             host.abc.com:6666;transport=tcp
+                             aaa://host.abc.com;protocol=diameter
+                             aaa://host.abc.com:6666;protocol=diameter
+                             aaa://host.abc.com:6666;transport=tcp;protocol=diameter
+                             aaa://host.abc.com:1813;transport=udp;protocol=radius
+
+                       Since multiple Diameter processes on a single host cannot
+                       listen for incoming connections on the same port on a given
+                       protocol, the DiameterIdentity is guaranteed to be unique per
+                       host.
+
+                       A Diameter node MAY advertise different identities on each
+                       connection, via the CER and CEA's Origin-Host AVP, but the same
+                       identity MUST be used throughout the duration of a connection.
+
+                       When comparing AVPs of this format, it is necessary to add any
+                       absent fields with the default values prior to the comparison.
+                       For example, diameter-host.abc.com would be expanded to
+                       aaa://diameter/diameter-host.abc.com:TBD;protocol=sctp.
+               -->
                <typedefn type-name="IPFilterRule" type-parent="OctetString"/>
                <!--
-         The IPFilterRule format is derived from the OctetString AVP
-         Base Format.  It uses the UTF-8 encoding and has the same
-         requirements as the UTF8String. Packets may be filtered based
-         on the following information that is associated with it:
-
-            Direction                          (in or out)
-            Source and destination IP address  (possibly masked)
-            Protocol
-            Source and destination port        (lists or ranges)
-            TCP flags
-            IP fragment flag
-            IP options
-            ICMP types
-
-         Rules for the appropriate direction are evaluated in order,
-         with the first matched rule terminating the evaluation.  Each
-         packet is evaluated once. If no rule matches, the packet is
-         dropped if the last rule evaluated was a permit, and passed if
-         the last rule was a deny.
-
-         IPFilterRule filters MUST follow the format:
-
-            action dir proto from src to dst [options]
-
-            action       permit - Allow packets that match the rule.
-                         deny   - Drop packets that match the rule.
-
-            dir          "in" is from the terminal, "out" is to the
-                         terminal.
-
-            proto        An IP protocol specified by number.  The "ip"
-                         keyword means any protocol will match.
-
-            src and dst  <address/mask> [ports]
-
-                         The <address/mask> may be specified as:
-                         ipno       An IPv4 or IPv6 number in dotted-
-                                    quad or canonical IPv6 form. Only
-                                    this exact IP number will match the
-                                    rule.
-                         ipno/bits  An IP number as above with a mask
-                                    width of the form 1.2.3.4/24.  In
-                                    this case all IP numbers from
-                                    1.2.3.0 to 1.2.3.255 will match.
-                                    The bit width MUST be valid for the
-                                    IP version and the IP number MUST
-                                    NOT have bits set beyond the mask.
-
-                         The sense of the match can be inverted by
-                         preceding an address with the not modifier,
-                         causing all other addresses to be matched
-                         instead.  This does not affect the selection of
-                         port numbers.
-
-                            The keyword "any" is 0.0.0.0/0 or the IPv6
-                            equivalent.  The keyword "assigned" is the
-                            address or set of addresses assigned to the
-                            terminal.  The first rule SHOULD be "deny in
-                            ip !assigned".
-
-                         With the TCP, UDP and SCTP protocols, optional
-                         ports may be specified as:
-
-                            {port|port-port}[,port[,...]]
-
-                         The `-' notation specifies a range of ports
-                         (including boundaries).
-
-                         Fragmented packets which have a non-zero offset
-                         (i.e. not the first fragment) will never match
-                         a rule which has one or more port
-                         specifications.  See the frag option for
-                         details on matching fragmented packets.
-
-            options:
-               frag    Match if the packet is a fragment and this is not
-                       the first fragment of the datagram.  frag may not
-                       be used in conjunction with either tcpflags or
-                       TCP/UDP port specifications.
-
-               ipoptions spec
-                       Match if the IP header contains the comma
-                       separated list of options specified in spec. The
-                       supported IP options are:
-
-                       ssrr (strict source route), lsrr (loose source
-                       route), rr (record packet route) and ts
-                       (timestamp). The absence of a particular option
-                       may be denoted with a `!'.
-
-               tcpoptions spec
-                       Match if the TCP header contains the comma
-                       separated list of options specified in spec. The
-                       supported TCP options are:
-
-                       mss (maximum segment size), window (tcp window
-                       advertisement), sack (selective ack), ts (rfc1323
-                       timestamp) and cc (rfc1644 t/tcp connection
-                       count).  The absence of a particular option may
-                       be denoted with a `!'.
-
-               established
-                       TCP packets only. Match packets that have the RST
-                       or ACK bits set.
-
-               setup   TCP packets only. Match packets that have the SYN
-                       bit set but no ACK bit.
-
-               tcpflags spec
-                       TCP packets only. Match if the TCP header
-                       contains the comma separated list of flags
-                       specified in spec. The supported TCP flags are:
-
-                       fin, syn, rst, psh, ack and urg. The absence of a
-                       particular flag may be denoted with a `!'. A rule
-                       which contains a tcpflags specification can never
-                       match a fragmented packet which has a non-zero
-                       offset.  See the frag option for details on
-                       matching fragmented packets.
-
-               icmptypes types
-                       ICMP packets only.  Match if the ICMP type is in
-                       the list types. The list may be specified as any
-                       combination of ranges or individual types
-                       separated by commas.  The supported ICMP types
-                       are:
-
-                       echo reply (0), destination unreachable (3),
-                       source quench (4), redirect (5), echo request
-                       (8), router advertisement (9), router
-                       solicitation (10), time-to-live exceeded (11), IP
-                       header bad (12), timestamp request (13),
-                       timestamp reply (14), information request (15),
-                       information reply (16), address mask request (17)
-                       and address mask reply (18).
-
-         There is one kind of packet that the access device MUST always
-         discard, that is an IP fragment with a fragment offset of one.
-         This is a valid packet, but it only has one use, to try to
-         circumvent firewalls.
-
-            An access device that is unable to interpret or apply a deny
-            rule MUST terminate the session.  An access device that is
-            unable to interpret or apply a permit rule MAY apply a more
-            restrictive rule.  An access device MAY apply deny rules of
-            its own before the supplied rules, for example to protect
-            the access device owner's infrastructure.
-
-         The rule syntax is a modified subset of ipfw(8) from FreeBSD,
-         and the ipfw.c code may provide a useful base for
-         implementations.
+                       The IPFilterRule format is derived from the OctetString AVP
+                       Base Format.  It uses the UTF-8 encoding and has the same
+                       requirements as the UTF8String. Packets may be filtered based
+                       on the following information that is associated with it:
+
+                          Direction                          (in or out)
+                          Source and destination IP address  (possibly masked)
+                          Protocol
+                          Source and destination port        (lists or ranges)
+                          TCP flags
+                          IP fragment flag
+                          IP options
+                          ICMP types
+
+                       Rules for the appropriate direction are evaluated in order,
+                       with the first matched rule terminating the evaluation.  Each
+                       packet is evaluated once. If no rule matches, the packet is
+                       dropped if the last rule evaluated was a permit, and passed if
+                       the last rule was a deny.
+
+                       IPFilterRule filters MUST follow the format:
+
+                          action dir proto from src to dst [options]
+
+                          action       permit - Allow packets that match the rule.
+                                       deny   - Drop packets that match the rule.
+
+                          dir          "in" is from the terminal, "out" is to the
+                                       terminal.
+
+                          proto        An IP protocol specified by number.  The "ip"
+                                       keyword means any protocol will match.
+
+                          src and dst  <address/mask> [ports]
+
+                                       The <address/mask> may be specified as:
+                                       ipno       An IPv4 or IPv6 number in dotted-
+                                                  quad or canonical IPv6 form. Only
+                                                  this exact IP number will match the
+                                                  rule.
+                                       ipno/bits  An IP number as above with a mask
+                                                  width of the form 1.2.3.4/24.  In
+                                                  this case all IP numbers from
+                                                  1.2.3.0 to 1.2.3.255 will match.
+                                                  The bit width MUST be valid for the
+                                                  IP version and the IP number MUST
+                                                  NOT have bits set beyond the mask.
+
+                                       The sense of the match can be inverted by
+                                       preceding an address with the not modifier,
+                                       causing all other addresses to be matched
+                                       instead.  This does not affect the selection of
+                                       port numbers.
+
+                                          The keyword "any" is 0.0.0.0/0 or the IPv6
+                                          equivalent.  The keyword "assigned" is the
+                                          address or set of addresses assigned to the
+                                          terminal.  The first rule SHOULD be "deny in
+                                          ip !assigned".
+
+                                       With the TCP, UDP and SCTP protocols, optional
+                                       ports may be specified as:
+
+                                          {port|port-port}[,port[,...]]
+
+                                       The `-' notation specifies a range of ports
+                                       (including boundaries).
+
+                                       Fragmented packets which have a non-zero offset
+                                       (i.e. not the first fragment) will never match
+                                       a rule which has one or more port
+                                       specifications.  See the frag option for
+                                       details on matching fragmented packets.
+
+                          options:
+                             frag    Match if the packet is a fragment and this is not
+                                     the first fragment of the datagram.  frag may not
+                                     be used in conjunction with either tcpflags or
+                                     TCP/UDP port specifications.
+
+                             ipoptions spec
+                                     Match if the IP header contains the comma
+                                     separated list of options specified in spec. The
+                                     supported IP options are:
+
+                                     ssrr (strict source route), lsrr (loose source
+                                     route), rr (record packet route) and ts
+                                     (timestamp). The absence of a particular option
+                                     may be denoted with a `!'.
+
+                             tcpoptions spec
+                                     Match if the TCP header contains the comma
+                                     separated list of options specified in spec. The
+                                     supported TCP options are:
+
+                                     mss (maximum segment size), window (tcp window
+                                     advertisement), sack (selective ack), ts (rfc1323
+                                     timestamp) and cc (rfc1644 t/tcp connection
+                                     count).  The absence of a particular option may
+                                     be denoted with a `!'.
+
+                             established
+                                     TCP packets only. Match packets that have the RST
+                                     or ACK bits set.
+
+                             setup   TCP packets only. Match packets that have the SYN
+                                     bit set but no ACK bit.
+
+                             tcpflags spec
+                                     TCP packets only. Match if the TCP header
+                                     contains the comma separated list of flags
+                                     specified in spec. The supported TCP flags are:
+
+                                     fin, syn, rst, psh, ack and urg. The absence of a
+                                     particular flag may be denoted with a `!'. A rule
+                                     which contains a tcpflags specification can never
+                                     match a fragmented packet which has a non-zero
+                                     offset.  See the frag option for details on
+                                     matching fragmented packets.
+
+                             icmptypes types
+                                     ICMP packets only.  Match if the ICMP type is in
+                                     the list types. The list may be specified as any
+                                     combination of ranges or individual types
+                                     separated by commas.  The supported ICMP types
+                                     are:
+
+                                     echo reply (0), destination unreachable (3),
+                                     source quench (4), redirect (5), echo request
+                                     (8), router advertisement (9), router
+                                     solicitation (10), time-to-live exceeded (11), IP
+                                     header bad (12), timestamp request (13),
+                                     timestamp reply (14), information request (15),
+                                     information reply (16), address mask request (17)
+                                     and address mask reply (18).
+
+                       There is one kind of packet that the access device MUST always
+                       discard, that is an IP fragment with a fragment offset of one.
+                       This is a valid packet, but it only has one use, to try to
+                       circumvent firewalls.
+
+                          An access device that is unable to interpret or apply a deny
+                          rule MUST terminate the session.  An access device that is
+                          unable to interpret or apply a permit rule MAY apply a more
+                          restrictive rule.  An access device MAY apply deny rules of
+                          its own before the supplied rules, for example to protect
+                          the access device owner's infrastructure.
+
+                       The rule syntax is a modified subset of ipfw(8) from FreeBSD,
+                       and the ipfw.c code may provide a useful base for
+                       implementations.
                -->
                <typedefn type-name="QOSFilterRule" type-parent="OctetString"/>
                <!--
-         The QosFilterRule format is derived from the OctetString AVP
-         Base Format.  It uses the UTF-8 encoding and has the same
-         requirements as the UTF8String. Packets may be marked or
-         metered based on the following information that is associated
-         with it:
-
-            Direction                          (in or out)
-            Source and destination IP address  (possibly masked)
-            Protocol
-            Source and destination port        (lists or ranges)
-            DSCP values                        (no mask or range)
-
-         Rules for the appropriate direction are evaluated in order,
-         with the first matched rule terminating the evaluation.  Each
-         packet is evaluated once. If no rule matches, the packet is
-         treated as best effort.
-
-         QoSFilterRule filters MUST follow the format:
-
-            action dir proto from src to dst [options]
-
-                         tag    - Mark packet with a specific DSCP [49].
-                                  The DSCP option MUST be included.
-
-                         meter  - Meter traffic. The metering options
-                                  MUST be included.
-
-            dir          "in" is from the terminal, "out" is to the
-                         terminal.
-
-            proto        An IP protocol specified by number.  The "ip"
-                         keyword means any protocol will match.
-
-            src and dst  <address/mask> [ports]
-
-                         The <address/mask> may be specified as:
-                         ipno       An IPv4 or IPv6 number in dotted-
-                                    quad or canonical IPv6 form. Only
-                                    this exact IP number will match the
-                                    rule.
-                         ipno/bits  An IP number as above with a mask
-                                    width of the form 1.2.3.4/24.  In
-                                    this case all IP numbers from
-                                    1.2.3.0 to 1.2.3.255 will match.
-                                    The bit width MUST be valid for the
-                                    IP version and the IP number MUST
-                                    NOT have bits set beyond the mask.
-
-                         The sense of the match can be inverted by
-                         preceding an address with the not modifier,
-                         causing all other addresses to be matched
-                         instead.  This does not affect the selection of
-                         port numbers.
-
-                            The keyword "any" is 0.0.0.0/0 or the IPv6
-                            equivalent.  The keyword "assigned" is the
-                            address or set of addresses assigned to the
-                            terminal.  The first rule SHOULD be "deny in
-                            ip !assigned".
-
-                         With the TCP, UDP and SCTP protocols, optional
-                         ports may be specified as:
-
-                            {port|port-port}[,port[,...]]
-
-                         The `-' notation specifies a range of ports
-                         (including boundaries).
-
-            options:
-
-               DSCP <color>
-                       color values as defined in [49]. Exact matching
-                       of DSCP values is required (no masks or ranges).
-                       the "deny" can replace the color_under or
-                       color_over values in the meter action for rate-
-                       dependent packet drop.
-
-               metering <rate> <color_under> <color_over>
-                       The metering option provides Assured Forwarding,
-                       as defined in [50], and MUST be present if the
-                       action is set to meter. The rate option is the
-                       throughput, in bits per second, which is used by
-                       the access device to mark packets. Traffic above
-                       the rate is marked with the color_over codepoint,
-                       while traffic under the rate is marked with the
-                       color_under codepoint. The color_under and
-                       color_over options contain the drop preferences,
-                       and MUST conform to the recommended codepoint
-                       keywords described in [50] (e.g. AF13).
-
-                       The metering option also supports the strict
-                       limit on traffic required by Expedited
-                       Forwarding, as defined in [51]. The color_over
-                       option may contain the keyword "drop" to prevent
-                       forwarding of traffic that exceeds the rate
-                       parameter.
-
-         The rule syntax is a modified subset of ipfw(8) from FreeBSD,
-         and the ipfw.c code may provide a useful base for
-         implementations.
+                       The QosFilterRule format is derived from the OctetString AVP
+                       Base Format.  It uses the UTF-8 encoding and has the same
+                       requirements as the UTF8String. Packets may be marked or
+                       metered based on the following information that is associated
+                       with it:
 
+                          Direction                          (in or out)
+                          Source and destination IP address  (possibly masked)
+                          Protocol
+                          Source and destination port        (lists or ranges)
+                          DSCP values                        (no mask or range)
+
+                       Rules for the appropriate direction are evaluated in order,
+                       with the first matched rule terminating the evaluation.  Each
+                       packet is evaluated once. If no rule matches, the packet is
+                       treated as best effort.
+
+                       QoSFilterRule filters MUST follow the format:
+
+                          action dir proto from src to dst [options]
+
+                                       tag    - Mark packet with a specific DSCP [49].
+                                                The DSCP option MUST be included.
+
+                                       meter  - Meter traffic. The metering options
+                                                MUST be included.
+
+                          dir          "in" is from the terminal, "out" is to the
+                                       terminal.
+
+                          proto        An IP protocol specified by number.  The "ip"
+                                       keyword means any protocol will match.
+
+                          src and dst  <address/mask> [ports]
+                       
+                                       The <address/mask> may be specified as:
+                                       ipno       An IPv4 or IPv6 number in dotted-
+                                                  quad or canonical IPv6 form. Only
+                                                  this exact IP number will match the
+                                                  rule.
+                                       ipno/bits  An IP number as above with a mask
+                                                  width of the form 1.2.3.4/24.  In
+                                                  this case all IP numbers from
+                                                  1.2.3.0 to 1.2.3.255 will match.
+                                                  The bit width MUST be valid for the
+                                                  IP version and the IP number MUST
+                                                  NOT have bits set beyond the mask.
+
+                                       The sense of the match can be inverted by
+                                       preceding an address with the not modifier,
+                                       causing all other addresses to be matched
+                                       instead.  This does not affect the selection of
+                                       port numbers.
+
+                                          The keyword "any" is 0.0.0.0/0 or the IPv6
+                                          equivalent.  The keyword "assigned" is the
+                                          address or set of addresses assigned to the
+                                          terminal.  The first rule SHOULD be "deny in
+                                          ip !assigned".
+
+                                       With the TCP, UDP and SCTP protocols, optional
+                                       ports may be specified as:
+
+                                          {port|port-port}[,port[,...]]
+
+                                       The `-' notation specifies a range of ports
+                                       (including boundaries).
+
+                          options:
+
+                             DSCP <color>
+                                     color values as defined in [49]. Exact matching
+                                     of DSCP values is required (no masks or ranges).
+                                     the "deny" can replace the color_under or
+                                     color_over values in the meter action for rate-
+                                     dependent packet drop.
+
+                             metering <rate> <color_under> <color_over>
+                                     The metering option provides Assured Forwarding,
+                                     as defined in [50], and MUST be present if the
+                                     action is set to meter. The rate option is the
+                                     throughput, in bits per second, which is used by
+                                     the access device to mark packets. Traffic above
+                                     the rate is marked with the color_over codepoint,
+                                     while traffic under the rate is marked with the
+                                     color_under codepoint. The color_under and
+                                     color_over options contain the drop preferences,
+                                     and MUST conform to the recommended codepoint
+                                     keywords described in [50] (e.g. AF13).
+
+                                     The metering option also supports the strict
+                                     limit on traffic required by Expedited
+                                     Forwarding, as defined in [51]. The color_over
+                                     option may contain the keyword "drop" to prevent
+                                     forwarding of traffic that exceeds the rate
+                                     parameter.
+
+                       The rule syntax is a modified subset of ipfw(8) from FreeBSD,
+                       and the ipfw.c code may provide a useful base for
+                       implementations.
                -->
                <typedefn type-name="MIPRegistrationRequest" type-parent="OctetString"/>
                <typedefn type-name="Integer32"/>
                <!--
-         32 bit signed value, in network byte order. The AVP Length
-         field MUST be set to 12 (16 if the 'V' bit is enabled).
+                       32 bit signed value, in network byte order. The AVP Length
+                       field MUST be set to 12 (16 if the 'V' bit is enabled).
                -->
                <typedefn type-name="VendorId" type-parent="Unsigned32"/>
                <typedefn type-name="AppId" type-parent="Integer32"/>
                <typedefn type-name="Integer64"/>
                <!--
-         64 bit signed value, in network byte order. The AVP Length
-         field MUST be set to 16 (20 if the 'V' bit is enabled).
+                       64 bit signed value, in network byte order. The AVP Length
+                       field MUST be set to 16 (20 if the 'V' bit is enabled).
                -->
                <typedefn type-name="Unsigned32"/>
                <!--
-         32 bit unsigned value, in network byte order. The AVP Length
-         field MUST be set to 12 (16 if the 'V' bit is enabled).
-         Unsigned32 values used to transmit time data contains the four
-         most significant octets returned from NTP [18], in network byte
-         order.
+                       32 bit unsigned value, in network byte order. The AVP Length
+                       field MUST be set to 12 (16 if the 'V' bit is enabled).
+                       Unsigned32 values used to transmit time data contains the four
+                       most significant octets returned from NTP [18], in network byte
+                       order.
                -->
                <typedefn type-name="Time"/>
                <!--
-         The Time format is derived from the Unsigned32 AVP Base Format.
-         This is 32 bit unsigned value containing the four most
-         significant octets returned from NTP [18], in network byte
-         order.
+                       The Time format is derived from the Unsigned32 AVP Base Format.
+                       This is 32 bit unsigned value containing the four most
+                       significant octets returned from NTP [18], in network byte
+                       order.
 
-         This represent the number of seconds since 0h on 1 January 1900
-         with respect to the Coordinated Universal Time (UTC).
+                       This represent the number of seconds since 0h on 1 January 1900
+                       with respect to the Coordinated Universal Time (UTC).
 
-         On 6h 28m 16s UTC, 7 February 2036 the time value will
-         overflow.  NTP [18] describes a procedure to extend the time to
-         2104.
+                       On 6h 28m 16s UTC, 7 February 2036 the time value will
+                       overflow.  NTP [18] describes a procedure to extend the time to
+                       2104.
                -->
                <typedefn type-name="Unsigned64"/>
                <!--
-         64 bit unsigned value, in network byte order. The AVP Length
-         field MUST be set to 16 (20 if the 'V' bit is enabled).
+                       64 bit unsigned value, in network byte order. The AVP Length
+                       field MUST be set to 16 (20 if the 'V' bit is enabled).
                -->
-               <typedefn type-name="Enumerated" type-parent="Unsigned32"/>
+               <typedefn type-name="Enumerated" type-parent="Integer32"/>
                <typedefn type-name="DiameterURI" type-parent="UTF8String"/>
 
                <!-- ************************* End Typedefns ************************ -->
                        <enum name="LAT" code="4"/>
                        <enum name="X25-PAD" code="5"/>
                        <enum name="X25-T3POS" code="6"/>
+                       <enum name="Unassigned" code="7"/>
                        <enum name="TCP Clear Quiet (suppresses any NAS-generated connect string)" code="8"/>
                </avp>
                <avp name="Login-TCP-Port" code="16" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
                        <type type-name="Unsigned32"/>
                </avp>
+               <!-- 17        Unassigned -->
+               <avp name="Unassigned" code="17" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
                <avp name="Reply-Message" code="18" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="UTF8String"/>
                </avp>
                <avp name="Callback-Id" code="20" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="UTF8String"/>
                </avp>
+               <!-- 21        Unassigned -->
+               <avp name="Unassigned" code="21" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
                <avp name="Framed-Route" code="22" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="UTF8String"/>
                </avp>
                        <enum name="Accounting-On" code="7"/>
                        <enum name="Accounting-Off" code="8"/>
                        <!-- 9-14 Reserved for Tunnel Accounting -->
+                       <enum name="Tunnel-Start" code="9"/>
+                       <enum name="Tunnel-Stop" code="10"/>
+                       <enum name="Tunnel-Reject" code="11"/>
+                       <enum name="Tunnel-Link-Start" code="12"/>
+                       <enum name="Tunnel-Link-Stop" code="13"/>
+                       <enum name="Tunnel-Link-Rejectf" code="14"/>
                        <!-- 15 Reserved for Tunnel Failed -->
+                       <enum name="Failed" code="15"/>
                </avp>
                <avp name="Acct-Delay-Time" code="41" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
                        <type type-name="Unsigned32"/>
                <avp name="Acct-Output-Octets" code="43" mandatory="may">
                        <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Accounting-Session-Id" code="44" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
-                       <type type-name="Unsigned32"/>
+               <avp name="Acct-Session-Id" code="44" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
+                       <type type-name="OctetString"/>
+                       <!-- See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5411 -->
                </avp>
                <avp name="Acct-Authentic" code="45" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
                        <type type-name="Enumerated"/>
                        <type type-name="Integer32"/>
                </avp>
 <!-- 54        Unassigned -->
+               <avp name="Unassigned" code="54" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
                <avp name="Event-Timestamp" code="55" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
                        <type type-name="Time"/>
                </avp>
-<!--  
-56        Egress-VLANID                            [RFC4675]
-57        Ingress-Filters                          [RFC4675]
-58        Egress-VLAN-Name                         [RFC4675]
-59        User-Priority-Table                      [RFC4675]
--->
+               <avp name="Egress-VLANID" code="56" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Ingress-Filters" code="57" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
+                       <type type-name="Enumerated"/>
+                       <enum name="Enabled" code="1"/>
+                       <enum name="Disabled" code="2"/>
+               </avp>
+               <avp name="Egress-VLAN-Name" code="58" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="User-Priority-Table" code="59" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
+                       <type type-name="OctetString"/>
+               </avp>
                <avp name="CHAP-Challenge" code="60" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
                <avp name="Framed-Pool" code="88" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
-<!--
-http://www.iana.org/assignments/radius-types
-   89        CUI                                      [RFC4372]
--->
+               <avp name="CUI" code="89" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="UTF8String"/>
+               </avp>
                <avp name="Tunnel-Client-Auth-Id" code="90" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="UTF8String"/>
                </avp>
                <avp name="Tunnel-Server-Auth-Id" code="91" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="UTF8String"/>
                </avp>
-<!--
-http://www.iana.org/assignments/radius-types
-   92        NAS-Filter-Rule                          [RFC4849]
--->
+               <avp name="NAS-Filter-Rule" code="92" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="UTF8String"/>
+               </avp>
 <!--  93       (unassigned) -->
+               <avp name="Unassigned" code="93" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
                <avp name="Originating-Line-Info" code="94" mandatory="may" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
@@ -1110,9 +1162,9 @@ http://www.iana.org/assignments/radius-types
                <avp name="SIP-AOR" code="122" mandatory="may">
                        <type type-name="UTF8String"/>
                </avp>
-<!--
-123       Delegated-IPv6-Prefix                    [RFC4818]
--->
+               <avp name="Delegated-IPv6-Prefix" code="123" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
                <avp name="MIP6-Feature-Vector" code="124" mandatory="may">
                        <type type-name="Unsigned64"/>
                </avp>
@@ -1138,24 +1190,398 @@ http://www.iana.org/assignments/radius-types
                <avp name="Location-Capable" code="131" mandatory="may">
                        <type type-name="OctetString"/>
                </avp>
-               <!--
-133       Framed-Management-Protocol               [RFC5607]
-134       Management-Transport-Protection          [RFC5607]
-135       Management-Policy-Id                     [RFC5607]
-136       Management-Privilege-Level               [RFC5607]
-137       PKM-SS-Cert                              [RFC-zorn-radius-pkmv1-12.txt]
-138       PKM-CA-Cert                              [RFC-zorn-radius-pkmv1-12.txt]
-139       PKM-Auth-Wait-Timeout                    [RFC-zorn-radius-pkmv1-12.txt]
-140       PKM-Cryptosuite-List                     [RFC-zorn-radius-pkmv1-12.txt]
-141       PKM-SAID                                 [RFC-zorn-radius-pkmv1-12.txt]
-142       PKM-SA-Descriptor                        [RFC-zorn-radius-pkmv1-12.txt]
-143       PKM-Auth-Key                             [RFC-zorn-radius-pkmv1-12.txt]
-144-191   Unassigned
-192-223   Experimental Use                         [RFC3575]
-224-240   Implementation Specific                  [RFC3575]
-241-255   Reserved                                 [RFC3575]   
-               -->
+               <avp name="Requested-Location-Info" code="132" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Framed-Management-Protocol" code="133" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot">
+                       <type type-name="Enumerated"/>
+                       <enum name="SNMP" code="1"/>
+                       <enum name="Web-based" code="2"/>
+                       <enum name="NETCONF" code="3"/>
+                       <enum name="FTP" code="4"/>
+                       <enum name="TFTP" code="5"/>
+                       <enum name="SFTP" code="6"/>
+                       <enum name="RCP" code="7"/>
+                       <enum name="SCP" code="8"/>
+               </avp>
+               <avp name="Management-Transport-Protection" code="134" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot">
+                       <type type-name="Enumerated"/>
+                       <enum name="No-Protection" code="1"/>
+                       <enum name="Integrity-Protection" code="2"/>
+                       <enum name="Integrity-Confidentiality-Protection" code="3"/>
+               </avp>
+               <avp name="Management-Policy-Id" code="135" mandatory="may">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Management-Privilege-Level" code="136" mandatory="must" may-encrypt="no" vendor-bit="mustnot">
+                       <type type-name="Integer32"/>
+               </avp>
+               <avp name="PKM-SS-Cert" code="137" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="PKM-CA-Cert" code="138" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="PKM-Config-Settings" code="139" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="PKM-Cryptosuite-List" code="140" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="PPKM-SAID" code="141" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="PKM-SA-Descriptor" code="142" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="PKM-Auth-Key" code="143" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <!-- 144-191   Unassigned -->
+               <avp name="Unassigned" code="144" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="145" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="146" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="147" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="148" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="149" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="150" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="151" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="152" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="153" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="154" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="155" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="156" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="157" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="158" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="159" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="160" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="161" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="162" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="163" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="164" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="165" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="166" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="167" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="168" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="169" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="170" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="171" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="172" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="173" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="174" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="175" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="176" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="177" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="178" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="179" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="180" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="181" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="182" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="183" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="184" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="185" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="186" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="187" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="188" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="189" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="190" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="191" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+
+               <!-- 192-223   Experimental Use                         [RFC3575] -->
+               <avp name="Experimental-Use" code="192" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="193" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="194" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="195" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="196" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="197" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="198" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="199" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="200" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="201" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="202" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="203" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="204" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="205" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="206" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="207" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="208" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="209" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="210" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="211" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="212" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="213" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="214" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="215" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="216" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="217" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="218" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="219" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="220" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="221" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="222" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="223" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <!-- 224-240   Implementation Specific                  [RFC3575] -->
+               <avp name="Implementation-Specific" code="224" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="225" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="226" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="227" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="228" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="229" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="230" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="231" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="232" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="233" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="234" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="235" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="236" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="237" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="238" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="239" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="240" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <!--241-255   Reserved                                 [RFC3575] -->
+               <avp name="Reserved" code="241" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="242" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="243" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="244" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="245" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="246" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="247" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="248" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="249" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="250" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="251" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="252" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="253" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="254" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="255" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
                <!-- ******************* DIAMETER BASE PROTOCOL AVPS ************************ -->
+               <avp name="Unassigned" code="256" mandatory="may">
+                 <type type-name="OctetString"/>
+               </avp>
                <avp name="Host-IP-Address" code="257" mandatory="must" protected="may" may-encrypt="no" vendor-bit="mustnot">
                        <type type-name="IPAddress"/>
                </avp>
@@ -1180,7 +1606,7 @@ http://www.iana.org/assignments/radius-types
                        <enum name="3GPP Zh" code="16777221"/>
                        <enum name="3GPP Gq" code="16777222"/>
                        <enum name="3GPP Gmb" code="16777223"/>
-                       <enum name="3GPP Gx(Obsolete)" code="16777224"/>
+                       <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"/>
@@ -1198,9 +1624,9 @@ http://www.iana.org/assignments/radius-types
                        <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="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="NSN Unified Charging Trigger Function (UCTF)" code="16777246"/>
                        <enum name="3GPP2 CAN Access Authentication and Authorization" code="16777247"/>
@@ -1229,6 +1655,43 @@ http://www.iana.org/assignments/radius-types
                        <enum name="Juniper-Example" code="16777270"/>
                        <enum name="ITU-T Ri" code="16777271"/>
                        <enum name="3GPP S6b" code="16777272"/>
+      <!--
+16777273 Juniper JGx [Claudio_Lordello] 
+16777274 ITU-T Rd [ITU-T Rec. Q.3306.1][Janusz_Pieczerak] 
+16777275 ADMI Notification Application [Tomas_Menzl] 
+16777276 ADMI Messaging Interface Application [Tomas_Menzl] 
+16777277 Peter-Service VSI [Alexey_Grishin] 
+16777278 ETSI Rr request model [ETSI TS 183 071][Miguel_Angel_Reina_Ortega] 
+16777279 ETSI Rr delegated model [ETSI TS 183 071][Miguel_Angel_Reina_Ortega] 
+16777280 WIMAX HRPD Interworking [3GPP2 X.S0058-0 v1.0][Avi_Lior] 
+16777281 WiMAX Network Access Authentication and Authorization Diameter Application (WNAAADA) [WiMAX Release 1.5][Avi_Lior] 
+16777282 WiMAX Network Accounting Diameter Application (WNADA) [WiMAX Release 1.5][Avi_Lior] 
+16777283 WiMAX MIP4 Diameter Application (WM4DA) [WiMAX Release 1.5][Avi_Lior] 
+16777284 WiMAX MIP6 Diameter Application (WM6DA) [WiMAX Release 1.5][Avi_Lior] 
+16777285 WiMAX DHCP Diameter Application (WDDA) [WiMAX Release 1.5][Avi_Lior] 
+16777286 WiMAX-Location-Authentication-Authorization Diameter Application (WLAADA) [WiMAX Release 1.5][Avi_Lior] 
+16777287 WiMAX-Policy-and-Charging-Control-R3-Policies Diameter Application (WiMAX PCC-R3-P) [WiMAX Release 1.5][Avi_Lior] 
+16777288 WiMAX-Policy-and-Charging-Control-R3-OFfline-Charging Diameter Application (WiMAX PCC-R3-OFC) [WiMAX Release 1.5][Avi_Lior] 
+16777289 WiMAX-Policy-and-Charging-Control-R3-Offline-Charging-Prime Diameter Application (WiMAX PCC-R3-OFC-PRIME) [WiMAX Release 1.5][Avi_Lior] 
+16777290 WiMAX-Policy-and-Charging-Control-R3-Online-Charging Diameter Application (WiMAX PCC-R3-OC) [WiMAX Release 1.5][Avi_Lior] 
+16777291 3GPP SLh [3GPP TS 29.173][Kimmo_Kymalainen] 
+16777292 3GPP SGmb [3GPP TS 29.061][Kimmo_Kymalainen] 
+16777293 CMDI - Cloudmark Diameter Interface [Sanjiv_Parikh] 
+16777294 Camiant DRMA [Tarek_Abou-Assali][Michael_Mercurio] 
+16777295 PiLTE Interworking Diameter Application [3GPP2 publication X.S0057][Avi_Lior] 
+16777296 Juniper-Sessions-Recovery (JSR) [Aleksey_Romanov] 
+16777297 Vedicis LiveProxy [Francois-Frederic_Ozog] 
+16777298 Pi*3GPP2 Diameter Application [3GPP2 publication X.S0057A E-UTRAN eHRPD][Avi_Lior] 
+16777299 Sandvine Rf+ [Yoni_Eitan] 
+16777300 Subscription Information Application [Lars_Anglert] 
+16777301 Ericsson Charging-DCIP [Lars_Anglert] 
+-->
+      <enum name="3GPP Sy" code="16777302"/>
+      <enum name="3GPP Sd" code="16777303"/>
+      <enum name="Ericsson Sy" code="16777304"/>
+      <!--
+16777305 HP DTD [Chiranjeev_Agrawal][J_V_Kishore]       
+      -->
                        <enum name="Relay" code="4294967295"/>
                </avp>
                <avp name="Acct-Application-Id" code="259" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
@@ -1250,7 +1713,7 @@ http://www.iana.org/assignments/radius-types
                        <enum name="3GPP Zh" code="16777221"/>
                        <enum name="3GPP Gq" code="16777222"/>
                        <enum name="3GPP Gmb" code="16777223"/>
-                       <enum name="3GPP Gx(Obsolete)" code="16777224"/>
+                       <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"/>
@@ -1299,7 +1762,45 @@ http://www.iana.org/assignments/radius-types
                        <enum name="Juniper-Example" code="16777270"/>
                        <enum name="ITU-T Ri" code="16777271"/>
                        <enum name="3GPP S6b" code="16777272"/>
-                       <enum name="Relay" code="4294967295"/>
+      <!--
+16777273 Juniper JGx [Claudio_Lordello] 
+16777274 ITU-T Rd [ITU-T Rec. Q.3306.1][Janusz_Pieczerak] 
+16777275 ADMI Notification Application [Tomas_Menzl] 
+16777276 ADMI Messaging Interface Application [Tomas_Menzl] 
+16777277 Peter-Service VSI [Alexey_Grishin] 
+16777278 ETSI Rr request model [ETSI TS 183 071][Miguel_Angel_Reina_Ortega] 
+16777279 ETSI Rr delegated model [ETSI TS 183 071][Miguel_Angel_Reina_Ortega] 
+16777280 WIMAX HRPD Interworking [3GPP2 X.S0058-0 v1.0][Avi_Lior] 
+16777281 WiMAX Network Access Authentication and Authorization Diameter Application (WNAAADA) [WiMAX Release 1.5][Avi_Lior] 
+16777282 WiMAX Network Accounting Diameter Application (WNADA) [WiMAX Release 1.5][Avi_Lior] 
+16777283 WiMAX MIP4 Diameter Application (WM4DA) [WiMAX Release 1.5][Avi_Lior] 
+16777284 WiMAX MIP6 Diameter Application (WM6DA) [WiMAX Release 1.5][Avi_Lior] 
+16777285 WiMAX DHCP Diameter Application (WDDA) [WiMAX Release 1.5][Avi_Lior] 
+16777286 WiMAX-Location-Authentication-Authorization Diameter Application (WLAADA) [WiMAX Release 1.5][Avi_Lior] 
+16777287 WiMAX-Policy-and-Charging-Control-R3-Policies Diameter Application (WiMAX PCC-R3-P) [WiMAX Release 1.5][Avi_Lior] 
+16777288 WiMAX-Policy-and-Charging-Control-R3-OFfline-Charging Diameter Application (WiMAX PCC-R3-OFC) [WiMAX Release 1.5][Avi_Lior] 
+16777289 WiMAX-Policy-and-Charging-Control-R3-Offline-Charging-Prime Diameter Application (WiMAX PCC-R3-OFC-PRIME) [WiMAX Release 1.5][Avi_Lior] 
+16777290 WiMAX-Policy-and-Charging-Control-R3-Online-Charging Diameter Application (WiMAX PCC-R3-OC) [WiMAX Release 1.5][Avi_Lior] 
+16777291 3GPP SLh [3GPP TS 29.173][Kimmo_Kymalainen] 
+16777292 3GPP SGmb [3GPP TS 29.061][Kimmo_Kymalainen] 
+16777293 CMDI - Cloudmark Diameter Interface [Sanjiv_Parikh] 
+16777294 Camiant DRMA [Tarek_Abou-Assali][Michael_Mercurio] 
+16777295 PiLTE Interworking Diameter Application [3GPP2 publication X.S0057][Avi_Lior] 
+16777296 Juniper-Sessions-Recovery (JSR) [Aleksey_Romanov] 
+16777297 Vedicis LiveProxy [Francois-Frederic_Ozog] 
+16777298 Pi*3GPP2 Diameter Application [3GPP2 publication X.S0057A E-UTRAN eHRPD][Avi_Lior] 
+16777299 Sandvine Rf+ [Yoni_Eitan] 
+16777300 Subscription Information Application [Lars_Anglert] 
+16777301 Ericsson Charging-DCIP [Lars_Anglert] 
+-->
+      <enum name="3GPP Sy" code="16777302"/>
+      <enum name="3GPP Sd" code="16777303"/>
+      <enum name="Ericsson Sy" code="16777304"/>
+      <!--
+16777305 HP DTD [Chiranjeev_Agrawal][J_V_Kishore]       
+      -->
+
+      <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>
@@ -1456,7 +1957,7 @@ http://www.iana.org/assignments/radius-types
                </avp>
                <avp name="Failed-AVP" code="279" mandatory="must" may-encrypt="no" vendor-bit="mustnot">
                        <grouped>
-                       
+
                        </grouped>
                </avp>
                <avp name="Proxy-Host" code="280" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
@@ -1483,10 +1984,22 @@ http://www.iana.org/assignments/radius-types
                        <enum name="AUTHORIZE_AUTHENTICATE" code="1"/>
                </avp>
 <!-- 286 Unassigned -->
+               <avp name="Unassigned" code="286" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
                <avp name="Accounting-Sub-Session-Id" code="287" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
                        <type type-name="Unsigned64"/>
                </avp>
 <!-- 288-290    Unallocated http://www.iana.org/assignments/aaa-parameters  -->
+               <avp name="Unallocated" code="288" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="289" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="290" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
                <avp name="Authorization-Lifetime" code="291" mandatory="must" may-encrypt="no" vendor-bit="mustnot">
                        <type type-name="Integer32"/>
                </avp>
@@ -1540,6 +2053,7 @@ http://www.iana.org/assignments/radius-types
                        <enum name="DIAMETER_ERROR_POSITIONING_DENIED" code="4224"/>
                        <enum name="DIAMETER_ERROR_POSITIONING_FAILED" code="4225"/>
                        <enum name="DIAMETER_ERROR_UNKNOWN_UNREACHABLE LCS_CLIENT" code="4226"/>
+                       <!-- 4227-5000 Unassigned -->
                        <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"/>
@@ -1551,11 +2065,13 @@ http://www.iana.org/assignments/radius-types
                        <enum name="DIAMETER_ERROR_NOT_SUPPORTED_USER_DATA" code="5009"/>
                        <enum name="DIAMETER_MISSING_USER_ID" code="5010"/>
                        <enum name="DIAMETER_ERROR_FEATURE_UNSUPPORTED" code="5011"/>
+                       <!-- 5012 - 5040 -->
                        <enum name="DIAMETER_ERROR_USER_NO_WLAN_SUBSCRIPTION" code="5041"/>
                        <enum name="DIAMETER_ERROR_W-APN_UNUSED_BY_USER" code="5042"/>
                        <enum name="DIAMETER_ERROR_W-DIAMETER_ERROR_NO_ACCESS_INDEPENDENT_SUBSCRIPTION" code="5043"/>
                        <enum name="DIAMETER_ERROR_USER_NO_W-APN_SUBSCRIPTION" code="5044"/>
                        <enum name="DIAMETER_ERROR_UNSUITABLE_NETWORK" code="5045"/>
+                       <!-- 5046-5060 Unassigned -->
                        <enum name="INVALID_SERVICE_INFORMATION" code="5061"/>
                        <enum name="FILTER_RESTRICTIONS" code="5062"/>
                        <enum name="REQUESTED_SERVICE_NOT_AUTHORIZED" code="5063"/>
@@ -1571,6 +2087,7 @@ http://www.iana.org/assignments/radius-types
                        <enum name="DIAMETER_ERROR_SUBS_DATA_ABSENT" code="5106"/>
                        <enum name="DIAMETER_ERROR_NO_SUBSCRIPTION_TO_DATA" code="5107"/>
                        <enum name="DIAMETER_ERROR_DSAI_NOT_AVAILABLE" code="5108"/>
+                       <!-- 5109-5119 Unassigned -->
                        <enum name="DIAMETER_ERROR_START_INDICATION" code="5120"/>
                        <enum name="DIAMETER_ERROR_STOP_INDICATION" code="5121"/>
                        <enum name="DIAMETER_ERROR_UNKNOWN_MBMS_BEARER_SERVICE" code="5122"/>
@@ -1590,165 +2107,327 @@ http://www.iana.org/assignments/radius-types
                        <enum name="DIAMETER_ERROR_RAT_NOT_ALLOWED" code="5421"/>
                        <enum name="DIAMETER_ERROR_EQUIPMENT_UNKNOWN" code="5422"/>
                        <enum name="DIAMETER_ERROR_UNKNOWN_SERVING_NODE" code="5423"/>
+                       <!-- 5424-5449 Unassigned -->
                        <enum name="DIAMETER_ERROR_USER_NO_NON_3GPP_SUBSCRIPTION" code="5450"/>
                        <enum name="DIAMETER_ERROR_USER_NO_APN_SUBSCRIPTION" code="5451"/>
                        <enum name="DIAMETER_ERROR_RAT_TYPE_NOT_ALLOWED" code="5452"/>
                        <enum name="DIAMETER_ERROR_SUBSESSION" code="5470"/>
                        <enum name="DIAMETER_ERROR_UNAUTHORIZED_REQUESTING_NETWORK" code="5490"/>
                </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>
+               <!-- 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 name="Unallocated" code="301" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="302" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="303" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="304" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="305" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="306" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="307" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="308" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="309" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="310" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="311" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="312" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="313" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="314" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="315" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="316" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="317" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+
+<!-- AVP:s 318 - 348 Belongs to Diameter Mobile IPv4 Application and is defined in mobileipv4.xml
+318 MIP-FA-to-HA-SPI [RFC4004]
+319 MIP-FA-to-MN-SPI [RFC4004]
+320 MIP-Reg-Request [RFC4004]
+321 MIP-Reg-Reply [RFC4004]
+322 MIP-MN-AAA-Auth [RFC4004]
+323 MIP-HA-to-FA-SPI [RFC4004]
+324 Unassigned
+325 MIP-MN-to-FA-MSA [RFC4004]
+326 MIP-FA-to-MN-MSA [RFC4004]
+327 Unassigned
+328 MIP-FA-to-HA-MSA [RFC4004]
+329 MIP-HA-to-FA-MSA [RFC4004]
+331 MIP-MN-to-HA-MSA [RFC4004]
+332 MIP-HA-to-MN-MSA [RFC4004]
+333 MIP-Mobile-Node-Address [RFC4004]
+334 MIP-Home-Agent-Address [RFC4004]
+335 MIP-Nonce [RFC4004]
+336 MIP-Candidate-Home-Agent-Host [RFC4004]
+337 MIP-Feature-Vector [RFC4004]
+338 MIP-Auth-Input-Data-Length [RFC4004]
+339 MIP-Authenticator-Length [RFC4004]
+340 MIP-Authenticator-Offset [RFC4004]
+341 MIP-MN-AAA-SPI [RFC4004]
+342 MIP-Filter-Rule [RFC4004]
+343 MIP-Session-Key [RFC4004]
+344 MIP-FA-Challenge [RFC4004]
+345 MIP-Algorithm-Type [RFC4004]
+346 MIP-Replay-Mode [RFC4004]
+347 MIP-Originating-Foreign-AAA [RFC4004]
+348 MIP-Home-Agent-Host [RFC4004]
+-->
+<!-- AVP:s 349-362        Unassigned -->
+               <avp name="Unassigned" code="349" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="350" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="351" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="352" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="353" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="354" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="355" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="356" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="357" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="358" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="359" mandatory="may">
+                       <type type-name="OctetString"/>
                </avp>
-               <!-- 301-317    Unallocated -->
-<!-- AVP:s 318 - 348 Belongs to Diameter Mobile IPv4 Application and is defined in mobileipv4.xml
-318 MIP-FA-to-HA-SPI [RFC4004] 
-319 MIP-FA-to-MN-SPI [RFC4004] 
-320 MIP-Reg-Request [RFC4004] 
-321 MIP-Reg-Reply [RFC4004] 
-322 MIP-MN-AAA-Auth [RFC4004] 
-323 MIP-HA-to-FA-SPI [RFC4004] 
-324 Unassigned  
-325 MIP-MN-to-FA-MSA [RFC4004] 
-326 MIP-FA-to-MN-MSA [RFC4004] 
-327 Unassigned  
-328 MIP-FA-to-HA-MSA [RFC4004] 
-329 MIP-HA-to-FA-MSA [RFC4004] 
-331 MIP-MN-to-HA-MSA [RFC4004] 
-332 MIP-HA-to-MN-MSA [RFC4004] 
-333 MIP-Mobile-Node-Address [RFC4004] 
-334 MIP-Home-Agent-Address [RFC4004] 
-335 MIP-Nonce [RFC4004] 
-336 MIP-Candidate-Home-Agent-Host [RFC4004] 
-337 MIP-Feature-Vector [RFC4004] 
-338 MIP-Auth-Input-Data-Length [RFC4004] 
-339 MIP-Authenticator-Length [RFC4004] 
-340 MIP-Authenticator-Offset [RFC4004] 
-341 MIP-MN-AAA-SPI [RFC4004] 
-342 MIP-Filter-Rule [RFC4004] 
-343 MIP-Session-Key [RFC4004] 
-344 MIP-FA-Challenge [RFC4004] 
-345 MIP-Algorithm-Type [RFC4004] 
-346 MIP-Replay-Mode [RFC4004] 
-347 MIP-Originating-Foreign-AAA [RFC4004] 
-348 MIP-Home-Agent-Host [RFC4004] 
---> 
-<!-- AVP:s 349-362        Unassigned -->
-<!-- AVP:s 368 - 393 is in sip.xml 
-363 Accounting-Input-Octets [RFC4005][RFC4004] 
-364 Accounting-Output-Octets [RFC4005][RFC4004] 
-365 Accounting-Input-Packets [RFC4005][RFC4004] 
-366 Accounting-Output-Packets [RFC4005][RFC4004] 
-367 MIP-MSA-Lifetime [RFC4004] 
-368 SIP-Accounting-Information [RFC4740] 
-369 SIP-Accounting-Server-URI [RFC4740] 
-370 SIP-Credit-Control-Server-URI [RFC4740] 
-371 SIP-Server-URI [RFC4740] 
-372 SIP-Server-Capabilities [RFC4740] 
-373 SIP-Mandatory-Capability [RFC4740] 
-374 SIP-Optional-Capability [RFC4740] 
-375 SIP-Server-Assignment-Type [RFC4740] 
-376 SIP-Auth-Data-Item [RFC4740] 
-377 SIP-Authentication-Scheme [RFC4740] 
-378 SIP-Item-Number [RFC4740] 
-379 SIP-Authenticate [RFC4740] 
-380 SIP-Authorization [RFC4740] 
-381 SIP-Authentication-Info [RFC4740] 
-382 SIP-Number-Auth-Items [RFC4740] 
-383 SIP-Deregistration-Reason [RFC4740] 
-384 SIP-Reason-Code [RFC4740] 
-385 SIP-Reason-Info [RFC4740] 
-386 SIP-Visited-Network-Id [RFC4740] 
-387 SIP-User-Authorization-Type [RFC4740] 
-388 SIP-Supported-User-Data-Type [RFC4740] 
-389 SIP-User-Data [RFC4740] 
-390 SIP-User-Data-Type [RFC4740] 
-391 SIP-User-Data-Contents [RFC4740] 
-392 SIP-User-Data-Already-Available [RFC4740] 
-393 SIP-Method [RFC4740] 
+               <avp name="Unassigned" code="360" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="361" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="362" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+
+<!-- AVP:s 368 - 393 is in sip.xml
+363 Accounting-Input-Octets [RFC4005][RFC4004]
+364 Accounting-Output-Octets [RFC4005][RFC4004]
+365 Accounting-Input-Packets [RFC4005][RFC4004]
+366 Accounting-Output-Packets [RFC4005][RFC4004]
+367 MIP-MSA-Lifetime [RFC4004]
+368 SIP-Accounting-Information [RFC4740]
+369 SIP-Accounting-Server-URI [RFC4740]
+370 SIP-Credit-Control-Server-URI [RFC4740]
+371 SIP-Server-URI [RFC4740]
+372 SIP-Server-Capabilities [RFC4740]
+373 SIP-Mandatory-Capability [RFC4740]
+374 SIP-Optional-Capability [RFC4740]
+375 SIP-Server-Assignment-Type [RFC4740]
+376 SIP-Auth-Data-Item [RFC4740]
+377 SIP-Authentication-Scheme [RFC4740]
+378 SIP-Item-Number [RFC4740]
+379 SIP-Authenticate [RFC4740]
+380 SIP-Authorization [RFC4740]
+381 SIP-Authentication-Info [RFC4740]
+382 SIP-Number-Auth-Items [RFC4740]
+383 SIP-Deregistration-Reason [RFC4740]
+384 SIP-Reason-Code [RFC4740]
+385 SIP-Reason-Info [RFC4740]
+386 SIP-Visited-Network-Id [RFC4740]
+387 SIP-User-Authorization-Type [RFC4740]
+388 SIP-Supported-User-Data-Type [RFC4740]
+389 SIP-User-Data [RFC4740]
+390 SIP-User-Data-Type [RFC4740]
+391 SIP-User-Data-Contents [RFC4740]
+392 SIP-User-Data-Already-Available [RFC4740]
+393 SIP-Method [RFC4740]
 -->
-<!-- 394-399 Unassigned  -->    
+<!-- 394-399 Unassigned  -->
+               <avp name="Unassigned" code="394" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="395" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="396" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="397" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="398" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="399" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+
 <!-- 400 408 is defined in nasreq.xml
-400 NAS-Filter-Rule [RFC4005] 
-401 Tunneling [RFC4005] 
-402 CHAP-Auth [RFC4005] 
-403 CHAP-Algorithm [RFC4005] 
-404 CHAP-Ident [RFC4005] 
-405 CHAP-Response [RFC4005] 
-406 Acounting-Auth-Method [RFC4005] 
-407 QoS-Filter-Rule [RFC4005] 
-408 Origin-AAA-Protocol [RFC4005] 
- -->
+400 NAS-Filter-Rule [RFC4005]
+401 Tunneling [RFC4005]
+402 CHAP-Auth [RFC4005]
+403 CHAP-Algorithm [RFC4005]
+404 CHAP-Ident [RFC4005]
+405 CHAP-Response [RFC4005]
+406 Acounting-Auth-Method [RFC4005]
+407 QoS-Filter-Rule [RFC4005]
+408 Origin-AAA-Protocol [RFC4005]
+-->
 <!-- 409-410 Unassigned -->
+               <avp name="Unassigned" code="409" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="410" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+
+<!-- AVP:s 411 - 461 Belongs to Charge Control and is defined in chargecontrol.xml
+411 CC-Correlation-Id [RFC4006]
+412 CC-Input-Octets [RFC4006]
+413 CC-Money [RFC4006]
+414 CC-Output-Octets [RFC4006]
+415 CC-Request-Number [RFC4006]
+416 CC-Request-Type [RFC4006]
+417 CC-Service-Specific-Units [RFC4006]
+418 CC-Session-Failover [RFC4006]
+419 CC-Sub-Session-Id [RFC4006]
+420 CC-Time [RFC4006]
+421 CC-Total-Octets [RFC4006]
+422 Check-Balance-Result [RFC4006]
+423 Cost-Information [RFC4006]
+424 Cost-Unit [RFC4006]
+425 Currency-Code [RFC4006]
+426 Credit-Control [RFC4006]
+427 Credit-Control-Failure-Handling [RFC4006]
+428 Direct-Debiting-Failure-Handling [RFC4006]
+429 Exponent [RFC4006]
+430 Final-Unit-Indication [RFC4006]
+431 Granted-Service-Unit [RFC4006]
+432 Rating-Group [RFC4006]
+433 Redirect-Address-Type [RFC4006]
+434 Redirect-Server [RFC4006]
+435 Redirect-Server-Address [RFC4006]
+436 Requested-Action [RFC4006]
+437 Requested-Service-Unit [RFC4006]
+438 Restriction-Filter-Rule [RFC4006]
+439 Service-Identifier [RFC4006]
+440 Service-Parameter-Info [RFC4006]
+441 Service-Parameter-Type [RFC4006]
+442 Service-Parameter-Value [RFC4006]
+443 Subscription-Id [RFC4006]
+444 Subscription-Id-Data [RFC4006]
+445 Unit-Value [RFC4006]
+446 Used-Service-Unit [RFC4006]
+447 Value-Digits [RFC4006]
+448 Validity-Time [RFC4006]
+449 Final-Unit-Action [RFC4006]
+450 Subscription-Id-Type [RFC4006]
+451 Tariff-Time-Change [RFC4006]
+452 Tariff-Change-Usage [RFC4006]
+453 G-S-U-Pool-Identifier [RFC4006]
+454 CC-Unit-Type [RFC4006]
+455 Multiple-Services-Indicator [RFC4006]
+456 Multiple-Services-Credit-Control [RFC4006]
+457 G-S-U-Pool-Reference [RFC4006]
+458 User-Equipment-Info [RFC4006]
+459 User-Equipment-Info-Type [RFC4006]
+460 User-Equipment-Info-Value [RFC4006]
+461 Service-Context-Id [RFC4006]
 -->
-<!-- AVP:s 411 - 461 Belongs to Carge Control and is defined in chargecontrol.xml
-411 CC-Correlation-Id [RFC4006] 
-412 CC-Input-Octets [RFC4006] 
-413 CC-Money [RFC4006] 
-414 CC-Output-Octets [RFC4006] 
-415 CC-Request-Number [RFC4006] 
-416 CC-Request-Type [RFC4006] 
-417 CC-Service-Specific-Units [RFC4006] 
-418 CC-Session-Failover [RFC4006] 
-419 CC-Sub-Session-Id [RFC4006] 
-420 CC-Time [RFC4006] 
-421 CC-Total-Octets [RFC4006] 
-422 Check-Balance-Result [RFC4006] 
-423 Cost-Information [RFC4006] 
-424 Cost-Unit [RFC4006] 
-425 Currency-Code [RFC4006] 
-426 Credit-Control [RFC4006] 
-427 Credit-Control-Failure-Handling [RFC4006] 
-428 Direct-Debiting-Failure-Handling [RFC4006] 
-429 Exponent [RFC4006] 
-430 Final-Unit-Indication [RFC4006] 
-431 Granted-Service-Unit [RFC4006] 
-432 Rating-Group [RFC4006] 
-433 Redirect-Address-Type [RFC4006] 
-434 Redirect-Server [RFC4006] 
-435 Redirect-Server-Address [RFC4006] 
-436 Requested-Action [RFC4006] 
-437 Requested-Service-Unit [RFC4006] 
-438 Restriction-Filter-Rule [RFC4006] 
-439 Service-Identifier [RFC4006] 
-440 Service-Parameter-Info [RFC4006] 
-441 Service-Parameter-Type [RFC4006] 
-442 Service-Parameter-Value [RFC4006] 
-443 Subscription-Id [RFC4006] 
-444 Subscription-Id-Data [RFC4006] 
-445 Unit-Value [RFC4006] 
-446 Used-Service-Unit [RFC4006] 
-447 Value-Digits [RFC4006] 
-448 Validity-Time [RFC4006] 
-449 Final-Unit-Action [RFC4006] 
-450 Subscription-Id-Type [RFC4006] 
-451 Tariff-Time-Change [RFC4006] 
-452 Tariff-Change-Usage [RFC4006] 
-453 G-S-U-Pool-Identifier [RFC4006] 
-454 CC-Unit-Type [RFC4006] 
-455 Multiple-Services-Indicator [RFC4006] 
-456 Multiple-Services-Credit-Control [RFC4006] 
-457 G-S-U-Pool-Reference [RFC4006] 
-458 User-Equipment-Info [RFC4006] 
-459 User-Equipment-Info-Type [RFC4006] 
-460 User-Equipment-Info-Value [RFC4006] 
-461 Service-Context-Id [RFC4006] 
-
---> 
 <!-- epa.xml
-     462 EAP-Payload [RFC4072] 
-     463 EAP-Reissued-Payload [RFC4072] 
-     464 EAP-Master-Session-Key [RFC4072] 
-     465 Accounting-EAP-Auth-Method [RFC4072] 
+462 EAP-Payload [RFC4072]
+463 EAP-Reissued-Payload [RFC4072]
+464 EAP-Master-Session-Key [RFC4072]
+465 Accounting-EAP-Auth-Method [RFC4072]
 -->
 <!-- 466-479    Unallocated -->
+               <avp name="Unassigned" code="466" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="467" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="468" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="469" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="470" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="471" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="472" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="473" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="474" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="475" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="476" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="477" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="478" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="479" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
                <avp name="Accounting-Record-Type" code="480" mandatory="must" may-encrypt="yes" vendor-bit="mustnot">
                        <type type-name="Enumerated"/>
                        <enum name="Event Record" code="1"/>
@@ -1757,6 +2436,12 @@ http://www.iana.org/assignments/radius-types
                        <enum name="Stop Record" code="4"/>
                </avp>
 <!-- 481-482    Unallocated http://www.iana.org/assignments/aaa-parameters/aaa-parameters.xhtml -->
+               <avp name="Unassigned" code="481" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="482" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
                <avp name="Accounting-Realtime-Required" code="483" mandatory="must" may-encrypt="yes" vendor-bit="mustnot">
                        <type type-name="Unsigned32"/>
                        <enum name="Reserved" code="0"/>
@@ -1765,108 +2450,137 @@ http://www.iana.org/assignments/radius-types
                        <enum name="GRANT_AND_LOSE" code="3"/>
                </avp>
 <!-- 484    unallocated  -->
+               <avp name="Unassigned" code="484" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
                <avp name="Accounting-Record-Number" code="485" mandatory="must" may-encrypt="yes" vendor-bit="mustnot">
                        <type type-name="Unsigned32"/>
                </avp>
-<!--
-486 - 494 in mobileipv6.xml
-495 TMOD-1 [RFC5624] 
-496 Token-Rate [RFC5624] 
-497 Bucket-Depth [RFC5624] 
-498 Peak-Traffic-Rate [RFC5624] 
-499 Minimum-Policed-Unit [RFC5624] 
-500 Maximum-Packet-Size [RFC5624] 
-501 TMOD-2 [RFC5624] 
-502 Bandwidth [RFC5624] 
-503 PHB-Class [RFC5624] 
-504 - 507 in mobileipv6.xml
- 503 PHB-Class [RFC5624] 
- 504 PMIP6-DHCP-Server-Address [RFC5779] 
- 505 PMIP6-IPv4-Home-Address [RFC5779] 
- 506 Mobile-Node-Identifier [RFC5779] 
- 507 Service-Configuration [RFC5779] 
-508 QoS-Resources [RFC5777] 
-509 Filter-Rule [RFC5777] 
-510 Filter-Rule-Precedence [RFC5777] 
-511 Classifier [RFC5777] 
-512 Classifier-ID [RFC5777] 
-513 Protocol [RFC5777] 
-514 Direction [RFC5777] 
-515 From-Spec [RFC5777] 
-516 To-Spec [RFC5777] 
-517 Negated [RFC5777] 
-518 IP-Address [RFC5777] 
-519 IP-Address-Range [RFC5777] 
-520 IP-Address-Start [RFC5777] 
-521 IP-Address-End [RFC5777] 
-522 IP-Address-Mask [RFC5777] 
-523 IP-Mask-Bit-Mask-Width [RFC5777] 
-524 MAC-Address [RFC5777] 
-525 MAC-Address-Mask [RFC5777] 
-526 MAC-Address-Mask-Pattern [RFC5777] 
-527 EUI64-Address [RFC5777] 
-528 EUI64-Address-Mask [RFC5777] 
-529 EUI64-Address-Mask-Pattern [RFC5777] 
-530 Port [RFC5777] 
-531 Port-Range [RFC5777] 
-532 Port-Start [RFC5777] 
-533 Port-End [RFC5777] 
-534 Use-Assigned-Address [RFC5777] 
-535 Diffserv-Code-Point [RFC5777] 
-536 Fragmentation-Flag [RFC5777] 
-537 IP-Option [RFC5777] 
-538 IP-Option-Type [RFC5777] 
-539 IP-Option-Value [RFC5777] 
-540 TCP-Option [RFC5777] 
-541 TCP-Option-Type [RFC5777] 
-542 TCP-Option-Value [RFC5777] 
-543 TCP-Flags [RFC5777] 
-544 TCP-Flag-Type [RFC5777] 
-545 ICMP-Type [RFC5777] 
-546 ICMP-Type-Number [RFC5777] 
-547 ICMP-Code [RFC5777] 
-548 ETH-Option [RFC5777] 
-549 ETH-Proto-Type [RFC5777] 
-550 ETH-Ether-Type [RFC5777] 
-551 ETH-SAP [RFC5777] 
-552 VLAN-ID-Range [RFC5777] 
-553 S-VID-Start [RFC5777] 
-554 S-VID-End [RFC5777] 
-555 C-VID-Start [RFC5777] 
-556 C-VID-End [RFC5777] 
-557 User-Priority-Range [RFC5777] 
-558 Low-User-Priority [RFC5777] 
-559 High-User-Priority [RFC5777] 
-560 Time-Of-Day-Condition [RFC5777] 
-561 Time-Of-Day-Start [RFC5777] 
-562 Time-Of-Day-End [RFC5777] 
-563 Day-Of-Week-Mask [RFC5777] 
-564 Day-Of-Month-Mask [RFC5777] 
-565 Month-Of-Year-Mask [RFC5777] 
-566 Absolute-Start-Time [RFC5777] 
-567 Absolute-Start-Fractional-Seconds [RFC5777] 
-568 Absolute-End-Time [RFC5777] 
-569 Absolute-End-Fractional-Seconds [RFC5777] 
-570 Timezone-Flag [RFC5777] 
-571 Timezone-Offset [RFC5777] 
-572 Treatment-Action [RFC5777] 
-573 QoS-Profile-Id [RFC5777] 
-574 QoS-Profile-Template [RFC5777] 
-575 QoS-Semantics [RFC5777] 
-576 QoS-Parameters [RFC5777] 
-577 Excess-Treatment [RFC5777] 
-578 QoS-Capability [RFC5777] 
-579 QoS-Authorization-Data [RFC-ietf-dime-diameter-qos-15] 
-580 Bound-Auth-Session-Id [RFC-ietf-dime-diameter-qos-15] 
-581-0xffffff Unassigned 
--->
-               <avp name="Example-AVP" code="999999" mandatory="mustnot" vendor-bit="may">
+<!-- 486 - 494 in mobileipv6.xml -->
+               <avp name="TMOD-1" code="495" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
+                       <grouped>
+                               <gavp name="Token-Rate"/>
+                               <gavp name="Bucket-Depth"/>
+                               <gavp name="Peak-Traffic-Rate"/>
+                               <gavp name="Minimum-Policed-Unit"/>
+                               <gavp name="Maximum-Packet-Size"/>
+                       </grouped>
+               </avp>
+               <avp name="Token-Rate" code="496" mandatory="may">
+                       <type type-name="Float32"/>
+               </avp>
+               <avp name="Bucket-Depth" code="497" mandatory="may">
+                       <type type-name="Float32"/>
+               </avp>
+               <avp name="Peak-Traffic-Rate" code="498" mandatory="may">
+                       <type type-name="Float32"/>
+               </avp>
+               <avp name="Minimum-Policed-Unit" code="499" mandatory="may">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Maximum-Packet-Size" code="500" mandatory="may">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="TMOD-2" code="501" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
                        <grouped>
-                               <gavp name="Origin-Host"/>
-                               <gavp name="Host-IP-Address"/>
+                               <gavp name="Token-Rate"/>
+                               <gavp name="Bucket-Depth"/>
+                               <gavp name="Peak-Traffic-Rate"/>
+                               <gavp name="Minimum-Policed-Unit"/>
+                               <gavp name="Maximum-Packet-Size"/>
                        </grouped>
                </avp>
-               <!-- ************************ END DIAMETER BASE PROTOCOL AVPS ******************* -->
+               <avp name="Bandwidth" code="502" mandatory="may">
+                       <type type-name="Float32"/>
+               </avp>
+               <avp name="PHB-Class" code="503" mandatory="may">
+                       <type type-name="Unsigned32"/>
+               </avp>
+<!-- 504 - 507 in mobileipv6.xml -->
+<!--
+508 QoS-Resources [RFC5777]
+509 Filter-Rule [RFC5777]
+510 Filter-Rule-Precedence [RFC5777]
+511 Classifier [RFC5777]
+512 Classifier-ID [RFC5777]
+513 Protocol [RFC5777]
+514 Direction [RFC5777]
+515 From-Spec [RFC5777]
+516 To-Spec [RFC5777]
+517 Negated [RFC5777]
+518 IP-Address [RFC5777]
+519 IP-Address-Range [RFC5777]
+520 IP-Address-Start [RFC5777]
+521 IP-Address-End [RFC5777]
+522 IP-Address-Mask [RFC5777]
+523 IP-Mask-Bit-Mask-Width [RFC5777]
+524 MAC-Address [RFC5777]
+525 MAC-Address-Mask [RFC5777]
+526 MAC-Address-Mask-Pattern [RFC5777]
+527 EUI64-Address [RFC5777]
+528 EUI64-Address-Mask [RFC5777]
+529 EUI64-Address-Mask-Pattern [RFC5777]
+530 Port [RFC5777]
+531 Port-Range [RFC5777]
+532 Port-Start [RFC5777]
+533 Port-End [RFC5777]
+534 Use-Assigned-Address [RFC5777]
+535 Diffserv-Code-Point [RFC5777]
+536 Fragmentation-Flag [RFC5777]
+537 IP-Option [RFC5777]
+538 IP-Option-Type [RFC5777]
+539 IP-Option-Value [RFC5777]
+540 TCP-Option [RFC5777]
+541 TCP-Option-Type [RFC5777]
+542 TCP-Option-Value [RFC5777]
+543 TCP-Flags [RFC5777]
+544 TCP-Flag-Type [RFC5777]
+545 ICMP-Type [RFC5777]
+546 ICMP-Type-Number [RFC5777]
+547 ICMP-Code [RFC5777]
+548 ETH-Option [RFC5777]
+549 ETH-Proto-Type [RFC5777]
+550 ETH-Ether-Type [RFC5777]
+551 ETH-SAP [RFC5777]
+552 VLAN-ID-Range [RFC5777]
+553 S-VID-Start [RFC5777]
+554 S-VID-End [RFC5777]
+555 C-VID-Start [RFC5777]
+556 C-VID-End [RFC5777]
+557 User-Priority-Range [RFC5777]
+558 Low-User-Priority [RFC5777]
+559 High-User-Priority [RFC5777]
+560 Time-Of-Day-Condition [RFC5777]
+561 Time-Of-Day-Start [RFC5777]
+562 Time-Of-Day-End [RFC5777]
+563 Day-Of-Week-Mask [RFC5777]
+564 Day-Of-Month-Mask [RFC5777]
+565 Month-Of-Year-Mask [RFC5777]
+566 Absolute-Start-Time [RFC5777]
+567 Absolute-Start-Fractional-Seconds [RFC5777]
+568 Absolute-End-Time [RFC5777]
+569 Absolute-End-Fractional-Seconds [RFC5777]
+570 Timezone-Flag [RFC5777]
+571 Timezone-Offset [RFC5777]
+572 Treatment-Action [RFC5777]
+573 QoS-Profile-Id [RFC5777]
+574 QoS-Profile-Template [RFC5777]
+575 QoS-Semantics [RFC5777]
+576 QoS-Parameters [RFC5777]
+577 Excess-Treatment [RFC5777]
+578 QoS-Capability [RFC5777]
+579 QoS-Authorization-Data [RFC5866] 
+580 Bound-Auth-Session-Id [RFC5866] 
+581 Key [RFC-ietf-dime-local-keytran-14] 
+582 Key-Type [RFC-ietf-dime-local-keytran-14] 
+583 Keying-Material [RFC-ietf-dime-local-keytran-14] 
+584 Key-Lifetime [RFC-ietf-dime-local-keytran-14] 
+585 Key-SPI [RFC-ietf-dime-local-keytran-14] 
+586 Key-Name [RFC-ietf-dime-local-keytran-14] 
+587-0xffffff Unassigned -->
+
+<!-- ************************ END DIAMETER BASE PROTOCOL AVPS ******************* -->
+
 <!--
 3GPP TS 29.230 version 8.7.0 Release 8  Table 7.1: 3GPP specific AVP codes
 100 3GPP-WLAN-APN-Id OctetString 29.234 [6]
@@ -1891,7 +2605,11 @@ Note: The AVP codes from 256 to 299 are reserved for future use.
 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]
+-->
+    <avp name="3GPP-AAA-Server-Name" may-encrypt="yes" vendor-id="TGPP" vendor-bit="must" mandatory="must" code="318">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <!--
 319 Maximum-Number-Accesses Unsigned32
 Note: The AVP codes from 320 to 399 are reserved for TS 29.234
 -->
@@ -1932,36 +2650,120 @@ Note: The AVP codes from 320 to 399 are reserved for TS 29.234
                        <enum name="3G GBA" code="0"/>
                        <enum name="2G GBA" code="1"/>
                </avp>
-<!--
-411 UE-Id OctectString
-412 UE-Id-Type Enumerated
-413 UICC-App-Label OctectString
-414 UICC-ME Enumerated
-415 Requested-Key-Lifetime Time
-416 Private-Identity-Request Enumerated
-417 GBA-Push-Info OctectString
-418 NAF-SA-Identifier OctectString
-419    Security-Feature-Request        OctetString
-420    Security-Feature-Response       OctetString
+               <avp name="UE-Id" code="411" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="UE-Id-Type" code="412" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="Private user identity" code="0"/>
+                       <enum name="Public user identity" code="1"/>
+               </avp>
+               <avp name="UICC-App-Label" code="413" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="UICC-ME" code="414" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="GBA_ME" code="0"/>
+                       <enum name="GBA_U" code="1"/>
+               </avp>
+               <avp name="Requested-Key-Lifetime" code="415" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Time"/>
+               </avp>
+               <avp name="Private-Identity-Request" code="416" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="Private identity requested" code="0"/>
+                       <enum name="Private identity not requested" code="1"/>
+               </avp>
+               <avp name="GBA-Push-Info" code="417" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="NAF-SA-Identifier" code="418" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Security-Feature-Request" code="419" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Security-Feature-Response" code="420" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+<!-- Note: The AVP codes from 421 to 499 are reserved for TS 29.109
+
+               <avp name="Reserved for TS 29.109" code="421" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="422" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="423" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="424" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="425" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="426" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="427" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="428" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="429" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="430" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="431" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="432" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="433" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="434" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="435" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="436" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="437" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="438" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="439" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
 29.109 [7]
-Note: TThe AVP codes from 419 to 499 are reserved for TS 29.109
+Note: The AVP codes from 421 to 499 are reserved for TS 29.109
 -->
-<!-- Ref 3GPP TS 29.209 version 6.7.0 Release 6 
+<!-- Ref 3GPP TS 29.209 version 6.7.0 Release 6
  NOTE AVP 500 - 523 is in gqpolicy.xml
       AVP 524 - 527 is in TGPPRx.xml (3GPP TS 29.214)
 Note: The AVP codes from 524 to 599 are reserved for TS 29.209 and TS 29.211
- NOTE AVP 600 - 650 is in imscxdx.xml
+ NOTE AVP 600 - 651 is in imscxdx.xml
 
-Note: The AVP codes from 651 to 699 are reserved for TS 29.229.
+Note: The AVP codes from 652 to 699 are reserved for TS 29.229.
  ************************** 3GPP Sh AVPS        **************************
  ************************** NOTE see TGPPSh.xml **************************
  ************************** 3GPP TS 29.329      **************************
- **************************      700 - 712         **************************
-Note: The AVP codes from 712 to799 are reserved for TS 29.329.
+ **************************   700 - 716         **************************
+Note: The AVP codes from 717 to799 are reserved for TS 29.329.
 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. -->
+<!-- 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">
                        <grouped>
                                <gavp name="SIP-Method"/>
@@ -1980,10 +2782,11 @@ Note: The AVP codes from 800 to 822 are reserved for TS 32.299.
                <avp name="Content-Type" code="826" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <!-- In 3GPP TS 32.299 version 6.5.0 Release 6 (2005-12)                                        -->
-               <!-- type type-name="UTF8String"                                                                                        -->
-               <!-- but according to 3GPP TS 32.299 version 7.4.0 Release 7(2006-12) it        -->
-               <!-- should be:                                                                                                                         -->
+               <!--
+                    In 3GPP TS 32.299 version 6.5.0 Release 6 (2005-12)
+                    type type-name="UTF8String"
+                    but according to 3GPP TS 32.299 version 7.4.0 Release 7(2006-12) it should be:
+               -->
                <avp name="Content-Length" code="827" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
@@ -2162,7 +2965,7 @@ Note: The AVP codes from 800 to 822 are reserved for TS 32.299.
                        <enum name="Server Time-out" code="504"/>
                        <enum name="Version Not Supported" code="505"/>
                        <enum name="Message Too Large" code="513"/>
-                       <enum name="Precondition Failure" code="580"/> 
+                       <enum name="Precondition Failure" code="580"/>
                        <enum name="Busy Everywhere" code="600"/>
                        <enum name="Decline" code="603"/>
                        <enum name="Does Not Exist Anywhere" code="604"/>
@@ -2216,6 +3019,13 @@ Note: The AVP codes from 800 to 822 are reserved for TS 32.299.
                        <enum name="CHANGE_IN_QOS" code="2"/>
                        <enum name="CHANGE_IN_LOCATION" code="3"/>
                        <enum name="CHANGE_IN_RAT" 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="CHANGEINQOS_TRAFFIC_CLASS" code="10"/>
                        <enum name="CHANGEINQOS_RELIABILITY_CLASS" code="11"/>
                        <enum name="CHANGEINQOS_DELAY_CLASS" code="12"/>
@@ -2230,16 +3040,64 @@ Note: The AVP codes from 800 to 822 are reserved for TS 32.299.
                        <enum name="CHANGEINQOS_TRAFFIC_HANDLING_PRIORITY" code="21"/>
                        <enum name="CHANGEINQOS_GUARANTEED_BIT_RATE_FOR_UPLINK" code="22"/>
                        <enum name="CHANGEINQOS_GUARANTEED_BIT_RATE_FOR_DOWNLINK" code="23"/>
+
+                       <enum name="Undefined" code="24"/>
+                       <enum name="Undefined" code="25"/>
+                       <enum name="Undefined" code="26"/>
+                       <enum name="Undefined" code="27"/>
+                       <enum name="Undefined" code="28"/>
+                       <enum name="Undefined" code="29"/>
+
                        <enum name="CHANGEINLOCATION_MCC" code="30"/>
                        <enum name="CHANGEINLOCATION_MNC" code="31"/>
                        <enum name="CHANGEINLOCATION_RAC" code="32"/>
                        <enum name="CHANGEINLOCATION_LAC" code="33"/>
                        <enum name="CHANGEINLOCATION_CellId" code="34"/>
+                       <enum name="CHANGEINLOCATION_TAC" code="35"/>
+                       <enum name="CHANGEINLOCATION_ECGI" code="36"/>
+                       <enum name="Undefined" code="37"/>
+                       <enum name="Undefined" code="38"/>
+                       <enum name="Undefined" code="39"/>
+
                        <enum name="CHANGE_IN_MEDIA_COMPOSITION" code="40"/>
+
+                       <enum name="Undefined" code="41"/>
+                       <enum name="Undefined" code="42"/>
+                       <enum name="Undefined" code="43"/>
+                       <enum name="Undefined" code="44"/>
+                       <enum name="Undefined" code="45"/>
+                       <enum name="Undefined" code="46"/>
+                       <enum name="Undefined" code="47"/>
+                       <enum name="Undefined" code="48"/>
+                       <enum name="Undefined" code="49"/>
+
                        <enum name="CHANGEINPARTICIPANTS_Number" code="50"/>
                        <enum name="CHANGE_IN_THRSHLD_OF_PARTICIPANTS_NMB" code="51"/>
                        <enum name="CHANGE_IN_USER_PARTICIPATING_TYPE" code="52"/>
+
+                       <enum name="Undefined" code="53"/>
+                       <enum name="Undefined" code="54"/>
+                       <enum name="Undefined" code="55"/>
+                       <enum name="Undefined" code="56"/>
+                       <enum name="Undefined" code="57"/>
+                       <enum name="Undefined" code="58"/>
+                       <enum name="Undefined" code="59"/>
+
                        <enum name="CHANGE_IN_SERVICE_CONDITION" code="60"/>
+                       <enum name="CHANGE_IN_SERVING_NODE" code="61"/>
+                       <enum name="Undefined" code="62"/>
+                       <enum name="Undefined" code="63"/>
+                       <enum name="Undefined" code="64"/>
+                       <enum name="Undefined" code="65"/>
+                       <enum name="Undefined" code="66"/>
+                       <enum name="Undefined" code="67"/>
+                       <enum name="Undefined" code="68"/>
+                       <enum name="Undefined" code="69"/>
+
+                       <enum name="CHANGE_IN_USER_CSG_INFORMATION" code="70"/>
+                       <enum name="CHANGE_IN_HYBRID_SUBSCRIBED_USER_CSG_INFORMATION" code="71"/>
+                       <enum name="CHANGE_IN_HYBRID_UNSUBSCRIBED_USER_CSG_INFORMATION" code="72"/>
+
                </avp>
                <avp name="Quota-Holding-Time" code="871" mandatory="must" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
@@ -2270,26 +3128,45 @@ Note: The AVP codes from 800 to 822 are reserved for TS 32.299.
                <avp name="PS-Information" code="874" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="3GPP-Charging-Id"/>
+                               <gavp name="PDN-Connection-ID"/>
+                               <gavp name="Node-Id"/>
                                <gavp name="3GPP-PDP Type"/>
                                <gavp name="PDP-Address"/>
-                               <gavp name="3GPP-GPRS-Negotiated-QoS-Profile"/>
+                               <gavp name="Dynamic-Address-Flag"/>
+                               <gavp name="3GPP-GPRS-Negotiated-QoS-Profile"/> <!-- ??-->
+                               <gavp name="QoS-Information"/>
                                <gavp name="SGSN-Address"/>
                                <gavp name="GGSN-Address"/>
                                <gavp name="CG-Address"/>
+                               <gavp name="Serving-Node-Type"/>
+                               <gavp name="SGW-Change"/>
                                <gavp name="3GPP-IMSI-MCC-MNC"/>
+                               <gavp name="IMSI-Unauthenticated-Flag"/>
                                <gavp name="3GPP-GGSN-MCC-MNC"/>
                                <gavp name="3GPP-NSAPI"/>
                                <gavp name="Called-Station-Id"/>
                                <gavp name="3GPP-Session-Stop-Indicator"/>
                                <gavp name="3GPP-Selection-Mode"/>
                                <gavp name="3GPP-Charging-Characteristics"/>
+                               <gavp name="Charging-Characteristics-Selection-Mode"/>
                                <gavp name="3GPP-SGSN-MCC-MNC"/>
                                <gavp name="3GPP-MS-TimeZone"/>
-                               <gavp name="3GPP-CAMEL-Charging-Info"/>
+                               <gavp name="3GPP-CAMEL-Charging-Info"/>         <!-- ??-->
                                <gavp name="Charging-Rule-Base-Name"/>
                                <gavp name="3GPP-User-Location-Info"/>
                                <gavp name="3GPP-RAT-Type"/>
                                <gavp name="PS-Furnish-Charging-Information"/>
+                               <gavp name="PDP-Context-Type"/>
+                               <gavp name="Offline-Charging"/>
+                               <gavp name="Traffic-Data-Volumes"/>
+                               <gavp name="Service-Data-Container"/>
+                               <gavp name="User-Equipment-Info"/>
+                               <gavp name="Terminal-Information"/>
+                               <gavp name="Start-Time"/>
+                               <gavp name="Stop-Time"/>
+                               <gavp name="Change-Condition"/>
+                               <gavp name="Diagnostics"/>
+                               <gavp name="Low-Priority-Indicator"/>
                        </grouped>
                </avp>
                <avp name="WLAN-Information" code="875" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
@@ -2336,7 +3213,7 @@ Note: The AVP codes from 800 to 822 are reserved for TS 32.299.
                                <gavp name="Originator-Address"/>
                                <gavp name="Recipient-Address"/>
                                <gavp name="Submission-Time"/>
-                               <gavp name="MM-Content-Type"/>  
+                               <gavp name="MM-Content-Type"/>
                                <gavp name="Priority"/>
                                <gavp name="Message-ID"/>
                                <gavp name="Message-Type"/>
@@ -2486,28 +3363,8 @@ Note: The AVP codes from 800 to 822 are reserved for TS 32.299.
                        <enum name="Other" code="6"/>
                </avp>
 <!--
-900 TMGI OctectString
-901 Required-MBMS-Bearer-Capabilities UTF8String
-902 MBMS-StartStop-Indication Enumerated
-903 MBMS-Service-Area OctectString
-904 MBMS-Session-Duration Unsigned32
-905 Alternative-APN UTF8String
-906 MBMS-Service-Type Enumerated
-907 MBMS-2G-3G-Indicator Enumerated
-908 MBMS-Session-Identity OctetString
-909 RAI UTF8String
-910 Additional-MBMS-Trace-Info OctetString
-911 MBMS-Time-To-Data-Transfer Unsigned32
-912 MBMS-Session-Identity-Repetition-Number Unsigned32
-913 MBMS-Required-QoS UTF8String
-914 MBMS-Counting-Information Enumerated
-915 MBMS-User-Data-Mode-Indication Enumerated
-916 MBMS-GGSN-Address UTF8String
-917 MBMS-GGSN-IPv6-Address UTF8String
-918 MBMS-BMSC-SSM-IP-Address UTF8String
-919 MBMS-BMSC-SSM-IPv6-Address UTF8Strin
-Note: The AVP codes from 920 to 999 are reserved for TS 29.061
-29.210
+Note: The AVP codes from 900 to 999 are reserved for TS 29.061
+29.210 -> 3GPP TS 29.212
 ******** Found in TGPPGmb.xml ********
 -->
                <avp name="Bearer-Usage" code="1000" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
@@ -2573,7 +3430,7 @@ Note: The AVP codes from 920 to 999 are reserved for TS 29.061
                        <enum name="RESOURCES_LIMITATION"                       code="9"/>
                        <enum name="MAX_NR_BEARERS_REACHED"                     code="10"/>
                        <enum name="QOS_CHANGE_EXCEEDING_AUTHORIZATION"         code="11"/>
-                       <enum name="NO_EVENT_TRIGGER"                           code="12"/>
+                       <enum name="RAI_CHANGE"                                 code="12"/>
                        <enum name="USER_LOCATION_CHANGE"                       code="13"/>
                        <enum name="NO_EVENT_TRIGGERS"                          code="14"/>
                        <enum name="OUT_OF_CREDIT"                              code="15"/>
@@ -2589,8 +3446,18 @@ Note: The AVP codes from 920 to 999 are reserved for TS 29.061
                        <enum name="UE_TIME_ZONE_CHANGE"                        code="25"/>
                        <enum name="USAGE_REPORT"                               code="26"/>
                        <enum name="TAI_CHANGE"                                 code="27"/>
-                       <enum name="ECGI_CHANGE"                                code="28"/>
-                       <enum name="TIME_CHANGE"                                code="100"/>
+      <enum name="ECGI_CHANGE"                         code="28"/>
+      <enum name="APN-AMBR_MODIFICATION_FAILURE"                               code="29"/>
+      <enum name="USER_CSG_INFORMATION_CHANGE"                         code="30"/>
+      <enum name="USAGE_REPORT"                                code="33"/>
+      <enum name="DEFAULT-EPS-BEARER-QOS_MODIFICATION_FAILURE"                         code="34"/>
+      <enum name="USER_CSG_HYBRID_SUBSCRIBED_INFORMATION_CHANGE"                               code="35"/>
+      <enum name="USER_CSG_ HYBRID_UNSUBSCRIBED_INFORMATION_CHANGE"                            code="36"/>
+      <enum name="ROUTING_RULE_CHANGE"                         code="37"/>
+      <enum name="MAX_MBR_APN_AMBR_CHANGE"                             code="38"/>
+      <enum name="APPLICATION_START"                           code="39"/>
+      <enum name="APPLICATION_STOP"                            code="40"/>
+      <enum name="TIME_CHANGE"                         code="100"/>
                        <enum name="TFT DELETED"                                code="1000"/>
                        <enum name="LOSS OF BEARER"                             code="1001"/>
                        <enum name="RECOVERY OF BEARER"                         code="1002"/>
@@ -2636,14 +3503,14 @@ Note: The AVP codes from 920 to 999 are reserved for TS 29.061
                        <type type-name="OctetString"/>
                </avp>
                <avp name="PDP-Session-operation" code="1015" vendor-id="TGPP" protected="may" mandatory="must" may-encrypt="yes" vendor-bit="must">
-                       <type type-name="Unsigned32" /> 
+                       <type type-name="Unsigned32" />
                        <enum name="PDP-SESSION-TERMINATION" code="0"/>
                </avp>
                <avp name="QoS-Information" code="1016" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="QoS-Class-Identifier"/>
-                               <gavp name="Max-Requested-Bandwdith-DL"/>
-                               <gavp name="Max-Requested-Bandwdith-UL"/>
+                               <gavp name="Max-Requested-Bandwidth-DL"/>
+                               <gavp name="Max-Requested-Bandwidth-UL"/>
                                <gavp name="Guaranteed-Bitrate-UL"/>
                                <gavp name="Guaranteed-Bitrate-DL"/>
                                <gavp name="Bearer-Identifier"/>
@@ -2697,7 +3564,7 @@ Note: The AVP codes from 920 to 999 are reserved for TS 29.061
                </avp>
                <avp name="Guaranteed-Bitrate-DL" code="1025" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
-               </avp>          
+               </avp>
                <avp name="Guaranteed-Bitrate-UL" code="1026" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
@@ -2712,17 +3579,17 @@ Note: The AVP codes from 920 to 999 are reserved for TS 29.061
                </avp>
                <avp name="QoS-Class-Identifier" code="1028" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-                       <enum name="None"                       code="0"/>
-                       <enum name="Conversational"                     code="1"/>
-                       <enum name="Conversational"                     code="2"/>
-                       <enum name="Streaming"  code="3"/>
-                       <enum name="Streaming"          code="4"/>
-                       <enum name="Interactive"                        code="5"/>
-                       <enum name="Interactive"                code="6"/>
-                       <enum name="Interactive"                code="7"/>
-                       <enum name="Interactive"                code="8"/>
-                       <enum name="Background"                 code="9"/>
-                       <enum name="OTHER"                      code="0xFFFFFFFF"/>
+                       <enum name="QCI_1"      code="1"/>
+                       <enum name="QCI_2"      code="2"/>
+                       <enum name="QCI_3"      code="3"/>
+                       <enum name="QCI_4"      code="4"/>
+                       <enum name="QCI_5"      code="5"/>
+                       <enum name="QCI_6"      code="6"/>
+                       <enum name="QCI_7"      code="7"/>
+                       <enum name="QCI_8"      code="8"/>
+                       <enum name="QCI_9"      code="9"/>
+                       <!-- The values shall be used to indicate standardized characteristics associated with standardized QCI values from
+                               3GPP TS 23.203 -->
                </avp>
                <avp name="QoS-Negotiation" code="1029" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
@@ -2952,6 +3819,21 @@ Note: The AVP codes from 920 to 999 are reserved for TS 29.061
                        <enum name="CHANGE_CSG_SUBSCRIBED_HYBRID_CELL"   code="1"/>
                        <enum name="CHANGE_CSG_UNSUBSCRIBED_HYBRID_CELL"   code="2"/>
                </avp>
+               <avp name="Packet-Filter-Usage" code="1072" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="SEND_TO_UE"  code="0"/>
+               </avp>
+               <avp name="Flow-Direction" code="1073" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="UNSPECIFIED"  code="0"/>
+                       <enum name="DOWNLINK"   code="1"/>
+                       <enum name="UPLINK"   code="2"/>
+                       <enum name="BIDIRECTIONAL"   code="3"/>
+               </avp>
+               <avp name="QoS-Rule-Base-Name" code="1074" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                 <type type-name="UTF8String"/>
+               </avp>
+
 <!-- Note: The AVP codes from 1072 to 1099 are reserved for TS 29.212 -->
 <!-- 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">
@@ -2959,7 +3841,7 @@ Note: The AVP codes from 920 to 999 are reserved for TS 29.061
                                <gavp name="MSISDN"/>
                                <gavp name="VASP-ID"/>
                                <gavp name="VAS-ID"/>
-                       </grouped>              
+                       </grouped>
                </avp>
                <avp name="VASP-ID" code="1101" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
@@ -2982,7 +3864,7 @@ Note: The AVP codes from 920 to 999 are reserved for TS 29.061
                        <grouped>
                                <gavp name="Sequence-Number"/>
                                <gavp name="Recipient-Address"/>
-                       </grouped>              
+                       </grouped>
                </avp>
                <avp name="Result-Recipient-Address" code="1106" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
@@ -2990,7 +3872,7 @@ Note: The AVP codes from 920 to 999 are reserved for TS 29.061
                                <gavp name="Recipient-Address"/>
                                <gavp name="Routeing-Address"/>
                                <gavp name="Sender-Address"/>
-                       </grouped>              
+                       </grouped>
                </avp>
                <avp name="Sequence-Number" code="1107" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
@@ -3033,7 +3915,7 @@ Note: The AVP codes from 920 to 999 are reserved for TS 29.061
                        <grouped>
                                <gavp name="Status-Code"/>
                                <gavp name="Status-Text"/>
-                       </grouped>              
+                       </grouped>
                </avp>
                <avp name="Status-Code" code="1117" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
@@ -3046,7 +3928,7 @@ Note: The AVP codes from 920 to 999 are reserved for TS 29.061
                        <enum name="unresolved" code="0"/>
                        <enum name="resolved" code="1"/>
                </avp>
-<!--29.140 [16]
+<!-- 29.140 [16]
 Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
 32.299
 -->
@@ -3059,7 +3941,7 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
                                <gavp name="Address-Data"/>
                                <gavp name="Address-Domain"/>
                                <gavp name="Addressee-Type"/>
-                       </grouped>              
+                       </grouped>
                </avp>
                <avp name="Submission-Time" code="1202" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Time"/>
@@ -3074,17 +3956,18 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
                </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 -->
+<!-- http://www.openmobilealliance.org/tech/omna/omna-wsp-content-type.aspx -->
                <avp name="Type-Number" code="1204" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
+                       <enum name="*/*" code="0"/>
                        <enum name="text/*" code="1"/>
-                       <enum name="text/html" code="2"/> 
-                       <enum name="text/plain" code="3"/> 
-                       <enum name="text/x-hdml" code="4"/> 
+                       <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.wml" code="8"/>
                        <enum name="text/vnd.wap.wmlscript" code="9"/>
                        <enum name="text/vnd.wap.wta-event" code="10"/>
                        <enum name="multipart/*" code="11"/>
@@ -3093,7 +3976,7 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
                        <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/java-vm" code="17"/>
                        <enum name="application/x-www-form-urlencoded" code="18"/>
                        <enum name="application/x-hdmlc" code="19"/>
                        <enum name="application/vnd.wap.wmlc" code="20"/>
@@ -3184,8 +4067,8 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
                <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"/> 
+                       <enum name="Normal" code="1"/>
+                       <enum name="High" code="2"/>
                </avp>
                <avp name="Message-ID" code="1210" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
@@ -3424,6 +4307,7 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
                </avp>
                <avp name="Service-Generic-Information" code="1256" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
+        <!-- The AVP is defined in OMA-DDS-Charging_Data -->
                        </grouped>
        </avp>
                <avp name="Service-Specific-Type" code="1257" vendor-bit="must" vendor-id="TGPP">
@@ -3458,12 +4342,18 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
                <avp name="PoC-Change-Time" code="1262" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Time"/>
                </avp>
-               <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">
+    <!-- The Access-Network-Information AVP (AVP code 1263) is of type OctetString and indicates the SIP P-header
+        "P-Access-Network-Information".
+        As it's a SIP Header the actual content will be text so for Wireshark displays sake we treat this as
+        an UTF8String
+        -->
+    <avp name="Access-Network-Information" code="1263" vendor-bit="must" vendor-id="TGPP">
+      <!-- <type type-name="OctetString"/>  -->
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Trigger" code="1264" vendor-bit="must" vendor-id="TGPP">
                                        <grouped>
-                                       <gavp name="Trigger-Type_3GPP"/>
+                                       <gavp name="Trigger-Type"/>
                                        </grouped>
                </avp>
                <avp name="Base-Time-Interval" code="1265" vendor-bit="must" vendor-id="TGPP">
@@ -3528,7 +4418,7 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
                                <gavp name="AF-Charging-Identifier"/>
                                <gavp name="Flows"/>
                        </grouped>
-               </avp>  
+               </avp>
                <avp name="PoC-Session-Initiation-type" code="1277" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
                        <enum name="Pre-established" code="0"/>
@@ -3547,7 +4437,7 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
                        <enum name="Normal" code="0"/>
                        <enum name="NW PoC Box" code="1"/>
                        <enum name="UE PoC Box" code="2"/>
-               </avp>  
+               </avp>
                <avp name="Alternate-Charged-Party-Address" code="1280" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
@@ -3575,36 +4465,33 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
                <avp name="Media-Initiator-Party" code="1288" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-<!-- 
-Note: The AVP codes from 1289 to 1399 are reserved for TS 32.299
--->
-<!-- 
-3GPP TS 29.272 V9.1.0 (2009-12
--->
+
+<!-- Note: The AVP codes from 1289 to 1399 are reserved for TS 32.299 -->
+<!-- 3GPP TS 29.272 V9.1.0 (2009-12 -->
                <avp name="Subscription-Data" code="1400" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <grouped>
                                        <gavp name="Subscriber-Status"/>
-                                       <gavp name="MSISDN"/> 
-                                       <gavp name="STN-SR"/> 
+                                       <gavp name="MSISDN"/>
+                                       <gavp name="STN-SR"/>
                                        <gavp name="Network-Access-Mode"/>
                                        <gavp name="Operator-Determined-Barring"/>
                                        <gavp name="HPLMN-ODB"/>
                                        <gavp name="Regional-Subscription-Zone-Code"/>
                                        <gavp name="Access-Restriction-Data"/>
                                        <gavp name="APN-OI-Replacement"/>
-                                       <gavp name="3GPP-Charging-Characteristics"/> 
+                                       <gavp name="3GPP-Charging-Characteristics"/>
                                        <gavp name="AMBR"/>
                                        <gavp name="APN-Configuration-Profile"/>
                                        <gavp name="RAT-Frequency-Selection-Priority-ID"/>
                                        <gavp name="Trace-Data"/>
                                        <gavp name="GPRS-Subscription-Data"/>
-                                       <gavp name="CSG-Subscription-Data"/> 
+                                       <gavp name="CSG-Subscription-Data"/>
                                        <gavp name="Roaming-Restricted-Due-To-Unsupported-Feature"/>
                        </grouped>
                </avp>
                <avp name="Terminal-Information" code="1401" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <grouped>
-                                       <gavp name="IMEI"/> 
+                                       <gavp name="IMEI"/>
                                        <gavp name="TGPP2-MEID"/>
                                        <gavp name="Software-Version"/>
                        </grouped>
@@ -3652,11 +4539,11 @@ Note: The AVP codes from 1289 to 1399 are reserved for TS 32.299
                </avp>
                <avp name="Authentication-Info" code="1413" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <grouped>
-                                       <gavp name="E-UTRAN-Vector"/> 
+                                       <gavp name="E-UTRAN-Vector"/>
                                        <gavp name="UTRAN-Vector"/>
                                        <gavp name="GERAN-Vector"/>
                        </grouped>
-               </avp>    
+               </avp>
                <avp name="E-UTRAN-Vector"      code="1414" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <grouped>
                                        <gavp name="Item-Number"/>
@@ -3741,7 +4628,7 @@ Note: The AVP codes from 1289 to 1399 are reserved for TS 32.299
                </avp>
                <avp name="APN-Configuration" code="1430" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <grouped>
-                                       <gavp name="Context-Identifier"/> 
+                                       <gavp name="Context-Identifier"/>
                                        <gavp name="Served-Party-IP-Address"/>
                                        <gavp name="Served-Party-IP-Address"/>
                                        <gavp name="PDN-Type"/>
@@ -3843,6 +4730,13 @@ Note: The AVP codes from 1289 to 1399 are reserved for TS 32.299
                <avp name="SRES" code="1454" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <type type-name="OctetString"/>
                </avp>
+               <!-- Requesting-Node-Type is from old (v8.1.0 - v8.2.0) versions of 29.272. -->
+               <avp name="Requesting-Node-Type" code="1455" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="MME" code="0"/>
+                       <enum name="SGSN" code="1"/>
+                       <enum name="MME/SGSN" code="2"/>
+               </avp>
                <avp name="PDN-Type" code="1456" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
                        <enum name="IPv4" code="0"/>
@@ -3853,7 +4747,7 @@ Note: The AVP codes from 1289 to 1399 are reserved for TS 32.299
                        <type type-name="Enumerated"/>
                        <enum name="Roaming-Restricted-Due-To-Unsupported-Feature" code="0"/>
                </avp>
-               <avp name="Trace-Data" code="1458" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">        
+               <avp name="Trace-Data" code="1458" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <grouped>
                                <gavp name="Trace-Reference"/>
                                <gavp name="Trace-Depth"/>
@@ -3865,7 +4759,7 @@ Note: The AVP codes from 1289 to 1399 are reserved for TS 32.299
                        </grouped>
                </avp>
                <avp name="Trace-Reference" code="1459" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
-                       <type type-name="OctetString"/> 
+                       <type type-name="OctetString"/>
                </avp>
                <avp name="Trace-Depth" code="1462" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
@@ -3876,7 +4770,7 @@ Note: The AVP codes from 1289 to 1399 are reserved for TS 32.299
                        <enum name="MediumWithoutVendorSpecificExtension" code="4"/>
                        <enum name="MaximumWithoutVendorSpecificExtension" code="5"/>
                        <!--
-                         The Trace-Depth AVP is of type Enumerated. 
+                         The Trace-Depth AVP is of type Enumerated.
                          The possible values are those defined in 3GPP TS 32.422 [23] for Trace Depth.
                        -->
                </avp>
@@ -3915,9 +4809,9 @@ Note: The AVP codes from 1289 to 1399 are reserved for TS 32.299
                        </grouped>
                </avp>
                <avp name="PDP-Type" code="1470" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
-                       <type type-name="OctetString"/> 
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="TGPP2-MEID" code="1471" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> 
+               <avp name="TGPP2-MEID" code="1471" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <type type-name="OctetString"/>
                </avp>
                <avp name="Specific-APN-Info" code="1472" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
@@ -4105,6 +4999,12 @@ Note: The AVP codes from 1289 to 1399 are reserved for TS 32.299
                                <gavp name="Trace-Reference"/>
                        </grouped>
                </avp>
+    <avp name="MIP-FA-RK" may-encrypt="yes" vendor-id="TGPP" vendor-bit="must" mandatory="must" code="1506">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-FA-RK-SPI" may-encrypt="yes" vendor-id="TGPP" vendor-bit="must" mandatory="must" code="1507">
+      <type type-name="Unsigned32"/>
+    </avp>    
 <!--
 Note: The AVP codes from 1485 to 1499 are reserved for TS 29.272.
 Note: The AVP codes from 1506 to 1599 are reserved for TS 29.273
@@ -4143,8 +5043,48 @@ Note: The AVP codes from 1506 to 1599 are reserved for TS 29.273
                <avp name="Routing-Area-Identity" code="1605" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="OctetString"/>
                </avp>
+               <avp name="Location-Area-Identity" code="1606" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Service-Area-Identity" code="1607" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Geographical-Information" code="1608" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Geodetic-Information" code="1609" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+
+<!--
+1610 Current-Location-Retrieved Enumerated
+1611 Age-Of-Location-Information Unsigned32
+1612 Active-APN Grouped
+1613   SIPTO-Permission        Enumerated
+1614   Error-Diagnostic        Enumerated
+1615   UE-SRVCC-Capability     Enumerated
+1616   MPS-Priority    Unsigned32
+1617   VPLMN-LIPA-Allowed      Enumerated
+1618   LIPA-Permission Enumerated
+1619   Subscribed-Periodic-RAU-TAU-Timer       Unsigned32
+1620   Ext-PDP-Type    OctetString
+1621   Ext-PDP-Address Address
+1622   MDT-Configuration       Grouped
+1623   Job-Type        Enumerated
+1624   Area-Scope      Grouped
+1625   List-Of-Measurements    Unsigned32
+1626   Reporting-Trigger       Unsigned32
+1627   Report-Interval Enumerated
+1628   Report-Amount   Enumerated
+1629   Event-ThresholdRSRP     Unsigned32
+1630   Event-ThresholdRSRQ     Unsigned32
+1631   Logging-Interval        Enumerated
+1632   Logging-Duration        Enumerated
+1633   Relay-Node-Indicator    Enumerated
 
-               <avp name="SMS-Information" code="2000" vendor-bit="must" vendor-id="TGPP"> 
+Note: The AVP codes from 1634 to 1699 are reserved for TS 29.272.
+-->
+               <avp name="SMS-Information" code="2000" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="SMS-Node"/>
                                <gavp name="Client-Address"/>
@@ -4164,10 +5104,10 @@ Note: The AVP codes from 1506 to 1599 are reserved for TS 29.273
                                <gavp name="Recipients"/>
                        </grouped>
                </avp>
-               <avp name="Data-Coding-Scheme" code="2001" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Data-Coding-Scheme" code="2001" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Integer32"/>
                </avp>
-               <avp name="Destination-Interface" code="2002" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Destination-Interface" code="2002" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="Interface-Id"/>
                                <gavp name="Interface-Text"/>
@@ -4175,13 +5115,13 @@ Note: The AVP codes from 1506 to 1599 are reserved for TS 29.273
                                <gavp name="Interface-Type"/>
                        </grouped>
                </avp>
-               <avp name="Interface-Id" code="2003" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Interface-Id" code="2003" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="Interface-Port" code="2004" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Interface-Port" code="2004" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="Interface-Text" code="2005" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Interface-Text" code="2005" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
                <avp name="Interface-Type" code="2006" vendor-bit="must" vendor-id="TGPP">
@@ -4196,12 +5136,12 @@ Note: The AVP codes from 1506 to 1599 are reserved for TS 29.273
                        <type type-name="Enumerated"/>
                        <enum name="SUBMISSION" code="0"/>
                        <enum name="DELIVERY_REPORT" code="1"/>
-                       <enum name="SM Service Request" code="1"/>
+                       <enum name="SM Service Request" code="2"/>
                </avp>
-               <avp name="Originating-SCCP-Address" code="2008" vendor-bit="must" vendor-id="TGPP"> 
-                       <type type-name="Address"/>
+               <avp name="Originating-SCCP-Address" code="2008" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPAddress"/>
                </avp>
-               <avp name="Originator-Interface" code="2009" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Originator-Interface" code="2009" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="Interface-Id"/>
                                <gavp name="Interface-Text"/>
@@ -4209,24 +5149,24 @@ Note: The AVP codes from 1506 to 1599 are reserved for TS 29.273
                                <gavp name="Interface-Type"/>
                        </grouped>
                </avp>
-               <avp name="Recipient-SCCP-Address" code="2010" vendor-bit="must" vendor-id="TGPP"> 
-                       <type type-name="Address"/>
+               <avp name="Recipient-SCCP-Address" code="2010" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPAddress"/>
                </avp>
                <avp name="Reply-Path-Requested" code="2011" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
                        <enum name="No Reply Path Set" code="0"/>
                        <enum name="Reply path Set" code="1"/>
                </avp>
-               <avp name="SM-Discharge-Time" code="2012" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="SM-Discharge-Time" code="2012" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Time"/>
                </avp>
-               <avp name="SM-Protocol-ID" code="2013" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="SM-Protocol-ID" code="2013" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="SM-Status" code="2014" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="SM-Status" code="2014" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="SM-User-Data-Header" code="2015" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="SM-User-Data-Header" code="2015" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="OctetString"/>
                </avp>
                <avp name="SMS-Node" code="2016" vendor-bit="must" vendor-id="TGPP">
@@ -4234,15 +5174,15 @@ Note: The AVP codes from 1506 to 1599 are reserved for TS 29.273
                        <enum name="SMS Router" code="0"/>
                        <enum name="IP-SM-GW" code="1"/>
                        <enum name="SMS Router and IP-SM-GW" code="2"/>
-                       <enum name="SMS-SC" code="4"/>
+                       <enum name="SMS-SC" code="3"/>
                </avp>
-               <avp name="SMSC-Address" code="2017" vendor-bit="must" vendor-id="TGPP"> 
-                       <type type-name="Address"/>
+               <avp name="SMSC-Address" code="2017" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPAddress"/>
                </avp>
-               <avp name="Client-Address" code="2018" vendor-bit="must" vendor-id="TGPP"> 
-                       <type type-name="Address"/>
+               <avp name="Client-Address" code="2018" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPAddress"/>
                </avp>
-               <avp name="Number-of-Messages-Sent" code="2019" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Number-of-Messages-Sent" code="2019" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
                <avp name="Low-Balance-Indication" code="2020" vendor-bit="must" vendor-id="TGPP">
@@ -4250,19 +5190,19 @@ Note: The AVP codes from 1506 to 1599 are reserved for TS 29.273
                        <enum name="NOT-APPLICABLE" code="0"/>
                        <enum name="YES" code="1"/>
                </avp>
-               <avp name="Remaining-Balance" code="2021" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Remaining-Balance" code="2021" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="Unit-Value"/>
                                <gavp name="Currency-Code"/>
                        </grouped>
                </avp>
-               <avp name="Refund-Information" code="2022" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Refund-Information" code="2022" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="Carrier-Select-Routing-Information" code="2023" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Carrier-Select-Routing-Information" code="2023" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="Number-Portability-Routing-Information" code="2024" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Number-Portability-Routing-Information" code="2024" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
                <avp name="PoC-Event-Type" code="2025" vendor-bit="must" vendor-id="TGPP">
@@ -4273,19 +5213,19 @@ Note: The AVP codes from 1506 to 1599 are reserved for TS 29.273
                        <enum name="Early Ssession Setting-up event" code="3"/>
                        <enum name="PoC Talk Burst" code="4"/>
                </avp>
-               <avp name="Recipients" code="2026" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Recipients" code="2026" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="Recipient-Address"/>
                        </grouped>
                </avp>
-               <avp name="Destination-Interface" code="2027" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Destination-Interface" code="2027" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="Address-Type"/>
                                <gavp name="Address-Data"/>
                                <gavp name="Address-Domain"/>
                        </grouped>
                </avp>
-               <avp name="Recipient-Received-Address" code="2028" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Recipient-Received-Address" code="2028" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="Address-Type"/>
                                <gavp name="Address-Data"/>
@@ -4305,8 +5245,8 @@ Note: The AVP codes from 1506 to 1599 are reserved for TS 29.273
                        <enum name="VAS4SMS Short Message Auto Reply" code="8"/>
                        <enum name="VAS4SMS Short Message Personal Signature" code="9"/>
                        <enum name="VAS4SMS Short Message Deferred Delivery" code="10"/>
-               </avp>    
-               <avp name="MMTel-Information" code="2030" vendor-bit="must" vendor-id="TGPP"> 
+               </avp>
+               <avp name="MMTel-Information" code="2030" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="Service-type"/>
                                <gavp name="Service-mode"/>
@@ -4315,10 +5255,10 @@ Note: The AVP codes from 1506 to 1599 are reserved for TS 29.273
                                <gavp name="Associated-Party-Address"/>
                        </grouped>
                </avp>
-               <avp name="Service-type" code="2031" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Service-type" code="2031" vendor-bit="must" vendor-id="TGPP">
                                <type type-name="Enumerated"/>
                </avp>
-               <avp name="Service-Mode" code="2032" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Service-Mode" code="2032" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
                </avp>
                <avp name="Subscriber-Role" code="2033" vendor-bit="must" vendor-id="TGPP">
@@ -4326,27 +5266,27 @@ Note: The AVP codes from 1506 to 1599 are reserved for TS 29.273
                        <enum name="ORIGINATING" code="0"/>
                        <enum name="TERMINATING" code="1"/>
                </avp>
-               <avp name="Number-Of-Diversions" code="2034" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Number-Of-Diversions" code="2034" vendor-bit="must" vendor-id="TGPP">
                <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Associated-Party-Address" code="2035" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Associated-Party-Address" code="2035" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="SDP-Type" code="2036" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="SDP-Type" code="2036" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
                        <enum name="SDP Offer" code="0"/>
                        <enum name="SDP Answer" code="1"/>
                </avp>
-               <avp name="Change-Condition" code="2037" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Change-Condition" code="2037" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Integer32"/>
                </avp>
-               <avp name="Change-Time" code="2038" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Change-Time" code="2038" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Time"/>
                </avp>
-               <avp name="Diagnostics" code="2039" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Diagnostics" code="2039" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Time"/>
                </avp>
-               <avp name="Service-Data-Container" code="2040" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Service-Data-Container" code="2040" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="AF-Correlation-Information"/>
                                <gavp name="Charging-Rule-Base-Name"/>
@@ -4369,22 +5309,22 @@ Note: The AVP codes from 1506 to 1599 are reserved for TS 29.273
                                <gavp name="3GPP2-BSID"/>
                        </grouped>
                </avp>
-               <avp name="Start-Time" code="2041" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Start-Time" code="2041" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Time"/>
                </avp>
-               <avp name="Stop-Time" code="2042" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Stop-Time" code="2042" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Time"/>
                </avp>
-               <avp name="Time-First-Usage" code="2043" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Time-First-Usage" code="2043" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Time"/>
                </avp>
-               <avp name="Time-Last-Usage" code="2044" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Time-Last-Usage" code="2044" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Time"/>
                </avp>
-               <avp name="Time-Usage" code="2045" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Time-Usage" code="2045" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Traffic-Data-Volumes" code="2046" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Traffic-Data-Volumes" code="2046" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="QoS-Information"/>
                                <gavp name="Accounting-Input-Octets"/>
@@ -4396,7 +5336,7 @@ Note: The AVP codes from 1506 to 1599 are reserved for TS 29.273
                                <gavp name="3GPP-User-Location-Info"/>
                        </grouped>
                </avp>
-               <avp name="Serving-Node-Type" code="2047" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Serving-Node-Type" code="2047" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
                        <enum name="SGSN" code="0"/>
                        <enum name="PMIPSGW" code="1"/>
@@ -4405,7 +5345,7 @@ Note: The AVP codes from 1506 to 1599 are reserved for TS 29.273
                        <enum name="hSGW" code="4"/>
                        <enum name="MME" code="5"/>
                </avp>
-               <avp name="Supplementary-Service" code="2048" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Supplementary-Service" code="2048" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="Service-Type"/>
                                <gavp name="Service-Mode"/>
@@ -4417,49 +5357,49 @@ Note: The AVP codes from 1506 to 1599 are reserved for TS 29.273
                                <gavp name="Participant-Action-Type"/>
                        </grouped>
                </avp>
-               <avp name="Participant-Action-Type" code="2049" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Participant-Action-Type" code="2049" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
                        <enum name="CREATE_CONF" code="0"/>
                        <enum name="JOIN_CONF" code="1"/>
                        <enum name="INVITE_INTO_CONF" code="2"/>
                        <enum name="QUIT_CONF" code="3"/>
                </avp>
-               <avp name="PDN-Conncetion-ID" code="2050" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="PDN-Connection-ID" code="2050" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Dynamic-Address-Flag" code="2051" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Dynamic-Address-Flag" code="2051" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
                        <enum name="Static" code="0"/>
                        <enum name="Dynamic" code="1"/>
                </avp>
-               <avp name="Accumulated-Cost" code="2052" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Accumulated-Cost" code="2052" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="Value-Digits"/>
                                <gavp name="Exponent"/>
                        </grouped>
                </avp>
-               <avp name="AoC-Cost-Information" code="2053" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="AoC-Cost-Information" code="2053" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="Accumulated-Cost"/>
                                <gavp name="Incremental-Cost"/>
                                <gavp name="Currency-Code"/>
                        </grouped>
                </avp>
-               <avp name="AoC-Information" code="2054" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="AoC-Information" code="2054" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="AoC-Cost-Information"/>
                                <gavp name="Incremental-Cost"/>
                                <gavp name="Tariff-Information"/>
                        </grouped>
                </avp>
-               <avp name="AoC-Request-Type" code="2055" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="AoC-Request-Type" code="2055" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
                        <enum name="AoC_NOT_REQUESTED" code="0"/>
                        <enum name="AoC_FULL" code="1"/>
                        <enum name="AoC_COST_ONLY" code="2"/>
                        <enum name="AoC_TARIFF_ONLY" code="3"/>
                </avp>
-               <avp name="Current-Tariff" code="2056" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Current-Tariff" code="2056" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="Value-Digits"/>
                                <gavp name="Exponent"/>
@@ -4480,7 +5420,7 @@ Note: The AVP codes from 1506 to 1599 are reserved for TS 29.273
                                <gavp name="Unit-Threshold"/>
                        </grouped>
                </avp>
-               <avp name="Scale-Factor" code="2059" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Scale-Factor" code="2059" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="Value-Digits"/>
                                <gavp name="Exponent"/>
@@ -4525,16 +5465,15 @@ Note: The AVP codes from 1506 to 1599 are reserved for TS 29.273
                        <enum name="Roaming-Default" code="4"/>
                        <enum name="Visiting-Default" code="5"/>
                </avp>
-<!-- 
-Note: The AVP codes from 2067 to 2099 are reserved for TS 32.299
--->
-<!--
-2100   reserved        -       32.299 [5]
--->
+
+<!-- Note: The AVP codes from 2067 to 2099 are reserved for TS 32.299 -->
+               <avp name="Reserved" code="2100" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
                <avp name="Application-Server-ID" code="2101" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Application-Service-Type" code="2102" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Application-Service-Type" code="2102" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
                        <enum name="SENDING" code="100"/>
                        <enum name="RECEIVING" code="101"/>
@@ -4549,14 +5488,22 @@ Note: The AVP codes from 2067 to 2099 are reserved for TS 32.299
                <avp name="Delivery-Status" code="2104" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-<!--
-2105   reserved        -       
-2106   reserved        -       
-2107   reserved        -       
-2108   reserved        -       
-2109   reserved        -       
--->
-               <avp name="IM-Information" code="2110" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Reserved" code="2105" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="2106" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="2107" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="2108" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="2109" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="IM-Information" code="2110" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="Interface-Id"/>
                                <gavp name="Interface-Text"/>
@@ -4586,16 +5533,20 @@ Note: The AVP codes from 2118 to 2199 are reserved for TS 32.299
 2201 Subsession-Enforcement-Info Grouped
 2202 Subsession-Id Unsigned32
 2203 Subsession-Operation Enumerated
+2204 Multiple-BBERF-Action Enumerated
 29.215 [22]
 Note: The AVP codes from 2204 to 2299 are reserved for TS 29.215
 -->
+               <avp name="Reserved" code="2300" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
                <avp name="SIP-Request-Timestamp-Fraction" code="2301" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
                <avp name="SIP-Response-Timestamp-Fraction" code="2302" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Online-Charging-Flag" code="2303" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Online-Charging-Flag" code="2303" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
                        <enum name="ECF address not provided" code="0"/>
                        <enum name="ECF address provided" code="1"/>
@@ -4603,7 +5554,7 @@ Note: The AVP codes from 2204 to 2299 are reserved for TS 29.215
                <avp name="CUG-Information" code="2304" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="Real-Time-Tariff-Information" code="2305" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="Real-Time-Tariff-Information" code="2305" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
                                <gavp name="Tariff-Information"/>
                                <gavp name="Tariff-XML"/>
@@ -4613,9 +5564,9 @@ Note: The AVP codes from 2204 to 2299 are reserved for TS 29.215
                        <type type-name="UTF8String"/>
                </avp>
                <avp name="MBMS-GW-Address" code="2307" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Address"/>
+                       <type type-name="IPAddress"/>
                </avp>
-               <avp name="IMSI-Unauthenticated-Flag" code="2308" vendor-bit="must" vendor-id="TGPP"> 
+               <avp name="IMSI-Unauthenticated-Flag" code="2308" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
                        <enum name="Authenticated" code="0"/>
                        <enum name="Unauthenticated" code="1"/>
@@ -4634,43 +5585,129 @@ Note: The AVP codes from 2204 to 2299 are reserved for TS 29.215
 2319   User-CSG-Information    Grouped
 
 Note: The AVP codes from 2320 to 2399 are reserved for TS 32.299
-2400   LMSI    OctetString     
-2401   Serving-Node    Grouped 
-2402   MME-Name        DiameterIdentity        
-2403   MSC-Number      OctetString     
-2404   LCS-Capabilities-Sets   Unsigned32      
-2405   GMLC-Address    Address 
-2406   Additional-Serving-Node Grouped 
-2407   PPR-Address     Address 
+2400   LMSI    OctetString
+2401   Serving-Node    Grouped
+2402   MME-Name        DiameterIdentity
+2403   MSC-Number      OctetString
+2404   LCS-Capabilities-Sets   Unsigned32
+2405   GMLC-Address    Address
+2406   Additional-Serving-Node Grouped
+2407   PPR-Address     Address
 Note: The AVP codes from 2408 to 2499 are reserved for TS 29.173
-2500   Location-Type   Enumerated      
-2501   LCS-EPS-Client-Name     Grouped 
-2502   LCS-Requestor-Name      Grouped 
-2503   LCS-Priority    Unsigned32      
-2504   LCS-QoS Grouped 
-2505   Horizontal-Accuracy     Unsigned32      
-2506   Vertical-Accuracy       Unsigned32      
-2507   Vertical-Requested      Enumerated      
-2508   Velocity-Requested      Enumerated      
-2509   Response-Time   Enumerated      
-2510   Supported-GAD-Shapes    Unsigned32      
-2511   LCS-Codeword    UTF8String      
-2512   LCS-Privacy-Check       Enumerated      
-2513   Accuracy-Fulfilment-Indicator   Enumerated      
-2514   Age-Of-Location-Estimate        Unsigned32      
-2515   Velocity-Estimate       OctetString     
-2516   EUTRAN-Positioning-Data OctetString     
-2517   ECGI    OctetString     
-2518   Location-Event  Enumerated      
-2519   Pseudonym-Indicator     Enumerated      
-2520   LCS-Service-Type-ID     Unsigned32      
-2521   LCS-Privacy-Check-Non-Session   Grouped 
-2522   LCS-Privacy-Check-Session       Grouped 
-2523   LCS-QoS-Class   Enumerated      
+-->
+      <avp name="Location-Type" code="2500" vendor-bit="must" vendor-id="TGPP">
+        <type type-name="Enumerated"/>
+        <enum name="CURRENT_LOCATION" code="0"/>
+        <enum name="CURRENT_OR_LAST_KNOWN_LOCATION" code="1"/>
+        <enum name="INITIAL_LOCATION " code="2"/>
+        <enum name="RESERVED" code="3"/>
+        <enum name="RESERVED" code="4"/>
+        <enum name="NOTIFICATION_VERIFICATION_ONLY" code="5"/>
+      </avp>
+
+      <avp name="LCS-EPS-Client-Name" code="2501" vendor-bit="must" vendor-id="TGPP">
+        <grouped>
+          <gavp name="LCS-Name-String"/>
+          <gavp name="LCS-Format-Indicator"/>
+        </grouped>
+      </avp>
+
+      <avp name="LCS-Requestor-Name" code="2502" vendor-bit="must" vendor-id="TGPP">
+        <grouped>
+          <gavp name="LCS-Requestor-Id-String"/>
+          <gavp name="LCS-Format-Indicator"/>
+        </grouped>
+      </avp>
+
+      <avp name="LCS-Priority" code="2503" vendor-bit="must" vendor-id="TGPP">
+        <type type-name="Unsigned32"/>
+      </avp>
+
+      <avp name="LCS-QoS" code="2504" vendor-bit="must" vendor-id="TGPP">
+        <grouped>
+          <gavp name="LCS-QoS-Class"/>
+          <gavp name="Vertical-Accuracy "/>
+          <gavp name="Vertical-Requested"/>
+          <gavp name="Response-Time"/>
+        </grouped>
+      </avp>
+
+      <!--      
+2505   Horizontal-Accuracy     Unsigned32
+2506   Vertical-Accuracy       Unsigned32
+2507   Vertical-Requested      Enumerated
+-->
+      <avp name="Velocity-Requested" code="2508" vendor-bit="must" vendor-id="TGPP">
+        <type type-name="Enumerated"/>
+        <enum name="VELOCITY_IS_NOT_REQUESTED" code="0"/>
+        <enum name="BEST VELOCITY_IS_REQUESTED" code="1"/>
+      </avp>
+
+      <!--
+2509   Response-Time   Enumerated
+-->
+      <avp name="Supported-GAD-Shapes" code="2510" vendor-bit="must" vendor-id="TGPP">
+        <type type-name="Unsigned32"/>
+      </avp>
+
+      <avp name="LCS-Codeword" code="2511" vendor-bit="must" vendor-id="TGPP"> 
+        <type type-name="UTF8String"/>
+      </avp>
+
+      <avp name="LCS-Privacy-Check" code="2512" vendor-bit="must" vendor-id="TGPP">
+        <type type-name="Enumerated"/>
+        <enum name="ALLOWED_WITHOUT_NOTIFICATION" code="0"/>
+        <enum name="ALLOWED_WITH_NOTIFICATION" code="1"/>
+        <enum name="ALLOWED_IF_NO_RESPONSE" code="2"/>
+        <enum name="RESTRICTED_IF_NO_RESPONSE" code="3"/>
+        <enum name="NOT_ALLOWED" code="4"/>
+      </avp>
+
+      <!--
+2513   Accuracy-Fulfilment-Indicator   Enumerated
+-->
+      <avp name="Age-Of-Location-Estimate" code="2514" vendor-bit="must" vendor-id="TGPP">
+        <type type-name="Unsigned32"/>
+      </avp>
+
+      <!--
+2515   Velocity-Estimate       OctetString
+2516   EUTRAN-Positioning-Data OctetString
+-->
+      <avp name="ECGI" code="2517" vendor-bit="must" vendor-id="TGPP">
+        <type type-name="OctetString"/>
+      </avp>
+      <!--
+2518   Location-Event  Enumerated
+2519   Pseudonym-Indicator     Enumerated
+-->
+      <avp name="LCS-Service-Type-ID" code="2520" vendor-bit="must" vendor-id="TGPP">
+        <type type-name="Unsigned32"/>
+      </avp>
+
+      <avp name="LCS-Privacy-Check-Non-Session" code="2521" vendor-bit="must" vendor-id="TGPP">
+        <grouped>
+          <gavp name="LCS-Privacy-Check"/>
+        </grouped>
+      </avp>
+
+      <avp name="LCS-Privacy-Check-Session" code="2522" vendor-bit="must" vendor-id="TGPP">
+        <grouped>
+          <gavp name="LCS-Privacy-Check"/>
+        </grouped>
+      </avp>
+
+      <avp name="LCS-QoS-Class" code="2523" vendor-bit="must" vendor-id="TGPP">
+        <type type-name="Enumerated"/>
+        <enum name="ASSURED" code="0"/>
+        <enum name="BEST EFFORT" code="1"/>
+      </avp>
+
+      <!--
 Note: The AVP codes from 2524 to 2599 are reserved for TS 29.172
 
 -->
-<!--- TGPP2 AVP's X.S0013-014-0 
+<!--- TGPP2 AVP's X.S0013-014-0
 http://www.3gcn.org/TGPP2/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="TGPP2">
@@ -4775,19 +5812,29 @@ http://www.3gcn.org/TGPP2/TSGX/Projects/X.P0013-B%20IP%20Network%20-%20MMD/X.S00
        </application>
        <application id="16777216" name="3GPP Cx" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588">
        </application>
-       <application id="16777224" name="3GPP Gx(Obsolete)" uri="http://www.3gpp.org/ftp/Specs/html-info/29210.htm">
+       <application id="16777224" name="3GPP Gx" uri="http://www.3gpp.org/ftp/Specs/html-info/29210.htm">
+       </application>
+       <application id="16777232" name="Ericsson Charging-CIP" uri="http://www.3gpp.org/ftp/Specs/html-info/29210.htm">
        </application>
        <application id="16777238" name="3GPP Gx" uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm">
        </application>
-       <application id="16777251" name="3GPP S6a/S6d" uri="http://www.ietf.org/rfc/rfc5516.txt?number=5516">
+  <application id="16777250" name="3GPP STa" uri="http://www.3gpp.org/ftp/Specs/html-info/29273.htm">
+  </application>
+  <application id="16777251" name="3GPP S6a/S6d" uri="http://www.ietf.org/rfc/rfc5516.txt?number=5516">
        </application>
        <application id="16777252" name="3GPP S13/S13'" uri="http://www.ietf.org/rfc/rfc5516.txt?number=5516">
        </application>
-       <application id="16777265" name="3GPP SWx" uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm">
+  <application id="16777255" name="3GPP SLg" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588">
+  </application>
+  <application id="16777265" name="3GPP SWx" uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm">
        </application>
        <application id="16777266" name="3GPP Gxx" uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm">
        </application>
-       &nasreq;
+  <application id="16777272" name="3GPP S6b" uri="http://www.3gpp.org/ftp/Specs/html-info/29273.htm">
+  </application>
+  <application id="16777304" name="Ericsson Sy" uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm">
+  </application>
+  &nasreq;
        &eap;
        &mobileipv4;
        &chargecontrol;
@@ -4800,5 +5847,7 @@ http://www.3gcn.org/TGPP2/TSGX/Projects/X.P0013-B%20IP%20Network%20-%20MMD/X.S00
        &gqpolicy;
        &etsie2e4;
        &Ericsson;
-       &mobileipv6;
+  &mobileipv6;
+  &Cisco;
+  &Vodafone;
 </dictionary>