summaryrefslogtreecommitdiffstats
path: root/resources/protocols/diameter
diff options
context:
space:
mode:
Diffstat (limited to 'resources/protocols/diameter')
-rw-r--r--resources/protocols/diameter/CiscoSystems.xml8
-rw-r--r--resources/protocols/diameter/Starent.xml20
-rw-r--r--resources/protocols/diameter/Travelping.xml32
-rw-r--r--resources/protocols/diameter/VerizonWireless.xml10
-rw-r--r--resources/protocols/diameter/dictionary.xml22
5 files changed, 79 insertions, 13 deletions
diff --git a/resources/protocols/diameter/CiscoSystems.xml b/resources/protocols/diameter/CiscoSystems.xml
index 9bd03fc0..31a5b267 100644
--- a/resources/protocols/diameter/CiscoSystems.xml
+++ b/resources/protocols/diameter/CiscoSystems.xml
@@ -211,6 +211,14 @@ http://www.cisco.com/c/dam/en/us/td/docs/wireless/asr_5000/20/AAA/20-AAA-Referen
<enum name="Pre-Emption-Vulnerability-Disabled" code="1"/>
</avp>
+ <avp name="Cumulative-Acct-Input-Octets" code="132044" vendor-id="CiscoSystems" >
+ <type type-name="Unsigned64" />
+ </avp>
+
+ <avp name="Cumulative-Acct-Output-Octets" code="132045" vendor-id="CiscoSystems" >
+ <type type-name="Unsigned64" />
+ </avp>
+
<avp name="Override-Tos-Value" code="132046" vendor-id="CiscoSystems">
<grouped>
<gavp name="Override-Tos-Direction" />
diff --git a/resources/protocols/diameter/Starent.xml b/resources/protocols/diameter/Starent.xml
index 0e2ed2c1..3faad13d 100644
--- a/resources/protocols/diameter/Starent.xml
+++ b/resources/protocols/diameter/Starent.xml
@@ -912,7 +912,7 @@
<enum name="intra-ggsn-handoff" code="510"/>
<enum name="WSG-Auth-failed" code="511"/>
<enum name="Gtp-non-existent-pdp-context" code="512"/>
- <enum name="sgsn-cancel-loc-inital-attach" code="513"/>
+ <enum name="sgsn-cancel-loc-initial-attach" code="513"/>
<enum name="Local-fallback-timeout" code="514"/>
<enum name="sgsn-nrspca-actv-rej-by-sgsn" code="515"/>
<enum name="sgsn-nrspca-actv-rej-by-ms" code="516"/>
@@ -1176,16 +1176,16 @@
<type type-name="Unsigned32"/>
</avp>
- <avp name="SN-IPv6-Primary-DNS" code="101" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
- <type type-name="IPAddress"/>
+ <avp name="SN1-IPv6-Primary-DNS" code="101" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
+ <type type-name="Address"/>
</avp>
<avp name="SN-IPv6-rtr-advt-interval" code="96" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
</avp>
- <avp name="SN-IPv6-Secondary-DNS" code="102" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
- <type type-name="OctetString"/>
+ <avp name="SN1-IPv6-Secondary-DNS" code="102" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
+ <type type-name="Address"/>
</avp>
<avp name="SN-IPv6-Sec-Pool" code="124" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
@@ -1618,8 +1618,8 @@
<type type-name="UTF8String"/>
</avp>
- <avp name="SN-Primary-DNS-Server" code="5" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
- <type type-name="IPAddress"/>
+ <avp name="SN1-Primary-DNS-Server" code="5" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
+ <type type-name="Address"/>
</avp>
<avp name="SN-Primary-NBNS-Server" code="148" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
@@ -1881,8 +1881,8 @@
<type type-name="UTF8String"/>
</avp>
- <avp name="SN-Secondary-DNS-Server" code="6" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
- <type type-name="IPAddress"/>
+ <avp name="SN1-Secondary-DNS-Server" code="6" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
+ <type type-name="Address"/>
</avp>
<avp name="SN-Secondary-NBNS-Server" code="149" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
@@ -1965,7 +1965,7 @@
<avp name="SN-Subscriber-Acct-Mode" code="192" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
<type type-name="Unsigned32"/>
- <enum name="flow-based-auxilliary" code="0"/>
+ <enum name="flow-based-auxiliary" code="0"/>
<enum name="flow-based-all" code="1"/>
<enum name="flow-based-none" code="2"/>
<enum name="session-based" code="3"/>
diff --git a/resources/protocols/diameter/Travelping.xml b/resources/protocols/diameter/Travelping.xml
new file mode 100644
index 00000000..180bac10
--- /dev/null
+++ b/resources/protocols/diameter/Travelping.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Travelping vendor-specific AVPs. -->
+
+<vendor vendor-id="Travelping" code="18681" name="Travelping">
+ <avp name="TP-NAT-IP-Address" code="16" vendor-id="Travelping" mandatory="may" protected="may" may-encrypt="yes" vendor-bit="must">
+ <type type-name="OctetString"/>
+ </avp>
+
+ <avp name="TP-NAT-Pool-Id" code="27" vendor-id="Travelping" mandatory="may" protected="may" may-encrypt="yes" vendor-bit="must">
+ <type type-name="UTF8String"/>
+ </avp>
+
+ <avp name="TP-NAT-Port-End" code="29" vendor-id="Travelping" mandatory="may" protected="may" may-encrypt="yes" vendor-bit="must">
+ <type type-name="Unsigned32"/>
+ </avp>
+
+ <avp name="TP-NAT-Port-Start" code="28" vendor-id="Travelping" mandatory="may" protected="may" may-encrypt="yes" vendor-bit="must">
+ <type type-name="Unsigned32"/>
+ </avp>
+
+ <avp name="TP-Previous-PS-Information" code="64" vendor-id="Travelping" mandatory="may" protected="may" may-encrypt="yes" vendor-bit="must">
+ <grouped>
+ <gavp name="QoS-Information"/>
+ <gavp name="SGSN-Address"/>
+ <gavp name="3GPP-SGSN-MCC-MNC"/>
+ <gavp name="3GPP-MS-TimeZone"/>
+ <gavp name="3GPP-User-Location-Info"/>
+ <gavp name="3GPP-RAT-Type"/>
+ </grouped>
+ </avp>
+</vendor>
diff --git a/resources/protocols/diameter/VerizonWireless.xml b/resources/protocols/diameter/VerizonWireless.xml
index ab39ecc9..04015bbf 100644
--- a/resources/protocols/diameter/VerizonWireless.xml
+++ b/resources/protocols/diameter/VerizonWireless.xml
@@ -11,13 +11,21 @@
</avp>
<avp name="Charging-Gateway-Function-Host" vendor-id="VerizonWireless" code="6068" >
- <type type-name="OctetString"/>
+ <type type-name="UTF8String"/>
</avp>
<avp name="Charging-Group-ID" vendor-id="VerizonWireless" code="6069" >
<type type-name="OctetString"/>
</avp>
+ <avp name="Originating-User-Location-Info" vendor-id="VerizonWireless" code="6080" >
+ <type type-name="OctetString"/>
+ </avp>
+
+ <avp name="Originating-BSID" vendor-id="VerizonWireless" code="6081" >
+ <type type-name="OctetString"/>
+ </avp>
+
<avp name="LI-Indicator-Gx" code="6092" vendor-id="VerizonWireless" >
<grouped>
<gavp name="Random-Vector"/>
diff --git a/resources/protocols/diameter/dictionary.xml b/resources/protocols/diameter/dictionary.xml
index cdbd7778..4e69196a 100644
--- a/resources/protocols/diameter/dictionary.xml
+++ b/resources/protocols/diameter/dictionary.xml
@@ -34,6 +34,7 @@
<!ENTITY Siemens SYSTEM "Siemens.xml">
<!ENTITY Microsoft SYSTEM "Microsoft.xml">
<!ENTITY Metaswitch SYSTEM "Metaswitch.xml">
+ <!ENTITY Travelping SYSTEM "Travelping.xml">
<!ENTITY Custom SYSTEM "Custom.xml">
]>
<dictionary>
@@ -304,6 +305,17 @@
The UTF8String MUST not contain any octets with a value of
zero.
-->
+ <typedefn type-name="Address" type-parent="OctetString"/>
+ <!--
+ The Address format is derived from the OctetString AVP Base
+ Format. It represents 32 bit (IPv4) [17] or 128 bit (IPv6) [16]
+ address, most significant octet first. The format of the
+ address (IPv4 or IPv6) is determined by the length. If the
+ attribute value is an IPv4 address, the AVP Length field MUST
+ be 12 (16 if 'V' bit is enabled), otherwise the AVP Length
+ field MUST be set to 24 (28 if the 'V' bit is enabled) for IPv6
+ addresses.
+ -->
<typedefn type-name="IPAddress" type-parent="OctetString"/>
<!--
The IPAddress format is derived from the OctetString AVP Base
@@ -314,6 +326,8 @@
be 12 (16 if 'V' bit is enabled), otherwise the AVP Length
field MUST be set to 24 (28 if the 'V' bit is enabled) for IPv6
addresses.
+ For AVPs with codes < 256, the RADIUS ipaddr encoding is used
+ instead.
-->
<typedefn type-name="DiameterIdentity" type-parent="OctetString"/>
<!--
@@ -1127,7 +1141,7 @@
<type type-name="UTF8String"/>
</avp>
<avp name="Framed-Pool" code="88" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
- <type type-name="OctetString"/>
+ <type type-name="UTF8String"/>
</avp>
<avp name="CUI" code="89" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
<type type-name="UTF8String"/>
@@ -6411,6 +6425,9 @@
<avp name="PC5-Link-AMBR" code="1718" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP">
<type type-name="Integer32"/>
</avp>
+ <avp name="Third-Context-Identifier" code="1719" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP">
+ <type type-name="Unsigned32"/>
+ </avp>
<avp name="SMS-Information" code="2000" vendor-bit="must" vendor-id="TGPP">
<grouped>
@@ -8320,7 +8337,7 @@
<gavp name="Reporting-Time-Stamp"/>
<gavp name="Updated-Network-Configuration"/>
<gavp name="SCEF-Reference-ID-Ext"/>
- <gavp name="SCEF-Reference-ID-For-Deletion-Ext"/>
+ <gavp name="SCEF-Reference-ID-for-Deletion-Ext"/>
<gavp name="Event-Handling"/>
<gavp name="Loss-Of-Connectivity-Reason"/>
<gavp name="PDN-Connectivity-Status-Report"/>
@@ -9125,5 +9142,6 @@
&Siemens;
&Microsoft;
&Metaswitch;
+ &Travelping;
&Custom;
</dictionary>