diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2016-06-15 18:40:53 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-06-15 23:41:04 +0000 |
| commit | c5528d0b06176e5616b15519b26e071833f3f413 (patch) | |
| tree | 85dce3db8447b492e5e5b3ae8c9aa5185d200a01 /diameter/dictionary.xml | |
| parent | e551731723c4931e1f036312ac107d4fc1c62740 (diff) | |
| download | wireshark-c5528d0b06176e5616b15519b26e071833f3f413.tar.gz | |
Make some more Diameter AVP names unique.
In some cases this means using the correct (updated?) name from the
specification. In others it means prepending the application- or vendor-name
to force uniqueness.
Remove a few more "Unassigned" AVPs from the XML files.
Change-Id: I61d55ef97ff8efc3317c91bf79e73031735f740a
Reviewed-on: https://code.wireshark.org/review/15949
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'diameter/dictionary.xml')
| -rw-r--r-- | diameter/dictionary.xml | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml index 0bd319f74f..1abd6e22f7 100644 --- a/diameter/dictionary.xml +++ b/diameter/dictionary.xml @@ -1116,7 +1116,7 @@ <avp name="Tunnel-Server-Auth-Id" code="91" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot"> <type type-name="UTF8String"/> </avp> - <avp name="NAS-Filter-Rule" code="92" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot"> + <avp name="RADIUS-NAS-Filter-Rule" code="92" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot"> <type type-name="UTF8String"/> </avp> <!-- AVP 93 unassigned --> @@ -2055,17 +2055,7 @@ 433 Redirect-Address-Type [RFC4006] 434 Redirect-Server [RFC4006] 435 Redirect-Server-Address [RFC4006] - --> - - <avp name="Requested-Action" code="436" mandatory="must" may-encrypt="yes" vendor-bit="mustnot"> - <type type-name="Enumerated"/> - <enum name="DIRECT_DEBITING" code="0"/> - <enum name="REFUND_ACCOUNT" code="1"/> - <enum name="CHECK_BALANCE" code="2"/> - <enum name="PRICE_ENQUIRY" code="3"/> - </avp> - - <!-- + 436 Requested-Action [RFC4006] 437 Requested-Service-Unit [RFC4006] 438 Restriction-Filter-Rule [RFC4006] 439 Service-Identifier [RFC4006] @@ -2550,14 +2540,14 @@ <avp name="Event-Type" code="823" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot" vendor-id="TGPP"> <grouped> - <gavp name="SIP-Method"/> + <gavp name="3GPP-SIP-Method"/> <gavp name="Event"/> <gavp name="Content-Type"/> <gavp name="Content-Length"/> <gavp name="Content-Disposition"/> </grouped> </avp> - <avp name="SIP-Method" code="824" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP"> + <avp name="3GPP-SIP-Method" code="824" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP"> <type type-name="UTF8String"/> </avp> <avp name="Event" code="825" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP"> @@ -2923,7 +2913,7 @@ <gavp name="3GPP-Charging-Id"/> <gavp name="PDN-Connection-ID"/> <gavp name="Node-Id"/> - <gavp name="3GPP-PDP Type"/> + <gavp name="3GPP-PDP-Type"/> <gavp name="PDP-Address"/> <gavp name="Dynamic-Address-Flag"/> <gavp name="Dynamic-Address-Flag-Extension"/> @@ -3814,19 +3804,19 @@ </avp> <avp name="Initial-Recipient-Address" code="1105" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP"> <grouped> - <gavp name="Sequence-Number"/> + <gavp name="MM10-Sequence-Number"/> <gavp name="MM10-Recipient-Address"/> </grouped> </avp> <avp name="Result-Recipient-Address" code="1106" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP"> <grouped> - <gavp name="Sequence-Number"/> + <gavp name="MM10-Sequence-Number"/> <gavp name="MM10-Recipient-Address"/> <gavp name="Routeing-Address"/> <gavp name="Sender-Address"/> </grouped> </avp> - <avp name="Sequence-Number" code="1107" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP"> + <avp name="MM10-Sequence-Number" code="1107" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP"> <type type-name="Unsigned32"/> </avp> <avp name="MM10-Recipient-Address" code="1108" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP"> |