Commit 4176c6b0 authored by Elemer Lelik's avatar Elemer Lelik
Browse files

R40A -> R55A

parent f2325f01
......@@ -40,7 +40,7 @@ module DIAMETER_Types {
//
// File: BaseTypes_IETF_RFC3588.ddf
// Description: DDF for the Diameter base types
// Rev: R40A
// Rev: R55A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
......@@ -273,7 +273,7 @@ command_code, application_id, hop_by_hop_id, end_to_end_id, avps)";
//
// File: Base_IETF_RFC3588.ddf
// Description: DDF for the Diameter base AVPs
// Rev: <RnXnn>
// Rev: R55A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
......@@ -666,7 +666,7 @@ type AVP_Grouped BASE_NONE_Vendor_Specific_Application_Id
//
// File: Ericsson_Specific_AVPs.ddf
// Description: Ericsson specific AVP definitions
// Rev: <RnXnn>
// Rev: R55A
// Prodnr: CNL 113 462
// Reference: http://snmp.ericsson.se/diameter-assignments.html
//
......
......@@ -37,7 +37,7 @@
//
// File: AAAInterface_3GPP_TS29272_940.ddf
// Description: DDF for S6a/S6d and S13 Interfaces according to 3GPP TS 29.272 V9.4.0
// Rev: R40A
// Rev: R55A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
......
......@@ -37,7 +37,7 @@
//
// File: AAAInterface_3GPP_TS29272_950.ddf
// Description: DDF for S6a/S6d and S13 Interfaces according to 3GPP TS 29.272 V9.5.0
// Rev: R40A
// Rev: R55A
// Prodnr: CNL 113 462
......
......@@ -37,7 +37,7 @@
//
// File: AAAInterface_3GPP_TS29272_970.ddf
// Description: DDF for S6a/S6d and S13 Interfaces according to 3GPP TS 29.272 V9.7.0
// Rev: R40A
// Rev: R55A
// Prodnr: CNL 113 462
......
......@@ -37,7 +37,7 @@
//
// File: AAAInterface_3GPP_TS29272_a30.ddf
// Description: DDF for S6a/S6d and S13 Interfaces according to 3GPP TS 29.272 V10.3.0
// Rev: R40A
// Rev: R55A
// Prodnr: CNL 113 462
......
......@@ -37,7 +37,7 @@
//
// File: AAAInterface_3GPP_TS29272_a60.ddf
// Description: DDF for S6a/S6d and S13 Interfaces according to 3GPP TS 29.272 V10.6.0
// Rev: R40A
// Rev: R55A
// Prodnr: CNL 113 462
......
......@@ -37,7 +37,7 @@
//
// File: AAAInterface_3GPP_TS29272_b60.ddf
// Description: DDF for S6a/S6d and S13 Interfaces according to 3GPP TS 29.272 V11.6.0
// Rev: R40A
// Rev: R55A
// Prodnr: CNL 113 462
......
......@@ -11,7 +11,7 @@
//
// File: AAAInterface_3GPP_TS29272_bd0.ddf
// Description: DDF for S6a/S6d and S13 Interfaces according to 3GPP TS 29.272 V11.13.0
// Rev: R40A
// Rev: R55A
// Prodnr: CNL 113 462
......
This diff is collapsed.
This diff is collapsed.
......@@ -37,7 +37,7 @@
//
// File: AAAInterface_3GPP_TS29273_840.ddf
// Description: DDF for EPS AAA according to 3GPP TS 29.273 V8.4.0
// Rev: R40A
// Rev: R55A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
......
......@@ -37,7 +37,7 @@
//
// File: AAAInterface_3GPP_TS29273_940.ddf
// Description: DDF for EPS AAA according to 3GPP TS 29.273 V9.4.0
// Rev: R40A
// Rev: R55A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
......
......@@ -37,7 +37,7 @@
//
// File: AAAInterface_3GPP_TS29273_940.ddf
// Description: DDF for EPS AAA according to 3GPP TS 29.273 V11.3.0
// Rev: R40A
// Rev: R55A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
......
/******************************************************************************
* Copyright (c) 2004, 2017 Ericsson AB
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Timea Moder
******************************************************************************/
//
// File: AAAInterface_3GPP_TS29273_940.ddf
// Description: DDF for EPS AAA according to 3GPP TS 29.273 V13.6.0
// Rev: R55A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
// APPLICATION-NAME: AAA
// APPLICATION-REVISION: V13_6_0
// AVP implementations according to:
// 3GPP TS 29.273 V13.6.0 - EPS AAA interfaces based on the Diameter protocol
// Statement of Compiance X/174 02-AXB 250 20 Uen PA4
// Dependant applications
// IETF RFC 3588 - Diameter Base Protocol
// IETF RFC 4005 - Diameter Network Access Server Application
// 3GPP TS 29.273 V13.6.0 9.2.2
type enumerated Command_Code {
AA (265),
Session_Termination (275),
Abort_Session (274)
}
// 3GPP 29.273 V13.6.0
// AVP: Non-3GPP-User-Data (1500) 3GPP (10415)
// 8.2.3.1
type AVP_Grouped Non_3GPP_User_Data
// 3GPP 29.273 V13.6.0
// AVP: Non-3GPP-IP-Access (1501) 3GPP (10415)
// 8.2.3.3
type enumerated Non_3GPP_IP_Access {
NON_3GPP_SUBSCRIPTION_ALLOWED (0),
NON_3GPP_SUBSCRIPTION_BARRED (1)
}
// 3GPP 29.273 V13.6.0
// AVP: Non-3GPP-IP-Access-APN (1502) 3GPP (10415)
// 8.2.3.4
type enumerated Non_3GPP_IP_Access_APN {
NON_3GPP_APNS_ENABLE (0),
NON_3GPP_APNS_DISABLE (1)
}
// 3GPP 29.273 V13.6.0
// AVP: AN-Trusted (1503) 3GPP (10415)
// 5.2.3.9
type enumerated AN_Trusted {
TRUSTED (0),
UNTRUSTED (1)
}
// 3GPP 29.273 V13.6.0
// AVP: ANID (1504) 3GPP (10415)
// 5.2.3.7
type AVP_UTF8String ANID
// 3GPP 29.273 V13.6.0
// AVP: Trace-Info (1505) 3GPP (10415)
// 8.2.3.13
type AVP_Grouped Trace_Info
// 3GPP 29.273 V13.6.0
// AVP: MIP-FA-RK (1506) 3GPP (10415)
// 5.2.3.12
type AVP_OctetString MIP_FA_RK
// 3GPP 29.273 V13.6.0
// AVP: MIP-FA-RK-SPI (1507) 3GPP (10415)
// 5.2.3.13
type AVP_Unsigned32 MIP_FA_RK_SPI
// 3GPP 29.273 V13.6.0
// AVP: Trust-Relationship-Update (1515) 3GPP (10415)
// 9.2.3.1.4
type enumerated Trust_Relationship_Update {
REQUEST_UPDATE (1)
}
// 3GPP 29.273 V13.6.0
// AVP: RAR-Flags (1522) 3GPP (10415)
// 9.2.3.1.5
type AVP_Unsigned32 RAR_Flags
// 3GPP 29.273 V13.6.0
// AVP: Origination-Time-Stamp (1536) 3GPP (10415)
// 9.2.3.2.6
type AVP_Unsigned64 Origination_Time_Stamp
// 3GPP 29.273 V13.6.0
// AVP: Maximum-Wait-Time (1537) 3GPP (10415)
// 9.2.3.2.7
type AVP_Unsigned32 Maximum_Wait_Time
/******************************************************************************
* Copyright (c) 2004, 2017 Ericsson AB
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Timea Moder
******************************************************************************/
//
// File: AAAInterface_3GPP_TS29273_f00.ddf
// Description: DDF for EPS AAA according to 3GPP TS 29.273 V15.0.0
// Rev: R55A
// Prodnr: CNL 113 462
///////////////////////////////////////////////
// APPLICATION-NAME: AAA
// APPLICATION-REVISION: V15_0_0
// AVP implementations according to:
// 3GPP TS 29.273 V15.0.0 - EPS AAA interfaces based on the Diameter protocol
// Dependant applications
// IETF RFC 3588 - Diameter Base Protocol
// IETF RFC 4005 - Diameter Network Access Server Application
// 9.2.2
type enumerated Command_Code {
AA (265),
Session_Termination (275),
Abort_Session (274)
}
// 8.2.3.1
// AVP: Non-3GPP-User-Data (1500) 3GPP (10415)
type AVP_Grouped Non_3GPP_User_Data;
// 8.2.3.3
// AVP: Non-3GPP-IP-Access (1501) 3GPP (10415)
type enumerated Non_3GPP_IP_Access {
NON_3GPP_SUBSCRIPTION_ALLOWED (0),
NON_3GPP_SUBSCRIPTION_BARRED (1)
}
// 8.2.3.4
// AVP: Non-3GPP-IP-Access-APN (1502) 3GPP (10415)
type enumerated Non_3GPP_IP_Access_APN {
NON_3GPP_APNS_ENABLE (0),
NON_3GPP_APNS_DISABLE (1)
}
// 5.2.3.9
// AVP: AN-Trusted (1503) 3GPP (10415)
type enumerated AN_Trusted {
TRUSTED (0),
UNTRUSTED (1)
}
// 5.2.3.7
// AVP: ANID (1504) 3GPP (10415)
type AVP_UTF8String ANID;
// 8.2.3.13
// AVP: Trace-Info (1505) 3GPP (10415)
type AVP_Grouped Trace_Info;
// 5.2.3.12
// AVP: MIP-FA-RK (1506) 3GPP (10415)
type AVP_OctetString MIP_FA_RK;
// 5.2.3.13
// AVP: MIP-FA-RK-SPI (1507) 3GPP (10415)
type AVP_Unsigned32 MIP_FA_RK_SPI;
// 5.2.3.17
// AVP: PPR-Flags (1508) 3GPP (10415)
type AVP_Unsigned32 PPR_Flags;
// 5.2.3.18
// AVP: WLAN-Identifier (1509) 3GPP (10415)
type AVP_Grouped WLAN_Identifier;
// 8.2.3.19
// AVP: TWAN-Access-Info (1510) 3GPP (10415)
type AVP_Grouped TWAN_Access_Info;
// 8.2.3.20
// AVP: Access-Authorization-Flags (1511) 3GPP (10415)
type AVP_Unsigned32 Access_Authorization_Flags;
// 8.2.3.18
// AVP: TWAN-Default-APN-Context-Id (1512) 3GPP (10415)
type AVP_Unsigned32 TWAN_Default_APN_Context_Id;
// 9.2.3.1.4
// AVP: Trust-Relationship-Update (1515) 3GPP (10415)
type enumerated Trust_Relationship_Update {
REQUEST_UPDATE (1)
}
// 5.2.3.14
// AVP: Full-Network-Name (1516) 3GPP (10415)
type AVP_OctetString Full_Network_Name;
// 5.2.3.15
// AVP: Short-Network-Name (1517) 3GPP (10415)
type AVP_OctetString Short_Network_Name;
// 8.2.3.21
// AVP: AAA-Failure-Indication (1518) 3GPP (10415)
type AVP_Unsigned32 AAA_Failure_Indication;
// 5.2.3.19
// AVP: Transport-Access-Type (1519) 3GPP (10415)
type enumerated Transport_Access_Type
{
BBF (0)
}
// 5.2.3.20
// AVP: DER-Flags (1520) 3GPP (10415)
type AVP_Unsigned32 DER_Flags;
// 5.2.3.21
// AVP: DEA-Flags (1521) 3GPP (10415)
type AVP_Unsigned32 DEA_Flags;
// 9.2.3.1.5
// AVP: RAR-Flags (1522) 3GPP (10415)
type AVP_Unsigned32 RAR_Flags;
// 9.2.3.7
// AVP: DER-S6b-Flags (1523) 3GPP (10415)
type AVP_Unsigned32 DER_S6b_Flags;
// 5.2.3.22
// AVP: SSID (1524) 3GPP (10415)
type AVP_UTF8String SSID;
// 5.2.3.23
// AVP: HESSID (1525) 3GPP (10415)
type AVP_UTF8String HESSID;
// 5.2.3.24
// AVP: Access-Network-Info (1526) 3GPP (10415)
type AVP_Grouped Access_Network_Info;
// 5.2.3.25
// AVP: TWAN-Connection-Mode (1527) 3GPP (10415)
type AVP_Unsigned32 TWAN_Connection_Mode;
// 5.2.3.26
// AVP: TWAN-Connectivity-Parameters (1528) 3GPP (10415)
type AVP_Grouped TWAN_Connectivity_Parameters;
// 5.2.3.27
// AVP: Connectivity-Flags (1529) 3GPP (10415)
type AVP_Unsigned32 Connectivity_Flags;
// 5.2.3.28
// AVP: TWAN-PCO (1530) 3GPP (10415)
type AVP_Grouped TWAN_PCO;
// 5.2.3.29
// AVP: TWAG-CP-Address (1531) 3GPP (10415)
type AVP_Address TWAG_CP_Address;
// 5.2.3.30
// AVP: TWAG-UP-Address (1532) 3GPP (10415)
type AVP_UTF8String TWAG_UP_Address;
// 5.2.3.31
// AVP: TWAN-S2a-Failure-Cause (1533) 3GPP (10415)
type AVP_Unsigned32 TWAN_S2a_Failure_Cause;
// 5.2.3.33
// AVP: SM-Back-Off-Timer (1534) 3GPP (10415)
type AVP_Unsigned32 SM_Back_Off_Timer;
// 5.2.3.33
// AVP: WLCP-Key (1535) 3GPP (10415)
type AVP_OctetString WLCP_Key;
// 9.2.3.2.6
// AVP: Origination-Time-Stamp (1536) 3GPP (10415)
type AVP_Unsigned64 Origination_Time_Stamp;
// 9.2.3.2.7
// AVP: Maximum-Wait-Time (1537) 3GPP (10415)
type AVP_Unsigned32 Maximum_Wait_Time;
// 7.2.3.5
// AVP: Emergency-Services (1538) 3GPP (10415)
type AVP_Unsigned32 Emergency_Services;
// 7.2.3.5
// AVP: AAR-Flags (1539) 3GPP (10415)
type AVP_Unsigned32 AAR_Flags;
// 5.2.3.35
// AVP: IMEI-Check-In-VPLMN-Result (1540) 3GPP (10415)
type AVP_Unsigned32 IMEI_Check_In_VPLMN_Result;
// 8.2.3.27
// AVP: ERP-Authorization (1541) 3GPP (10415)
type AVP_Unsigned32 ERP_Authorization;
File mode changed from 100644 to 100755
......@@ -145,7 +145,12 @@ while [ $# -ge 1 ]; do
comm_name=`which $0`
comm_dir_name=`dirname $comm_name`
if [ -f "${comm_dir_name}/${AVPSCRIPT}" ]; then
echo "// Generated with command:" > ${TTCN3FILE}".ttcn"
echo "///////////////////////////////////////////////////" > ${TTCN3FILE}".ttcn"
echo "// //" >> ${TTCN3FILE}".ttcn"
echo "// !!!! Generated file, do not edit !!!! //" >> ${TTCN3FILE}".ttcn"
echo "// //" >> ${TTCN3FILE}".ttcn"
echo "///////////////////////////////////////////////////" >> ${TTCN3FILE}".ttcn"
echo "// Generated with command:" >> ${TTCN3FILE}".ttcn"
echo "// AVP.sh ${AWKARGS}" >> ${TTCN3FILE}".ttcn"
gawk -f ${comm_dir_name}/${AVPSCRIPT} ${AWKARGS} >> ${TTCN3FILE}".ttcn"
else
......
......@@ -78,9 +78,8 @@ BEGIN {
}
print "int encode_AVP_Grouped(unsigned char* & p, const AVP__Grouped& avp){"
print " int avp_len=0;"
print " unsigned char* start =p;"
print "int encode_AVP_Grouped(TTCN_Buffer & p, const AVP__Grouped& avp){"
print " size_t start_len =p.get_len();"
print " for (int count = 0; count < avp.size_of(); count++) {"
print " switch(avp[count].get_selection()){"
print " case GenericAVP::ALT_avp__undefined:{"
......@@ -107,20 +106,9 @@ BEGIN {
print " const AVP& avptype=avp[count].avp();"
print " const AVP__Header& avphdr=avptype.avp__header();"
print " encode_int_4byte(p, get_AVP_code_val(avphdr.avp__code()));"
print "#ifdef DPMG_USE_DETAILED_BITS"
print " encode_bits_1byte(p, avphdr.V__bit(), avphdr.M__bit(), avphdr.P__bit(),"
print " avphdr.r__bits());"
print "#else"
print " encode_octets(p, bit2oct(avphdr.VMPxxxxx()));"
print "#endif "
print " unsigned char* length_field=p;"
print " p+=3;"
print " if (avphdr.vendor__id().ispresent()){"
print " encode_int_4byte(p, avphdr.vendor__id()());"
print " }"
print " int encoded_octets=0;"
print " TTCN_Buffer avp_buffer;"
print " switch(avptype.avp__data().get_selection()){"
......@@ -182,20 +170,20 @@ BEGIN {
if($2 == "enumerated") {
if(enum_2_Unsigned32 || ((new_avp_code SP new_avp_vendor_id_code) in enum_replace_list)) {
AVP_type[new_avp_code SP new_avp_vendor_id_code] = "AVP_Unsigned32"
BUFFER = "(p, "
BUFFER = "(avp_buffer, "
TYPE = "AVP_Unsigned32"
printCaseCommand(BUFFER, TYPE)
} else {
AVP_type[new_avp_code SP new_avp_vendor_id_code] = "enumerated"
BUFFER = "(p,(int)"
BUFFER = "(avp_buffer,(int)"
TYPE = "AVP_enumerated"
printCaseCommand(BUFFER, TYPE)
}
next
} else {
AVP_type[new_avp_code SP new_avp_vendor_id_code] = $2
BUFFER = "(p,"
BUFFER = "(avp_buffer,"
TYPE = $2
printCaseCommand(BUFFER, TYPE)
}
......@@ -206,9 +194,19 @@ END {
print " default:"
print " break;"
print " }"
print " int avphdr_size = 8 + 4 * (avphdr.vendor__id().ispresent());"
print " avp_len=avphdr_size+encoded_octets;"
print " encode_int_3byte(length_field, (unsigned int) avp_len);"
print " encode_int_4byte(p, get_AVP_code_val(avphdr.avp__code()));"
print "#ifdef DPMG_USE_DETAILED_BITS"
print " encode_bits_1byte(p, avphdr.V__bit(), avphdr.M__bit(), avphdr.P__bit(),"
print " avphdr.r__bits());"
print "#else"
print " encode_octets(p, bit2oct(avphdr.VMPxxxxx()));"
print "#endif "
print " encode_int_3byte(p, (unsigned int) (8 + 4 * (avphdr.vendor__id().ispresent())+encoded_octets));"
print " if (avphdr.vendor__id().ispresent()){"
print " encode_int_4byte(p, avphdr.vendor__id()());"
print " }"
print " p.put_buf(avp_buffer);"
print " "
print " }"
print " break;"
......@@ -218,7 +216,7 @@ END {
print " }"
print " } // for AVPs"
print " "
print "return p-start;"
print "return p.get_len()-start_len;"
print "}"
print ""
print "int get_AVP_code_val(const AVP__Code& avpcodes){"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment