New Diameter AVPS

Change-Id: Ic7fca037cdf041988bc93f6b4066eb190e3028d0
Reviewed-on: https://code.wireshark.org/review/33461
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

4 files changed, 410 insertions, 0 deletions

diff --git a/diameter/Ericsson.xml b/diameter/Ericsson.xml
index dea6477992..b7126fda6b 100644
--- a/diameter/Ericsson.xml
+++ b/diameter/Ericsson.xml
@@ -17,6 +17,23 @@
 		<enum name="Audio Conference" code="0"/>
 		<enum name="Video Conference" code="1"/>
 	</avp>
+	<avp name="SSO-Status" code="280" vendor-id="Ericsson" mandatory="must" vendor-bit="must" may-encrypt="no" protected="mustnot">
+		<type type-name="Enumerated"/>
+		<enum name="NON-VALID" code="0"/>
+		<enum name="NON-TRUSTED" code="1"/>
+	</avp>
+	<avp name="IMS-Service-Identification" code="284" vendor-id="Ericsson" mandatory="must" vendor-bit="must" may-encrypt="no" protected="mustnot">
+		<type type-name="UTF8String"/>
+	</avp>
+	<avp name="Ericsson_Service_Information" code="285" vendor-id="Ericsson" mandatory="must" vendor-bit="must">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="Activity-Information" code="288" vendor-id="Ericsson" mandatory="must" vendor-bit="must" may-encrypt="no" protected="mustnot">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="Feature-Tag" code="289" vendor-id="Ericsson" mandatory="must" vendor-bit="must" may-encrypt="no" protected="mustnot">
+		<type type-name="UTF8String"/>
+	</avp>
 	<avp name="Rule-Space-Suggestion" code="290" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
 		<type type-name="UTF8String"/>
 	</avp>
@@ -26,6 +43,17 @@
 	<avp name="Bearer-Control-Options" code="292" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
 		<type type-name="Unsigned32"/>
 	</avp>
+	<avp name="GPRS-Roaming-Status" code="333" vendor-id="Ericsson" mandatory="must" vendor-bit="must" may-encrypt="no" protected="mustnot">
+		<type type-name="Enumerated"/>
+		<enum name="HOME" code="0"/>
+		<enum name="VISITED" code="1"/>
+	</avp>
+	<avp name="Ericsson-Wildcarded-Public-Identity" code="334" vendor-id="Ericsson" mandatory="must" vendor-bit="must" may-encrypt="no" protected="mustnot">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="SIP-Ringing-Timestamp" code="338" vendor-id="Ericsson" mandatory="must" vendor-bit="must" may-encrypt="no" protected="mustnot">
+		<type type-name="Time"/>
+	</avp>
 
 	<!-- ************************** SCAP AVPS, see 155 19-FAY 112 51/2 rev B ********************* -->
 	<avp name="SCAP-Currency-Code" code="544" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
@@ -166,6 +194,16 @@
 	</avp>
 	<!-- ************************ END SCAP AVPS ******************* -->
 
+	<avp name="S-CSCF-Name-Originating" code="1008" vendor-id="None" mandatory="must"  may-encrypt="no">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="S-CSCF-Name-Terminating" code="1009" vendor-id="None" mandatory="must"  may-encrypt="no">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="SIP-Server-Name" code="1012" vendor-id="None" mandatory="must"  may-encrypt="no">
+		<type type-name="OctetString"/>
+	</avp>
+
 
 	<avp name="Charging-Rule-Authorization" code="1055" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
 		<grouped>
@@ -201,6 +239,9 @@
 	<avp name="Gx-Capability-List" code="1060" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
 		<type type-name="Unsigned32"/>
 	</avp>
+	<avp name="MMT-Information" code="1061" vendor-id="Ericsson" mandatory="must" vendor-bit="must">
+		<type type-name="OctetString"/>
+	</avp>
 	<avp name="Result-Code-Extension" code="1067" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
 		<type type-name="Unsigned32"/>
 	</avp>
@@ -231,7 +272,119 @@
 		<enum name="END_USER_NAI" code="3"/>
 		<enum name="END_USER_PRIVATE" code="4"/>
 	</avp>
