summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--diameter/Cisco.xml845
-rw-r--r--diameter/Oracle.xml12
-rw-r--r--diameter/VerizonWireless.xml12
-rw-r--r--diameter/Vodafone.xml2
-rw-r--r--diameter/dictionary.xml67
-rw-r--r--epan/diam_dict.l25
6 files changed, 486 insertions, 477 deletions
diff --git a/diameter/Cisco.xml b/diameter/Cisco.xml
index b4c31f2842..23a8ba4941 100644
--- a/diameter/Cisco.xml
+++ b/diameter/Cisco.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
- <application id="16777238" name="3GPP Gx" uri="http://www.ietf.org/internet-drafts/draft-ietf-aaa-diameter-cc-06.txt">
+<vendor vendor-id="Cisco" code="5771" name="Cisco">
<!--Flow-Description-->
<avp name="Flow-Description" code="507" vendor-id="Cisco" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must">
<type type-name="IPFilterRule"/>
-
</avp>
<!--Cisco-Charging-Rule-Definition-->
@@ -28,7 +27,7 @@
</avp>
<!--Content-Definition-->
-
+
<avp name="Content-Definition" code="131073" vendor-id="Cisco" mandatory="must" may-encrypt="yes" protected="mustnot" vendor-bit="must">
<grouped>
<gavp name="Content-Name"/>
@@ -48,7 +47,7 @@
<gavp name="Subscriber-IP-Source"/>
<gavp name="Flow-Status-Policy-Mismatch"/>
<gavp name="Relative-URL"/>
- <gavp name="Control-URL"/>
+ <gavp name="Control-URL"/>
<gavp name="Domain-Group-Name"/>
<gavp name="Mining"/>
<gavp name="Nexthop-Media"/>
@@ -58,9 +57,9 @@
</avp>
-
+
<!--Billing-Policy-Definition-->
-
+
<avp name="Billing-Policy-Definition" code="131074" vendor-id="Cisco" mandatory="must" may-encrypt="yes" protected="mustnot" vendor-bit="must">
<grouped>
<gavp name="Billing-Policy-Name"/>
@@ -72,7 +71,7 @@
</avp>
<!--Policy-Map-Definition-->
-
+
<avp name="Policy-Map-Definition" code="131075" vendor-id="Cisco" mandatory="must" may-encrypt="yes" protected="mustnot" vendor-bit="must">
<grouped>
<gavp name="Policy-Map-Name"/>
@@ -82,10 +81,10 @@
<gavp name="Policy-Map-Match-Install"/>
</grouped>
</avp>
-
+
<!--Service-Definition-->
-
+
<avp name="Service-Definition" code="131076" vendor-id="Cisco" mandatory="must" may-encrypt="yes" protected="mustnot" vendor-bit="must">
<grouped>
<gavp name="Service-Name"/>
@@ -119,9 +118,9 @@
</avp>
-
+
<!--Content-Policy-Map-->
-
+
<avp name="Content-Policy-Map" code="131077" vendor-id="Cisco" mandatory="must" may-encrypt="yes" protected="mustnot" vendor-bit="must">
<grouped>
<gavp name="Content-Name"/>
@@ -130,9 +129,9 @@
</grouped>
</avp>
-
+
<!--Service-Info-->
-
+
<avp name="Service-Info" code="131078" vendor-id="Cisco" mandatory="must" may-encrypt="yes" protected="mustnot" vendor-bit="must">
<grouped>
<gavp name="Service-Name"/>
@@ -141,9 +140,9 @@
</grouped>
</avp>
-
+
<!--Billing-Plan-Definition-->
-
+
<avp name="Billing-Plan-Definition" code="131079" vendor-id="Cisco" mandatory="must" may-encrypt="yes" protected="mustnot" vendor-bit="must">
<grouped>
<gavp name="Billing-plan-Name"/>
@@ -172,24 +171,24 @@
</avp>
<!--Content-Idle-Timer-->
-
+
<avp name="Content-Idle-Timer" code="131082" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
<type type-name="Unsigned32"/>
</avp>
-
+
<!--Nexthop-Uplink-->
-
+
<avp name="Nexthop-Uplink" code="131083" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
<type type-name="IPAddress"/>
</avp>
<!--Nexthop-Downlink-->
-
+
<avp name="Nexthop-Downlink" code="131084" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
<type type-name="IPAddress"/>
</avp>
- <!--L7-Parse-Protocol-Type-->
-
+ <!--L7-Parse-Protocol-Type-->
+
<avp name="L7-Parse-Protocol-Type" code="131085" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="HTTP" code="0"/>
@@ -205,9 +204,9 @@
<enum name="NBAR" code="10"/>
<enum name="DNS" code="11"/>
<enum name="HTTP-INSERT" code="12"/>
- </avp>
+ </avp>
<!--Service-Status-->
-
+
<avp name="Service-Status" code="131086" vendor-id="Cisco" mandatory="must" may-encrypt="yes" protected="mustnot" vendor-bit="must">
<grouped>
<gavp name="Service-Name"/>
@@ -218,41 +217,41 @@
<gavp name="Service-Group-Name"/>
</grouped>
</avp>
- <!--Service-Name-->
+ <!--Service-Name-->
<avp name="Service-Name" code="131087" vendor-id="Cisco" mandatory="must" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="OctetString"/>
-
+ <type type-name="OctetString"/>
+
</avp>
<!--Biling-Policy-Name-->
<avp name="Biling-Policy-Name" code="131088" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="OctetString"/>
-
+ <type type-name="OctetString"/>
+
</avp>
<!--Policy-Map-Name-->
<avp name="Policy-Map-Name" code="131089" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="OctetString"/>
-
+ <type type-name="OctetString"/>
+
</avp>
<!--Policy-Map-Match-->
-
+
<avp name="Policy-Map-Match" code="131090" vendor-id="Cisco" mandatory="must" may-encrypt="yes" protected="mustnot" vendor-bit="must">
<grouped>
<gavp name="Match-String"/>
<gavp name="Attribute-String"/>
</grouped>
</avp>
- <!--Match-String-->
+ <!--Match-String-->
<avp name="Match-String" code="131091" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
<type type-name="UTF8String"/>
-
+
</avp>
- <!--Attribute-String-->
+ <!--Attribute-String-->
<avp name="Attribute-String" code="131092" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
<type type-name="UTF8String"/>
-
+
</avp>
- <!--Online-Billing-Basis-->
-
+ <!--Online-Billing-Basis-->
+
<avp name="Online-Billing-Basis" code="131093" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="EVENT" code="1"/>
@@ -261,181 +260,181 @@
<enum name="DURATION" code="4"/>
<enum name="DURATION-CONNECT" code="5"/>
<enum name="DURATION-TRANSACTION" code="6"/>
- </avp>
- <!--Service-Activation-->
-
+ </avp>
+ <!--Service-Activation-->
+
<avp name="Service-Activation" code="131094" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="USER_PROFILE" code="0"/>
<enum name="AUTOMATIC" code="1"/>
- </avp>
- <!--CDR-Volume-Threshold-->
-
+ </avp>
+ <!--CDR-Volume-Threshold-->
+
<avp name="CDR-Volume-Threshold" code="131095" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
-
- </avp>
- <!--CDR-Time-Threshold-->
-
+
+ </avp>
+ <!--CDR-Time-Threshold-->
+
<avp name="CDR-Time-Threshold" code="131096" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
-
- </avp>
+
+ </avp>
<!--Advice-Of-Charge-->
-
+
<avp name="Advice-Of-Charge" code="131097" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
<grouped>
<gavp name="Append-URL"/>
<gavp name="Confirm-Token"/>
</grouped>
</avp>
- <!--Append-URL-->
-
+ <!--Append-URL-->
+
<avp name="Append-URL" code="131098" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="DISABLE_APPEND_URL" code="0"/>
<enum name="ENABLE_APPEND_URL" code="1"/>
- </avp>
-
+ </avp>
+
<!--Confirm-Token-->
<avp name="Confirm-Token" code="131099" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="OctetString"/>
-
+ <type type-name="OctetString"/>
+
</avp>
- <!--Service-Class-->
-
+ <!--Service-Class-->
+
<avp name="Service-Class" code="131100" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
-
- </avp>
- <!--Service-Idle-Time-->
-
+
+ </avp>
+ <!--Service-Idle-Time-->
+
<avp name="Service-Idle-Time" code="131101" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
-
+
</avp>
<!--Owner-Id-->
<avp name="Owner-Id" code="131102" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="OctetString"/>
-
- </avp>
+ <type type-name="OctetString"/>
+
+ </avp>
<!--Owner-Name-->
<avp name="Owner-Name" code="131103" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="OctetString"/>
-
+ <type type-name="OctetString"/>
+
</avp>
- <!--Online-Passthrough-Quota-->
-
+ <!--Online-Passthrough-Quota-->
+
<avp name="Online-Passthrough-Quota" code="131104" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
-
+
</avp>
- <!--Online-Reauthorization-Threshold-->
-
+ <!--Online-Reauthorization-Threshold-->
+
<avp name="Online-Reauthorization-Threshold" code="131105" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
-
+
</avp>
- <!--Online-Reauthorization-Timeout-->
-
+ <!--Online-Reauthorization-Timeout-->
+
<avp name="Online-Reauthorization-Timeout" code="131106" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Initial-Timeout"/>
<gavp name="Maximum-Timeout"/>
</grouped>
</avp>
- <!--Initial-Timeout-->
-
+ <!--Initial-Timeout-->
+
<avp name="Initial-Timeout" code="131107" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
-
+
</avp>
- <!--Maximum-Timeout-->
-
+ <!--Maximum-Timeout-->
+
<avp name="Maximum-Timeout" code="131108" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
-
+
</avp>
<!--Refund-policy-->
<avp name="Refund-policy" code="131109" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="OctetString"/>
-
+ <type type-name="OctetString"/>
+
</avp>
- <!--Meter-Exclude-->
-
+ <!--Meter-Exclude-->
+
<avp name="Meter-Exclude" code="131110" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="MMS_WAP" code="0"/>
<enum name="RTSP_PAUSE" code="1"/>
<enum name="SERVICE_IDLE" code="2"/>
<enum name="NETWORK_INIT_SIP" code="3"/>
- </avp>
- <!--Meter-Include-Imap-->
-
+ </avp>
+ <!--Meter-Include-Imap-->
+
<avp name="Meter-Include-Imap" code="131111" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="BODY_AND_HEADER" code="0"/>
<enum name="BODY_ONLY" code="1"/>
<enum name="BODY_AND_OTHER" code="2"/>
</avp>
- <!--Metering-Granularity-->
-
+ <!--Metering-Granularity-->
+
<avp name="Metering-Granularity" code="131112" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Meter-Increment"/>
<gavp name="Meter-Initial"/>
<gavp name="Meter-Minimum"/>
</grouped>
- </avp>
- <!--Meter-Increment-->
-
+ </avp>
+ <!--Meter-Increment-->
+
<avp name="Meter-Increment" code="131113" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
</avp>
- <!--Meter-Initial-->
-
+ <!--Meter-Initial-->
+
<avp name="Meter-Initial" code="131114" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
</avp>
- <!--Meter-Minimum-->
-
+ <!--Meter-Minimum-->
+
<avp name="Meter-Minimum" code="131115" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
</avp>
<!--Verify-->
-
+
<avp name="Verify" code="131116" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
<grouped>
<gavp name="Confirm-Token"/>
</grouped>
</avp>
-
+
<!--Confirm-Token-->
<avp name="Confirm-Token" code="131117" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="OctetString"/>
- </avp>
-
- <!--Weight-->
-
+ <type type-name="OctetString"/>
+ </avp>
+
+ <!--Weight-->
+
<avp name="Weight" code="131118" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
</avp>
- <!--User-Idle-Timer-->
-
+ <!--User-Idle-Timer-->
+
<avp name="User-Idle-Timer" code="131119" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
</avp>
- <!--Policy-Preload-Req-Type-->
-
+ <!--Policy-Preload-Req-Type-->
+
<avp name="Policy-Preload-Req-Type" code="131120" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="POLICY_PRELOAD_REQ" code="0"/>
<enum name="POLICY_PRELOAD_RESP" code="1"/>
<enum name="POLICY_PRELOAD_PUSH" code="2"/>
<enum name="POLICY_PRELOAD_PUSH_ACK" code="3"/>
- </avp>
- <!--Policy-Preload-Object-Type-->
-
+ </avp>
+ <!--Policy-Preload-Object-Type-->
+
<avp name="Policy-Preload-Object-Type" code="131121" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="POLICY_MAP" code="0"/>
@@ -447,16 +446,16 @@
<enum name="HEADER_INSERT" code="6"/>
<enum name="HEADER_GROUP" code="7"/>
<enum name="QOS_PROFILE" code="8"/>
- </avp>
- <!--Policy-Preload-Status-->
-
+ </avp>
+ <!--Policy-Preload-Status-->
+
<avp name="Policy-Preload-Status" code="131122" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="INITIATE" code="0"/>
<enum name="COMPLETE" code="1"/>
- </avp>
- <!--Charging-Rule-Trigger-Type-->
-
+ </avp>
+ <!--Charging-Rule-Trigger-Type-->
+
<avp name="Charging-Rule-Trigger-Type" code="131123" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="NO_CHARGING_RULE_EVENT_TRIGGERS" code="0"/>
@@ -465,8 +464,8 @@
<enum name="SVC_FLOW_DETECTION" code="3"/>
<enum name="CHARGING_RULE_REMOVE" code="4"/>
</avp>
- <!--Charging-Rule-Event-->
-
+ <!--Charging-Rule-Event-->
+
<avp name="Charging-Rule-Event" code="131124" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Charging-Rule-Name"/>
@@ -476,15 +475,15 @@
<gavp name="Cisco-Report-Usage"/>
</grouped>
</avp>
- <!--Service-Reporting-Level-->
-
+ <!--Service-Reporting-Level-->
+
<avp name="Service-Reporting-Level" code="131125" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="TRANSACTION" code="0"/>
<enum name="SERVICE" code="1"/>
- </avp>
- <!--Accounting-->
-
+ </avp>
+ <!--Accounting-->
+
<avp name="Accounting" code="131126" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Accounting-Customer-String"/>
@@ -493,83 +492,83 @@
</avp>
<!--Accounting-Customer-String-->
<avp name="Accounting-Customer-String" code="131127" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="OctetString"/>
-
- </avp>
- <!--L7-Parse-Length-->
-
+ <type type-name="OctetString"/>
+
+ </avp>
+ <!--L7-Parse-Length-->
+
<avp name="L7-Parse-Length" code="131128" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
- </avp>
- <!--Service-CDR-Threshold-->
-
+ </avp>
+ <!--Service-CDR-Threshold-->
+
<avp name="Service-CDR-Threshold" code="131129" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="CDR-Volume-Threshold"/>
<gavp name="CDR-Time-Threshold"/>
-
+
</grouped>
</avp>
- <!--Intermediate-CDR-Threshold-->
-
+ <!--Intermediate-CDR-Threshold-->
+
<avp name="Intermediate-CDR-Threshold" code="131130" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="CDR-Volume-Threshold"/>
<gavp name="CDR-Time-Threshold"/>
-
+
</grouped>
</avp>
- <!--CDR-Generation-Delay-->
-
+ <!--CDR-Generation-Delay-->
+
<avp name="CDR-Generation-Delay" code="131131" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
</avp>
- <!--Replicate-Session-->
-
+ <!--Replicate-Session-->
+
<avp name="Replicate-Session" code="131132" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Replicate-Session-Delay"/>
-
+
</grouped>
</avp>
- <!--Replicate-Session-Delay-->
-
+ <!--Replicate-Session-Delay-->
+
<avp name="Replicate-Session-Delay" code="131133" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
</avp>
- <!--Content-Pending-Timer-->
-
+ <!--Content-Pending-Timer-->
+
<avp name="Content-Pending-Timer" code="131134" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
</avp>
- <!--Operation-Status-->
-
+ <!--Operation-Status-->
+
<avp name="Operation-Status" code="131135" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="OUT_OF_SERVICE" code="0"/>
<enum name="IN_SERVICE" code="1"/>
- </avp>
-
- <!--Subscriber-IP-Source-->
-
+ </avp>
+
+ <!--Subscriber-IP-Source-->
+
<avp name="Subscriber-IP-Source" code="131136" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="DEFAULT" code="0"/>
<enum name="HTTP_X_FORWARDED_FOR" code="1"/>
</avp>
- <!--Nexthop-->
-
+ <!--Nexthop-->
+
<avp name="Nexthop" code="131137" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="IPAddress"/>
</avp>
- <!--Nexthop-Reverse-->
-
+ <!--Nexthop-Reverse-->
+
<avp name="Nexthop-Reverse" code="131138" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="IPAddress"/>
</avp>
-
- <!--Charging-Rule-Event-Trigger-->
-
+
+ <!--Charging-Rule-Event-Trigger-->
+
<avp name="Charging-Rule-Event-Trigger" code="131139" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Charging-Rule-Trigger-Type"/>
@@ -578,15 +577,15 @@
<gavp name="Cisco-Report-Usage"/>
<gavp name="Volume-Threshold-64"/>
</grouped>
- </avp>
+ </avp>
<!--Billing-Plan-Name-->
<avp name="Billing-Plan-Name" code="131140" vendor-id="Cisco" mandatory="must" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="OctetString"/>
-
- </avp>
-
- <!--Content-Flow-Description-->
-
+ <type type-name="OctetString"/>
+
+ </avp>
+
+ <!--Content-Flow-Description-->
+
<avp name="Content-Flow-Description" code="131141" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Content-Flow-Filter"/>
@@ -594,9 +593,9 @@
<gavp name="VLAN-Id"/>
</grouped>
- </avp>
- <!--Content-Flow-Filter-->
-
+ </avp>
+ <!--Content-Flow-Filter-->
+
<avp name="Content-Flow-Filter" code="131142" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Client-Group-Id"/>
@@ -605,111 +604,111 @@
<gavp name="Protocol-ID"/>
<gavp name="Start-of-Port-Range"/>
<gavp name="End-of-Port-Range"/>
-
+
</grouped>
- </avp>
-
- <!--Client-Group-Id-->
-
+ </avp>
+
+ <!--Client-Group-Id-->
+
<avp name="Client-Group-Id" code="131143" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="ACL-Number"/>
<gavp name="ACL-Name"/>
</grouped>
- </avp>
- <!--ACL-Number-->
-
+ </avp>
+ <!--ACL-Number-->
+
<avp name="ACL-Number" code="131144" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
</avp>
-
+
<!--ACL-Name-->
<avp name="ACL-Name" code="131145" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="OctetString"/>
-
- </avp>
- <!--Destination-IP-Address-->
-
- <avp name="Destination-IP-Address" code="131146" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
- <type type-name="IPAddress"/>
- </avp>
- <!--Destination-Mask-->
-
- <avp name="Destination-Mask" code="131147" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
- <type type-name="IPAddress"/>
- </avp>
- <!--Protocol-ID-->
-
- <avp name="Protocol-ID" code="131148" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
- <type type-name="Unsigned32"/>
- </avp>
- <!--Start-of-Port-Range-->
-
- <avp name="Start-of-Port-Range" code="131149" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
- <type type-name="Unsigned32"/>
- </avp>
- <!--End-of-Port-Range-->
-
- <avp name="End-of-Port-Range" code="131150" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
- <type type-name="Unsigned32"/>
- </avp>
+ <type type-name="OctetString"/>
+
+ </avp>
+ <!--Destination-IP-Address-->
- <!--Content-Name-->
- <avp name="Content-Name" code="131151" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="OctetString"/>
+ <avp name="Destination-IP-Address" code="131146" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
+ <type type-name="IPAddress"/>
+ </avp>
+ <!--Destination-Mask-->
- </avp>
+ <avp name="Destination-Mask" code="131147" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
+ <type type-name="IPAddress"/>
+ </avp>
+ <!--Protocol-ID-->
+
+ <avp name="Protocol-ID" code="131148" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
+ <type type-name="Unsigned32"/>
+ </avp>
+ <!--Start-of-Port-Range-->
+
+ <avp name="Start-of-Port-Range" code="131149" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
+ <type type-name="Unsigned32"/>
+ </avp>
+ <!--End-of-Port-Range-->
+
+ <avp name="End-of-Port-Range" code="131150" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
+ <type type-name="Unsigned32"/>
+ </avp>
+
+ <!--Content-Name-->
+ <avp name="Content-Name" code="131151" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
+ <type type-name="OctetString"/>
+
+ </avp>
+
+ <!--Failed-Preload-Object-->
+
+ <avp name="Failed-Preload-Object" code="131152" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
+ <grouped>
+ <gavp name="Policy-Preload-Object-Type"/>
+ <gavp name="Failed-Preload-Obj-Name"/>
+ </grouped>
+ </avp>
+ <!--VRF-Name-->
+
+ <avp name="VRF-Name" code="131153" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
+ <type type-name="OctetString"/>
+ </avp>
+
+ <!--VLAN-Id-->
+ <avp name="VLAN-Id" code="131154" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
+ <type type-name="Unsigned32"/>
- <!--Failed-Preload-Object-->
-
- <avp name="Failed-Preload-Object" code="131152" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
- <grouped>
- <gavp name="Policy-Preload-Object-Type"/>
- <gavp name="Failed-Preload-Obj-Name"/>
- </grouped>
- </avp>
- <!--VRF-Name-->
-
- <avp name="VRF-Name" code="131153" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
- <type type-name="OctetString"/>
</avp>
-
- <!--VLAN-Id-->
- <avp name="VLAN-Id" code="131154" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="Unsigned32"/>
-
- </avp>
<!--Volume-Usage-->
<avp name="Volume-Usage" code="131155" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="Unsigned64"/>
-
- </avp>
- <!--Time-Usage-->
-
+ <type type-name="Unsigned64"/>
+
+ </avp>
+ <!--Time-Usage-->
+
<avp name="Time-Usage" code="131156" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Duration"/>
<gavp name="First-Packet-Timestanp"/>
<gavp name="Last-Packet-Timestanp"/>
-
+
</grouped>
- </avp>
-
+ </avp>
+
<!--Duration-->
<avp name="Duration" code="131157" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="Unsigned32"/>
-
- </avp>
+ <type type-name="Unsigned32"/>
+
+ </avp>
<!--First-Packet-Timestanp-->
<avp name="First-Packet-Timestanp" code="131158" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="Unsigned32"/>
-
+ <type type-name="Unsigned32"/>
+
</avp>
<!--Last-Packet-Timestanp-->
<avp name="Last-Packet-Timestanp" code="131159" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="Unsigned32"/>
-
+ <type type-name="Unsigned32"/>
+
</avp>
<!--Cisco-Flow-Description-->
@@ -723,11 +722,11 @@
</grouped>
</avp>
- <!--Terminate-Bearer-->
-
+ <!--Terminate-Bearer-->
+
<avp name="Terminate-Bearer" code="131161" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
- <gavp name="Bearer-Identifier"/>
+ <gavp name="Bearer-Identifier"/>
</grouped>
</avp>
@@ -739,22 +738,22 @@
</avp>
- <!--Content-Scope-->
-
+ <!--Content-Scope-->
+
<avp name="Content-Scope" code="131163" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="GLOBAL" code="0"/>
<enum name="USER" code="1"/>
</avp>
- <!--Flow-Status-Policy-Mismatch-->
-
+ <!--Flow-Status-Policy-Mismatch-->
+
<avp name="Flow-Status-Policy-Mismatch" code="131164" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="FORWARD" code="0"/>
<enum name="BLOCK" code="1"/>
</avp>
- <!--Policy-Map-Type-->
-
+ <!--Policy-Map-Type-->
+
<avp name="Policy-Map-Type" code="131165" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="URL_MAP" code="0"/>
@@ -763,193 +762,193 @@
<enum name="ATTRIBUTE_MAP" code="3"/>
</avp>
- <!--Policy-Map-Match-Install-->
-
+ <!--Policy-Map-Match-Install-->
+
<avp name="Policy-Map-Match-Install" code="131166" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
- <gavp name="Policy-Map-Match"/>
+ <gavp name="Policy-Map-Match"/>
</grouped>
- </avp>
- <!--Policy-Map-Match-Remove-->
-
+ </avp>
+ <!--Policy-Map-Match-Remove-->
+
<avp name="Policy-Map-Match-Remove" code="131167" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
- <gavp name="Policy-Map-Match"/>
+ <gavp name="Policy-Map-Match"/>
</grouped>
- </avp>
- <!--Policy-Map-Replace-->
-
+ </avp>
+ <!--Policy-Map-Replace-->
+
<avp name="Policy-Map-Replace" code="131168" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="DISABLED" code="0"/>
<enum name="ENABLED" code="1"/>
</avp>
- <!--Cisco-Flow-Status-->
-
+ <!--Cisco-Flow-Status-->
+
<avp name="Cisco-Flow-Status" code="131169" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="FORWARD" code="0"/>
<enum name="BLOCK" code="1"/>
<enum name="REDIRECT" code="2"/>
- </avp>
- <!--Service-QoS-->
-
+ </avp>
+ <!--Service-QoS-->
+
<avp name="Service-QoS" code="131170" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="QoS-Rate-Limit-UL"/>
<gavp name="QoS-Rate-Limit-DL"/>
-
+
</grouped>
- </avp>
- <!--QoS-Rate-Limit-UL-->
-
+ </avp>
+ <!--QoS-Rate-Limit-UL-->
+
<avp name="QoS-Rate-Limit-UL" code="131171" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
- <gavp name="QoS-Rate-Limit"/>
+ <gavp name="QoS-Rate-Limit"/>
</grouped>
</avp>
- <!--QoS-Rate-Limit-DL-->
-
+ <!--QoS-Rate-Limit-DL-->
+
<avp name="QoS-Rate-Limit-DL" code="131172" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
- <gavp name="QoS-Rate-Limit"/>
+ <gavp name="QoS-Rate-Limit"/>
</grouped>
</avp>
- <!--QoS-Rate-Limit-->
-
+ <!--QoS-Rate-Limit-->
+
<avp name="QoS-Rate-Limit" code="131173" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Max-Bandwidth"/>
<gavp name="Max-Burst-Size"/>
<gavp name="Rate-Limit-Conform-Action"/>
<gavp name="Rate-Limit-Exceed-Action"/>
-
+
</grouped>
</avp>
<!--Max-Bandwidth-->
<avp name="Max-Bandwidth" code="131174" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="Unsigned32"/>
-
- </avp>
- <!--Rate-Limit-Conform-Action-->
-
+ <type type-name="Unsigned32"/>
+
+ </avp>
+ <!--Rate-Limit-Conform-Action-->
+
<avp name="Rate-Limit-Conform-Action" code="131175" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Rate-Limit-Action"/>
<gavp name="DSCP"/>
-
+
</grouped>
- </avp>
- <!--Rate-Limit-Exceed-Action-->
-
+ </avp>
+ <!--Rate-Limit-Exceed-Action-->
+
<avp name="Rate-Limit-Exceed-Action" code="131176" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Rate-Limit-Action"/>
<gavp name="DSCP"/>
-
+
</grouped>
- </avp>
- <!--Rate-Limit-Action-->
-
+ </avp>
+ <!--Rate-Limit-Action-->
+
<avp name="Rate-Limit-Action" code="131177" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="FORWARD" code="0"/>
<enum name="DROP" code="1"/>
<enum name="MARK_DSCP" code="2"/>
-
+
</avp>
<!--DSCP-->
<avp name="DSCP" code="131178" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="Unsigned32"/>
-
- </avp>
- <!--Policy-Map-Install-->
-
+ <type type-name="Unsigned32"/>
+
+ </avp>
+ <!--Policy-Map-Install-->
+
<avp name="Policy-Map-Install" code="131179" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
- <gavp name="Policy-Map-Definition"/>
+ <gavp name="Policy-Map-Definition"/>
</grouped>
- </avp>
- <!--Policy-Map-Remove-->
-
+ </avp>
+ <!--Policy-Map-Remove-->
+
<avp name="Policy-Map-Remove" code="131180" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
- <gavp name="Policy-Map-Name"/>
+ <gavp name="Policy-Map-Name"/>
</grouped>
</avp>
- <!--Billing-Policy-Install-->
-
+ <!--Billing-Policy-Install-->
+
<avp name="Billing-Policy-Install" code="131181" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
- <gavp name="Billing-Policy-Definition"/>
+ <gavp name="Billing-Policy-Definition"/>
</grouped>
- </avp>
- <!--Billing-Policy-Remove-->
-
+ </avp>
+ <!--Billing-Policy-Remove-->
+
<avp name="Billing-Policy-Remove" code="131182" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
- <gavp name="Billing-Policy-Name"/>
+ <gavp name="Billing-Policy-Name"/>
</grouped>
- </avp>
- <!--Content-Install-->
-
+ </avp>
+ <!--Content-Install-->
+
<avp name="Content-Install" code="131183" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
- <gavp name="Content-Definition"/>
+ <gavp name="Content-Definition"/>
</grouped>
- </avp>
- <!--Content-Remove-->
-
+ </avp>
+ <!--Content-Remove-->
+
<avp name="Content-Remove" code="131184" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
- <gavp name="Content-Name"/>
+ <gavp name="Content-Name"/>
</grouped>
- </avp>
- <!--Service-Install-->
-
+ </avp>
+ <!--Service-Install-->
+
<avp name="Service-Install" code="131185" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
- <gavp name="Service-Definition"/>
+ <gavp name="Service-Definition"/>
</grouped>
- </avp>
- <!--Service-Remove-->
-
+ </avp>
+ <!--Service-Remove-->
+
<avp name="Service-Remove" code="131186" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
- <gavp name="Service-Name"/>
+ <gavp name="Service-Name"/>
</grouped>
- </avp>
- <!--Billing-Plan-Install-->
-
+ </avp>
+ <!--Billing-Plan-Install-->
+
<avp name="Billing-Plan-Install" code="131187" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
- <gavp name="Billing-Plan-Definition"/>
+ <gavp name="Billing-Plan-Definition"/>
</grouped>
- </avp>
- <!--Billing-Plan-Remove-->
-
+ </avp>
+ <!--Billing-Plan-Remove-->
+
<avp name="Billing-Plan-Remove" code="131188" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
- <gavp name="Billing-Plan-Name"/>
+ <gavp name="Billing-Plan-Name"/>
</grouped>
- </avp>
- <!--Policy-Preload-Error-Code-->
-
+ </avp>
+ <!--Policy-Preload-Error-Code-->
+
<avp name="Policy-Preload-Error-Code" code="131189" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="INCONSISTENT_PRELOAD_DATA" code="0"/>
@@ -957,13 +956,13 @@
<enum name="FAILURE_TO_ENFORCE" code="2"/>
<enum name="WRONG_ORDER" code="3"/>
<enum name="CONFLICT_WITH_STATIC_CONFIG" code="4"/>
-
- </avp>
+
+ </avp>
<!--Max-Burst-Size-->
<avp name="Max-Burst-Size" code="131190" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="Unsigned32"/>
-
- </avp>
+ <type type-name="Unsigned32"/>
+
+ </avp>
<!--Failed-Preload-Obj-Name-->
<avp name="Failed-Preload-Obj-Name" code="131191" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
@@ -974,7 +973,7 @@
<gavp name="Service-Name"/>
<gavp name="Billing-Plan-Name"/>
</grouped>
- </avp>
+ </avp>
<!--Cisco-Event-Trigger-Type-->
<avp name="Cisco-Event-Trigger-Type" code="131192" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
@@ -984,8 +983,8 @@
<enum name="TIME_THRESHOLD" code="3"/>
<enum name="USER_AGENT_DETECTION" code="4"/>
<enum name="Volume-Threshold-64" code="5"/>
- </avp>
- <!--Cisco-Event-Trigger-->
+ </avp>
+ <!--Cisco-Event-Trigger-->
<avp name="Cisco-Event-Trigger" code="131193" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Cisco-Event-Trigger-Type"/>
@@ -995,9 +994,9 @@
<gavp name="Volume-Threshold-64"/>
</grouped>
</avp>
- <!--TCP-SYN-->
+ <!--TCP-SYN-->
<avp name="TCP-SYN" code="131194" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="OctetString"/>
+ <type type-name="OctetString"/>
</avp>
<!--Cisco-Event-->
@@ -1016,12 +1015,12 @@
<type type-name="Unsigned32"/>
<enum name="DISABLED" code="0"/>
<enum name="ENABLED" code="1"/>
-
+
</avp>
- <!--Control-URL-->
+ <!--Control-URL-->
<avp name="Control-URL" code="131197" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
- <gavp name="Interleaved"/>
+ <gavp name="Interleaved"/>
</grouped>
</avp>
@@ -1030,52 +1029,52 @@
<type type-name="Unsigned32"/>
<enum name="DISABLED" code="0"/>
<enum name="ENABLED" code="1"/>
-
+
</avp>
<!--Mining-->
<avp name="Mining" code="131199" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="DISABLED" code="0"/>
<enum name="ENABLED" code="1"/>
-
+
</avp>
<!--User-Default-->
<avp name="User-Default" code="131200" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="DISABLED" code="0"/>
<enum name="ENABLED" code="1"/>
-
+
</avp>
<!--Priority-->
<avp name="Priority" code="131201" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="Unsigned32"/>
-
+ <type type-name="Unsigned32"/>
+
</avp>
- <!--Domain-Group-Name-->
+ <!--Domain-Group-Name-->
<avp name="Domain-Group-Name" code="131202" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="OctetString"/>
</avp>
- <!--Domain-Group-Definition-->
+ <!--Domain-Group-Definition-->
<avp name="Domain-Group-Definition" code="131203" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
- <gavp name="Domain-Group-Name"/>
+ <gavp name="Domain-Group-Name"/>
<gavp name="Priority"/>
<gavp name="Match-String"/>
</grouped>
</avp>
- <!--Domain-Group-Install-->
+ <!--Domain-Group-Install-->
<avp name="Domain-Group-Install" code="131204" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
- <gavp name="Domain-Group-Definition"/>
+ <gavp name="Domain-Group-Definition"/>
</grouped>
</avp>
- <!--Domain-Group-Remove-->
+ <!--Domain-Group-Remove-->
<avp name="Domain-Group-Remove" code="131205" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
- <gavp name="Domain-Group-Name"/>
+ <gavp name="Domain-Group-Name"/>
</grouped>
</avp>
@@ -1084,7 +1083,7 @@
<type type-name="Unsigned32"/>
<enum name="DISABLED" code="0"/>
<enum name="ENABLED" code="1"/>
-
+
</avp>
<!--Dual-Billing-Basis-->
<avp name="Dual-Billing-Basis" code="131207" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
@@ -1094,27 +1093,27 @@
<enum name="TCP_BYTE" code="3"/>
<enum name="DURATION" code="4"/>
<enum name="DURATION-CONNECT" code="5"/>
- <enum name="DURATION-TRANSACTION" code="6"/>
+ <enum name="DURATION-TRANSACTION" code="6"/>
</avp>
<!--Dual-Passthrough-Quota-->
<avp name="Dual-Passthrough-Quota" code="131208" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="Unsigned32"/>
-
+ <type type-name="Unsigned32"/>
+
</avp>
<!--Dual-Reauthorization-Threshold-->
<avp name="Dual-Reauthorization-Threshold" code="131209" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="Unsigned32"/>
-
+ <type type-name="Unsigned32"/>
+
</avp>
<!--Virtual-Online-->
<avp name="Virtual-Online" code="131210" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="DISABLED" code="0"/>
<enum name="ENABLED" code="1"/>
-
+
</avp>
- <!--Nexthop-Media-->
+ <!--Nexthop-Media-->
<avp name="Nexthop-Media" code="131211" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="IPAddress"/>
@@ -1124,24 +1123,24 @@
<type type-name="Unsigned32"/>
<enum name="DISABLED" code="0"/>
<enum name="ENABLED" code="1"/>
-
+
</avp>
<!--Quota-Consumption-Time-->
<avp name="Quota-Consumption-Time" code="131213" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="Unsigned32"/>
-
+ <type type-name="Unsigned32"/>
+
</avp>
- <!--Class-Map-Name-->
+ <!--Class-Map-Name-->
<avp name="Class-Map-Name" code="131214" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
<type type-name="UTF8String"/>
-
+
</avp>
- <!--Header-Group-Name-->
+ <!--Header-Group-Name-->
<avp name="Header-Group-Name" code="131215" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
<type type-name="UTF8String"/>
-
+
</avp>
- <!--Header-Group-Definition-->
+ <!--Header-Group-Definition-->
<avp name="Header-Group-Definition" code="131216" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Header-Group-Name"/>
@@ -1149,43 +1148,43 @@
</grouped>
</avp>
- <!--Header-Group-Install-->
+ <!--Header-Group-Install-->
<avp name="Header-Group-Install" code="131217" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Header-Group-Definition"/>
</grouped>
</avp>
- <!--Header-Group-Remove-->
+ <!--Header-Group-Remove-->
<avp name="Header-Group-Remove" code="131218" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Header-Group-Name"/>
</grouped>
</avp>
- <!--Header-Insert-Name-->
+ <!--Header-Insert-Name-->
<avp name="Header-Insert-Name" code="131219" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
<type type-name="UTF8String"/>
-
+
</avp>
- <!--Header-Field-Name-->
+ <!--Header-Field-Name-->
<avp name="Header-Field-Name" code="131220" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
<type type-name="UTF8String"/>
-
+
</avp>
- <!--Header-Class-Name-->
+ <!--Header-Class-Name-->
<avp name="Header-Class-Name" code="131221" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
<type type-name="UTF8String"/>
-
+
</avp>
<!--Header-Class-Mode-->
<avp name="Header-Class-Mode" code="131222" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="EXCLUDE" code="0"/>
<enum name="INCLUDE" code="1"/>
-
+
</avp>
- <!--Header-Class-->
+ <!--Header-Class-->
<avp name="Header-Class" code="131223" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Header-Class-Name"/>
@@ -1195,20 +1194,20 @@
</avp>
<!--Radius-Attribute-Type-->
<avp name="Radius-Attribute-Type" code="131224" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="Unsigned32"/>
-
+ <type type-name="Unsigned32"/>
+
</avp>
<!--Radius-Vsa-Vendor-Id-->
<avp name="Radius-Vsa-Vendor-Id" code="131225" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="Unsigned32"/>
-
+ <type type-name="Unsigned32"/>
+
</avp>
<!--Radius-Vsa-Subattribute-Type-->
<avp name="Radius-Vsa-Subattribute-Type" code="131226" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="Unsigned32"/>
-
+ <type type-name="Unsigned32"/>
+
</avp>
- <!--Header-Item-Radius-->
+ <!--Header-Item-Radius-->
<avp name="Header-Item-Radius" code="131227" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Radius-Attribute-Type"/>
@@ -1222,14 +1221,14 @@
<type type-name="Unsigned32"/>
<enum name="TIMESTAMP" code="0"/>
<enum name="QUOTA_SERVER " code="1"/>
-
+
</avp>
- <!--Header-Item-String-->
+ <!--Header-Item-String-->
<avp name="Header-Item-String" code="131229" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
<type type-name="UTF8String"/>
-
+
</avp>
- <!--Header-Items-Encrypted-->
+ <!--Header-Items-Encrypted-->
<avp name="Header-Items-Encrypted" code="131230" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Header-Item"/>
@@ -1238,7 +1237,7 @@
</grouped>
</avp>
- <!--Header-Insert-Definition-->
+ <!--Header-Insert-Definition-->
<avp name="Header-Insert-Definition" code="131231" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Header-Insert-Name"/>
@@ -1251,14 +1250,14 @@
</grouped>
</avp>
- <!--Header-Insert-Install-->
+ <!--Header-Insert-Install-->
<avp name="Header-Insert-Install" code="131232" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Header-Insert-Definition"/>
</grouped>
</avp>
- <!--Header-Insert-Remove-->
+ <!--Header-Insert-Remove-->
<avp name="Header-Insert-Remove" code="131233" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Header-Insert-Name"/>
@@ -1270,21 +1269,21 @@
<type type-name="Unsigned32"/>
<enum name="DISABLED" code="0"/>
<enum name="ENABLED" code="1"/>
-
+
</avp>
<!--Domain-Group-Clear-->
<avp name="Domain-Group-Clear" code="131235" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="DISABLED" code="0"/>
<enum name="ENABLED" code="1"/>
-
+
</avp>
- <!--Cisco-QoS-Profile-Name-->
+ <!--Cisco-QoS-Profile-Name-->
<avp name="Cisco-QoS-Profile-Name" code="131236" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
<type type-name="UTF8String"/>
-
+
</avp>
- <!--Cisco-QoS-Profile-->
+ <!--Cisco-QoS-Profile-->
<avp name="Cisco-QoS-Profile" code="131237" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Cisco-QoS-Profile-Name"/>
@@ -1292,35 +1291,35 @@
</grouped>
</avp>
- <!--Cisco-QoS-Profile-Install-->
+ <!--Cisco-QoS-Profile-Install-->
<avp name="Cisco-QoS-Profile-Install" code="131238" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Cisco-QoS-Profile"/>
</grouped>
</avp>
- <!--Cisco-QoS-Profile-Remove-->
+ <!--Cisco-QoS-Profile-Remove-->
<avp name="Cisco-QoS-Profile-Remove" code="131239" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Cisco-QoS-Profile"/>
</grouped>
</avp>
- <!--Cisco-QoS-Profile-Uplink-->
+ <!--Cisco-QoS-Profile-Uplink-->
<avp name="Cisco-QoS-Profile-Uplink" code="131240" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Cisco-QoS-Profile-Name"/>
</grouped>
</avp>
- <!--Cisco-QoS-Profile-Downlink-->
+ <!--Cisco-QoS-Profile-Downlink-->
<avp name="Cisco-QoS-Profile-Downlink" code="131241" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Cisco-QoS-Profile-Name"/>
</grouped>
</avp>
- <!--Header-Item-Encryption-->
+ <!--Header-Item-Encryption-->
<avp name="Header-Item-Encryption" code="131242" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="UNENCRYPTED" code="0"/>
@@ -1328,9 +1327,9 @@
</avp>
<!--Service-Group-Name-->
<avp name="Service-Group-Name" code="131243" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
- <type type-name="OctetString"/>
+ <type type-name="OctetString"/>
</avp>
- <!--Service-Group-Definition-->
+ <!--Service-Group-Definition-->
<avp name="Service-Group-Definition" code="131244" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Service-Group-Name"/>
@@ -1340,32 +1339,32 @@
<gavp name="Redirect-Server"/>
</grouped>
</avp>
- <!--Service-Group-Install-->
+ <!--Service-Group-Install-->
<avp name="Service-Group-Install" code="131245" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Service-Group-Definition"/>
</grouped>
</avp>
- <!--Service-Group-Remove-->
+ <!--Service-Group-Remove-->
<avp name="Service-Group-Remove" code="131246" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Service-Group-Name"/>
</grouped>
</avp>
- <!--Service-Group-Event-->
+ <!--Service-Group-Event-->
<avp name="Service-Group-Event" code="131247" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Service-Group-Name"/>
<gavp name="Cisco-Event"/>
</grouped>
</avp>
- <!--Cisco-Report-Usage-->
+ <!--Cisco-Report-Usage-->
<avp name="Cisco-Report-Usage" code="131248" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<grouped>
<gavp name="Event-Trigger"/>
</grouped>
</avp>
- <!--Accel-->
+ <!--Accel-->
<avp name="Accel" code="131249" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
<enum name="DISABLE" code="0"/>
@@ -1385,7 +1384,7 @@
<!--Cisco-Request-Usage-Type-->
<avp name="Cisco-Request-Usage-Type" code="131251" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
- <enum name="NO_USAGE" code="0"/>
+ <enum name="NO_USAGE" code="0"/>
<enum name="VOL_USAGE" code="1"/>
<enum name="TIME_USAGE" code="2"/>
</avp>
@@ -1430,7 +1429,7 @@
<type type-name="Unsigned32"/>
</avp>
<!--Volume-Threshold-64-->
- <avp name="Volume-Threshold-64" code="131258" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
+ <avp name="Volume-Threshold-64" code="131258" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned64"/>
</avp>
<!--Delegated-IP-Install-->
@@ -1475,7 +1474,5 @@
</grouped>
</avp>
- <!-- ********************** END GX AVPS ***************** -->
- </application>
-
-
+ <!-- ********************** END Cisco AVPS ***************** -->
+</vendor>
diff --git a/diameter/Oracle.xml b/diameter/Oracle.xml
index fe5ab71671..5eab3b7a0a 100644
--- a/diameter/Oracle.xml
+++ b/diameter/Oracle.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
-<application id="16777229" name="3GPP Rx Release 6" uri="http://www.3GPP.org/ftp/Specs/html-info/29211.htm">
+<vendor vendor-id="OracleTekelec" code="323" name="Oracle Tekelec">
- <avp name="DSR-ApplicationInvoked" code="2468" vendor-bit="must" vendor-id="Oracle_Tekelec">
+ <avp name="DSR-ApplicationInvoked" code="2468" vendor-bit="must" vendor-id="OracleTekelec">
<type type-name="Enumerated"/>
<enum name="RBAR ID" code="3"/>
<enum name="FABR ID" code="4"/>
<enum name="CPA ID" code="5"/>
<enum name="Policy DRA ID" code="6"/>
</avp>
- <avp name="PDRA-Early-Binding" code="2500" vendor-bit="must" vendor-id="Oracle_Tekelec">
+ <avp name="PDRA-Early-Binding" code="2500" vendor-bit="must" vendor-id="OracleTekelec">
<type type-name="OctetString"/>
</avp>
- <avp name="Session-Release-Reason" code="2501" vendor-bit="must" vendor-id="Oracle_Tekelec">
+ <avp name="Session-Release-Reason" code="2501" vendor-bit="must" vendor-id="OracleTekelec">
<type type-name="OctetString"/>
</avp>
- <avp name="MsgCopyAnswer" code="2516" vendor-bit="must" vendor-id="Oracle_Tekelec">
+ <avp name="MsgCopyAnswer" code="2516" vendor-bit="must" vendor-id="OracleTekelec">
<grouped>
<gavp name="Session-Id"/>
<!-- This grouped AVP holds any AVP -->
</grouped>
</avp>
-</application>
+</vendor>
diff --git a/diameter/VerizonWireless.xml b/diameter/VerizonWireless.xml
index c0fabc8495..9b05483613 100644
--- a/diameter/VerizonWireless.xml
+++ b/diameter/VerizonWireless.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
- <application id="16777322" name="Verizon Session Recovery" uri="http://www.ietf.org/rfc/rfc4006.txt">
+<vendor vendor-id="VerizonWireless" code="12951" name="Verizon Wireless"/>
- <avp name="Dummy" code="0" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="VerizonWireless">
- <type type-name="OctetString"/>
- </avp>
- </application> \ No newline at end of file
+<application id="16777322" name="Verizon Session Recovery" uri="http://www.ietf.org/rfc/rfc4006.txt">
+
+ <avp name="Dummy" code="0" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="VerizonWireless">
+ <type type-name="OctetString"/>
+ </avp>
+</application> \ No newline at end of file
diff --git a/diameter/Vodafone.xml b/diameter/Vodafone.xml
index 499e031ac8..8630f8688b 100644
--- a/diameter/Vodafone.xml
+++ b/diameter/Vodafone.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+<vendor vendor-id="Vodafone" code="12645" name="Vodafone"/>
+
<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">
diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index 4a47e5b246..d72a62b4fe 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -169,37 +169,6 @@
<!-- ************************************************************** -->
- <!-- ************************* Vendors **************************** -->
- <!-- ************************************************************** -->
- <vendor vendor-id="None" code="0" name="None"/>
- <vendor vendor-id="HP" code="11" name="Hewlett Packard"/>
- <vendor vendor-id="Sun" code="42" name="Sun Microsystems, Inc."/>
- <vendor vendor-id="Merit" code="61" name="Merit Networks"/>
- <vendor vendor-id="Nokia" code="94" name="Nokia"/>
- <vendor vendor-id="Ericsson" code="193" name="Ericsson"/>
- <vendor vendor-id="Oracle_Tekelec" code="323" name="Oracle_Tekelec"/>
- <vendor vendor-id="USR" code="429" name="US Robotics Corp."/>
- <vendor vendor-id="ALU" code="637" name="ALU Network"/>
- <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="TGPP2" code="5535" name="3GPP2"/>
- <vendor vendor-id="Cisco" code="5771" name="Cisco"/>
- <vendor vendor-id="SKT" code="5806" name="SK Telecom"/>
- <vendor vendor-id="Starent" code="8164" name="Starent"/>
- <vendor vendor-id="TGPP" code="10415" name="3GPP"/>
- <vendor vendor-id="Vodafone" code="12645" name="Vodafone"/>
- <vendor vendor-id="VerizonWireless" code="12951" name="Verizon Wireless"/>
- <vendor vendor-id="ETSI" code="13019" name="ETSI"/>
- <vendor vendor-id="Tango" code="13421" name="Tango Telecom Limited"/>
- <vendor vendor-id="NokiaSolutionsAndNetworks" code="28458" name="Nokia Solutions and Networks"/>
- <vendor vendor-id="ChinaTelecom" code="81000" name="China Telecom"/>
- <vendor vendor-id="TGPPCX" code="16777216" name="3GPP CX/DX"/>
- <!-- *********************** End Vendors ************************** -->
-
-
- <!-- ************************************************************** -->
<!-- ************************ typedefn's ************************** -->
<!-- ************************************************************** -->
<typedefn type-name="OctetString"/>
@@ -6637,6 +6606,9 @@
</base>
+ <!-- ********************************************************************** -->
+ <!-- ************************* Application IDs **************************** -->
+ <!-- ********************************************************************** -->
<!---
Duplicates should be avoided
16777216 is defined in TGPP.xml
@@ -6646,21 +6618,22 @@
16777224 is defined in ChinaTelecom.xml
16777227 is defined in Ericsson.xml
16777228 is defined in starent.xml
- 16777229 is defined in Oracle.xml
16777234 is defined in Vodafone.xml
16777236 is defined in TGPP.xml
16777237 is defined in TGPP2.xml
- 16777238 is defined in Cisco.xml
16777267 is defined in TGPP.xml
16777292 is defined in TGPP.xml
16777302 is defined in NokiaSolutionsAndNetworks.xml
16777304 is defined in SKT.xml
16777317 is defined in NokiaSolutionsAndNetworks.xml
+ 16777322 is defined in VerizonWireless.xml
-->
<application id="0" name="Diameter Common Messages" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588"></application>
<application id="3" name="Diameter Base Accounting" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588"></application>
<application id="16777219" name="3GPP Wx" uri="http://www.3GPP.org/ftp/Specs/html-info/29234.htm"></application>
+ <application id="16777229" name="3GPP Rx Release 6" uri="http://www.3GPP.org/ftp/Specs/html-info/29211.htm"></application>
<application id="16777232" name="Ericsson Charging-CIP" uri="http://www.3gpp.org/ftp/Specs/html-info/29210.htm"></application>
+ <application id="16777238" name="3GPP Gx" uri="http://www.ietf.org/internet-drafts/draft-ietf-aaa-diameter-cc-06.txt"></application>
<application id="16777250" name="3GPP STa" uri="http://www.3gpp.org/ftp/Specs/html-info/29273.htm"></application>
<application id="16777251" name="3GPP S6a/S6d" uri="http://www.ietf.org/rfc/rfc5516.txt?number=5516"></application>
<application id="16777252" name="3GPP S13/S13'" uri="http://www.ietf.org/rfc/rfc5516.txt?number=5516"></application>
@@ -6674,6 +6647,34 @@
<application id="16777315" name="Ericsson Diameter Signalling Controller Application (DSC)" uri="http://www.iana.org/assignments/aaa-parameters/aaa-parameters.xml"></application>
<application id="16777327" name="Ericsson Sx" uri="http://www.iana.org/assignments/aaa-parameters/aaa-parameters.xml"></application>
<application id="4294967295" name="Relay" uri="http://www.ietf.org/rfc/rfc6733.txt?number=6733"></application>
+ <!-- *********************** End Application IDs ************************** -->
+
+
+ <!-- ************************************************************** -->
+ <!-- ************************* Vendors **************************** -->
+ <!-- ************************************************************** -->
+ <vendor vendor-id="None" code="0" name="None"/>
+ <vendor vendor-id="HP" code="11" name="Hewlett Packard"/>
+ <vendor vendor-id="Sun" code="42" name="Sun Microsystems, Inc."/>
+ <vendor vendor-id="Merit" code="61" name="Merit Networks"/>
+ <vendor vendor-id="Nokia" code="94" name="Nokia"/>
+ <vendor vendor-id="Ericsson" code="193" name="Ericsson"/>
+ <vendor vendor-id="USR" code="429" name="US Robotics Corp."/>
+ <vendor vendor-id="ALU" code="637" name="ALU Network"/>
+ <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="TGPP2" code="5535" name="3GPP2"/>
+ <vendor vendor-id="SKT" code="5806" name="SK Telecom"/>
+ <vendor vendor-id="Starent" code="8164" name="Starent"/>
+ <vendor vendor-id="TGPP" code="10415" name="3GPP"/>
+ <vendor vendor-id="ETSI" code="13019" name="ETSI"/>
+ <vendor vendor-id="Tango" code="13421" name="Tango Telecom Limited"/>
+ <vendor vendor-id="NokiaSolutionsAndNetworks" code="28458" name="Nokia Solutions and Networks"/>
+ <vendor vendor-id="ChinaTelecom" code="81000" name="China Telecom"/>
+ <vendor vendor-id="TGPPCX" code="16777216" name="3GPP CX/DX"/>
+ <!-- *********************** End Vendors ************************** -->
&nasreq;
&eap;
diff --git a/epan/diam_dict.l b/epan/diam_dict.l
index c89a02dd21..3cf67859a1 100644
--- a/epan/diam_dict.l
+++ b/epan/diam_dict.l
@@ -178,6 +178,8 @@ grouped_start <grouped>
grouped_end <\/grouped>
vendor_start <vendor
+vendor_end<\/vendor>
+
gavp_start <gavp
ignored_attr [a-z0-9-]+=
@@ -395,12 +397,12 @@ description_attr description=\042
}
<COMMAND_ATTRS>{name_attr} { ATTR_STR(cmd->name); }
-<COMMAND_ATTRS>{vendor_attr} { ATTR_STR(cmd->vendor); }
+<COMMAND_ATTRS>{vendor_attr} { ATTR_STR(cmd->vendor); }
<COMMAND_ATTRS>{code_attr} { ATTR_UINT(cmd->code); }
<COMMAND_ATTRS>{stop} |
<COMMAND_ATTRS>{stop_end} { BEGIN IN_APPL; }
-<IN_APPL>{vendor_start} {
+<IN_DICT>{vendor_start} {
D(("vendor_start\n"));
vnd = g_new(ddict_vendor_t,1);
@@ -417,8 +419,8 @@ description_attr description=\042
<VENDOR_ATTRS>{name_attr} { ATTR_STR(vnd->desc); }
<VENDOR_ATTRS>{vendor_attr} { ATTR_STR(vnd->name); }
<VENDOR_ATTRS>{code_attr} { ATTR_UINT(vnd->code); }
-<VENDOR_ATTRS>{stop} |
-<VENDOR_ATTRS>{stop_end} { BEGIN IN_APPL; }
+<VENDOR_ATTRS>{stop} { BEGIN IN_APPL; }
+<VENDOR_ATTRS>{stop_end} { BEGIN IN_DICT; }
<IN_APPL>{typedefn_start} {
D(("typedefn_start\n"));
@@ -460,10 +462,10 @@ description_attr description=\042
}
<AVP_ATTRS>{name_attr} { ATTR_STR(avp->name); }
-<AVP_ATTRS>{description_attr} { ATTR_STR(avp->description); }
+<AVP_ATTRS>{description_attr} { ATTR_STR(avp->description); }
<AVP_ATTRS>{vendor_attr} { ATTR_STR(avp->vendor); }
<AVP_ATTRS>{code_attr} { ATTR_UINT(avp->code); }
-<AVP_ATTRS>{stop} { BEGIN IN_AVP; }
+<AVP_ATTRS>{stop} { BEGIN IN_AVP; }
<AVP_ATTRS>{stop_end} { BEGIN IN_APPL; }
@@ -509,15 +511,20 @@ description_attr description=\042
<ENUM_ATTRS>{name_attr} { ATTR_STR(enumitem->name); }
<ENUM_ATTRS>{code_attr} { ATTR_UINT(enumitem->code); }
-<TYPE_ATTRS,GAVP_ATTRS,ENUM_ATTRS>{stop} { BEGIN IN_AVP; }
+<TYPE_ATTRS,GAVP_ATTRS,ENUM_ATTRS>{stop} { BEGIN IN_AVP; }
<TYPE_ATTRS,GAVP_ATTRS,ENUM_ATTRS>{stop_end} { BEGIN IN_AVP; }
<IN_AVP>{avp_end} { D(("avp_end\n")); BEGIN IN_APPL; }
-<IN_APPL>{application_end} |
-<IN_APPL>{base_end} {
+<IN_APPL>{application_end} {
D(("application_end\n")); BEGIN IN_DICT;
}
+<IN_APPL>{vendor_end} {
+ D(("vendor_end\n")); BEGIN IN_DICT;
+}
+<IN_APPL>{base_end} {
+ D(("base_end\n")); BEGIN IN_DICT;
+}
<IN_DICT>{dictionary_end} {
yyterminate();
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-18 18:00:33 +0000