diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2015-04-28 20:29:28 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-04-29 11:37:29 +0000 |
| commit | 7f6fe7a1fd9db03a48b044e2966561336fa39298 (patch) | |
| tree | 376fb4a441f4d46c0886c4337380b4e5abc5b37c /diameter/etsie2e4.xml | |
| parent | fbec73db25515fada8a3b10d0d7160d8a548b859 (diff) | |
Reorganize some of the Diameter XML files, taking advantage of the fact that
AVPs can be grouped by Vendor now (not just by Application).
Move a bunch of vendor-specific Application IDs to the vendor's XML file.
Delete the (basically empty) SKT.xml, ChinaTelecom.xml, and VerizonWireless.xml
files.
Fix a typo: 16777224 is 3GPP Gx, not 3GPP Cx.
Use (derived) type Enumerated (rather than Unsigned32 or Integer32) when the
AVP is of type Enumerated.
Change-Id: I7a9702c0c48dc3fe751ad74413d8ecc040984f1f
Reviewed-on: https://code.wireshark.org/review/8235
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'diameter/etsie2e4.xml')
| -rw-r--r-- | diameter/etsie2e4.xml | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/diameter/etsie2e4.xml b/diameter/etsie2e4.xml index dfc6172443..4713e3aaff 100644 --- a/diameter/etsie2e4.xml +++ b/diameter/etsie2e4.xml @@ -3,42 +3,43 @@ <!-- ETSI ES 283 035 V2.5.1 (2008-08) --> - <application id="16777231" name="Diameter e2e4 Application" uri="http://pda.etsi.org"> +<application id="16777231" name="Diameter e2e4 Application" uri="http://pda.etsi.org"> <!-- ETSI ES 283 026 V1.6.0 (2008-02) Specifies some experimental resultcodes with vendor id ETSI 6.3.2 Experimental-Result-Code AVP values defined in the present document This clause defines the specific values of the Experimental-Result-Code AVP (vendor-id is ETSI): - - XXX prefixed with ETSI to not clash with the IETF one, that causes some filter problem with Wireshark when creating custom columns - - The following tshark parameters ” -Y diameter -z -proto,colinfo,diameter.Experimental-Result-Code,diameter.Experimental-Result-Code” -yields no result where as + XXX prefixed with ETSI to not clash with the IETF one, that causes some filter problem with Wireshark when creating custom columns --Y diameter -z proto,colinfo,diameter.Result-Code,diameter.Result-Code + The following tshark parameters ” -Y diameter -z + proto,colinfo,diameter.Experimental-Result-Code,diameter.Experimental-Result-Code” + + yields no result where as + + -Y diameter -z proto,colinfo,diameter.Result-Code,diameter.Result-Code + + Does -Does - <avp name="Experimental-Result-Code" code="298" mandatory="must" protected="mustnot" vendor-bit="must" vendor-id="ETSI" may-encrypt="no" > --> - <avp name="ETSI-Experimental-Result-Code" code="298" mandatory="must" protected="mustnot" vendor-bit="must" vendor-id="ETSI" may-encrypt="no" > - <type type-name="Unsigned32"/> - <enum name="INSUFFICIENT_RESOURCES" code="4041"/> - <enum name="COMMIT_FAILURE" code="4043"/> - <enum name="REFRESH_FAILURE" code="4044"/> - <enum name="QOS_PROFILE_FAILURE" code="4045"/> - <enum name="ACCESS_PROFILE_FAILURE" code="4046"/> - <enum name="PRIORITY_NOT_GRANTED" code="4047"/> - <enum name="MODIFICATION_FAILURE" code="5041"/> - </avp> -<!-- dummy AVP to fill out the range --> - <avp name="Not defined in .xml" code="299" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> - <type type-name="OctetString"/> - </avp> - <!-- ************************* e4 AVPs ************************ --> + <avp name="ETSI-Experimental-Result-Code" code="298" mandatory="must" protected="mustnot" vendor-bit="must" vendor-id="ETSI" may-encrypt="no" > + <type type-name="Enumerated"/> + <enum name="INSUFFICIENT_RESOURCES" code="4041"/> + <enum name="COMMIT_FAILURE" code="4043"/> + <enum name="REFRESH_FAILURE" code="4044"/> + <enum name="QOS_PROFILE_FAILURE" code="4045"/> + <enum name="ACCESS_PROFILE_FAILURE" code="4046"/> + <enum name="PRIORITY_NOT_GRANTED" code="4047"/> + <enum name="MODIFICATION_FAILURE" code="5041"/> + </avp> + <!-- dummy AVP to fill out the range --> + <avp name="Not defined in .xml" code="299" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + + <!-- ************************* e4 AVPs ************************ --> <avp name="Globally-Unique-Address" code="300" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> <grouped> @@ -843,4 +844,4 @@ Does <avp name="ETSI-Digest-Response-Auth" code="521" mandatory="may" vendor-bit="must" vendor-id="ETSI" may-encrypt="no"> <type type-name="UTF8String"/> </avp> - </application> +</application> |