diff options
author | AndersBroman <anders.broman@ericsson.com> | 2016-09-21 13:15:32 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2016-09-21 11:19:29 +0000 |
commit | c2c8dc38fee6d33a2e926aa05a3e3f7ef1723db2 (patch) | |
tree | 89e5d383517491dd04a0eef83fe90638c0667b91 /diameter | |
parent | 73899237f0ef8b70c05608ac57c7722a7016e271 (diff) | |
download | wireshark-c2c8dc38fee6d33a2e926aa05a3e3f7ef1723db2.tar.gz wireshark-c2c8dc38fee6d33a2e926aa05a3e3f7ef1723db2.tar.bz2 wireshark-c2c8dc38fee6d33a2e926aa05a3e3f7ef1723db2.zip |
[Diameter AVPs] Correct 3GPP AVPs 1655. 1656 531 and 532
Bug: 12927
Change-Id: I545d5c54396431ab67f78fbc31111460d758f8b1
Reviewed-on: https://code.wireshark.org/review/17827
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'diameter')
-rw-r--r-- | diameter/TGPP.xml | 4 | ||||
-rw-r--r-- | diameter/dictionary.xml | 26 |
2 files changed, 26 insertions, 4 deletions
diff --git a/diameter/TGPP.xml b/diameter/TGPP.xml index aa8de3a530..cd5a4fc38f 100644 --- a/diameter/TGPP.xml +++ b/diameter/TGPP.xml @@ -549,10 +549,10 @@ </grouped> </avp> <avp name="Sponsor-Identity" code="531" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="OctetString" /> + <type type-name="UTF8String" /> </avp> <avp name="Application-Service-Provider-Identity" code="532" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="OctetString" /> + <type type-name="UTF8String" /> </avp> <avp name="Rx-Request-Type" code="533" mandatory="may" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> <type type-name="Enumerated"/> diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml index 64b35f03d2..1d75530003 100644 --- a/diameter/dictionary.xml +++ b/diameter/dictionary.xml @@ -5324,13 +5324,35 @@ <avp name="Subscription-Data-Flags" code="1654" vendor-bit="must" vendor-id="TGPP"> <type type-name="Unsigned32"/> </avp> - <avp name="Measurement-Period-UMTS" code="1655" vendor-bit="must" vendor-id="TGPP"> + <avp name="Measurement-Period-LTE" code="1655" vendor-bit="must" vendor-id="TGPP"> <!-- The possible values are those defined in 3GPP TS 32.422 --> <type type-name="Enumerated"/> + <enum name="1024 ms" code="0"/> + <enum name="1280 ms" code="1"/> + <enum name="2048 ms" code="2"/> + <enum name="2560 ms" code="3"/> + <enum name="5120 ms" code="4"/> + <enum name="10240 ms" code="5"/> + <enum name="1 min" code="6"/> </avp> - <avp name="Measurement-Period-LTE" code="1656" vendor-bit="must" vendor-id="TGPP"> + <avp name="Measurement-Period-UMTS" code="1656" vendor-bit="must" vendor-id="TGPP"> <!-- The possible values are those defined in 3GPP TS 32.422 --> <type type-name="Enumerated"/> + <enum name="250 ms" code="0"/> + <enum name="500 ms" code="1"/> + <enum name="1000 ms" code="2"/> + <enum name="2000 ms" code="3"/> + <enum name="3000 ms" code="4"/> + <enum name="4000 ms" code="5"/> + <enum name="6000 ms" code="6"/> + <enum name="8000 ms" code="7"/> + <enum name="12000 ms" code="8"/> + <enum name="16000 ms" code="9"/> + <enum name="20000 ms" code="10"/> + <enum name="24000 ms" code="11"/> + <enum name="28000 ms" code="12"/> + <enum name="32000 ms" code="13"/> + <enum name="32000 ms" code="14"/> </avp> <avp name="Collection-Period-RRM-LTE" code="1657" vendor-bit="must" vendor-id="TGPP"> <!-- The possible values are those defined in 3GPP TS 32.422 --> |