Commit 20e2edca authored by Jeff Morriss's avatar Jeff Morriss Committed by Anders Broman

Add some Diameter AVPs referenced by (recently added) grouped AVPs.

... In order to make the Diameter XML valid again.

This includes adding T6a/T6b and most of the AVPs of that application.

Fix up some white space while at it.

Change-Id: Ie39b3e574065628fdba215cc9c045eebcbd3077e
Reviewed-on: https://code.wireshark.org/review/18422Reviewed-by: 's avatarAnders Broman <a.broman58@gmail.com>
parent af7fc8b7
......@@ -1311,7 +1311,7 @@
</avp>
</application> <!-- 3GPP MB2c -->
<application id="16777336" name="3GPP PC4a" uri="http://www.3gpp.org/ftp/Specs/html-info/29344.htm">
<application id="16777336" name="3GPP PC4a" uri="http://www.3gpp.org/ftp/Specs/html-info/29344.htm">
<command name="ProSe-Subscriber-Information" code="8388664" vendor-id="TGPP"/>
<command name="Update-ProSe-Subscriber-Data" code="8388665" vendor-id="TGPP"/>
......@@ -1321,41 +1321,87 @@
<avp name="ProSe-Subscription-Data" code="3701" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<grouped>
<gavp name="ProSe-Permission"/>
<gavp name="ProSe-Allowed-PLMN"/>
<gavp name="3GPP-Charging-Characteristics"/>
</grouped>
<gavp name="ProSe-Permission"/>
<gavp name="ProSe-Allowed-PLMN"/>
<gavp name="3GPP-Charging-Characteristics"/>
</grouped>
</avp>
<avp name="ProSe-Permission" code="3702" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="Unsigned32"/>
</avp>
<avp name="ProSe-Allowed-PLMN" code="3703" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<grouped>
<gavp name="Visited-PLMN-Id"/>
<gavp name="Authorized-Discovery-Range"/>
<gavp name="ProSe-Direct-Allowed"/>
</grouped>
</avp>
<avp name="ProSe-Direct-Allowed" code="3704" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="Unsigned32"/>
</avp>
<avp name="UPR-Flags" code="3705" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="Unsigned32"/>
</avp>
<avp name="PNR-Flags" code="3706" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="Unsigned32"/>
</avp>
<avp name="ProSe-Initial-Location-Information" code="3707" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<grouped>
<gavp name="MME-Name"/>
<gavp name="E-UTRAN-Cell-Global-Identity"/>
<gavp name="Tracking-Area-Identity"/>
<gavp name="Age-Of-Location-Information"/>
</grouped>
</avp>
<avp name="Authorized-Discovery-Range" code="3708" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="Unsigned32"/>
</avp>
<avp name="ProSe-Permission" code="3702" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="Unsigned32"/>
</avp>
<avp name="ProSe-Allowed-PLMN" code="3703" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<grouped>
<gavp name="Visited-PLMN-Id"/>
<gavp name="Authorized-Discovery-Range"/>
<gavp name="ProSe-Direct-Allowed"/>
</grouped>
</avp>
<avp name="ProSe-Direct-Allowed" code="3704" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="Unsigned32"/>
</avp>
<avp name="UPR-Flags" code="3705" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="Unsigned32"/>
</avp>
<avp name="PNR-Flags" code="3706" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="Unsigned32"/>
</avp>
<avp name="ProSe-Initial-Location-Information" code="3707" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<grouped>
<gavp name="MME-Name"/>
<gavp name="E-UTRAN-Cell-Global-Identity"/>
<gavp name="Tracking-Area-Identity"/>
<gavp name="Age-Of-Location-Information"/>
</grouped>
</avp>
<avp name="Authorized-Discovery-Range" code="3708" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="Unsigned32"/>
</avp>
</application> <!-- 3GPP PC4a -->
<application id="16777346" name="3GPP T6a/T6b" uri="http://www.3gpp.org/ftp/Specs/html-info/29128.htm">
<avp name="Communication-Failure-Information" code="4300" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
<grouped>
<gavp name="Cause-Type"/>
<gavp name="S1AP-Cause"/>
<gavp name="RANAP-Cause"/>
<gavp name="BSSGP-Cause"/>
<gavp name="GMM-Cause"/>
<gavp name="SM-Cause"/>
</grouped>
</avp>
<avp name="Cause-Type" code="4301" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
<type type-name="Unsigned32"/>
</avp>
<avp name="S1AP-Cause" code="4302" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
<type type-name="Unsigned32"/>
</avp>
<avp name="RANAP-Cause" code="4303" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
<type type-name="Unsigned32"/>
</avp>
<avp name="GMM-Cause" code="4304" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
<type type-name="Unsigned32"/>
</avp>
<avp name="SM-Cause" code="4305" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
<type type-name="Unsigned32"/>
</avp>
<avp name="Number-Of-UE-Per-Location-Configuration" code="4306" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
<grouped>
<gavp name="EPS-Location-Information"/>
</grouped>
</avp>
<avp name="Number-Of-UE-Per-Location-Report" code="4307" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
<grouped>
<gavp name="EPS-Location-Information"/>
<gavp name="UE-Count"/>
</grouped>
</avp>
<avp name="UE-Count" code="4308" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
<type type-name="Unsigned32"/>
</avp>
<avp name="BSSGP-Cause" code="4309" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
<type type-name="Unsigned32"/>
</avp>
<!--
Note: The AVP codes from 4300 to 4399 are reserved for TS 29.128
-->
</application>
<!-- 3GPP PC4a -->
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment