resolution of TODOs (912d7ba1) · Commits · TTCN-3 Libraries / LibDiameter

ttcn/LibDiameter_Templates.ttcn

+8 −8

Original line number	Diff line number	Diff line
		@@ -1397,7 +1397,7 @@ module LibDiameter_Templates {
		failed := omit,
		redirect_Host := omit,
		redirect_Host_Usage := omit,
		redirect_Host_Cache_Time := omit,
		redirect_Max_Cache_Time := omit,
		proxy_Info := omit,
		aVP_Type := omit
		}
		@@ -1438,7 +1438,7 @@ module LibDiameter_Templates {
		failed := omit,
		redirect_Host := omit,
		redirect_Host_Usage := omit,
		redirect_Host_Cache_Time := omit,
		redirect_Max_Cache_Time := omit,
		proxy_Info := omit,
		aVP_Type := omit
		}
		@@ -1638,7 +1638,7 @@ module LibDiameter_Templates {
		failed := omit,
		redirect_Host := omit,
		redirect_Host_Usage := omit,
		redirect_Host_Cache_Time := omit,
		redirect_Max_Cache_Time := omit,
		proxy_Info := omit,
		aVP_Type := omit
		}
		@@ -1700,7 +1700,7 @@ module LibDiameter_Templates {
		origin_State_Id := omit,
		redirect_Host := omit,
		redirect_Host_Usage := omit,
		redirect_Host_Cache_Time := omit,
		redirect_Max_Cache_Time := omit,
		proxy_Info := omit,
		aVP_Type := omit
		}
		@@ -1770,7 +1770,7 @@ module LibDiameter_Templates {
		failed := *,
		redirect_Host := *,
		redirect_Host_Usage := *,
		redirect_Host_Cache_Time := *,
		redirect_Max_Cache_Time := *,
		proxy_Info := *,
		aVP_Type := *
		}
		@@ -1811,7 +1811,7 @@ module LibDiameter_Templates {
		failed := *,
		redirect_Host := *,
		redirect_Host_Usage := *,
		redirect_Host_Cache_Time := *,
		redirect_Max_Cache_Time := *,
		proxy_Info := *,
		aVP_Type := *
		}
		@@ -2011,7 +2011,7 @@ module LibDiameter_Templates {
		failed := *,
		redirect_Host := *,
		redirect_Host_Usage := *,
		redirect_Host_Cache_Time := *,
		redirect_Max_Cache_Time := *,
		proxy_Info := *,
		aVP_Type := *
		}
		@@ -2073,7 +2073,7 @@ module LibDiameter_Templates {
		origin_State_Id := *,
		redirect_Host := *,
		redirect_Host_Usage := *,
		redirect_Host_Cache_Time := *,
		redirect_Max_Cache_Time := *,
		proxy_Info := *,
		aVP_Type := *
		}

ttcn/LibDiameter_TypesAndValues.ttcn

+42 −22

Original line number	Diff line number	Diff line
		@@ -67,8 +67,8 @@ group BasicTypesAndConstants{
		const integer c_vendIdProxy_Info_AVP := 284; //Ref: RFC3588 6.7.2. Proxy-Info AVP
		const integer c_vendIdProxy_State_AVP := 33; //Ref: RFC3588 6.7.4. Proxy-State AVP
		const integer c_vendIdRe_Auth_Request_Type_AVP := 285; //Ref: RFC3588 8.12. Re-Auth-Request-Type AVP
		const integer c_vendIdRedirect_Host_AVP := 292; //TODO Ref: RFC3588 6.12. Redirect-Host AVP
		const integer c_vendIdRedirect_Host_Cache_Time_AVP := 9999; //TODO Ref: RFC3588 Redirect_Host_Cache_Time_AVP is not defined.
		const integer c_vendIdRedirect_Host_AVP := 292; //Ref: RFC3588 6.12. Redirect-Host AVP
		// const integer c_vendIdRedirect_Host_Cache_Time_AVP := 9999; //NOTE Ref: RFC3588 Redirect_Host_Cache_Time_AVP is NOT defined.
		const integer c_vendIdRedirect_Host_Usage_AVP := 261; //Ref: RFC3588 6.13. Redirect-Host-Usage AVP
		const integer c_vendIdResult_Code_AVP := 268; //Ref: RFC3588 7.1. Result-Code AVP
		const integer c_vendIdRoute_Record_AVP := 282; //Ref: RFC3588 6.7.1. Route-Record AVP
		@@ -537,7 +537,13 @@ group BasicTypesAndConstants{
		}

		type record QoSFilterRule{
		//TODO RFC3588 Define this type!!!
		//RFC3588 page 49
		UTF8String action_,
		UTF8String direction,
		UTF8String proto,
		IP_AddressMask src, //including optional ports
		IP_AddressMask dst, //including optional ports
		UTF8String options optional
		}

		type UInt32 AVP_Code (1..c_uInt32Max);
		@@ -654,7 +660,8 @@ group BasicTypesAndConstants{
		STATE_MAINTAINED_E (0),
		NO_STATE_MAINTAINED_E (1)
		};
		type DiameterURI SIP_AOR_Type;// TODO -check URI for this type !!!!
		type DiameterURI SIP_AOR_Type;// RFC 4740 sec. 9.8

		type enumerated SIP_User_Auth_Ty_Type{
		//Ref: RFC4740, section 9.10
		REGISTRATION_E (0),
		@@ -893,7 +900,7 @@ group BasicTypesAndConstants{
		CONTROL_E (4),
		TEXT_E (5),
		MESSAGE_E (6),
		OTHER_E (7) //TODO: OTHER is defined as c_uInt32Max = 0xFFFFFFFF
		OTHER_E (7) // OTHER is defined as c_uInt32Max = 0xFFFFFFFF
		};

		type enumerated Service_Info_Type{
		@@ -1429,8 +1436,8 @@ group BasicTypesAndConstants{
		Diameter_Identity aVP_Data
		};
		type record Redirect_Host_AVP{
		/*TODO Ref: RFC3588 6.12. Redirect-Host AVP
		In Ref aVP_Data type is not defined, I presume it should be Address. rmag */
		/* Ref: RFC3588 6.12. Redirect-Host AVP
		NOTE: In Ref aVP_Data type is not defined, I presume it should be Address. rmag */
		AVP_Header aVP_Header,//<AVP header: 292 ....>
		Address aVP_Data
		};
		@@ -1440,12 +1447,12 @@ group BasicTypesAndConstants{
		Redirect_Host_Usage_Type aVP_Data
		};

		type record Redirect_Host_Cache_Time_AVP{
		// TODO Ref: RFC3588 Redirect_Host_Cache_Time_AVP is not defined.
		// I presume it should be Time type. rmag
		AVP_Header aVP_Header,//<AVP header: ....>
		Time aVP_Data
		};
		// type record Redirect_Host_Cache_Time_AVP{
		// // NOTE Ref: RFC3588 Redirect_Host_Cache_Time_AVP is NOT defined.
		// // I presume it should be Time type. rmag
		// AVP_Header aVP_Header,//<AVP header: ....>
		// Time aVP_Data
		// };
		type record Accounting_Record_Type_AVP{
		//Ref: RFC3588 9.8.1. Accounting-Record-Type AVP
		AVP_Header aVP_Header,//<AVP header: 480 ....>
		@@ -1917,9 +1924,22 @@ group BasicTypesAndConstants{
		UTF8String aVP_Data
		};
		type record Supported_Features_AVP{
		// Ref: 3GPP TS 29.329 6.3.11 Supported-Features AVP
		// Ref: 3GPP TS 29.329 6.3.11 Supported-Features AVP (See 3GPP TS 29.229, clause 6.3.29)
		AVP_Header aVP_Header,//<AVP header: 628 ....>
		set of AVP_Type aVP_Data //TODO Badly referenced type.
		Vendor_Id_AVP vendor_Id,
		Feature_List_ID_AVP feature_list_Id optional,
		Feature_List_AVP feature_list,
		set of AVP_Type aVP_Data optional //other parameters.
		};
		type record Feature_List_ID_AVP{
		// Ref: 3GPP TS 29.229, clause 6.3.30
		AVP_Header aVP_Header,//<AVP header: 634 ....>
		UInt32 aVP_Data
		};
		type record Feature_List_AVP{
		// Ref: 3GPP TS 29.229, clause 6.3.31
		AVP_Header aVP_Header,//<AVP header: 634 ....>
		UInt32 aVP_Data
		};
		type record Wildcarded_PSI_AVP{
		// Ref: 3GPP TS 29.329 6.3.19 Wildcarded-PSI AVP , 3GPP TS 29.229
		@@ -2179,7 +2199,7 @@ group BasicTypesAndConstants{
		type record Restriction_Filter_Rule_AVP{
		// Ref: RFC4006 8.36. Restriction-Filter-Rule AVP
		AVP_Header aVP_Header,//< AVP Header: 438 >
		IPFilterRule_Type aVP_Data//TODO Find out about this type
		IPFilterRule_Type aVP_Data
		};
		type record Filter_Id_AVP{
		// Ref: RFC4005 6.7. Filter-Id AVP
		@@ -2424,7 +2444,7 @@ group BasicTypesAndConstants{
		Max_Requested_Bandwidth_UL_AVP max_Requested_Bw_Ul optional,
		Max_Requested_Bandwidth_DL_AVP max_Requested_Bw_Dl optional,
		Flow_Status_AVP flow_Status optional,
		Reservation_Priority_AVP reservation_Priority optional, //TODO: define type
		Reservation_Priority_AVP reservation_Priority optional,
		RS_Bandwidth_AVP rs_Bw optional,
		RR_Bandwidth_AVP rr_Bw optional,
		set of Codec_Data_AVP codec_data optional
		@@ -3618,7 +3638,7 @@ group BasicTypesAndConstants{
		set of Failed_AVP failed optional, //RFC3588 & TS 129 214 & TS 129 212
		set of Redirect_Host_AVP redirect_Host optional, //RFC3588 & TS 129 214
		Redirect_Host_Usage_AVP redirect_Host_Usage optional, //RFC3588 & TS 129 214
		Redirect_Host_Cache_Time_AVP redirect_Host_Cache_Time optional, //RFC3588 & TS 129 214
		Redirect_Max_Cache_Time_AVP redirect_Max_Cache_Time optional, //RFC3588 & TS 129 214
		set of Proxy_Info_AVP proxy_Info optional, //RFC3588 & TS 129 214 & TS 129 212
		set of AVP_Type aVP_Type optional //RFC3588 & TS 129 214 & TS 129 212
		}
		@@ -3703,7 +3723,7 @@ group BasicTypesAndConstants{
		set of Failed_AVP failed optional,
		set of Redirect_Host_AVP redirect_Host optional,
		Redirect_Host_Usage_AVP redirect_Host_Usage optional,
		Redirect_Host_Cache_Time_AVP redirect_Host_Cache_Time optional,
		Redirect_Max_Cache_Time_AVP redirect_Max_Cache_Time optional,
		set of Proxy_Info_AVP proxy_Info optional,
		set of AVP_Type aVP_Type optional
		}
		@@ -3742,7 +3762,7 @@ group BasicTypesAndConstants{
		Origin_State_Id_AVP origin_State_Id optional,
		set of Redirect_Host_AVP redirect_Host optional,
		Redirect_Host_Usage_AVP redirect_Host_Usage optional,
		Redirect_Host_Cache_Time_AVP redirect_Host_Cache_Time optional,
		Redirect_Max_Cache_Time_AVP redirect_Max_Cache_Time optional,
		set of Proxy_Info_AVP proxy_Info optional,
		set of AVP_Type aVP_Type optional
		}
		@@ -4397,7 +4417,7 @@ group BasicTypesAndConstants{
		set of Failed_AVP failed optional,
		set of Redirect_Host_AVP redirect_Host optional,
		Redirect_Host_Usage_AVP redirect_Host_Usage optional,
		Redirect_Host_Cache_Time_AVP redirect_Host_Cache_Time optional,
		Redirect_Max_Cache_Time_AVP redirect_Max_Cache_Time optional,
		set of Proxy_Info_AVP proxy_Info optional,
		set of AVP_Type aVP_Type optional
		}