*AVP_RFC and *AVP_3GPP postifx changed into *RFC_AVP and *3GPP_AVP (d159264e) · Commits · TTCN-3 Libraries / LibDiameter

ttcn/LibDiameter_Templates.ttcn

+17 −17

Original line number	Original line	Diff line number	Diff line
	@@ -628,7 +628,7 @@ module LibDiameter_Templates {
	aVP_Data := 1		aVP_Data := 1
	}		}

	template SIP_Auth_Data_Item_AVP_RFC m_sIPAuthDataItem_dummy_RFC := {		template SIP_Auth_Data_Item_RFC_AVP m_sIPAuthDataItem_dummy_RFC := {
	aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Auth_Data_Item_AVP_Code_RFC, 1, c_vendId3gpp),		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_Authentication_Scheme := m_sIPAuthenticationScheme_digest_RFC,
	sIP_Item_Number := omit,		sIP_Item_Number := omit,
	@@ -639,35 +639,35 @@ module LibDiameter_Templates {
	}		}

	template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_digest_RFC := {		template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_digest_RFC := {
	sIP_Authentication_Scheme_AVP_RFC := {		sIP_Authentication_Scheme_RFC_AVP := {
	aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit),		aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit),
	aVP_Data := DIGEST_E		aVP_Data := DIGEST_E
	}		}
	}		}

	template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_unknown_RFC := {		template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_unknown_RFC := {
	sIP_Authentication_Scheme_AVP_RFC := {		sIP_Authentication_Scheme_RFC_AVP := {
	aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit),		aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit),
	aVP_Data := UNKNOWN_E		aVP_Data := UNKNOWN_E
	}		}
	}		}

	template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_digest_aka_RFC := {		template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_digest_aka_RFC := {
	sIP_Authentication_Scheme_AVP_RFC := {		sIP_Authentication_Scheme_RFC_AVP := {
	aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit),		aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit),
	aVP_Data := DIGEST_AKAv1_MD5_E		aVP_Data := DIGEST_AKAv1_MD5_E
	}		}
	}		}

	template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_nass_RFC := {		template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_nass_RFC := {
	sIP_Authentication_Scheme_AVP_RFC := {		sIP_Authentication_Scheme_RFC_AVP := {
	aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit),		aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit),
	aVP_Data := NASS_BUNDLE_E		aVP_Data := NASS_BUNDLE_E
	}		}
	}		}

	template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_giga_RFC := {		template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_giga_RFC := {
	sIP_Authentication_Scheme_AVP_RFC := {		sIP_Authentication_Scheme_RFC_AVP := {
	aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit),		aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit),
	aVP_Data := GIBA_E		aVP_Data := GIBA_E
	}		}
	@@ -824,7 +824,7 @@ module LibDiameter_Templates {
	}		}

	template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_RFC(template (value) SIP_Auth_Schm_Type p_SIPAuthSchmType) := {		template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_RFC(template (value) SIP_Auth_Schm_Type p_SIPAuthSchmType) := {
	sIP_Authentication_Scheme_AVP_RFC := {		sIP_Authentication_Scheme_RFC_AVP := {
	aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit),		aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit),
	aVP_Data := p_SIPAuthSchmType		aVP_Data := p_SIPAuthSchmType
	}		}
	@@ -840,7 +840,7 @@ module LibDiameter_Templates {
	aVP_Data := p_aVP_Data		aVP_Data := p_aVP_Data
	}		}

	template SIP_Authorization_AVP_RFC m_sIP_Authorization_RFC(		template SIP_Authorization_RFC_AVP m_sIP_Authorization_RFC(
	template (value) Digest_Username_AVP p_digest_Username,		template (value) Digest_Username_AVP p_digest_Username,
	template (value) Digest_Realm_AVP p_digestRealm,		template (value) Digest_Realm_AVP p_digestRealm,
	template (value) Digest_Nonce_AVP p_digestNonce,		template (value) Digest_Nonce_AVP p_digestNonce,
	@@ -864,7 +864,7 @@ module LibDiameter_Templates {
	aVP_Type := omit		aVP_Type := omit
	}		}

	template SIP_Authorization_AVP_RFC m_sIP_Authorization_digest_aka_RFC(		template SIP_Authorization_RFC_AVP m_sIP_Authorization_digest_aka_RFC(
	template (value) Digest_Username_AVP p_digest_Username,		template (value) Digest_Username_AVP p_digest_Username,
	template (value) Digest_Realm_AVP p_digestRealm,		template (value) Digest_Realm_AVP p_digestRealm,
	template (value) Digest_Nonce_AVP p_digestNonce,		template (value) Digest_Nonce_AVP p_digestNonce,
	@@ -3132,7 +3132,7 @@ module LibDiameter_Templates {
	aVP_Data := ?		aVP_Data := ?
	}		}

	template SIP_Auth_Data_Item_AVP_RFC mw_sIPAuthDataItem_dummy_RFC := {		template SIP_Auth_Data_Item_RFC_AVP mw_sIPAuthDataItem_dummy_RFC := {
	aVP_Header := mw_aVP_HeaderVid_Mbit1(c_sIP_Auth_Data_Item_AVP_Code_RFC, ?, c_vendId3gpp),		aVP_Header := mw_aVP_HeaderVid_Mbit1(c_sIP_Auth_Data_Item_AVP_Code_RFC, ?, c_vendId3gpp),
	sIP_Authentication_Scheme := mw_sIPAuthenticationScheme_digest_RFC,		sIP_Authentication_Scheme := mw_sIPAuthenticationScheme_digest_RFC,
	sIP_Item_Number := omit,		sIP_Item_Number := omit,
	@@ -3142,7 +3142,7 @@ module LibDiameter_Templates {
	aVP_Type := omit		aVP_Type := omit
	}		}

	template (present) SIP_Auth_Data_Item_AVP_RFC mw_sIPAuthDataItem_RFC(		template (present) SIP_Auth_Data_Item_RFC_AVP mw_sIPAuthDataItem_RFC(
	template (present) SIP_Authentication_Scheme_AVP p_sIP_Authentication_Scheme,		template (present) SIP_Authentication_Scheme_AVP p_sIP_Authentication_Scheme,
	template (present) SIP_Item_Number_AVP p_sIP_Item_Number := ?,		template (present) SIP_Item_Number_AVP p_sIP_Item_Number := ?,
	template (present) SIP_Authenticate_AVP p_sIP_Authenticate := ?,		template (present) SIP_Authenticate_AVP p_sIP_Authenticate := ?,
	@@ -3156,14 +3156,14 @@ module LibDiameter_Templates {
	}		}

	template SIP_Authentication_Scheme_AVP mw_sIPAuthenticationScheme_digest_RFC := {		template SIP_Authentication_Scheme_AVP mw_sIPAuthenticationScheme_digest_RFC := {
	sIP_Authentication_Scheme_AVP_RFC := {		sIP_Authentication_Scheme_RFC_AVP := {
	aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC),		aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC),
	aVP_Data := ?		aVP_Data := ?
	}		}
	}		}

	template SIP_Authentication_Scheme_AVP mw_sIPAuthenticationScheme_digest_aka_RFC := {		template SIP_Authentication_Scheme_AVP mw_sIPAuthenticationScheme_digest_aka_RFC := {
	sIP_Authentication_Scheme_AVP_RFC := {		sIP_Authentication_Scheme_RFC_AVP := {
	aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC),		aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC),
	aVP_Data := DIGEST_AKAv1_MD5_E		aVP_Data := DIGEST_AKAv1_MD5_E
	}		}
	@@ -3174,7 +3174,7 @@ module LibDiameter_Templates {
	aVP_Data := p_avpData		aVP_Data := p_avpData
	}		}

	template SIP_Authenticate_AVP_RFC mw_sIPAuthenticate_dummy := {		template SIP_Authenticate_RFC_AVP mw_sIPAuthenticate_dummy := {
	aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_sIP_Authenticate_AVP_Code_RFC),		aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_sIP_Authenticate_AVP_Code_RFC),
	digest_Realm := ?,		digest_Realm := ?,
	digest_Nonce := ?,		digest_Nonce := ?,
	@@ -3188,7 +3188,7 @@ module LibDiameter_Templates {
	aVP_Type := *		aVP_Type := *
	}		}

	template SIP_Authorization_AVP_RFC mw_sIPAuthorization_dummy_RFC := {		template SIP_Authorization_RFC_AVP mw_sIPAuthorization_dummy_RFC := {
	aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_sIP_Authorization_AVP_Code_RFC),		aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_sIP_Authorization_AVP_Code_RFC),
	digest_Username := ?,		digest_Username := ?,
	digest_Realm := ?,		digest_Realm := ?,
	@@ -3206,7 +3206,7 @@ module LibDiameter_Templates {
	aVP_Type := *		aVP_Type := *
	}		}

	template SIP_Authenticate_AVP_RFC mw_sIPAuthenticate_digest (		template SIP_Authenticate_RFC_AVP mw_sIPAuthenticate_digest (
	template (present) Digest_Realm_AVP p_digest_Realm := ?,		template (present) Digest_Realm_AVP p_digest_Realm := ?,
	template (present) Digest_QoP_AVP p_digest_QoP := ?,		template (present) Digest_QoP_AVP p_digest_QoP := ?,
	template (present) Digest_HA1_AVP p_digest_HA1 := ?		template (present) Digest_HA1_AVP p_digest_HA1 := ?
	@@ -3216,7 +3216,7 @@ module LibDiameter_Templates {
	digest_HA1 := p_digest_HA1		digest_HA1 := p_digest_HA1
	}		}

	template (present) SIP_Authenticate_AVP_RFC mw_sIPAuthenticate_digest_aka (		template (present) SIP_Authenticate_RFC_AVP mw_sIPAuthenticate_digest_aka (
	template (present) Digest_Realm_AVP p_digest_Realm := ?,		template (present) Digest_Realm_AVP p_digest_Realm := ?,
	template (present) Digest_QoP_AVP p_digest_QoP := ?,		template (present) Digest_QoP_AVP p_digest_QoP := ?,
	template (present) Digest_HA1_AVP p_digest_HA1 := ?		template (present) Digest_HA1_AVP p_digest_HA1 := ?

ttcn/LibDiameter_Types_Base_AVPs.ttcn

+15 −15

Original line number	Original line	Diff line number	Diff line
	@@ -216,7 +216,7 @@ module LibDiameter_Types_Base_AVPs {
	}		}
	}//end group AVP_Base_Types		}//end group AVP_Base_Types

	group AVP_RFC3588_Types{		group RFC_AVP3588_Types{

	type enumerated Result_Code_Type{		type enumerated Result_Code_Type{
	DIAMETER_DUMMY_E (0),		DIAMETER_DUMMY_E (0),
	@@ -1348,10 +1348,10 @@ module LibDiameter_Types_Base_AVPs {
	}		}

	type union 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_RFC_AVP sIP_Auth_Data_Item_RFC_AVP, //RFC type definition
	SIP_Auth_Data_Item_AVP_3GPP sIP_Auth_Data_Item_AVP_3GPP //3GPP type definition		SIP_Auth_Data_Item_3GPP_AVP sIP_Auth_Data_Item_3GPP_AVP //3GPP type definition
	}		}
	type record SIP_Auth_Data_Item_AVP_RFC{		type record SIP_Auth_Data_Item_RFC_AVP{
	//Ref: RFC4740 9.5. SIP-Auth-Data-Item AVP		//Ref: RFC4740 9.5. SIP-Auth-Data-Item AVP
	AVP_Header aVP_Header,//SIP-Auth-Data-Item ::= < AVP Header: 376 >		AVP_Header aVP_Header,//SIP-Auth-Data-Item ::= < AVP Header: 376 >
	SIP_Authentication_Scheme_AVP sIP_Authentication_Scheme,//requ.		SIP_Authentication_Scheme_AVP sIP_Authentication_Scheme,//requ.
	@@ -1367,11 +1367,11 @@ module LibDiameter_Types_Base_AVPs {
	}		}

	type union SIP_Authentication_Scheme_AVP{		type union SIP_Authentication_Scheme_AVP{
	SIP_Authentication_Scheme_AVP_RFC sIP_Authentication_Scheme_AVP_RFC,		SIP_Authentication_Scheme_RFC_AVP sIP_Authentication_Scheme_RFC_AVP,
	SIP_Authentication_Scheme_AVP_3GPP sIP_Authentication_Scheme_AVP_3GPP		SIP_Authentication_Scheme_3GPP_AVP sIP_Authentication_Scheme_3GPP_AVP
	}		}

	type record SIP_Authentication_Scheme_AVP_RFC{		type record SIP_Authentication_Scheme_RFC_AVP{
	//Ref: RFC4740 9.5.1. SIP-Authentication-Scheme AVP		//Ref: RFC4740 9.5.1. SIP-Authentication-Scheme AVP
	AVP_Header aVP_Header,//<AVP header: 377 ....>		AVP_Header aVP_Header,//<AVP header: 377 ....>
	SIP_Auth_Schm_Type aVP_Data		SIP_Auth_Schm_Type aVP_Data
	@@ -1392,17 +1392,17 @@ module LibDiameter_Types_Base_AVPs {
	}		}

	type union SIP_Authenticate_AVP {		type union SIP_Authenticate_AVP {
	SIP_Authenticate_AVP_RFC sIP_Authenticate_AVP_RFC, //RFC type definition		SIP_Authenticate_RFC_AVP sIP_Authenticate_RFC_AVP, //RFC type definition
	SIP_Authenticate_AVP_3GPP sIP_Authenticate_AVP_3GPP //3GPP type definition		SIP_Authenticate_3GPP_AVP sIP_Authenticate_3GPP_AVP //3GPP type definition
	}		}

	type record SIP_Authenticate_AVP_3GPP{		type record SIP_Authenticate_3GPP_AVP{
	// Ref: 129 229 6.3.10. SIP-Authenticate AVP		// Ref: 129 229 6.3.10. SIP-Authenticate AVP
	AVP_Header aVP_Header,//<AVP header: 609 ....>		AVP_Header aVP_Header,//<AVP header: 609 ....>
	octetstring aVP_Data		octetstring aVP_Data
	}		}

	type record SIP_Authenticate_AVP_RFC{		type record SIP_Authenticate_RFC_AVP{
	//Ref: RFC4740 9.5.3. SIP-Authenticate AVP		//Ref: RFC4740 9.5.3. SIP-Authenticate AVP
	AVP_Header aVP_Header,//SIP-Authenticate ::= < AVP Header: 379 >		AVP_Header aVP_Header,//SIP-Authenticate ::= < AVP Header: 379 >
	Digest_Realm_AVP digest_Realm,//requ.		Digest_Realm_AVP digest_Realm,//requ.
	@@ -1423,16 +1423,16 @@ module LibDiameter_Types_Base_AVPs {
	}		}

	type union SIP_Authorization_AVP {		type union SIP_Authorization_AVP {
	SIP_Authorization_AVP_RFC sIP_Authorization_AVP_RFC, //RFC type definition		SIP_Authorization_RFC_AVP sIP_Authorization_RFC_AVP, //RFC type definition
	SIP_Authorization_AVP_3GPP sIP_Authorization_AVP_3GPP //3GPP type definition		SIP_Authorization_3GPP_AVP sIP_Authorization_3GPP_AVP //3GPP type definition
	}		}
	type record SIP_Authorization_AVP_3GPP{		type record SIP_Authorization_3GPP_AVP{
	// Ref: 129 229 6.3.11. SIP-Authorization AVP		// Ref: 129 229 6.3.11. SIP-Authorization AVP
	AVP_Header aVP_Header,//SIP-Authorization ::= < AVP Header: 610 >		AVP_Header aVP_Header,//SIP-Authorization ::= < AVP Header: 610 >
	octetstring aVP_Data		octetstring aVP_Data
	}		}

	type record SIP_Authorization_AVP_RFC{		type record SIP_Authorization_RFC_AVP{
	// Ref: RFC4740 9.5.4. SIP-Authorization AVP		// Ref: RFC4740 9.5.4. SIP-Authorization AVP
	AVP_Header aVP_Header,//SIP-Authorization ::= < AVP Header: 380 >		AVP_Header aVP_Header,//SIP-Authorization ::= < AVP Header: 380 >
	Digest_Username_AVP digest_Username,//requi.		Digest_Username_AVP digest_Username,//requi.

ttcn/LibDiameter_Types_CxDx_AVPs.ttcn

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -441,7 +441,7 @@ module LibDiameter_Types_CxDx_AVPs {
	/**		/**
	* ETSI TS 129 229 Clause 6.3.9 SIP-Authentication-Scheme AVP		* ETSI TS 129 229 Clause 6.3.9 SIP-Authentication-Scheme AVP
	*/		*/
	type record SIP_Authentication_Scheme_AVP_3GPP{		type record SIP_Authentication_Scheme_3GPP_AVP{
	//Ref: RFC4740 9.5.1. SIP-Authentication-Scheme AVP		//Ref: RFC4740 9.5.1. SIP-Authentication-Scheme AVP
	AVP_Header aVP_Header,//<AVP header: 608 ....>		AVP_Header aVP_Header,//<AVP header: 608 ....>
	UTF8String aVP_Data		UTF8String aVP_Data
	@@ -450,7 +450,7 @@ module LibDiameter_Types_CxDx_AVPs {
	/**		/**
	* ETSI TS 129 229 V10.5.0 (2013-04) Clause 6.3.13 SIP-Auth-Data-Item AVP		* 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_3GPP {		type record SIP_Auth_Data_Item_3GPP_AVP {
	AVP_Header aVP_Header, //SIP-Auth-Data-Item ::= < AVP Header: 612 >		AVP_Header aVP_Header, //SIP-Auth-Data-Item ::= < AVP Header: 612 >
	SIP_Authentication_Scheme_AVP sIP_Authentication_Scheme optional,		SIP_Authentication_Scheme_AVP sIP_Authentication_Scheme optional,
	SIP_Item_Number_AVP sIP_Item_Number optional,		SIP_Item_Number_AVP sIP_Item_Number optional,

Admin message