Commit 0d9d69a1 authored by Joakim Karlsson's avatar Joakim Karlsson Committed by Anders Broman

[Diameter] fixed valid Diameter xml

Change-Id: Iacbbbb359885468e056dee3f8fa401223a38ca3c
Reviewed-on: https://code.wireshark.org/review/26271Reviewed-by: 's avatarAnders Broman <a.broman58@gmail.com>
parent b434e0a0
<?xml version="1.0" encoding="utf-8"?>
<vendor vendor-id="Huawei" code="2011" name="Huawei">
<avp name="P2PSMS-Information" code="20400" mandatory="no" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
<avp name="P2PSMS-Information" code="20400" mandatory="mustnot" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
<grouped>
<gavp name="SMSC-Address"/>
<gavp name="SMSC-Address-Huawei"/>
<gavp name="SM-Id"/>
<gavp name="SM-Length"/>
</grouped>
</avp>
<avp name="SMSC-Address" code="20401" mandatory="no" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
<avp name="SMSC-Address-Huawei" code="20401" mandatory="mustnot" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
<type type-name="UTF8String"/>
</avp>
<avp name="SM-Id" code="20402" mandatory="no" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
<avp name="SM-Id" code="20402" mandatory="mustnot" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
<type type-name="UTF8String"/>
</avp>
<avp name="SM-Length" code="20403" mandatory="no" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
<avp name="SM-Length" code="20403" mandatory="mustnot" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
<type type-name="Unsigned32"/>
</avp>
<avp name="MO-MSC-Address" code="20404" mandatory="no" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
<avp name="MO-MSC-Address" code="20404" mandatory="mustnot" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
<type type-name="UTF8String"/>
</avp>
<avp name="MT-MSC-Address" code="20405" mandatory="no" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
<avp name="MT-MSC-Address" code="20405" mandatory="mustnot" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
<type type-name="UTF8String"/>
</avp>
<avp name="Source-Addr" code="20406" mandatory="no" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
<avp name="Source-Addr" code="20406" mandatory="mustnot" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
<type type-name="UTF8String"/>
</avp>
<avp name="Dest-Addr" code="20407" mandatory="no" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
<avp name="Dest-Addr" code="20407" mandatory="mustnot" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
<type type-name="UTF8String"/>
</avp>
<avp name="Fee-Flag" code="20409" mandatory="no" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
<avp name="Fee-Flag" code="20409" mandatory="mustnot" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
<type type-name="Enumerated"/>
<enum name="Charge in the original mode" code="0"/>
<enum name="Charge the calling number" code="1"/>
<enum name="Charge the called number" code="2"/>
<enum name="Charge the charging number" code="3"/>
</avp>
<avp name="Fee-Type" code="20410" mandatory="no" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
<avp name="Fee-Type" code="20410" mandatory="mustnot" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
<type type-name="Enumerated"/>
<enum name="Charge by default mode" code="0"/>
<enum name="Charge by item" code="1"/>
......@@ -44,13 +46,13 @@
<enum name="Charge by month with limited number of SMs (with authentication and fee deduction)" code="5"/>
<enum name="Charge by month with limited number of SMs (with authentication but no fee deduction)" code="6"/>
</avp>
<avp name="Status-Report-Requested" code="20415" mandatory="no" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
<avp name="Status-Report-Requested" code="20415" mandatory="mustnot" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
<type type-name="Enumerated"/>
<enum name="No" code="0"/>
<enum name="Yes" code="1"/>
<enum name="Refund on Failure" code="2"/>
</avp>
<avp name="Send-Result" code="20418" mandatory="no" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
<avp name="Send-Result" code="20418" mandatory="mustnot" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
<type type-name="Enumerated"/>
<enum name="Delivered" code="0"/>
</avp>
......
<?xml version="1.0" encoding="utf-8"?>
<vendor vendor-id="Inovar" code="41897" name="Inovar"/>
<avp name="Inovar-Forward-To-Party" code="4001" mandatory="must" vendor-bit="must" vendor-id="Inovar">
<type type-name="UTF8String"/>
</avp>
<avp name="Inovar-App-Code" code="4002" mandatory="must" vendor-bit="must" vendor-id="Inovar">
<type type-name="Enumerated"/>
<enum name="=MY5" code="1"/>
<enum name="=Virtual Caller ID (VCID)" code="2"/>
</avp>
<avp name="Inovar-Service-Code" code="4003" mandatory="must" vendor-bit="must" vendor-id="Inovar">
<type type-name="Enumerated"/>
<enum name="=UE Registration Notification/Buddy List Lookup" code="1"/>
<enum name="=Unsuccessful Call Setup Notification" code="2"/>
</avp>
<avp name="Inovar-Service-ID" code="4004" mandatory="must" vendor-bit="must" vendor-id="Inovar">
<grouped>
<gavp name="Inovar-App-Code"/>
<gavp name="Inovar-Service-Code"/>
</grouped>
</avp>
<avp name="Inovar-Unsuccessful-Call-Reason" code="4005" mandatory="must" vendor-bit="must" vendor-id="Inovar">
<grouped>
<gavp name="Inovar-SIP-Response-Code"/>
<gavp name="Inovar-ISUP-Cause"/>
<gavp name="Inovar-Supplementary-Service-Id"/>
</grouped>
</avp>
<avp name="Inovar-SIP-Response-Code" code="4006" mandatory="must" vendor-bit="must" vendor-id="Inovar">
<type type-name="Integer32"/>
</avp>
<avp name="Inovar-ISUP-Cause" code="4007" mandatory="must" vendor-bit="must" vendor-id="Inovar">
<type type-name="Integer32"/>
</avp>
<avp name="Inovar-Supplementary-Service-Id" code="4008" mandatory="must" vendor-bit="must" vendor-id="Inovar">
<type type-name="Integer32"/>
</avp>
<avp name="Inovar-PS-Registration-Status" code="4009" mandatory="must" vendor-bit="must" vendor-id="Inovar">
<type type-name="Enumerated"/>
<enum name="=Subscriber is Not Registered in PS Domain" code="0"/>
<enum name="=Subscriber is Registered in PS Domain" code="1"/>
</avp>
<avp name="Inovar-Service-Result" code="4010" mandatory="must" vendor-bit="must" vendor-id="Inovar">
<type type-name="Enumerated"/>
<enum name="=MY5 Buddy List match found" code="1001"/>
<enum name="=MY5 internal failure" code="1002"/>
<enum name="=MY5 Subs not found" code="1003"/>
<enum name="=MY5 Subs Buddy List not configured" code="1004"/>
<enum name="=MY5 Subs Buddy List cfg not enabled" code="1005"/>
<enum name="=MY5 Subs Buddy List cfg enabled, but no match found 4 the Other Party Number" code="1006"/>
<enum name="=VCID success" code="2001"/>
<enum name="=VCID internal failure" code="2002"/>
<enum name="=VCID Subscriber not found" code="2003"/>
</avp>
<avp name="Inovar-Calling-Party-Info" code="4011" mandatory="must" vendor-bit="must" vendor-id="Inovar">
<grouped>
<gavp name="Calling-Party-Address"/>
<gavp name="Calling-Party-Address-Presentation-Status"/>
</grouped>
</avp>
\ No newline at end of file
<vendor vendor-id="Inovar" code="41897" name="Inovar">
<avp name="Inovar-Forward-To-Party" code="4001" mandatory="must" vendor-bit="must" vendor-id="Inovar">
<type type-name="UTF8String"/>
</avp>
<avp name="Inovar-App-Code" code="4002" mandatory="must" vendor-bit="must" vendor-id="Inovar">
<type type-name="Enumerated"/>
<enum name="=MY5" code="1"/>
<enum name="=Virtual Caller ID (VCID)" code="2"/>
</avp>
<avp name="Inovar-Service-Code" code="4003" mandatory="must" vendor-bit="must" vendor-id="Inovar">
<type type-name="Enumerated"/>
<enum name="=UE Registration Notification/Buddy List Lookup" code="1"/>
<enum name="=Unsuccessful Call Setup Notification" code="2"/>
</avp>
<avp name="Inovar-Service-ID" code="4004" mandatory="must" vendor-bit="must" vendor-id="Inovar">
<grouped>
<gavp name="Inovar-App-Code"/>
<gavp name="Inovar-Service-Code"/>
</grouped>
</avp>
<avp name="Inovar-Unsuccessful-Call-Reason" code="4005" mandatory="must" vendor-bit="must" vendor-id="Inovar">
<grouped>
<gavp name="Inovar-SIP-Response-Code"/>
<gavp name="Inovar-ISUP-Cause"/>
<gavp name="Inovar-Supplementary-Service-Id"/>
</grouped>
</avp>
<avp name="Inovar-SIP-Response-Code" code="4006" mandatory="must" vendor-bit="must" vendor-id="Inovar">
<type type-name="Integer32"/>
</avp>
<avp name="Inovar-ISUP-Cause" code="4007" mandatory="must" vendor-bit="must" vendor-id="Inovar">
<type type-name="Integer32"/>
</avp>
<avp name="Inovar-Supplementary-Service-Id" code="4008" mandatory="must" vendor-bit="must" vendor-id="Inovar">
<type type-name="Integer32"/>
</avp>
<avp name="Inovar-PS-Registration-Status" code="4009" mandatory="must" vendor-bit="must" vendor-id="Inovar">
<type type-name="Enumerated"/>
<enum name="=Subscriber is Not Registered in PS Domain" code="0"/>
<enum name="=Subscriber is Registered in PS Domain" code="1"/>
</avp>
<avp name="Inovar-Service-Result" code="4010" mandatory="must" vendor-bit="must" vendor-id="Inovar">
<type type-name="Enumerated"/>
<enum name="=MY5 Buddy List match found" code="1001"/>
<enum name="=MY5 internal failure" code="1002"/>
<enum name="=MY5 Subs not found" code="1003"/>
<enum name="=MY5 Subs Buddy List not configured" code="1004"/>
<enum name="=MY5 Subs Buddy List cfg not enabled" code="1005"/>
<enum name="=MY5 Subs Buddy List cfg enabled, but no match found 4 the Other Party Number" code="1006"/>
<enum name="=VCID success" code="2001"/>
<enum name="=VCID internal failure" code="2002"/>
<enum name="=VCID Subscriber not found" code="2003"/>
</avp>
<avp name="Inovar-Calling-Party-Info" code="4011" mandatory="must" vendor-bit="must" vendor-id="Inovar">
<grouped>
<gavp name="Calling-Party-Address"/>
<!--
Missing information from vendor how to present this AVP
<gavp name="Calling-Party-Address-Presentation-Status"/>
-->
</grouped>
</avp>
</vendor>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<vendor vendor-id="Juniper" code="2636" name="Juniper">
<!-- *********** Last updated 2016-04-14 ************ -->
<avp name="TDF-Application-Instance-Identifier-Base" code="1100" vendor-bit="must" vendor-id="Juniper">
......@@ -38,6 +40,6 @@
<type type-name="UTF8String"/>
</avp>
<avp name="Steering-IP-Address" code="1111" vendor-bit="must" vendor-id="Juniper">
<type type-name="Address"/>
<type type-name="IPAddress"/>
</avp>
</vendor>
\ No newline at end of file
......@@ -511,6 +511,7 @@
</avp>
</application> <!-- 3GPP Gq -->
<!-- The AVP codes from 500 to 599 are reserved for TS 29.209, 29.211, and 29.229. -->
<application id="16777236" name="3GPP Rx" uri="http://www.3gpp.org/DynaReport/29214.htm">
<avp name="Codec-Data" code="524" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
......
......@@ -2299,9 +2299,26 @@
558 Low-User-Priority [RFC5777]
559 High-User-Priority [RFC5777]
560 Time-Of-Day-Condition [RFC5777]
561 Time-Of-Day-Start [RFC5777]
562 Time-Of-Day-End [RFC5777]
563 Day-Of-Week-Mask [RFC5777]
-->
<avp name="Time-Of-Day-Start" code="561" mandatory="may">
<type type-name="Unsigned32"/>
</avp>
<avp name="Time-Of-Day-End" code="562" mandatory="may">
<type type-name="Unsigned32"/>
</avp>
<avp name="Day-Of-Week-Mask" code="563" mandatory="may">
<type type-name="Enumerated"/>
<enum name="SUNDAY" code="0"/>
<enum name="MONDAY" code="1"/>
<enum name="TUESDAY" code="2"/>
<enum name="WEDNESDAY" code="3"/>
<enum name="THURSDAY" code="4"/>
<enum name="FRIDAY" code="5"/>
<enum name="SATURDAY" code="6"/>
</avp>
<!--
564 Day-Of-Month-Mask [RFC5777]
565 Month-Of-Year-Mask [RFC5777]
566 Absolute-Start-Time [RFC5777]
......@@ -5228,10 +5245,10 @@
<type type-name="OctetString"/>
</avp>
<avp name="TWAG-CP-Address" code="1531" mandatory="mustnot" may-encrypt="no" vendor-bit="must" vendor-id="TGPP">
<type type-name="Address"/>
<type type-name="IPAddress"/>
</avp>
<avp name="TWAG-UP-Address" code="1532" mandatory="mustnot" may-encrypt="no" vendor-bit="must" vendor-id="TGPP">
<type type-name="UTF8String"/>
<type type-name="IPAddress"/>
</avp>
<avp name="TWAN-S2a-Failure-Cause" code="1533" mandatory="mustnot" may-encrypt="no" vendor-bit="must" vendor-id="TGPP">
<type type-name="Unsigned32"/>
......@@ -5386,7 +5403,7 @@
<gavp name="Logging-Duration"/>
<gavp name="Measurement-Period-LTE"/>
<gavp name="Measurement-Period-UMTS"/>
<gavp name="Collection-Period-RMM-LTE"/>
<gavp name="Collection-Period-RRM-LTE"/>
<gavp name="Collection-Period-RRM-UMTS"/>
<gavp name="Positioning-Method"/>
<gavp name="Measurement-Quantity"/>
......@@ -5684,7 +5701,7 @@
<enum name="SGi-BASED-DATA-DELIVERY" code="0"/>
<enum name="SCEF-BASED-DATA-DELIVERY" code="1"/>
</avp>
<avp name="Additional-Context-ID" code="1683" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP">
<avp name="Additional-Context-Identifier" code="1683" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP">
<type type-name="Unsigned32"/>
</avp>
<avp name="SCEF-Realm" code="1684" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP">
......@@ -6715,7 +6732,7 @@
<enum name="roaming with loopback" code="2"/>
</avp>
<avp name="Neighbour-Node-Address" code="2705" mandatory="must" vendor-bit="must" vendor-id="TGPP">
<type type-name="Address"/>
<type type-name="IPAddress"/>
</avp>
<avp name="Relationship-Mode" code="2706" vendor-bit="must" vendor-id="TGPP">
<type type-name="Enumerated"/>
......@@ -6728,7 +6745,7 @@
<enum name="outbound" code="1"/>
</avp>
<avp name="From-Address" code="2708" mandatory="must" vendor-bit="must" vendor-id="TGPP">
<type type-name="UTF8String"/>
<type type-name="IPAddress"/>
</avp>
<avp name="Access-Transfer-Information" code="2709" mandatory="must" vendor-bit="must" vendor-id="TGPP">
<grouped>
......@@ -6754,7 +6771,7 @@
<type type-name="UTF8String"/>
</avp>
<avp name="Related-IMS-Charging-Identifier-Node" code="2712" mandatory="must" vendor-bit="must" vendor-id="TGPP">
<type type-name="Address"/>
<type type-name="IPAddress"/>
</avp>
<avp name="IMS-Visited-Network-Identifier" code="2713" mandatory="must" vendor-bit="must" vendor-id="TGPP">
<type type-name="UTF8String"/>
......@@ -7324,7 +7341,7 @@
<avp name="Enhanced-Coverage-Restriction-Data" code="3156" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
<grouped>
<gavp name="Enhanced-Coverage-Restriction"/>
<gavp name="Visited-PLMN-IdName"/>
<gavp name="Visited-PLMN-Id"/>
</grouped>
</avp>
<avp name="Restricted-PLMN-List" code="3157" mandatory="mustnot" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
......@@ -7377,6 +7394,17 @@
<avp name="SM-RP-SMEA" code="3309" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
<type type-name="OctetString"/>
</avp>
<avp name="Maximum-UE-Availability-Time" code="3329" vendor-bit="must" vendor-id="TGPP">
<type type-name="Time"/>
</avp>
<avp name="Maximum-Retransmission-Time" code="3330" vendor-bit="must" vendor-id="TGPP">
<type type-name="Time"/>
</avp>
<avp name="Requested-Retransmission-Time" code="3331" vendor-bit="must" vendor-id="TGPP">
<type type-name="Time"/>
</avp>
<!--
Note: The AVP codes from 3300 to 3399 are reserved for TS 29.338
-->
......@@ -7675,6 +7703,9 @@
<avp name="Monitoring-Event-Report-Number" code="3923" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
<type type-name="Unsigned32"/>
</avp>
<avp name="Cellular-Network-Information " code="3924" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
<type type-name="OctetString"/>
</avp>
<avp name="Related-Change-Condition-Information" code="3925" mandatory="must" vendor-bit="must" may-encrypt="no" protected="may" vendor-id="TGPP">
<grouped>
<gavp name="SGSN-Address"/>
......@@ -7744,12 +7775,27 @@
</grouped>
</avp>
<avp name="SCS-Address" code="3941" mandatory="must" vendor-bit="must" may-encrypt="no" protected="may" vendor-id="TGPP">
<type type-name="Address"/>
<type type-name="IPAddress"/>
</avp>
<avp name="SCS-Realm" code="3942" mandatory="must" vendor-bit="must" may-encrypt="no" protected="may" vendor-id="TGPP">
<type type-name="DiameterIdentity"/>
</avp>
<!--
Note: The AVP codes from 3900 to 3999 are reserved for TS 32.299
-->
<avp name="eNodeB-ID" code="4008" mandatory="must" vendor-bit="must" protected="may" may-encrypt="yes" vendor-id="TGPP">
<type type-name="OctetString"/>
</avp>
<avp name="Extended-eNodeB-ID" code="4013" mandatory="must" vendor-bit="must" protected="may" may-encrypt="yes" vendor-id="TGPP">
<type type-name="OctetString"/>
</avp>
<!--
Note: The AVP codes from 4000 to 4013 are reserved for TS 29.217
-->
<avp name="Charging-Per-IP-CAN-Session-Indicator" code="4400" mandatory="must" vendor-bit="must" may-encrypt="no" protected="may" vendor-id="TGPP">
<type type-name="Enumerated"/>
<enum name="Inactive" code="0"/>
......@@ -7955,7 +8001,6 @@
<vendor vendor-id="Merit" code="61" name="Merit Networks"/>
<vendor vendor-id="USR" code="429" name="US Robotics Corp."/>
<vendor vendor-id="Lucent" code="1751" name="Lucent Technologies"/>
<vendor vendor-id="Huawei" code="2011" name="Huawei"/>
<vendor vendor-id="Deutsche_Telekom_AG" code="2937" name="Deutsche Telekom AG"/>
<vendor vendor-id="Acision" code="3830" name="Acision"/>
<vendor vendor-id="SKT" code="5806" name="SK Telecom"/>
......
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