aboutsummaryrefslogtreecommitdiffstats
path: root/diameter
diff options
context:
space:
mode:
Diffstat (limited to 'diameter')
-rw-r--r--diameter/chargecontrol.xml186
-rw-r--r--diameter/dictionary.xml242
2 files changed, 416 insertions, 12 deletions
diff --git a/diameter/chargecontrol.xml b/diameter/chargecontrol.xml
index 3ef2031345..5f5c2571ff 100644
--- a/diameter/chargecontrol.xml
+++ b/diameter/chargecontrol.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id:$ -->
+<!-- $Id$ -->
- <application id="4" name="Diameter Charge Control Application" uri="http://www.ietf.org/rfc/rfc4006.txt">
+ <application id="4" name="Diameter Credit Control Application" uri="http://www.ietf.org/rfc/rfc4006.txt">
<command name="Credit-Control" code="272" vendor-id="None"/>
@@ -11,6 +11,15 @@
<avp name="CC-Correlation-Id" code="411" mandatory="may" may-encrypt="yes" protected="may" vendor-bit="mustnot">
<type type-name="OctetString"/>
</avp>
+ <avp name="CC-Money" code="413" mandatory="must">
+ <grouped>
+ <gavp name="Unit-Value"/>
+ <gavp name="Currency-Code"/>
+ </grouped>
+ </avp>
+ <avp name="CC-Input-Octets" code="412" mandatory="must">
+ <type type-name="Unsigned64"/>
+ </avp>
<avp name="CC-Request-Number" code="415" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
<type type-name="Unsigned32"/>
</avp>
@@ -21,6 +30,28 @@
<enum name="TERMINATION_REQUEST" code="3"/>
<enum name="EVENT_REQUEST" code="4"/>
</avp>
+ <avp name="CC-Service-Specific-Units" code="417" mandatory="must">
+ <type type-name="Unsigned64"/>
+ </avp>
+ <avp name="CC-Session-Failover" code="418" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+ <type type-name="Enumerated"/>
+ <enum name="FAILOVER_NOT_SUPPORTED" code="0"/>
+ <enum name="FAILOVER_SUPPORTED" code="1"/>
+ </avp>
+ <avp name="CC-Sub-Session-Id" code="419" mandatory="must">
+ <type type-name="Unsigned64"/>
+ </avp>
+ <avp name="CC-Time" code="420" mandatory="must">
+ <type type-name="Unsigned32"/>
+ </avp>
+ <avp name="CC-Total-Octets" code="421" mandatory="must">
+ <type type-name="Unsigned64"/>
+ </avp>
+ <avp name="Check-Balance-Result" code="422" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+ <type type-name="Enumerated"/>
+ <enum name="ENOUGH_CREDIT" code="0"/>
+ <enum name="NO_CREDIT" code="1"/>
+ </avp>
<avp name="Cost-Information" code="423" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
<grouped>
<gavp name="Unit-Value"/>
@@ -34,9 +65,57 @@
<avp name="Currency-Code" code="425" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
<type type-name="Unsigned32"/>
</avp>
+ <avp name="Credit-Control" code="426" mandatory="must">
+ <type type-name="Enumerated"/>
+ <enum name="CREDIT_AUTHORIZATION" code="0"/>
+ <enum name="RE_AUTHORIZATION" code="1"/>
+ </avp>
+ <avp name="Credit-Control-Failure-Handling" code="427" mandatory="must">
+ <type type-name="Enumerated"/>
+ <enum name="TERMINATE" code="0"/>
+ <enum name="CONTINUE" code="1"/>
+ <enum name="RETRY_AND_TERMINATE" code="2"/>
+ </avp>
+ <avp name="Direct-Debiting-Failure-Handling" code="428" mandatory="must">
+ <type type-name="Enumerated"/>
+ <enum name="CONTINUE" code="1"/>
+ <enum name="TERMINATE_OR_BUFFER" code="0"/>
+ </avp>
<avp name="Exponent" code="429" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
<type type-name="Integer32"/>
</avp>
+ <avp name="Final-Unit-Indication" code="430" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+ <grouped>
+ <gavp name="Final-Unit-Action"/>
+ <gavp name="Restriction-Filter-Rule"/>
+ <gavp name="Filter-Id"/>
+ <gavp name="Redirect-Server"/>
+ </grouped>
+ </avp>
+ <avp name="Granted-Service-Unit" code="431" mandatory="must">
+ <grouped>
+ <gavp name="Tariff-Time-Change"/>
+ <gavp name="CC-Time"/>
+ <gavp name="CC-Money"/>
+ <gavp name="CC-Total-Octets"/>
+ <gavp name="CC-Imput-Octets"/>
+ <gavp name="CC-output-Octets"/>
+ <gavp name="CC-Service-Specific-Units"/>
+ </grouped>
+ </avp>
+ <avp name="Rating-Group" code="432" mandatory="must">
+ <type type-name="Unsigned32"/>
+ </avp>
+ <avp name="Redirect-Address-Type" code="433" mandatory="must">
+ <type type-name="Enumerated"/>
+ <enum name="IPV6_ADDRESS" code="1"/>
+ <enum name="SIP_URI" code="3"/>
+ <enum name="URL" code="2"/>
+ <enum name="IPV4_ADDRESS" code="0"/>
+ </avp>
+ <avp name="Redirect-Server-Address" code="435" mandatory="must">
+ <type type-name="UTF8String"/>
+ </avp>
<avp name="Requested-Action" code="436" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
<type type-name="Unsigned32"/>
<enum name="DIRECT_DEBITING" code="0"/>
@@ -44,6 +123,19 @@
<enum name="CHECK_BALANCE" code="2"/>
<enum name="PRICE_ENQUIRY" code="3"/>
</avp>
+ <avp name="Requested-Service-Unit" code="437" mandatory="must">
+ <grouped>
+ <gavp name="CC-Time"/>
+ <gavp name="CC-Money"/>
+ <gavp name="CC-Total-Octets"/>
+ <gavp name="CC-Imput-Octets"/>
+ <gavp name="CC-output-Octets"/>
+ <gavp name="CC-Service-Specific-Units"/>
+ </grouped>
+ </avp>
+ <avp name="Restricted-Filter-Rule" code="438" mandatory="must">
+ <type type-name="IPFilterRule"/>
+ </avp>
<avp name="Service-Identifier" code="439" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
<type type-name="Unsigned32"/>
</avp>
@@ -69,6 +161,35 @@
<avp name="Subscription-Id-Data" code="444" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
<type type-name="UTF8String"/>
</avp>
+ <avp name="Unit-Value" code="445" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+ <grouped>
+ <gavp name="Value-Digits"/>
+ <gavp name="Exponent"/>
+ </grouped>
+ </avp>
+ <avp name="Used-Service-Unit" code="446" mandatory="must">
+ <grouped>
+ <gavp name="Tariff-Change-Usage "/>
+ <gavp name="CC-Time"/>
+ <gavp name="CC-Money"/>
+ <gavp name="CC-Total-Octets"/>
+ <gavp name="CC-Imput-Octets"/>
+ <gavp name="CC-output-Octets"/>
+ <gavp name="CC-Service-Specific-Units"/>
+ </grouped>
+ </avp>
+ <avp name="Value-Digits" code="447" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+ <type type-name="Integer64"/>
+ </avp>
+ <avp name="Validity-Time" code="448" mandatory="must">
+ <type type-name="Unsigned32"/>
+ </avp>
+ <avp name="Final-Unit-Action" code="449" mandatory="must">
+ <type type-name="Enumerated"/>
+ <enum name="TERMINATE" code="0"/>
+ <enum name="REDIRECT" code="1"/>
+ <enum name="RESTRICT_ACCESS" code="2"/>
+ </avp>
<avp name="Subscription-Id-Type" code="450" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
<type type-name="Unsigned32"/>
<enum name="END_USER_E164" code="0"/>
@@ -77,14 +198,65 @@
<enum name="END_USER_NAI" code="3"/>
<enum name="END_USER_PRIVATE" code="4"/>
</avp>
- <avp name="Unit-Value" code="445" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+ <avp name="Tariff-Time-Change" code="451" mandatory="must">
+ <type type-name="Time"/>
+ </avp>
+ <avp name="Tariff-Change-Usage" code="452" mandatory="must">
+ <type type-name="Enumerated"/>
+ <enum name="UNIT_AFTER_TARIFF_CHANGE" code="1"/>
+ <enum name="UNIT_INDETERMINATE" code="2"/>
+ <enum name="UNIT_BEFORE_TARIFF_CHANGE" code="0"/>
+ </avp>
+ <avp name="CC-Unit-Type" code="454" mandatory="must">
+ <type type-name="Enumerated"/>
+ <enum name="TIME" code="0"/>
+ <enum name="TOTAL-OCTETS" code="2"/>
+ <enum name="OUTPUT-OCTETS" code="4"/>
+ <enum name="INPUT-OCTETS" code="3"/>
+ <enum name="SERVICE-SPECIFIC-UNITS" code="5"/>
+ <enum name="MONEY" code="1"/>
+ </avp>
+ <avp name="Multiple-Services-Indicator" code="455" mandatory="must">
+ <type type-name="Enumerated"/>
+ <enum name="MULTIPLE_SERVICES_NOT_SUPPORTED" code="0"/>
+ <enum name="MULTIPLE_SERVICES_SUPPORTED" code="1"/>
+ </avp>
+ <avp name="Multiple-Services-Credit-Control" code="456" mandatory="must">
<grouped>
- <gavp name="Value-Digits"/>
- <gavp name="Exponent"/>
+ <gavp name="Granted-Service-Unit"/>
+ <gavp name="Requested-Service-Unit"/>
+ <gavp name="Used-Service-Unit"/>
+ <gavp name="Tariff-Change-Usage"/>
+ <gavp name="Service-Identifier"/>
+ <gavp name="Rating-Group"/>
+ <gavp name="G-S-U-Pool-Reference"/>
+ <gavp name="Validity-Time"/>
+ <gavp name="Result-Code"/>
+ <gavp name="Final-Unit-Indication"/>
</grouped>
</avp>
- <avp name="Value-Digits" code="447" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
- <type type-name="Integer64"/>
+ <avp name="G-S-U-Pool-Reference" code="457" mandatory="must">
+ <grouped>
+ <gavp name="G-S-U-Pool-Identifier"/>
+ <gavp name="CC-Unit-Type"/>
+ <gavp name="Unit-Value "/>
+ </grouped>
+ </avp>
+ <avp name="User-Equipment-Info" code="458" mandatory="may">
+ <grouped>
+ <gavp name="User-Equipment-Info-Type"/>
+ <gavp name="User-Equipment-Info-Value"/>
+ </grouped>
+ </avp>
+ <avp name="User-Equipment-Info-Type" code="459" mandatory="may">
+ <type type-name="Enumerated"/>
+ <enum name="IMEISV" code="0"/>
+ <enum name="MAC" code="1"/>
+ <enum name="EUI64" code="2"/>
+ <enum name="MODIFIED_EUI64" code="3"/>
+ </avp>
+ <avp name="User-Equipment-Info-Value" code="460" mandatory="may">
+ <type type-name="OctetString"/>
</avp>
<avp name="Service-Context-Id" code="461" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
<type type-name="UTF8String"/>
diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index 90061fd548..15ff72c688 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -478,13 +478,243 @@
field MUST be set to 16 (20 if the 'V' bit is enabled).
-->
<!-- ************************* End Typedefns ************************ -->
- <!-- ******************* DIAMETER BASE PROTOCOL AVPS ************************ -->
- <avp name="Accounting-Interim-Interval" code="482" mandatory="must" may-encrypt="yes" vendor-bit="mustnot">
+ <!-- ******************* RADIUS AVPS ************************ -->
+ <avp name="User-Name" code="1" mandatory="must">
+ <type type-name="UTF8String"/>
+ </avp>
+ <avp name="User-Password" code="2" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="CHAP-Password" code="3" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="NAS-IP-Address" code="4" mandatory="may">
+ <type type-name="IPAddress"/>
+ </avp>
+ <avp name="NAS-Port" code="5" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Service-Type" code="6" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Framed-Protocol" code="7" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Framed-IP-Address" code="8" mandatory="may">
+ <type type-name="IPAddress"/>
+ </avp>
+ <avp name="Framed-IP-Netmask" code="9" mandatory="may">
+ <type type-name="IPAddress"/>
+ </avp>
+ <avp name="Framed-Routing" code="10" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Filter-Id" code="11" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Framed-MTU" code="12" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Framed-Compression" code="13" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Login-IP-Host" code="14" mandatory="may">
+ <type type-name="IPAddress"/>
+ </avp>
+ <avp name="Login-Service" code="15" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Login-TCP-Port" code="16" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Reply-Message" code="18" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Callback-Number" code="19" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Callback-Id" code="20" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Framed-Route" code="22" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Framed-IPX-Network" code="23" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="State" code="24" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Class" code="25" mandatory="must">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Vendor-Specific" code="26" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Session-Timeout" code="27" mandatory="must">
<type type-name="Unsigned32"/>
</avp>
+ <avp name="Idle-Timeout" code="28" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+
+
+ <avp name="Termination-Action" code="29" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Called-Station-Id" code="30" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Calling-Station-Id" code="31" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="NAS-Identifier" code="32" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Proxy-State" code="33" mandatory="must">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Login-LAT-Service" code="34" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Login-LAT-Node" code="35" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Login-LAT-Group" code="36" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Framed-AppleTalk-Link" code="37" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Framed-AppleTalk-Network" code="38" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Framed-AppleTalk-Zone" code="39" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Acct-Status-Type" code="40" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Acct-Delay-Time" code="41" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Acct-Input-Octets" code="42" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Acct-Output-Octets" code="43" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Accounting-Session-Id" code="44" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
+ <type type-name="Unsigned32"/>
+ </avp>
+ <avp name="Acct-Authentic" code="45" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Acct-Session-Time" code="46" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Acct-Input-Packets" code="47" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Acct-Output-Packets" code="48" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Acct-Terminate-Cause" code="49" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
<avp name="Accounting-Multi-Session-Id" code="50" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
<type type-name="Unsigned32"/>
</avp>
+ <avp name="Acct-Link-Count" code="51" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Acct-Input-Gigawords" code="52" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Acct-Output-Gigawords" code="53" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Event-Timestamp" code="55" mandatory="must">
+ <type type-name="Time"/>
+ </avp>
+ <avp name="CHAP-Challenge" code="60" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="NAS-Port-Type" code="61" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Port-Limit" code="62" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Login-LAT-Port" code="63" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Tunnel-Type" code="64" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Tunnel-Medium-Type" code="65" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Acct-Tunnel-Client-Endpoint" code="66" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Tunnel-Server-Endpoint" code="67" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Acct-Tunnel-Connection-ID" code="68" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Tunnel-Password" code="69" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="ARAP-Password" code="70" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="ARAP-Features" code="71" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="ARAP-Zone-Access" code="72" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="ARAP-Security" code="73" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="ARAP-Security-Data" code="74" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Password-Retry" code="75" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Prompt" code="76" mandatory="may">
+ <type type-name="Integer32"/>
+ </avp>
+ <avp name="Connect-Info" code="77" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Configuration-Token" code="78" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="EAP-Message" code="79" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Signature" code="80" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+ <avp name="Acct-Interim-Interval" code="85" mandatory="must">
+ <type type-name="Unsigned32"/>
+ </avp>
+ <avp name="Framed-Interface-Id" code="96" mandatory="may">
+ <type type-name="Unsigned64"/>
+ </avp>
+ <avp name="Framed-IPv6-Prefix" code="97" mandatory="may">
+ <type type-name="OctetString"/>
+ </avp>
+
+ <!-- ******************* DIAMETER BASE PROTOCOL AVPS ************************ -->
+
+ <avp name="Accounting-Interim-Interval" code="482" mandatory="must" may-encrypt="yes" vendor-bit="mustnot">
+ <type type-name="Unsigned32"/>
+ </avp>
<avp name="Accounting-Realtime-Required" code="483" mandatory="must" may-encrypt="yes" vendor-bit="mustnot">
<type type-name="Unsigned32"/>
<enum name="Reserved" code="0"/>
@@ -502,9 +732,6 @@
<enum name="Interim Record" code="3"/>
<enum name="Stop Record" code="4"/>
</avp>
- <avp name="Accounting-Session-Id" code="44" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
- <type type-name="Unsigned32"/>
- </avp>
<avp name="Acct-Application-Id" code="259" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
<type type-name="AppId"/>
<enum name="Diameter Common Messages" code="0"/>
@@ -572,6 +799,11 @@
<avp name="Error-Reporting-Host" code="294" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
<type type-name="DiameterIdentity"/>
</avp>
+ <avp name="E2E-Sequence" code="300" mandatory="must">
+ <grouped>
+ <gavp name="foo"/>
+ </grouped>
+ </avp>
<avp name="Failed-AVP" code="279" mandatory="must" may-encrypt="no" vendor-bit="mustnot">
<type type-name="OctetString"/>
</avp>