Commit ecc3369c authored by Jeff Morriss's avatar Jeff Morriss

Misc. Diameter XML cleanups.

Consistently used (derived) type Enumerated (rather than Unsigned32 or
Integer32) when the AVP is of type Enumerated.

Use a uri of "none" when we don't have access to the specification.
Update the URI of an Application or two.

Clean up white space and formatting.

Change-Id: Iad677db186469b7d8c4a23b7a7fca6c357dbc012
Reviewed-on: https://code.wireshark.org/review/8164Reviewed-by: 's avatarJeff Morriss <jeff.morriss.ws@gmail.com>
parent 448e122e
<?xml version="1.0" encoding="utf-8"?>
<!-- NOTE the Application ID is not assigned by IANA http://www.iana.org/assignments/aaa-parameters/aaa-parameters.xml -->
<application id="111" name="ALU Sy" uri="http://www.ietf.org/internet-drafts/draft-ietf-aaa-diameter-cc-06.txt">
<application id="111" name="ALU Sy" uri="none">
<avp name="Detailed-Result" code="15" mandatory="mustnot" protected="may" vendor-bit="must" vendor-id="ALU" may-encrypt="yes">
<grouped>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
<?xml version="1.0" encoding="utf-8"?>
<application id="16777305" name="HP Diameter Topology Discovery" uri="http://www.iana.org/assignments/aaa-parameters/aaa-parameters.xml">
<application id="16777305" name="HP Diameter Topology Discovery" uri="none">
<command name="Peer Information" code="100" vendor-id="HP">
<command name="Fetch Peers" code="101" vendor-id="HP">
<command name="Subscribe Change" code="102" vendor-id="HP">
......
......@@ -2,7 +2,7 @@
<!-- Nokia verndor-specific AVPs. Simple encoding, by old (oleksandr.darchuk[AT]gmail.com). 02.03.2009 -->
<application id="16777246" name="NSN Unified Charging Trigger Function (UCTF)" uri="http://www.ietf.org/rfc/rfc4006.txt">
<application id="16777246" name="NSN Unified Charging Trigger Function (UCTF)" uri="none">
<avp name="Nokia-IMS-Media-Component-Id" code="5101" vendor-id="Nokia">
<type type-name="Unsigned32"/>
......
......@@ -2,14 +2,13 @@
<!-- Nokia Solutions and Networks vendor-specific AVPs. -->
<application id="16777317" name="Nokia Solutions and Networks (NSN) Hd Application" uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm">
<application id="16777317" name="Nokia Solutions and Networks (NSN) Hd Application" uri="none">
<avp name="User-Agent-Type" code="2016" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="NokiaSolutionsAndNetworks">
<type type-name="Enumerated"/>
<enum name="NON_MOBILE_BROWSER" code="0"/>
<enum name="MOBILE_BROWSER" code="1"/>
</avp>
</application>
......
<?xml version="1.0" encoding="utf-8"?>
<vendor vendor-id="VerizonWireless" code="12951" name="Verizon Wireless"/>
<application id="16777322" name="Verizon Session Recovery" uri="http://www.ietf.org/rfc/rfc4006.txt">
<application id="16777322" name="Verizon Session Recovery" uri="none">
<avp name="Dummy" code="0" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="VerizonWireless">
<type type-name="OctetString"/>
......
......@@ -5,7 +5,7 @@
<application id="16777234" name="Vodafone Gx+" uri="http://www.ietf.org/internet-drafts/draft-ietf-aaa-diameter-cc-06.txt">
<avp name="Context-Type" code="256" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
<type type-name="Unsigned32"/>
<type type-name="Enumerated"/>
<enum name="PRIMARY" code="0"/>
<enum name="SECONDARY" code="1"/>
</avp>
......@@ -19,13 +19,13 @@
<type type-name="Unsigned32"/>
</avp>
<avp name="Radio-Access-Technology" code="260" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
<type type-name="Unsigned32"/>
<type type-name="Enumerated"/>
<enum name="UTRAN" code="0"/>
<enum name="GERAN" code="1"/>
<enum name="WLAN" code="2"/>
</avp>
<avp name="Reporting-Reason" code="261" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
<type type-name="Unsigned32"/>
<type type-name="Enumerated"/>
<enum name="THRESHOLD" code="0"/>
<enum name="QHT" code="1"/>
<enum name="FINAL" code="2"/>
......@@ -50,7 +50,7 @@
</grouped>
</avp>
<avp name="Trigger-Type" code="266" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
<type type-name="Unsigned32"/>
<type type-name="Enumerated"/>
<enum name="CHANGE_IN_SGSN_IP_ADDRESS" code="1"/>
<enum name="CHANGEINQOS_ANY" code="2"/>
<enum name="CHANGEINLOCATION_ANY" code="3"/>
......
<?xml version="1.0" encoding="UTF-8"?>
<application id="5" name="EAP Application" uri="http://www.ietf.org/rfc/rfc4072.txt">
<command name="Diameter-EAP" code="268" vendor-id="None"/>
<command name="Diameter-EAP" code="268" vendor-id="None"/>
<avp name="EAP-Payload" code="462">
<type type-name="OctetString"/>
</avp>
<avp name="EAP-Reissued-Payload" code="463">
<type type-name="OctetString"/>
</avp>
<avp name="EAP-Master-Session-Key" code="464">
<type type-name="OctetString"/>
</avp>
<avp name="Accounting-EAP-Auth-Method" code="465">
<type type-name="Unsigned64"/>
</avp>
</application>
<avp name="EAP-Payload" code="462">
<type type-name="OctetString"/>
</avp>
<avp name="EAP-Reissued-Payload" code="463">
<type type-name="OctetString"/>
</avp>
<avp name="EAP-Master-Session-Key" code="464">
<type type-name="OctetString"/>
</avp>
<avp name="Accounting-EAP-Auth-Method" code="465">
<type type-name="Unsigned64"/>
</avp>
</application>
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?>
<application id="7" name="Diameter Mobile IPv6 IKE (MIP6I)" uri="http://www.ietf.org/rfc/rfc5778.txt">
</application>
<application id="8" name="Diameter Mobile IPv6 Auth (MIP6A)" uri="http://www.ietf.org/rfc/rfc5778.txt">
<application id="7" name="Diameter Mobile IPv6 IKE (MIP6I)" uri="http://tools.ietf.org/html/rfc5778"></application>
<application id="8" name="Diameter Mobile IPv6 Auth (MIP6A)" uri="http://tools.ietf.org/html/rfc5778">
<!-- Mobile-IPv6 Application -->
<command name="MIP6-Request/Answer" code="325" vendor-id="None"/>
<!-- Mobile-IPv6 Application -->
<command name="MIP6-Request/Answer" code="325" vendor-id="None"/>
<!-- ************************** Mobile-IPv6 AVPS ********************* -->
<!-- ************************** Mobile-IPv6 AVPS ********************* -->
<!--
http://www.iana.org/assignments/aaa-parameters
-->
<!-- RFC5447 -->
<!-- RFC5447 -->
<avp name="MIP6-Agent-Info" code="486" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes">
<grouped>
<gavp name="MIP-Home-Agent-Address"/>
<gavp name="MIP-Home-Agent-Host"/>
<gavp name="MIP6-Home-Link-Prefix"/>
<gavp name="AVP"/>
</grouped>
</avp>
<avp name="MIP6-Agent-Info" code="486" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes">
<grouped>
<gavp name="MIP-Home-Agent-Address"/>
<gavp name="MIP-Home-Agent-Host"/>
<gavp name="MIP6-Home-Link-Prefix"/>
<gavp name="AVP"/>
</grouped>
</avp>
<!-- RFC5778 -->
<!-- RFC5778 -->
<avp name="MIP-Careof-Address" code="487" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes">
<type type-name="IPAddress"/>
</avp>
<avp name="MIP-Authenticator" code="488" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes">
<type type-name="OctetString"/>
</avp>
<avp name="MIP-MAC-Mobility-Data" code="489" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes">
<type type-name="OctetString"/>
</avp>
<avp name="MIP-Timestamp" code="490" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes">
<type type-name="OctetString"/>
</avp>
<avp name="MIP-MN-HA-SPI" code="491" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes">
<type type-name="Unsigned32"/>
</avp>
<avp name="MIP-MN-HA-MSA" code="492" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes">
<grouped>
<gavp name="MIP-Session-Key"/>
<gavp name="MIP-MSA-Lifetime"/>
<gavp name="MIP-MN-HA-SPI"/>
<gavp name="MIP-Algorithm-Type"/>
<gavp name="MIP-Replay-Mode"/>
<gavp name="AVP"/>
</grouped>
</avp>
<avp name="Service-Selection" code="493" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes">
<type type-name="UTF8String"/>
</avp>
<avp name="MIP6-Auth-Mode" code="494" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes">
<type type-name="Enumerated"/>
<enum name="Reserved" code="0"/>
<enum name="IP6_AUTH_MN_AAA" code="1"/>
</avp>
<avp name="MIP-Careof-Address" code="487" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes">
<type type-name="IPAddress"/>
</avp>
<avp name="MIP-Authenticator" code="488" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes">
<type type-name="OctetString"/>
</avp>
<avp name="MIP-MAC-Mobility-Data" code="489" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes">
<type type-name="OctetString"/>
</avp>
<avp name="MIP-Timestamp" code="490" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes">
<type type-name="OctetString"/>
</avp>
<avp name="MIP-MN-HA-SPI" code="491" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes">
<type type-name="Unsigned32"/>
</avp>
<avp name="MIP-MN-HA-MSA" code="492" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes">
<grouped>
<gavp name="MIP-Session-Key"/>
<gavp name="MIP-MSA-Lifetime"/>
<gavp name="MIP-MN-HA-SPI"/>
<gavp name="MIP-Algorithm-Type"/>
<gavp name="MIP-Replay-Mode"/>
<gavp name="AVP"/>
</grouped>
</avp>
<avp name="Service-Selection" code="493" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes">
<type type-name="UTF8String"/>
</avp>
<avp name="MIP6-Auth-Mode" code="494" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes">
<type type-name="Enumerated"/>
<enum name="Reserved" code="0"/>
<enum name="IP6_AUTH_MN_AAA" code="1"/>
</avp>
<!-- RFC5779 -->
<!-- RFC5779 -->
<avp name="PMIP6-DHCP-Server-Address" code="504">
<type type-name="IPAddress"/>
</avp>
<avp name="PMIP6-IPv4-Home-Address" code="505">
<type type-name="IPAddress"/>
</avp>
<avp name="Mobile-Node-Identifier" code="506">
<type type-name="UTF8String"/>
</avp>
<avp name="Service-Configuration" code="507">
<grouped>
<gavp name="MIP6-Agent-Info"/>
<gavp name="Service-Selection"/>
<gavp name="AVP"/>
</grouped>
</avp>
<avp name="PMIP6-DHCP-Server-Address" code="504">
<type type-name="IPAddress"/>
</avp>
<avp name="PMIP6-IPv4-Home-Address" code="505">
<type type-name="IPAddress"/>
</avp>
<avp name="Mobile-Node-Identifier" code="506">
<type type-name="UTF8String"/>
</avp>
<avp name="Service-Configuration" code="507">
<grouped>
<gavp name="MIP6-Agent-Info"/>
<gavp name="Service-Selection"/>
<gavp name="AVP"/>
</grouped>
</avp>
<!-- ************************ END Mobile-IPv6 AVPS ******************* -->
</application>
<!-- ************************ END Mobile-IPv6 AVPS ******************* -->
</application>
......@@ -19,34 +19,34 @@
<!--
368 - 393 is in sip.xml
368 SIP-Accounting-Information [RFC4740]
369 SIP-Accounting-Server-URI [RFC4740]
370 SIP-Credit-Control-Server-URI [RFC4740]
371 SIP-Server-URI [RFC4740]
372 SIP-Server-Capabilities [RFC4740]
373 SIP-Mandatory-Capability [RFC4740]
374 SIP-Optional-Capability [RFC4740]
375 SIP-Server-Assignment-Type [RFC4740]
376 SIP-Auth-Data-Item [RFC4740]
377 SIP-Authentication-Scheme [RFC4740]
378 SIP-Item-Number [RFC4740]
379 SIP-Authenticate [RFC4740]
380 SIP-Authorization [RFC4740]
381 SIP-Authentication-Info [RFC4740]
382 SIP-Number-Auth-Items [RFC4740]
383 SIP-Deregistration-Reason [RFC4740]
384 SIP-Reason-Code [RFC4740]
385 SIP-Reason-Info [RFC4740]
386 SIP-Visited-Network-Id [RFC4740]
387 SIP-User-Authorization-Type [RFC4740]
388 SIP-Supported-User-Data-Type [RFC4740]
389 SIP-User-Data [RFC4740]
390 SIP-User-Data-Type [RFC4740]
391 SIP-User-Data-Contents [RFC4740]
392 SIP-User-Data-Already-Available [RFC4740]
393 SIP-Method [RFC4740]
394-399 Unassigned
-->
368 SIP-Accounting-Information [RFC4740]
369 SIP-Accounting-Server-URI [RFC4740]
370 SIP-Credit-Control-Server-URI [RFC4740]
371 SIP-Server-URI [RFC4740]
372 SIP-Server-Capabilities [RFC4740]
373 SIP-Mandatory-Capability [RFC4740]
374 SIP-Optional-Capability [RFC4740]
375 SIP-Server-Assignment-Type [RFC4740]
376 SIP-Auth-Data-Item [RFC4740]
377 SIP-Authentication-Scheme [RFC4740]
378 SIP-Item-Number [RFC4740]
379 SIP-Authenticate [RFC4740]
380 SIP-Authorization [RFC4740]
381 SIP-Authentication-Info [RFC4740]
382 SIP-Number-Auth-Items [RFC4740]
383 SIP-Deregistration-Reason [RFC4740]
384 SIP-Reason-Code [RFC4740]
385 SIP-Reason-Info [RFC4740]
386 SIP-Visited-Network-Id [RFC4740]
387 SIP-User-Authorization-Type [RFC4740]
388 SIP-Supported-User-Data-Type [RFC4740]
389 SIP-User-Data [RFC4740]
390 SIP-User-Data-Type [RFC4740]
391 SIP-User-Data-Contents [RFC4740]
392 SIP-User-Data-Already-Available [RFC4740]
393 SIP-Method [RFC4740]
394-399 Unassigned
-->
<avp name="NAS-Filter-Rule" code="400" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
<type type-name="IPFilterRule"/>
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment