diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2016-10-24 11:31:25 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-10-25 03:54:04 +0000 |
| commit | 446dbea4eb05cc5e4a363dbc22f7421c6527a3a4 (patch) | |
| tree | 092ab4b9c36c32d4de4d75d13bfa37d4e83b6ce7 /diameter | |
| parent | 26950539d6f87e2f2157ac6d2bf9e5173b780856 (diff) | |
Fix a couple typos in the Diameter XML.
Also:
- Move new T6a/T6b AVPs into TGPP.xml (to keep them all together).
- Put back a comment that was (accidentally?) deleted; add some similar notes
in other places.
Change-Id: I2a468aa3be0069cd8124dd9e5b0a27e333849059
Reviewed-on: https://code.wireshark.org/review/18433
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'diameter')
| -rw-r--r-- | diameter/TGPP.xml | 24 | ||||
| -rw-r--r-- | diameter/dictionary.xml | 39 |
2 files changed, 37 insertions, 26 deletions
diff --git a/diameter/TGPP.xml b/diameter/TGPP.xml index 6da5a935f3..43eea3853b 100644 --- a/diameter/TGPP.xml +++ b/diameter/TGPP.xml @@ -1401,6 +1401,30 @@ <avp name="BSSGP-Cause" code="4309" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> <type type-name="Unsigned32"/> </avp> + <avp name="Serving-PLMN-Rate-Control" code="4310" mandatory="must" vendor-bit="must" may-encrypt="no" protected="may" vendor-id="TGPP"> + <grouped> + <gavp name="Uplink-Rate-Limit"/> + <gavp name="Downlink-Rate-Limit"/> + </grouped> + </avp> + <avp name="Uplink-Rate-Limit" code="4311" mandatory="must" vendor-bit="must" may-encrypt="no" protected="may" vendor-id="TGPP"> + <type type-name="Unsigned32"/> + </avp> + <avp name="Downlink-Rate-Limit" code="4312" mandatory="must" vendor-bit="must" may-encrypt="no" protected="may" vendor-id="TGPP"> + <type type-name="Unsigned32"/> + </avp> + <avp name="RRC-Cause-Counter" code="4318" mandatory="must" vendor-bit="must" may-encrypt="no" protected="may" vendor-id="TGPP"> + <grouped> + <gavp name="Counter-Value"/> + <gavp name="RRC-Counter-Timestamp"/> + </grouped> + </avp> + <avp name="Counter-Value" code="4319" mandatory="must" vendor-bit="must" may-encrypt="no" protected="may" vendor-id="TGPP"> + <type type-name="Unsigned32"/> + </avp> + <avp name="RRC-Counter-Timestamp" code="4320" mandatory="must" vendor-bit="must" may-encrypt="no" protected="may" vendor-id="TGPP"> + <type type-name="Time"/> + </avp> <!-- Note: The AVP codes from 4300 to 4399 are reserved for TS 29.128 --> diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml index a53f69fa6a..09e7f14e2f 100644 --- a/diameter/dictionary.xml +++ b/diameter/dictionary.xml @@ -2961,7 +2961,7 @@ <gavp name="Node-Id"/> <gavp name="3GPP-PDP-Type"/> <gavp name="PDP-Address"/> - <gavp name="PDP-Address_Prefix-Length"/> + <gavp name="PDP-Address-Prefix-Length"/> <gavp name="Dynamic-Address-Flag"/> <gavp name="Dynamic-Address-Flag-Extension"/> <gavp name="QoS-Information"/> @@ -6842,6 +6842,10 @@ <avp name="ePDG-Address" code="3425" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP"> <type type-name="IPAddress"/> </avp> + <!-- + Note: The AVP codes from 3400 to 3499 are reserved for TS 32.299 + --> + <avp name="Enhanced-Diagnostics" code="3901" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP"> <grouped> <gavp name="RAN-NAS-Release-Cause"/> @@ -7036,35 +7040,18 @@ <avp name="Rate-Control-Time-Unit" code="3939" mandatory="must" vendor-bit="must" may-encrypt="no" protected="may" vendor-id="TGPP"> <type type-name="Unsigned32"/> </avp> - <avp name="Serving-PLMN-Rate-Control" code="4310" mandatory="must" vendor-bit="must" may-encrypt="no" protected="may" vendor-id="TGPP"> - <grouped> - <gavp name="Uplink-Rate-Limit"/> - <gavp name="Downlink-Rate-Limit"/> - </grouped> - </avp> - <avp name="Uplink-Rate-Limit" code="4311" mandatory="must" vendor-bit="must" may-encrypt="no" protected="may" vendor-id="TGPP"> - <type type-name="Unsigned32"/> - </avp> - <avp name="Downlink-Rate-Limit" code="4312" mandatory="must" vendor-bit="must" may-encrypt="no" protected="may" vendor-id="TGPP"> - <type type-name="Unsigned32"/> - </avp> - <avp name="RRC-Cause-Counter" code="4318" mandatory="must" vendor-bit="must" may-encrypt="no" protected="may" vendor-id="TGPP"> - <grouped> - <gavp name="Counter-Value"/> - <gavp name="RRC-Counter-Timestamp"/> - </grouped> - </avp> - <avp name="Counter-Value" code="4319" mandatory="must" vendor-bit="must" may-encrypt="no" protected="may" vendor-id="TGPP"> - <type type-name="Unsigned32"/> - </avp> - <avp name="RRC-Counter-Timestamp" code="4320" mandatory="must" vendor-bit="must" may-encrypt="no" protected="may" vendor-id="TGPP"> - <type type-name="Time"/> - </avp> - <avp name="Charging-Per-IP-CAN-Session-Indicator" code="4400" mandatory="must" vendor-bit="must" may-encrypt="no" protected="may" vendor-id="TGPP"2> + <!-- + Note: The AVP codes from 3900 to 3999 are reserved for TS 29.128 + --> + + <avp name="Charging-Per-IP-CAN-Session-Indicator" code="4400" mandatory="must" vendor-bit="must" may-encrypt="no" protected="may" vendor-id="TGPP"> <type type-name="Enumerated"/> <enum name="Inactive" code="0"/> <enum name="Active" code="1"/> </avp> + <!-- + Note: The AVP codes from 4400 to 4499 are reserved for TS 32.299 + --> </base> <!-- ********************************************************************** --> |