From Josip Medved: Diameter dictionary has few invalid gavp definitions https://bugs...
[obnox/wireshark/wip.git] / diameter / dictionary.xml
index 83b95179220f27c42bf1c48b8b5faf276dc166a5..4473dbb6266b6a776fe5d8b1f1ccbd2e890db8c5 100644 (file)
@@ -56,7 +56,7 @@
   -->
                <!-- *********************** 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"/>
                <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
+               <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]
                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="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"/>
                        <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">
                        <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>
                        <type type-name="OctetString"/>
                </avp>
 
-<!-- AVP:s 411 - 461 Belongs to Carge Control and is defined in chargecontrol.xml
+<!-- 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]
 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 -->
+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 ******************* -->
 
@@ -2505,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
 -->
@@ -2571,75 +2675,75 @@ Note: The AVP codes from 320 to 399 are reserved for TS 29.234
                        <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="OctectString"/>
+                       <type type-name="OctetString"/>
                </avp>
                <avp name="NAF-SA-Identifier" code="418" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
-                       <type type-name="OctectString"/>
+                       <type type-name="OctetString"/>
                </avp>
                <avp name="Security-Feature-Request" code="419" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
-                       <type type-name="OctectString"/>
+                       <type type-name="OctetString"/>
                </avp>
                <avp name="Security-Feature-Response" code="420" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
-                       <type type-name="OctectString"/>
+                       <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="OctectString"/>
+                       <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="OctectString"/>
+                       <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="OctectString"/>
+                       <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="OctectString"/>
+                       <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="OctectString"/>
+                       <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="OctectString"/>
+                       <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="OctectString"/>
+                       <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="OctectString"/>
+                       <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="OctectString"/>
+                       <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="OctectString"/>
+                       <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="OctectString"/>
+                       <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="OctectString"/>
+                       <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="OctectString"/>
+                       <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="OctectString"/>
+                       <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="OctectString"/>
+                       <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="OctectString"/>
+                       <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="OctectString"/>
+                       <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="OctectString"/>
+                       <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="OctectString"/>
+                       <type type-name="OctetString"/>
                </avp>
 29.109 [7]
 Note: The AVP codes from 421 to 499 are reserved for TS 29.109
@@ -2648,9 +2752,9 @@ Note: The AVP codes from 421 to 499 are reserved for TS 29.109
  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      **************************
@@ -3258,99 +3362,8 @@ Note: The AVP codes from 800 to 822 are reserved for TS 32.299.
                        <enum name="Alphanumeric Shortcode" code="5"/>
                        <enum name="Other" code="6"/>
                </avp>
-               <avp name="TMGI" code="900" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="OctectString"/>
-               </avp>
-               <avp name="Required-MBMS-Bearer-Capabilities" code="901" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
-               </avp>
-               <avp name="MBMS-StartStop-Indicatio" code="902" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="START" code="0"/>
-                       <enum name="STOP" code="1"/>
-                       <enum name="UPDATE" code="2"/>
-               </avp>
-               <avp name="MBMS-Service-Area" code="903" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="OctectString"/>
-               </avp>
-               <avp name="MBMS-Session-Duration" code="904" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Unsigned32"/>
-               </avp>
-               <avp name="Alternative-APN" code="905" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
-               </avp>
-               <avp name="MBMS-Service-Type" code="906" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="MULTICAST" code="0"/>
-                       <enum name="BROADCAST" code="1"/>
-               </avp>
-               <avp name="MBMS-2G-3G-Indicator" code="907" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="2G" code="0"/>
-                       <enum name="3G" code="1"/>
-                       <enum name="2G-AND-3G" code="2"/>
-               </avp>
-               <avp name="MBMS-Session-Identity" code="908" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="OctetString"/>
-               </avp>
-               <avp name="RAI" code="909" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
-               </avp>
-               <avp name="Additional-MBMS-Trace-Info" code="910" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="OctetString"/>
-               </avp>
-               <avp name="MBMS-Time-To-Data-Transfe" code="911" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Unsigned32"/>
-               </avp>
-               <avp name="MBMS-Session-Identity-Repetition-Number" code="912" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Unsigned32"/>
-               </avp>
-               <avp name="MBMS-Required-QoS" code="913" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
-               </avp>
-               <avp name="MBMS-Counting-Information" code="914" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="COUNTING-NOT-APPLICABLE" code="0"/>
-                       <enum name="COUNTING-APPLICABLE" code="1"/>
-               </avp>
-               <avp name="MBMS-User-Data-Mode-Indication" code="915" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="Unicast" code="0"/>
-                       <enum name="Multicast and Unicast" code="1"/>
-               </avp>
-               <avp name="MBMS-GGSN-Address" code="916" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
-               </avp>
-               <avp name="MBMS-GGSN-IPv6-Address" code="917" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
-               </avp>
-               <avp name="MBMS-BMSC-SSM-IP-Address" code="918" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
-               </avp>
-               <avp name="MBMS-BMSC-SSM-IPv6-Address" code="919" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
-               </avp>
-               <avp name="MBMS-Flow-Identifier" code="920" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="OctetString"/>
-               </avp>
-               <avp name="CN-IP-Multicast-Distribution" code="921" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="NO-IP-MULTICAST" code="0"/>
-                       <enum name="IP-MULTICAST" code="1"/>
-               </avp>
-               <avp name="CN-IP-Multicast-Distribution" code="922" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="uncompressed-header" code="0"/>
-                       <enum name="compressed-header" code="1"/>
-               </avp>
-               <avp name="MBMS-Access-Indicator" code="923" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="UTRAN" code="0"/>
-                       <enum name="E-UTRAN" code="1"/>
-                       <enum name="UTRAN-AND-E-UTRAN" code="2"/>
-               </avp>
 <!--
-Note: The AVP codes from 924 to 999 are reserved for TS 29.061
+Note: The AVP codes from 900 to 999 are reserved for TS 29.061
 29.210 -> 3GPP TS 29.212
 ******** Found in TGPPGmb.xml ********
 -->
@@ -3496,8 +3509,8 @@ Note: The AVP codes from 924 to 999 are reserved for TS 29.061
                <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"/>
@@ -4717,7 +4730,7 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
                <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. -->
+               <!-- 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"/>
@@ -4986,6 +4999,12 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
                                <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
@@ -5345,7 +5364,7 @@ Note: The AVP codes from 1634 to 1699 are reserved for TS 29.272.
                        <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">
@@ -5575,30 +5594,116 @@ Note: The AVP codes from 2320 to 2399 are reserved for TS 32.299
 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
+-->
+      <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
-2508   Velocity-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
-2510   Supported-GAD-Shapes    Unsigned32
-2511   LCS-Codeword    UTF8String
-2512   LCS-Privacy-Check       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
-2514   Age-Of-Location-Estimate        Unsigned32
+-->
+      <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
-2517   ECGI    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
-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="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
 
 -->
@@ -5713,15 +5818,23 @@ http://www.3gcn.org/TGPP2/TSGX/Projects/X.P0013-B%20IP%20Network%20-%20MMD/X.S00
        </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;