+	<avp name="Related-ICID" code="1128" vendor-id="Ericsson" mandatory="must" vendor-bit="must" may-encrypt="no" protected="mustnot">
+		<type type-name="UTF8String"/>
+	</avp>
+	<avp name="Supplementary-Service-Information" code="1129" vendor-id="Ericsson" mandatory="must" vendor-bit="must">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="Supplementary-Service-Identity" code="1130" vendor-id="Ericsson" mandatory="must" vendor-bit="must" may-encrypt="no" protected="mustnot">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="Supplementary-Service-Action" code="1131" vendor-id="Ericsson" mandatory="must" vendor-bit="must" may-encrypt="no" protected="mustnot">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="Redirecting-Party-Address" code="1133" vendor-id="Ericsson" mandatory="must" vendor-bit="must" may-encrypt="no" protected="mustnot">
+		<type type-name="UTF8String"/>
+	</avp>
+	<avp name="Calling-Party-Address-Presentation-Status" code="1141" vendor-id="Ericsson" mandatory="must" vendor-bit="must">
+		<type type-name="Enumerated"/>
+		<enum name="PRESENTATION_ALLOWED" code="0"/>
+		<enum name="PRESENTATION_RESTRICTED" code="1"/>
+		<enum name="UNKNOWN" code="2"/>
+	</avp>
+	<avp name="Called-Asserted-Identity-Presentation-Status" code="1142" vendor-id="Ericsson" mandatory="must" vendor-bit="must">
+		<type type-name="Enumerated"/>
+		<enum name="PRESENTATION_ALLOWED" code="0"/>
+		<enum name="PRESENTATION_RESTRICTED" code="1"/>
+	</avp>
 	<avp name="Ericsson-Customer-Id" code="1146" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
 		<type type-name="UTF8String"/>
 	</avp>
+	<avp name="From-Header" code="1153" vendor-id="Ericsson" mandatory="must" vendor-bit="must" may-encrypt="no" protected="mustnot">
+		<type type-name="UTF8String"/>
+	</avp>
+	<avp name="Secondary-Digest-HA1" code="1192" vendor-id="Ericsson" mandatory="must" vendor-bit="must" may-encrypt="no" protected="mustnot">
+		<type type-name="UTF8String"/>
+	</avp>
+	<avp name="SIP-Ringing-Timestamp-Fraction" code="1256" vendor-id="Ericsson" mandatory="must" vendor-bit="must" may-encrypt="no" protected="mustnot">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="Authentication_Method" code="1261" vendor-id="Ericsson" mandatory="must" vendor-bit="must">
+		<type type-name="Enumerated"/>
+		<enum name="NoAuthentication" code="0"/>
+		<enum name="AkaAuthentication" code="1"/>
+		<enum name="NassBundledAuthentication" code="2"/>
+		<enum name="DigestAuthentication" code="3"/>
+		<enum name="SsoAuthentication" code="4"/>
+	</avp>
+	<avp name="From-Header-Presentation-Status" code="1262" vendor-id="Ericsson" mandatory="must" vendor-bit="must">
+		<type type-name="Enumerated"/>
+		<enum name="PRESENTATION_ALLOWED" code="0"/>
+		<enum name="PRESENTATION_RESTRICTED" code="1"/>
+		<enum name="UNKNOWN" code="2"/>
+	</avp>
+	<avp name="Transaction_Info" code="1264" vendor-id="Ericsson" mandatory="must" vendor-bit="must">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="Transaction-Type" code="1265" vendor-id="Ericsson" mandatory="must" vendor-bit="must">
+		<type type-name="Enumerated"/>
+		<enum name="SIP_REQUEST" code="0"/>
+		<enum name="SIP_RESPONSE" code="1"/>
+		<enum name="DIAMETER_REQUEST" code="2"/>
+		<enum name="DIAMETER_ANSWER" code="3"/>
+	</avp>
+	<avp name="Transaction-Data-Name" code="1266" vendor-id="Ericsson" mandatory="must" vendor-bit="must">
+		<type type-name="UTF8String"/>
+	</avp>
+	<avp name="Transaction-Data-Value" code="1267" vendor-id="Ericsson" mandatory="must" vendor-bit="must">
+		<type type-name="UTF8String"/>
+	</avp>
+	<avp name="Charging-Profile-Id" code="1268" vendor-id="Ericsson" mandatory="must" vendor-bit="must">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="Service-Number-Type" code="1307" vendor-id="Ericsson" mandatory="must" vendor-bit="must">
+		<type type-name="Enumerated"/>
+		<enum name="OSN" code="0"/>
+		<enum name="NSN" code="1"/>
+		<enum name="NON_SERVICE_E164" code="2"/>
+		<enum name="UNKNOWN" code="3"/>
+	</avp>
+	<avp name="SCC_Service_Identity" code="1314" vendor-id="Ericsson" mandatory="must" vendor-bit="must">
+		<type type-name="Enumerated"/>
+		<enum name="T_ADS" code="0"/>
+		<enum name="SDS" code="100"/>
+		<enum name="SRVCC" code="200"/>
+	</avp>
+	<avp name="SDD-TADS-Decision" code="1315" vendor-id="Ericsson" mandatory="must" vendor-bit="must">
+		<type type-name="Enumerated"/>
+		<enum name="NO_SELECTION" code="0"/>
+		<enum name="NO_SELECTION_AND_REJECT" code="1"/>
+		<enum name="VoLTE_UE_on_PS" code="2"/>
+		<enum name="VoLTE_UE_on_CS" code="3"/>
+		<enum name="VoLTE_UE_on_PS_or_PS" code="4"/>
+		<enum name="BREAKOUT_to_CS" code="5"/>
+		<enum name="FIXED_UE_on_PS_and_BREAKOUT_to_CS" code="6"/>
+	</avp>
+	<avp name="Served_User" code="1330" vendor-id="Ericsson" mandatory="must" vendor-bit="must">
+		<type type-name="UTF8String"/>
+	</avp>
+	<avp name="Tenant" code="1380" vendor-id="Ericsson" mandatory="must" vendor-bit="must">
+		<type type-name="UTF8String"/>
+	</avp>
+	<avp name="UHTZ-Offset" code="1388" vendor-id="Ericsson" mandatory="must" vendor-bit="must">
+		<type type-name="UTF8String"/>
+	</avp>
+	<avp name="AS-Type" code="1433" vendor-id="Ericsson" mandatory="must" vendor-bit="must">
+		<type type-name="Enumerated"/>
+		<enum name="MMTEL_AS" code="0"/>
+		<enum name="REDIRECTION_AS" code="1"/>
+		<enum name="SCHEDULED_CONFERENCE_AS" code="2"/>
+		<enum name="SCC_AS" code="3"/>
+		<enum name="PARLAY_X_AS" code="4"/>
+		<enum name="ST_AS" code="5"/>
+	</avp>
+	<avp name="Transaction-SIP-Message" code="1460" vendor-id="Ericsson" mandatory="must" vendor-bit="must">
+		<type type-name="UTF8String"/>
+	</avp>
 </vendor>
