Loading ttcn/LibDiameter_Templates.ttcn +37 −37 Original line number Diff line number Diff line Loading @@ -628,9 +628,9 @@ module LibDiameter_Templates { aVP_Data := 1 } template LibDiameter_Types_Base_AVPs.SIP_Auth_Data_Item_AVP m_sIPAuthDataItem_dummy := { aVP_Header := m_aVP_HeaderVid_Mbit1(LibDiameter_TypesAndValues.c_sIP_Auth_Data_Item_AVP_Code, 1, c_vendId3gpp), sIP_Authentication_Scheme := m_sIPAuthenticationScheme_digest, template SIP_Auth_Data_Item_AVP_RFC m_sIPAuthDataItem_dummy_RFC := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Auth_Data_Item_AVP_Code_RFC, 1, c_vendId3gpp), sIP_Authentication_Scheme := m_sIPAuthenticationScheme_digest_RFC, sIP_Item_Number := omit, sIP_Authenticate := omit, sIP_Authorization := omit, Loading @@ -638,28 +638,28 @@ module LibDiameter_Templates { aVP_Type := omit } template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_digest := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code, 4, c_vendId3gpp), template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_digest_RFC := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit), aVP_Data := DIGEST_E } template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_unknown := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code, 4, c_vendId3gpp), template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_unknown_RFC := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit), aVP_Data := UNKNOWN_E } template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_digest_aka := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code, 4, c_vendId3gpp), template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_digest_aka_RFC := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit), aVP_Data := DIGEST_AKAv1_MD5_E } template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_nass := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code, 4, c_vendId3gpp), template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_nass_RFC := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit), aVP_Data := NASS_BUNDLE_E } template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_giga := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code, 4, c_vendId3gpp), template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_giga_RFC := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit), aVP_Data := GIBA_E } Loading Loading @@ -813,8 +813,8 @@ module LibDiameter_Templates { aVP_Data := p_avpData } template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme(template (value) SIP_Auth_Schm_Type p_SIPAuthSchmType) := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code, 4, omit), template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_RFC(template (value) SIP_Auth_Schm_Type p_SIPAuthSchmType) := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit), aVP_Data := p_SIPAuthSchmType } Loading @@ -823,19 +823,19 @@ module LibDiameter_Templates { aVP_Data := p_avpData } template SIP_Item_Number_AVP m_sIPItemNumber(template (value) UInt32 p_aVP_Data) := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Item_Number_AVP_Code, 4, omit), template SIP_Item_Number_AVP m_sIPItemNumber_RFC(template (value) UInt32 p_aVP_Data) := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Item_Number_AVP_Code_RFC, 4, omit), aVP_Data := p_aVP_Data } template SIP_Authorization_AVP m_sIP_Authorization( template SIP_Authorization_AVP_RFC m_sIP_Authorization_RFC( template (value) Digest_Username_AVP p_digest_Username, template (value) Digest_Realm_AVP p_digestRealm, template (value) Digest_Nonce_AVP p_digestNonce, template (value) Digest_URI_AVP p_digestUri, template (value) Digest_Response_AVP p_digest_Response ) := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authorization_AVP_Code, 4, omit), aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authorization_AVP_Code_RFC, 4, omit), digest_Username := p_digest_Username, digest_Realm := p_digestRealm, digest_Nonce := p_digestNonce, Loading @@ -852,13 +852,13 @@ module LibDiameter_Templates { aVP_Type := omit } template SIP_Authorization_AVP m_sIP_Authorization_digest_aka( template SIP_Authorization_AVP_RFC m_sIP_Authorization_digest_aka_RFC( template (value) Digest_Username_AVP p_digest_Username, template (value) Digest_Realm_AVP p_digestRealm, template (value) Digest_Nonce_AVP p_digestNonce, template (value) Digest_URI_AVP p_digestUri, template (value) Digest_Response_AVP p_digest_Response ) modifies m_sIP_Authorization := { ) modifies m_sIP_Authorization_RFC := { // TODO How to pass RAND + AUX } Loading Loading @@ -3120,9 +3120,9 @@ module LibDiameter_Templates { aVP_Data := ? } template LibDiameter_Types_Base_AVPs.SIP_Auth_Data_Item_AVP mw_sIPAuthDataItem_dummy := { aVP_Header := mw_aVP_HeaderVid_Mbit1(LibDiameter_TypesAndValues.c_sIP_Auth_Data_Item_AVP_Code, ?, c_vendId3gpp), sIP_Authentication_Scheme := mw_sIPAuthenticationScheme_digest, template SIP_Auth_Data_Item_AVP_RFC mw_sIPAuthDataItem_dummy_RFC := { aVP_Header := mw_aVP_HeaderVid_Mbit1(c_sIP_Auth_Data_Item_AVP_Code_RFC, ?, c_vendId3gpp), sIP_Authentication_Scheme := mw_sIPAuthenticationScheme_digest_RFC, sIP_Item_Number := omit, sIP_Authenticate := omit, sIP_Authorization := omit, Loading @@ -3130,26 +3130,26 @@ module LibDiameter_Templates { aVP_Type := omit } template (present) LibDiameter_Types_Base_AVPs.SIP_Auth_Data_Item_AVP mw_sIPAuthDataItem( template (present) SIP_Auth_Data_Item_AVP_RFC mw_sIPAuthDataItem_RFC( template (present) SIP_Authentication_Scheme_AVP p_sIP_Authentication_Scheme, template (present) SIP_Item_Number_AVP p_sIP_Item_Number := ?, template (present) SIP_Authenticate_AVP p_sIP_Authenticate := ?, template SIP_Authorization_AVP p_sIP_Authorization := omit ) modifies mw_sIPAuthDataItem_dummy := { aVP_Header := mw_aVP_HeaderVid_Mbit1(LibDiameter_TypesAndValues.c_sIP_Auth_Data_Item_AVP_Code, ?, c_vendId3gpp), ) modifies mw_sIPAuthDataItem_dummy_RFC := { aVP_Header := mw_aVP_HeaderVid_Mbit1(c_sIP_Auth_Data_Item_AVP_Code_RFC, ?, c_vendId3gpp), sIP_Authentication_Scheme := p_sIP_Authentication_Scheme, sIP_Item_Number := p_sIP_Item_Number, sIP_Authenticate := p_sIP_Authenticate, sIP_Authorization := p_sIP_Authorization } template SIP_Authentication_Scheme_AVP mw_sIPAuthenticationScheme_digest := { aVP_Header := mw_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code, ?, c_vendId3gpp), template SIP_Authentication_Scheme_AVP mw_sIPAuthenticationScheme_digest_RFC := { aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC), aVP_Data := ? } template SIP_Authentication_Scheme_AVP mw_sIPAuthenticationScheme_digest_aka := { aVP_Header := mw_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code, ?, c_vendId3gpp), template SIP_Authentication_Scheme_AVP mw_sIPAuthenticationScheme_digest_aka_RFC := { aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC), aVP_Data := DIGEST_AKAv1_MD5_E } Loading @@ -3158,8 +3158,8 @@ module LibDiameter_Templates { aVP_Data := p_avpData } template SIP_Authenticate_AVP mw_sIPAuthenticate_dummy := { aVP_Header := mw_aVP_HeaderVid_Mbit1(c_sIP_Authenticate_AVP_Code, ?, c_vendId3gpp), template SIP_Authenticate_AVP_RFC mw_sIPAuthenticate_dummy := { aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_sIP_Authenticate_AVP_Code_RFC), digest_Realm := ?, digest_Nonce := ?, digest_Domain := *, Loading @@ -3172,8 +3172,8 @@ module LibDiameter_Templates { aVP_Type := * } template SIP_Authorization_AVP mw_sIPAuthorization_dummy := { aVP_Header := mw_aVP_HeaderVid_Mbit1(c_sIP_Authorization_AVP_Code, ?, c_vendId3gpp), template SIP_Authorization_AVP_RFC mw_sIPAuthorization_dummy_RFC := { aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_sIP_Authorization_AVP_Code_RFC), digest_Username := ?, digest_Realm := ?, digest_Nonce := ?, Loading @@ -3190,7 +3190,7 @@ module LibDiameter_Templates { aVP_Type := * } template SIP_Authenticate_AVP mw_sIPAuthenticate_digest ( template SIP_Authenticate_AVP_RFC mw_sIPAuthenticate_digest ( template (present) Digest_Realm_AVP p_digest_Realm := ?, template (present) Digest_QoP_AVP p_digest_QoP := ?, template (present) Digest_HA1_AVP p_digest_HA1 := ? Loading @@ -3200,7 +3200,7 @@ module LibDiameter_Templates { digest_HA1 := p_digest_HA1 } template (present) SIP_Authenticate_AVP mw_sIPAuthenticate_digest_aka ( template (present) SIP_Authenticate_AVP_RFC mw_sIPAuthenticate_digest_aka ( template (present) Digest_Realm_AVP p_digest_Realm := ?, template (present) Digest_QoP_AVP p_digest_QoP := ?, template (present) Digest_HA1_AVP p_digest_HA1 := ? Loading ttcn/LibDiameter_TypesAndValues.ttcn +13 −8 Original line number Diff line number Diff line Loading @@ -117,14 +117,14 @@ group BasicTypesAndConstants{ const integer c_sIP_Accounting_Information_AVP_Code := 368; //Ref: RFC4740 9.1. SIP-Accounting-Information AVP const integer c_sIP_Accounting_Server_URI_AVP_Code := 369; //Ref: RFC4740 9.1.1. SIP-Accounting-Server-URI AVP const integer c_sIP_AOR_AVP_Code := 122; //Ref: RFC4740 9.8. SIP-AOR AVP const integer c_sIP_Auth_Data_Item_AVP_Code := 376; //Ref: RFC4740 9.5. SIP-Auth-Data-Item AVP const integer c_sIP_Authenticate_AVP_Code := 379; //Ref: RFC4740 9.5.3. SIP-Authenticate AVP const integer c_sIP_Auth_Data_Item_AVP_Code_RFC := 376; //Ref: RFC4740 9.5. SIP-Auth-Data-Item AVP const integer c_sIP_Authenticate_AVP_Code_RFC := 379; //Ref: RFC4740 9.5.3. SIP-Authenticate AVP const integer c_sIP_Authentication_Info_AVP_Code := 381; //Ref: RFC4740 9.5.5. SIP-Authentication-Info AVP const integer c_sIP_Authentication_Scheme_AVP_Code := 377; //Ref: RFC4740 9.5.1. SIP-Authentication-Scheme AVP const integer c_sIP_Authorization_AVP_Code := 380; //Ref: RFC4740 9.5.4. SIP-Authorization AVP const integer c_sIP_Authentication_Scheme_AVP_Code_RFC := 377; //Ref: RFC4740 9.5.1. SIP-Authentication-Scheme AVP const integer c_sIP_Authorization_AVP_Code_RFC := 380; //Ref: RFC4740 9.5.4. SIP-Authorization AVP const integer c_sIP_Credit_Control_Server_URI_AVP_Code := 370; //Ref: RFC4740 9.1.2. SIP-Credit-Control-Server-URI AVP const integer c_sIP_Deregistration_Reason_AVP_Code := 383; //Ref: RFC4740 9.5.5. SIP-Authentication-Info AVP const integer c_sIP_Item_Number_AVP_Code := 378; //Ref: RFC4740 9.5.2 SIP-Item-Number AVP const integer c_sIP_Item_Number_AVP_Code_RFC := 378; //Ref: RFC4740 9.5.2 SIP-Item-Number AVP const integer c_sIP_MandatoryCapability_AVP_Code := 373; //Ref: RFC4740 9.3.1. SIP-Mandatory-Capability AVP const integer c_sIP_Method_AVP_Code := 393; //Ref: RFC4740 9.14. SIP-Method AVP const integer c_sIP_Number_Auth_Items_AVP_Code_RFC := 382; //Ref: RFC4740 9.6. SIP-Number-Auth-Items AVP Loading Loading @@ -156,7 +156,12 @@ group BasicTypesAndConstants{ const integer c_optional_Capability_AVP_Code := 605; //Ref: TS 129.229 6.3.6 Optional_Capability const integer c_user_Data_AVP_Code := 606; //Ref: TS 129.229 6.3.7 User_Data const integer c_sIP_Number_Auth_Items_AVP_Code := 607; //Ref: TS 129.229 6.3.8 SIP-Number-Auth-Items AVP const integer c_sIP_Authentication_Scheme_AVP_Code := 608; //Ref: TS 129.229 6.3.9. SIP-Authentication-Scheme AVP const integer c_sIP_Authenticate_AVP_Code := 609; //Ref: TS 129.229 6.3.10 SIP-Authenticate AVP const integer c_sIP_Authorization_AVP_Code := 610; //Ref: TS 129.229 6.3.11 SIP-Authorization AVP const integer c_sIP_Authentication_Context_AVP_Code := 611; //Ref: TS 129.229 6.3.12 SIP_Authentication_Context const integer c_sIP_Auth_Data_Item_AVP_Code := 612; //Ref: TS 129.229 6.3.13 SIP-Auth-Data-Item AVP const integer c_sIP_Item_Number_AVP_Code := 613; //Ref: TS 129.229 6.3.14 SIP-Item-Number AVP const integer c_server_Assignment_Type_AVP_Code := 614; //Ref: TS 129.229 6.3.15 Server_Assignment_Type const integer c_deregistration_Reason_AVP_Code := 615; //Ref: TS 129.229 6.3.16 Deregistration_Reason const integer c_reason_Code_AVP_Code := 616; //Ref: TS 129.229 6.3.17 Reason_Code Loading Loading @@ -1607,7 +1612,7 @@ group BasicTypesAndConstants{ Public_Identity_AVP public_Identity optional, //required only in TS129 229 SIP_Server_URI_AVP sIP_Server_URI optional, //only in RFC4740 SIP_Number_Auth_Items_AVP sIP_Number_Auth_Items optional, //RFC4740 & required in TS129 229 LibDiameter_Types_CxDx_AVPs.SIP_Auth_Data_Item_AVP sIP_Auth_Data_Item optional, //required in TS129 229 SIP_Auth_Data_Item_AVP sIP_Auth_Data_Item optional, //required in TS129 229 Server_Name_AVP server_Name optional, //only TS129 229 set of Failed_AVP failed optional, //only TS129 229 set of Proxy_Info_AVP proxy_Info optional, //RFC4740 & TS129 229 Loading Loading @@ -1645,7 +1650,7 @@ group BasicTypesAndConstants{ Public_Identity_AVP public_Identity optional, //required only in TS129 229 SIP_AOR_AVP sIP_AOR optional, //only in RFC4740 SIP_Number_Auth_Items_AVP sIP_Number_Auth_Items optional, //RFC4740 & TS129 229 set of LibDiameter_Types_CxDx_AVPs.SIP_Auth_Data_Item_AVP sIP_Auth_Data_Item optional, //TS129 229 set of SIP_Auth_Data_Item_AVP sIP_Auth_Data_Item optional, //TS129 229 Auth_Grace_Period_AVP auth_Grace_Period optional, //only in RFC4740 Authorization_Lifetime_AVP authorization_Lifetime optional, //only in RFC4740 Redirect_Host_AVP redirect_Host optional, //only in RFC4740 Loading Loading @@ -1766,7 +1771,7 @@ group BasicTypesAndConstants{ set of Supported_Features_AVP supported_Features optional, //only TS129 229 User_Data_AVP user_Data optional, //only TS129 229 Charging_Information_AVP charging_Information optional, //only TS129 229 LibDiameter_Types_CxDx_AVPs.SIP_Auth_Data_Item_AVP sIP_Auth_Data_Item optional, //only TS129 229 SIP_Auth_Data_Item_AVP sIP_Auth_Data_Item optional, //only TS129 229 set of Proxy_Info_AVP proxy_Info optional, //RFC4740 & TS129 229 set of Route_Record_AVP route_Record optional, //RFC4740 & TS129 229 set of AVP_Type aVP_Type optional //RFC4740 & TS129 229 Loading ttcn/LibDiameter_Types_Base_AVPs.ttcn +30 −3 Original line number Diff line number Diff line Loading @@ -17,6 +17,7 @@ module LibDiameter_Types_Base_AVPs { // LibDiameter import from LibDiameter_Types_RfRo_AVPs all; import from LibDiameter_Types_Gx_AVPs all; import from LibDiameter_Types_CxDx_AVPs all; group AVPTypes{ group AVP_Base_Types{ Loading Loading @@ -1346,7 +1347,11 @@ module LibDiameter_Types_Base_AVPs { variant (aVP_Data) "condition=CodecHelper.leaveScope()" } type record SIP_Auth_Data_Item_AVP{ type union SIP_Auth_Data_Item_AVP { SIP_Auth_Data_Item_AVP_RFC sIP_Auth_Data_Item_AVP_RFC, //RFC type definition SIP_Auth_Data_Item_AVP_3GPP sIP_Auth_Data_Item_AVP_3GPP //3GPP type definition } type record SIP_Auth_Data_Item_AVP_RFC{ //Ref: RFC4740 9.5. SIP-Auth-Data-Item AVP AVP_Header aVP_Header,//SIP-Auth-Data-Item ::= < AVP Header: 376 > SIP_Authentication_Scheme_AVP sIP_Authentication_Scheme,//requ. Loading Loading @@ -1380,7 +1385,19 @@ module LibDiameter_Types_Base_AVPs { variant "present=bytes(4, 378);use=com.testingtech.ttcn.tci.codec.CodecHelper" variant (aVP_Data) "condition=CodecHelper.leaveScope()" } type record SIP_Authenticate_AVP{ type union SIP_Authenticate_AVP { SIP_Authenticate_AVP_RFC sIP_Authenticate_AVP_RFC, //RFC type definition SIP_Authenticate_AVP_3GPP sIP_Authenticate_AVP_3GPP //3GPP type definition } type record SIP_Authenticate_AVP_3GPP{ // Ref: 129 229 6.3.10. SIP-Authenticate AVP AVP_Header aVP_Header,//<AVP header: 609 ....> octetstring aVP_Data } type record SIP_Authenticate_AVP_RFC{ //Ref: RFC4740 9.5.3. SIP-Authenticate AVP AVP_Header aVP_Header,//SIP-Authenticate ::= < AVP Header: 379 > Digest_Realm_AVP digest_Realm,//requ. Loading @@ -1400,7 +1417,17 @@ module LibDiameter_Types_Base_AVPs { variant (aVP_Type) "fieldPresent=CodecHelper.isAvailable();condition=CodecHelper.leaveScope()" } type record SIP_Authorization_AVP{ type union SIP_Authorization_AVP { SIP_Authorization_AVP_RFC sIP_Authorization_AVP_RFC, //RFC type definition SIP_Authorization_AVP_3GPP sIP_Authorization_AVP_3GPP //3GPP type definition } type record SIP_Authorization_AVP_3GPP{ // Ref: 129 229 6.3.11. SIP-Authorization AVP AVP_Header aVP_Header,//SIP-Authorization ::= < AVP Header: 610 > octetstring aVP_Data } type record SIP_Authorization_AVP_RFC{ // Ref: RFC4740 9.5.4. SIP-Authorization AVP AVP_Header aVP_Header,//SIP-Authorization ::= < AVP Header: 380 > Digest_Username_AVP digest_Username,//requi. Loading ttcn/LibDiameter_Types_CxDx_AVPs.ttcn +1 −5 Original line number Diff line number Diff line Loading @@ -16,10 +16,6 @@ module LibDiameter_Types_CxDx_AVPs { group AVPCodeConstants { /** * ETSI TS 129 229 V10.5.0 (2013-04) Clause 6.3.13 SIP-Auth-Data-Item AVP */ const integer c_sIP_Auth_Data_Item_AVP_Code := 612; /** * ETSI TS 129 229 V10.5.0 (2013-04) Clause 6.3.42 Line-Identifier AVP */ Loading Loading @@ -445,7 +441,7 @@ module LibDiameter_Types_CxDx_AVPs { /** * ETSI TS 129 229 V10.5.0 (2013-04) Clause 6.3.13 SIP-Auth-Data-Item AVP */ type record SIP_Auth_Data_Item_AVP { type record SIP_Auth_Data_Item_AVP_3GPP { AVP_Header aVP_Header, //SIP-Auth-Data-Item ::= < AVP Header: 612 > SIP_Authentication_Scheme_AVP sIP_Authentication_Scheme optional, SIP_Item_Number_AVP sIP_Item_Number optional, Loading Loading
ttcn/LibDiameter_Templates.ttcn +37 −37 Original line number Diff line number Diff line Loading @@ -628,9 +628,9 @@ module LibDiameter_Templates { aVP_Data := 1 } template LibDiameter_Types_Base_AVPs.SIP_Auth_Data_Item_AVP m_sIPAuthDataItem_dummy := { aVP_Header := m_aVP_HeaderVid_Mbit1(LibDiameter_TypesAndValues.c_sIP_Auth_Data_Item_AVP_Code, 1, c_vendId3gpp), sIP_Authentication_Scheme := m_sIPAuthenticationScheme_digest, template SIP_Auth_Data_Item_AVP_RFC m_sIPAuthDataItem_dummy_RFC := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Auth_Data_Item_AVP_Code_RFC, 1, c_vendId3gpp), sIP_Authentication_Scheme := m_sIPAuthenticationScheme_digest_RFC, sIP_Item_Number := omit, sIP_Authenticate := omit, sIP_Authorization := omit, Loading @@ -638,28 +638,28 @@ module LibDiameter_Templates { aVP_Type := omit } template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_digest := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code, 4, c_vendId3gpp), template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_digest_RFC := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit), aVP_Data := DIGEST_E } template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_unknown := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code, 4, c_vendId3gpp), template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_unknown_RFC := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit), aVP_Data := UNKNOWN_E } template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_digest_aka := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code, 4, c_vendId3gpp), template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_digest_aka_RFC := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit), aVP_Data := DIGEST_AKAv1_MD5_E } template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_nass := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code, 4, c_vendId3gpp), template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_nass_RFC := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit), aVP_Data := NASS_BUNDLE_E } template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_giga := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code, 4, c_vendId3gpp), template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_giga_RFC := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit), aVP_Data := GIBA_E } Loading Loading @@ -813,8 +813,8 @@ module LibDiameter_Templates { aVP_Data := p_avpData } template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme(template (value) SIP_Auth_Schm_Type p_SIPAuthSchmType) := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code, 4, omit), template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_RFC(template (value) SIP_Auth_Schm_Type p_SIPAuthSchmType) := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit), aVP_Data := p_SIPAuthSchmType } Loading @@ -823,19 +823,19 @@ module LibDiameter_Templates { aVP_Data := p_avpData } template SIP_Item_Number_AVP m_sIPItemNumber(template (value) UInt32 p_aVP_Data) := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Item_Number_AVP_Code, 4, omit), template SIP_Item_Number_AVP m_sIPItemNumber_RFC(template (value) UInt32 p_aVP_Data) := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Item_Number_AVP_Code_RFC, 4, omit), aVP_Data := p_aVP_Data } template SIP_Authorization_AVP m_sIP_Authorization( template SIP_Authorization_AVP_RFC m_sIP_Authorization_RFC( template (value) Digest_Username_AVP p_digest_Username, template (value) Digest_Realm_AVP p_digestRealm, template (value) Digest_Nonce_AVP p_digestNonce, template (value) Digest_URI_AVP p_digestUri, template (value) Digest_Response_AVP p_digest_Response ) := { aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authorization_AVP_Code, 4, omit), aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authorization_AVP_Code_RFC, 4, omit), digest_Username := p_digest_Username, digest_Realm := p_digestRealm, digest_Nonce := p_digestNonce, Loading @@ -852,13 +852,13 @@ module LibDiameter_Templates { aVP_Type := omit } template SIP_Authorization_AVP m_sIP_Authorization_digest_aka( template SIP_Authorization_AVP_RFC m_sIP_Authorization_digest_aka_RFC( template (value) Digest_Username_AVP p_digest_Username, template (value) Digest_Realm_AVP p_digestRealm, template (value) Digest_Nonce_AVP p_digestNonce, template (value) Digest_URI_AVP p_digestUri, template (value) Digest_Response_AVP p_digest_Response ) modifies m_sIP_Authorization := { ) modifies m_sIP_Authorization_RFC := { // TODO How to pass RAND + AUX } Loading Loading @@ -3120,9 +3120,9 @@ module LibDiameter_Templates { aVP_Data := ? } template LibDiameter_Types_Base_AVPs.SIP_Auth_Data_Item_AVP mw_sIPAuthDataItem_dummy := { aVP_Header := mw_aVP_HeaderVid_Mbit1(LibDiameter_TypesAndValues.c_sIP_Auth_Data_Item_AVP_Code, ?, c_vendId3gpp), sIP_Authentication_Scheme := mw_sIPAuthenticationScheme_digest, template SIP_Auth_Data_Item_AVP_RFC mw_sIPAuthDataItem_dummy_RFC := { aVP_Header := mw_aVP_HeaderVid_Mbit1(c_sIP_Auth_Data_Item_AVP_Code_RFC, ?, c_vendId3gpp), sIP_Authentication_Scheme := mw_sIPAuthenticationScheme_digest_RFC, sIP_Item_Number := omit, sIP_Authenticate := omit, sIP_Authorization := omit, Loading @@ -3130,26 +3130,26 @@ module LibDiameter_Templates { aVP_Type := omit } template (present) LibDiameter_Types_Base_AVPs.SIP_Auth_Data_Item_AVP mw_sIPAuthDataItem( template (present) SIP_Auth_Data_Item_AVP_RFC mw_sIPAuthDataItem_RFC( template (present) SIP_Authentication_Scheme_AVP p_sIP_Authentication_Scheme, template (present) SIP_Item_Number_AVP p_sIP_Item_Number := ?, template (present) SIP_Authenticate_AVP p_sIP_Authenticate := ?, template SIP_Authorization_AVP p_sIP_Authorization := omit ) modifies mw_sIPAuthDataItem_dummy := { aVP_Header := mw_aVP_HeaderVid_Mbit1(LibDiameter_TypesAndValues.c_sIP_Auth_Data_Item_AVP_Code, ?, c_vendId3gpp), ) modifies mw_sIPAuthDataItem_dummy_RFC := { aVP_Header := mw_aVP_HeaderVid_Mbit1(c_sIP_Auth_Data_Item_AVP_Code_RFC, ?, c_vendId3gpp), sIP_Authentication_Scheme := p_sIP_Authentication_Scheme, sIP_Item_Number := p_sIP_Item_Number, sIP_Authenticate := p_sIP_Authenticate, sIP_Authorization := p_sIP_Authorization } template SIP_Authentication_Scheme_AVP mw_sIPAuthenticationScheme_digest := { aVP_Header := mw_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code, ?, c_vendId3gpp), template SIP_Authentication_Scheme_AVP mw_sIPAuthenticationScheme_digest_RFC := { aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC), aVP_Data := ? } template SIP_Authentication_Scheme_AVP mw_sIPAuthenticationScheme_digest_aka := { aVP_Header := mw_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code, ?, c_vendId3gpp), template SIP_Authentication_Scheme_AVP mw_sIPAuthenticationScheme_digest_aka_RFC := { aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC), aVP_Data := DIGEST_AKAv1_MD5_E } Loading @@ -3158,8 +3158,8 @@ module LibDiameter_Templates { aVP_Data := p_avpData } template SIP_Authenticate_AVP mw_sIPAuthenticate_dummy := { aVP_Header := mw_aVP_HeaderVid_Mbit1(c_sIP_Authenticate_AVP_Code, ?, c_vendId3gpp), template SIP_Authenticate_AVP_RFC mw_sIPAuthenticate_dummy := { aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_sIP_Authenticate_AVP_Code_RFC), digest_Realm := ?, digest_Nonce := ?, digest_Domain := *, Loading @@ -3172,8 +3172,8 @@ module LibDiameter_Templates { aVP_Type := * } template SIP_Authorization_AVP mw_sIPAuthorization_dummy := { aVP_Header := mw_aVP_HeaderVid_Mbit1(c_sIP_Authorization_AVP_Code, ?, c_vendId3gpp), template SIP_Authorization_AVP_RFC mw_sIPAuthorization_dummy_RFC := { aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_sIP_Authorization_AVP_Code_RFC), digest_Username := ?, digest_Realm := ?, digest_Nonce := ?, Loading @@ -3190,7 +3190,7 @@ module LibDiameter_Templates { aVP_Type := * } template SIP_Authenticate_AVP mw_sIPAuthenticate_digest ( template SIP_Authenticate_AVP_RFC mw_sIPAuthenticate_digest ( template (present) Digest_Realm_AVP p_digest_Realm := ?, template (present) Digest_QoP_AVP p_digest_QoP := ?, template (present) Digest_HA1_AVP p_digest_HA1 := ? Loading @@ -3200,7 +3200,7 @@ module LibDiameter_Templates { digest_HA1 := p_digest_HA1 } template (present) SIP_Authenticate_AVP mw_sIPAuthenticate_digest_aka ( template (present) SIP_Authenticate_AVP_RFC mw_sIPAuthenticate_digest_aka ( template (present) Digest_Realm_AVP p_digest_Realm := ?, template (present) Digest_QoP_AVP p_digest_QoP := ?, template (present) Digest_HA1_AVP p_digest_HA1 := ? Loading
ttcn/LibDiameter_TypesAndValues.ttcn +13 −8 Original line number Diff line number Diff line Loading @@ -117,14 +117,14 @@ group BasicTypesAndConstants{ const integer c_sIP_Accounting_Information_AVP_Code := 368; //Ref: RFC4740 9.1. SIP-Accounting-Information AVP const integer c_sIP_Accounting_Server_URI_AVP_Code := 369; //Ref: RFC4740 9.1.1. SIP-Accounting-Server-URI AVP const integer c_sIP_AOR_AVP_Code := 122; //Ref: RFC4740 9.8. SIP-AOR AVP const integer c_sIP_Auth_Data_Item_AVP_Code := 376; //Ref: RFC4740 9.5. SIP-Auth-Data-Item AVP const integer c_sIP_Authenticate_AVP_Code := 379; //Ref: RFC4740 9.5.3. SIP-Authenticate AVP const integer c_sIP_Auth_Data_Item_AVP_Code_RFC := 376; //Ref: RFC4740 9.5. SIP-Auth-Data-Item AVP const integer c_sIP_Authenticate_AVP_Code_RFC := 379; //Ref: RFC4740 9.5.3. SIP-Authenticate AVP const integer c_sIP_Authentication_Info_AVP_Code := 381; //Ref: RFC4740 9.5.5. SIP-Authentication-Info AVP const integer c_sIP_Authentication_Scheme_AVP_Code := 377; //Ref: RFC4740 9.5.1. SIP-Authentication-Scheme AVP const integer c_sIP_Authorization_AVP_Code := 380; //Ref: RFC4740 9.5.4. SIP-Authorization AVP const integer c_sIP_Authentication_Scheme_AVP_Code_RFC := 377; //Ref: RFC4740 9.5.1. SIP-Authentication-Scheme AVP const integer c_sIP_Authorization_AVP_Code_RFC := 380; //Ref: RFC4740 9.5.4. SIP-Authorization AVP const integer c_sIP_Credit_Control_Server_URI_AVP_Code := 370; //Ref: RFC4740 9.1.2. SIP-Credit-Control-Server-URI AVP const integer c_sIP_Deregistration_Reason_AVP_Code := 383; //Ref: RFC4740 9.5.5. SIP-Authentication-Info AVP const integer c_sIP_Item_Number_AVP_Code := 378; //Ref: RFC4740 9.5.2 SIP-Item-Number AVP const integer c_sIP_Item_Number_AVP_Code_RFC := 378; //Ref: RFC4740 9.5.2 SIP-Item-Number AVP const integer c_sIP_MandatoryCapability_AVP_Code := 373; //Ref: RFC4740 9.3.1. SIP-Mandatory-Capability AVP const integer c_sIP_Method_AVP_Code := 393; //Ref: RFC4740 9.14. SIP-Method AVP const integer c_sIP_Number_Auth_Items_AVP_Code_RFC := 382; //Ref: RFC4740 9.6. SIP-Number-Auth-Items AVP Loading Loading @@ -156,7 +156,12 @@ group BasicTypesAndConstants{ const integer c_optional_Capability_AVP_Code := 605; //Ref: TS 129.229 6.3.6 Optional_Capability const integer c_user_Data_AVP_Code := 606; //Ref: TS 129.229 6.3.7 User_Data const integer c_sIP_Number_Auth_Items_AVP_Code := 607; //Ref: TS 129.229 6.3.8 SIP-Number-Auth-Items AVP const integer c_sIP_Authentication_Scheme_AVP_Code := 608; //Ref: TS 129.229 6.3.9. SIP-Authentication-Scheme AVP const integer c_sIP_Authenticate_AVP_Code := 609; //Ref: TS 129.229 6.3.10 SIP-Authenticate AVP const integer c_sIP_Authorization_AVP_Code := 610; //Ref: TS 129.229 6.3.11 SIP-Authorization AVP const integer c_sIP_Authentication_Context_AVP_Code := 611; //Ref: TS 129.229 6.3.12 SIP_Authentication_Context const integer c_sIP_Auth_Data_Item_AVP_Code := 612; //Ref: TS 129.229 6.3.13 SIP-Auth-Data-Item AVP const integer c_sIP_Item_Number_AVP_Code := 613; //Ref: TS 129.229 6.3.14 SIP-Item-Number AVP const integer c_server_Assignment_Type_AVP_Code := 614; //Ref: TS 129.229 6.3.15 Server_Assignment_Type const integer c_deregistration_Reason_AVP_Code := 615; //Ref: TS 129.229 6.3.16 Deregistration_Reason const integer c_reason_Code_AVP_Code := 616; //Ref: TS 129.229 6.3.17 Reason_Code Loading Loading @@ -1607,7 +1612,7 @@ group BasicTypesAndConstants{ Public_Identity_AVP public_Identity optional, //required only in TS129 229 SIP_Server_URI_AVP sIP_Server_URI optional, //only in RFC4740 SIP_Number_Auth_Items_AVP sIP_Number_Auth_Items optional, //RFC4740 & required in TS129 229 LibDiameter_Types_CxDx_AVPs.SIP_Auth_Data_Item_AVP sIP_Auth_Data_Item optional, //required in TS129 229 SIP_Auth_Data_Item_AVP sIP_Auth_Data_Item optional, //required in TS129 229 Server_Name_AVP server_Name optional, //only TS129 229 set of Failed_AVP failed optional, //only TS129 229 set of Proxy_Info_AVP proxy_Info optional, //RFC4740 & TS129 229 Loading Loading @@ -1645,7 +1650,7 @@ group BasicTypesAndConstants{ Public_Identity_AVP public_Identity optional, //required only in TS129 229 SIP_AOR_AVP sIP_AOR optional, //only in RFC4740 SIP_Number_Auth_Items_AVP sIP_Number_Auth_Items optional, //RFC4740 & TS129 229 set of LibDiameter_Types_CxDx_AVPs.SIP_Auth_Data_Item_AVP sIP_Auth_Data_Item optional, //TS129 229 set of SIP_Auth_Data_Item_AVP sIP_Auth_Data_Item optional, //TS129 229 Auth_Grace_Period_AVP auth_Grace_Period optional, //only in RFC4740 Authorization_Lifetime_AVP authorization_Lifetime optional, //only in RFC4740 Redirect_Host_AVP redirect_Host optional, //only in RFC4740 Loading Loading @@ -1766,7 +1771,7 @@ group BasicTypesAndConstants{ set of Supported_Features_AVP supported_Features optional, //only TS129 229 User_Data_AVP user_Data optional, //only TS129 229 Charging_Information_AVP charging_Information optional, //only TS129 229 LibDiameter_Types_CxDx_AVPs.SIP_Auth_Data_Item_AVP sIP_Auth_Data_Item optional, //only TS129 229 SIP_Auth_Data_Item_AVP sIP_Auth_Data_Item optional, //only TS129 229 set of Proxy_Info_AVP proxy_Info optional, //RFC4740 & TS129 229 set of Route_Record_AVP route_Record optional, //RFC4740 & TS129 229 set of AVP_Type aVP_Type optional //RFC4740 & TS129 229 Loading
ttcn/LibDiameter_Types_Base_AVPs.ttcn +30 −3 Original line number Diff line number Diff line Loading @@ -17,6 +17,7 @@ module LibDiameter_Types_Base_AVPs { // LibDiameter import from LibDiameter_Types_RfRo_AVPs all; import from LibDiameter_Types_Gx_AVPs all; import from LibDiameter_Types_CxDx_AVPs all; group AVPTypes{ group AVP_Base_Types{ Loading Loading @@ -1346,7 +1347,11 @@ module LibDiameter_Types_Base_AVPs { variant (aVP_Data) "condition=CodecHelper.leaveScope()" } type record SIP_Auth_Data_Item_AVP{ type union SIP_Auth_Data_Item_AVP { SIP_Auth_Data_Item_AVP_RFC sIP_Auth_Data_Item_AVP_RFC, //RFC type definition SIP_Auth_Data_Item_AVP_3GPP sIP_Auth_Data_Item_AVP_3GPP //3GPP type definition } type record SIP_Auth_Data_Item_AVP_RFC{ //Ref: RFC4740 9.5. SIP-Auth-Data-Item AVP AVP_Header aVP_Header,//SIP-Auth-Data-Item ::= < AVP Header: 376 > SIP_Authentication_Scheme_AVP sIP_Authentication_Scheme,//requ. Loading Loading @@ -1380,7 +1385,19 @@ module LibDiameter_Types_Base_AVPs { variant "present=bytes(4, 378);use=com.testingtech.ttcn.tci.codec.CodecHelper" variant (aVP_Data) "condition=CodecHelper.leaveScope()" } type record SIP_Authenticate_AVP{ type union SIP_Authenticate_AVP { SIP_Authenticate_AVP_RFC sIP_Authenticate_AVP_RFC, //RFC type definition SIP_Authenticate_AVP_3GPP sIP_Authenticate_AVP_3GPP //3GPP type definition } type record SIP_Authenticate_AVP_3GPP{ // Ref: 129 229 6.3.10. SIP-Authenticate AVP AVP_Header aVP_Header,//<AVP header: 609 ....> octetstring aVP_Data } type record SIP_Authenticate_AVP_RFC{ //Ref: RFC4740 9.5.3. SIP-Authenticate AVP AVP_Header aVP_Header,//SIP-Authenticate ::= < AVP Header: 379 > Digest_Realm_AVP digest_Realm,//requ. Loading @@ -1400,7 +1417,17 @@ module LibDiameter_Types_Base_AVPs { variant (aVP_Type) "fieldPresent=CodecHelper.isAvailable();condition=CodecHelper.leaveScope()" } type record SIP_Authorization_AVP{ type union SIP_Authorization_AVP { SIP_Authorization_AVP_RFC sIP_Authorization_AVP_RFC, //RFC type definition SIP_Authorization_AVP_3GPP sIP_Authorization_AVP_3GPP //3GPP type definition } type record SIP_Authorization_AVP_3GPP{ // Ref: 129 229 6.3.11. SIP-Authorization AVP AVP_Header aVP_Header,//SIP-Authorization ::= < AVP Header: 610 > octetstring aVP_Data } type record SIP_Authorization_AVP_RFC{ // Ref: RFC4740 9.5.4. SIP-Authorization AVP AVP_Header aVP_Header,//SIP-Authorization ::= < AVP Header: 380 > Digest_Username_AVP digest_Username,//requi. Loading
ttcn/LibDiameter_Types_CxDx_AVPs.ttcn +1 −5 Original line number Diff line number Diff line Loading @@ -16,10 +16,6 @@ module LibDiameter_Types_CxDx_AVPs { group AVPCodeConstants { /** * ETSI TS 129 229 V10.5.0 (2013-04) Clause 6.3.13 SIP-Auth-Data-Item AVP */ const integer c_sIP_Auth_Data_Item_AVP_Code := 612; /** * ETSI TS 129 229 V10.5.0 (2013-04) Clause 6.3.42 Line-Identifier AVP */ Loading Loading @@ -445,7 +441,7 @@ module LibDiameter_Types_CxDx_AVPs { /** * ETSI TS 129 229 V10.5.0 (2013-04) Clause 6.3.13 SIP-Auth-Data-Item AVP */ type record SIP_Auth_Data_Item_AVP { type record SIP_Auth_Data_Item_AVP_3GPP { AVP_Header aVP_Header, //SIP-Auth-Data-Item ::= < AVP Header: 612 > SIP_Authentication_Scheme_AVP sIP_Authentication_Scheme optional, SIP_Item_Number_AVP sIP_Item_Number optional, Loading