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/TGPP.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/TGPP.xml')
-rw-r--r-- | diameter/TGPP.xml | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/diameter/TGPP.xml b/diameter/TGPP.xml index 36a8b70532..251ecab823 100644 --- a/diameter/TGPP.xml +++ b/diameter/TGPP.xml @@ -242,13 +242,13 @@ </avp> <avp name="SIP-Auth-Data-Item(Obsolete CN#25)" code="13" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> <grouped> - <gavp name="SIP-Item-Number"/> - <gavp name="SIP-Authentication-Scheme"/> - <gavp name="SIP-Authenticate"/> - <gavp name="SIP-Authorization"/> - <gavp name="SIP-Authentication-Context"/> - <gavp name="Confidentiality-Key"/> - <gavp name="Integrity-Key"/> + <gavp name="SIP-Item-Number(Obsolete CN#25)"/> + <gavp name="SIP-Authentication-Scheme(Obsolete CN#25)"/> + <gavp name="SIP-Authenticate(Obsolete CN#25)"/> + <gavp name="SIP-Authorization(Obsolete CN#25)"/> + <gavp name="SIP-Authentication-Context(Obsolete CN#25)"/> + <gavp name="Confidentiality-Key(Obsolete CN#25)"/> + <gavp name="Integrity-Key(Obsolete CN#25)"/> </grouped> </avp> <avp name="SIP-Item-Number(Obsolete CN#25)" code="14" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> @@ -622,30 +622,30 @@ <avp name="Optional-Capability" code="605" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> <type type-name="Unsigned32"/> </avp> - <avp name="User-Data" code="606" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <avp name="Cx-User-Data" code="606" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> <type type-name="OctetString"/> </avp> - <avp name="SIP-Number-Auth-Items" code="607" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <avp name="3GPP-SIP-Number-Auth-Items" code="607" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> <type type-name="Unsigned32"/> </avp> - <avp name="SIP-Authentication-Scheme" code="608" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <avp name="3GPP-SIP-Authentication-Scheme" code="608" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> <type type-name="UTF8String"/> </avp> - <avp name="SIP-Authenticate" code="609" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <avp name="3GPP-SIP-Authenticate" code="609" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> <type type-name="OctetString"/> </avp> - <avp name="SIP-Authorization" code="610" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <avp name="3GPP-SIP-Authorization" code="610" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> <type type-name="OctetString"/> </avp> <avp name="SIP-Authentication-Context" code="611" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> <type type-name="OctetString"/> </avp> - <avp name="SIP-Auth-Data-Item" code="612" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <avp name="3GPP-SIP-Auth-Data-Item" code="612" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> <grouped> <gavp name="SIP-Item-Number"/> - <gavp name="SIP-Authentication-Scheme"/> - <gavp name="SIP-Authenticate"/> - <gavp name="SIP-Authorization"/> + <gavp name="3GPP-SIP-Authentication-Scheme"/> + <gavp name="3GPP-SIP-Authenticate"/> + <gavp name="3GPP-SIP-Authorization"/> <gavp name="SIP-Authentication-Context"/> <gavp name="Confidentiality-Key"/> <gavp name="Integrity-Key"/> @@ -659,7 +659,7 @@ <gavp name="Authorization -Information-SIM"/> </grouped> </avp> - <avp name="SIP-Item-Number" code="613" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <avp name="3GPP-SIP-Item-Number" code="613" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> <type type-name="Unsigned32"/> </avp> <avp name="Server-Assignment-Type" code="614" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> @@ -890,7 +890,7 @@ <avp name="MSISDN" code="701" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> <type type-name="OctetString"/> </avp> - <avp name="User-Data" code="702" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> + <avp name="Sh-User-Data" code="702" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> <type type-name="OctetString"/> </avp> <avp name="Data-Reference" code="703" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> |