diff --git a/diameter/Siemens.xml b/diameter/Siemens.xml
new file mode 100644
index 0000000000..1717f195f1
--- /dev/null
+++ b/diameter/Siemens.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Siemens vendor-specific AVPs. Added by Ajit Kuchekar (akuchekar[at]empirix.com) on 06-June-2019 -->
+
+<vendor vendor-id="Siemens_AG" code="4329" name="Siemens_AG">
+
+	<avp name="Siemens-IMSI" code="1106" vendor-id="Siemens_AG" mandatory="must" vendor-bit="must">
+		<type type-name="UTF8String"/>
+	</avp>
+	<avp name="Siemens-MSIDN" code="1107" vendor-id="Siemens_AG" mandatory="must" vendor-bit="must">
+		<type type-name="UTF8String"/>
+	</avp>
+	<avp name="Siemens-Server-Name" code="1110" vendor-id="Siemens_AG" mandatory="must" vendor-bit="must">
+	<type type-name="UTF8String"/>
+	</avp>
+</vendor>
diff --git a/diameter/Telefonica.xml b/diameter/Telefonica.xml
new file mode 100644
index 0000000000..670b475543
--- /dev/null
+++ b/diameter/Telefonica.xml
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Telefonica vendor-specific AVPs. Added by Ajit Kuchekar (akuchekar[at]empirix.com) on 05-June-2019 -->
+
+<vendor vendor-id="Telefonica_Moviles_Espa_S.A." code="27640" name="Telefonica OAMA">
+
+	<avp name="CS-Additional-Calling-Party-Number" code="1" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="CS-Announcement" code="2" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<grouped>
+			<gavp name="CS-Announcement-Type"/>
+			<gavp name="CS-Announcement-Logic"/>
+			<gavp name="CS-Announcement-Code"/>
+			<gavp name="CS-Announcement-Data"/>
+			<gavp name="CS-Warning-Period"/>
+		</grouped>
+	</avp>
+	<avp name="CS-Announcement-Code" code="3" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="CS-Announcement-Data" code="4" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<grouped>
+			<gavp name="CS-Announcement-Data-Type"/>
+			<gavp name="CS-Announcement-Data-Value"/>
+		</grouped>
+	</avp>
+	<avp name="CS-Announcement-Data-Type" code="5" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Enumerated"/>
+		<enum name="Integer32" code="1"/>
+		<enum name="OctetString" code="2"/>
+		<enum name="Time" code="3"/>
+	</avp>
+	<avp name="CS-Announcement-Data-Value" code="6" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="CS-Bearer-Capability" code="7" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="CS-Call-Reference-Number" code="8" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="CS-Called-Party-Number" code="9" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="OctetString"/>
+	</avp>
+		<avp name="CS-Calling-Partys-Category" code="10" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="CS-Calling-Party-Number" code="11" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="CS-Event-Type-BCSM" code="12" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Enumerated"/>
+		<enum name="collectedInfo" code="2"/>
+		<enum name="analyzedInformation" code="3"/>
+		<enum name="routeSelectFailure" code="4"/>
+		<enum name="oCalledPartyBusy" code="5"/>
+		<enum name="oNoAnswer" code="6"/>
+		<enum name="oAnswer" code="7"/>
+		<enum name="oDisconnect" code="9"/>
+		<enum name="oAbandon" code="10"/>
+		<enum name="termAttemptAuthorized" code="12"/>
+		<enum name="tBusy" code="13"/>
+		<enum name="tNoAnswer" code="14"/>
+		<enum name="tAnswer" code="15"/>
+		<enum name="tDisconnect" code="17"/>
+		<enum name="tAbandon" code="18"/>
+	</avp>
+	<avp name="CS-First-Call-Indication" code="13" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Enumerated"/>
+		<enum name="FIRST_CALL_FALSE" code="0"/>
+		<enum name="FIRST_CALL_TRUE" code="1"/>
+	</avp>
+	<avp name="CS-Free-Format-Data" code="14" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="CS-Furnish-Charging-Information" code="15" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<grouped>
+			<gavp name="CS-Free-Format-Data"/>
+			<gavp name="CS-Party-To-Charge"/>
+		</grouped>
+	</avp>
+	<avp name="CS-High-Layer-Compatibility" code="16" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="CS-Information" code="17" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<grouped>
+			<gavp name="CS-Traffic-Case"/>
+			<gavp name="CS-Service-Key"/>
+			<gavp name="CS-Service-Id"/>
+			<gavp name="CS-Event-Type-BCSM"/>
+			<gavp name="CS-Calling-Party-Number"/>
+		</grouped>
+	</avp>
+	<avp name="CS-Location-Information" code="18" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<grouped>
+			<gavp name="CS-Terminating-VLR-Number"/>
+			<gavp name="CS-Originating-Location-Number"/>
+			<gavp name="3GPP-User-Location-Info"/>
+		</grouped>
+	</avp>
+	<avp name="CS-MSC-Address" code="19" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="CS-Original-Called-Party-ID" code="20" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="CS-Originating-Location-Number" code="21" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="CS-Party-To-Charge" code="22" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="CS-Redirecting-Party-Number" code="23" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="CS-Redirection-Information" code="24" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="CS-Release-Cause-Code" code="25" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Integer32"/>
+	</avp>
+	<avp name="CS-Rerouting-Number" code="26" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="CS-Service-Key" code="27" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Integer32"/>
+	</avp>
+	<avp name="CS-Terminating-VLR-Number" code="28" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="CS-Warning-Period" code="29" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="CS-Accumulated-Time" code="30" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="CS-Announcement-Logic" code="31" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Enumerated"/>
+		<enum name="NOT_TO_BE_PLAYED" code="0"/>
+		<enum name="PLAYED_TO_CALLING_PARTY" code="1"/>
+		<enum name="PLAYED_TO_CALLED_PARTY" code="2"/>
+		<enum name="PLAYED_TO_BOTH_PARTIES" code="3"/>
+	</avp>
+	<avp name="CS-Announcement-Type" code="32" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Enumerated"/>
+		<enum name="IMMEDIATE_ANNOUNCEMENT" code="0"/>
+		<enum name="MIDCALL_ANNOUNCEMENT" code="1"/>
+		<enum name="ENDCALL_ANNOUNCEMENT" code="2"/>
+	</avp>
+	<avp name="CS-Balance-TopUp-Data" code="33" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="CS-Call-SetUp-Result-Code" code="34" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="CS-Customer-Data" code="35" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="UTF8String"/>
+	</avp>
+	<avp name="CS-Dialogue-Handling" code="36" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Enumerated"/>
+		<enum name="NORMAL" code="0"/>
+		<enum name="OPTIMIZED" code="1"/>
+	</avp>
+	<avp name="CS-ISUP-Release-Cause-Code" code="37" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="CS-Max-Call-Duration" code="38" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="CS-Result-Code" code="39" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="CS-Start-Of-Charging" code="40" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Time"/>
+	</avp>
+	<avp name="CS-Teleservice-Code" code="41" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="CS-Traffic-Case" code="42" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="CS-AoC-Info" code="43" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<grouped>
+			<gavp name="Tariff-Time-Change"/>
+			<gavp name="CS-AoC-Info-e1"/>
+			<gavp name="CS-AoC-Info-e2"/>
+			<gavp name="CS-AoC-Info-e3"/>
+			<gavp name="CS-AoC-Info-e4"/>
+			<gavp name="CS-AoC-Info-e5"/>
+			<gavp name="CS-AoC-Info-e6"/>
+			<gavp name="CS-AoC-Info-e7"/>
+		</grouped>
+	</avp>
+	<avp name="CS-AoC-Info-e1" code="44" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="CS-AoC-Info-e2" code="45" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="CS-AoC-Info-e3" code="46" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="CS-AoC-Info-e4" code="47" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="CS-AoC-Info-e5" code="48" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="CS-AoC-Info-e6" code="49" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="CS-AoC-Info-e7" code="50" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="CS-Called-Party-BCD-Number" code="51" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="CS-Conference-Id" code="52" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="UTF8String"/>
+	</avp>
+	<avp name="CS-MultiParty-Call-Indication" code="53" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<grouped>
+			<gavp name="CS-Conference-Id"/>
+			<gavp name="Number-Of-Participants"/>
+		</grouped>
+	</avp>
+	<avp name="CS-Network-Type" code="54" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="CS-Service-Id" code="55" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="OCS-Account-Management-Op" code="56" vendor-id="Telefonica_Moviles_Espa_S.A." mandatory="must" vendor-bit="must">
+		<type type-name="UTF8String"/>
+	</avp>
+</vendor>
diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index 1b955945e0..eb58ab4725 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -30,6 +30,8 @@
 	<!ENTITY Inovar			SYSTEM "Inovar.xml">
 	<!ENTITY Huawei			SYSTEM "Huawei.xml">
 	<!ENTITY VerizonWireless	SYSTEM "VerizonWireless.xml">
+	<!ENTITY Telefonica		SYSTEM "Telefonica.xml">
+	<!ENTITY Siemens		SYSTEM "Siemens.xml">
 	<!ENTITY Custom			SYSTEM "Custom.xml">
 ]>
 <dictionary>
@@ -8835,5 +8837,7 @@
 	&Inovar;
 	&Huawei;
 	&VerizonWireless;
+	&Telefonica;
+	&Siemens;
 	&Custom;
 </dictionary>