Some of Diego's comments added (869bf3b9) · Commits · TTCN-3 Libraries / LibIms

LibIms_Steps.ttcn

+60 −51

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,7 @@ module LibIms_Steps

	/*		/*
	*		*
	* @desc setting of BYE header fields (IMS addresses)		* @desc sets BYE header fields (IMS addresses)
	* extension of general settings from LibSip basic function		* extension of general settings from LibSip basic function
	* @param p_cSeq_s current cSeq		* @param p_cSeq_s current cSeq
	* @param p_to_user user_profile id of the user to send Bye		* @param p_to_user user_profile id of the user to send Bye
	@@ -49,7 +49,7 @@ module LibIms_Steps

	/**		/**
	*		*
	* @desc function set headers for forward request from AS in case if AS acts as Proxy		* @desc sets headers for forward request from AS in case if AS acts as Proxy
	*/		*/
	function f_setHeadersForwardRequestFromAS (inout CSeq p_cSeq_s) runs on ImsComponent		function f_setHeadersForwardRequestFromAS (inout CSeq p_cSeq_s) runs on ImsComponent
	{		{
	@@ -64,7 +64,7 @@ module LibIms_Steps

	/**		/**
	*		*
	* @desc function set headers for forward request from AS in case if AS acts as Proxy		* @desc sets header fields for forward request from AS in case if AS acts as Proxy
	*/		*/
	function f_setHeadersForwardResponseFromAS (inout CSeq p_cSeq_s) runs on ImsComponent		function f_setHeadersForwardResponseFromAS (inout CSeq p_cSeq_s) runs on ImsComponent
	{		{
	@@ -80,7 +80,7 @@ module LibIms_Steps

	/*		/*
	*		*
	* @desc setting of Invite header fields (IMS addresses)		* @desc sets Invite header fields (IMS addresses)
	* extension of general settings from LibSip basic function		* extension of general settings from LibSip basic function
	* @param p_cSeq_s current cSeq		* @param p_cSeq_s current cSeq
	* @param p_to_user user_profile id of the user to be invited		* @param p_to_user user_profile id of the user to be invited
	@@ -105,7 +105,7 @@ module LibIms_Steps

	/*		/*
	*		*
	* @desc setting of Message header fields (IMS addresses)		* @desc sets Message header fields (IMS addresses)
	* extension of general settings from LibSip basic function		* extension of general settings from LibSip basic function
	* @param p_cSeq_s current cSeq		* @param p_cSeq_s current cSeq
	* @param p_to_user user_profile id of the user to be invited		* @param p_to_user user_profile id of the user to be invited
	@@ -125,7 +125,7 @@ module LibIms_Steps

	/*		/*
	*		*
	* @desc setting of Notify header fields (IMS addresses)		* @desc sets Notify header fields (IMS addresses)
	* extension of general settings from LibSip basic function		* extension of general settings from LibSip basic function
	* @param p_cSeq_s current cSeq		* @param p_cSeq_s current cSeq
	* @param p_to_user user_profile id of the user to be invited		* @param p_to_user user_profile id of the user to be invited
	@@ -143,9 +143,9 @@ module LibIms_Steps

	}// end f_setHeadersNOTIFY		}// end f_setHeadersNOTIFY

	/*		/**
	*		**
	* @desc setting of Subscribe header fields (IMS addresses)		* @desc sets Subscribe header fields (IMS addresses)
	* extension of general settings from LibSip basic function		* extension of general settings from LibSip basic function
	* @param p_cSeq_s current cSeq		* @param p_cSeq_s current cSeq
	* @param p_to_user user_profile id of the user to be invited		* @param p_to_user user_profile id of the user to be invited
	@@ -171,6 +171,10 @@ module LibIms_Steps

	}// end f_setHeadersSUBSCRIBE		}// end f_setHeadersSUBSCRIBE

			/**
			* @desc sets headers for ReINVITE method on terminating side
			* @param p_cSeq_s current cSeq
			*/
	function f_setHeadersReINVITE (inout CSeq p_cSeq_s) runs on ImsComponent		function f_setHeadersReINVITE (inout CSeq p_cSeq_s) runs on ImsComponent
	{		{
	f_setHeadersGeneral(p_cSeq_s, "INVITE"); // cseq, contact, branch, via		f_setHeadersGeneral(p_cSeq_s, "INVITE"); // cseq, contact, branch, via
	@@ -184,8 +188,8 @@ module LibIms_Steps
	}// end function f_setHeadersReINVITE		}// end function f_setHeadersReINVITE

	/**		/**
	*		* @desc sets headers for ReINVITE method on terminating side
	* @desc function set headers for ReINVITE method on terminating side e.g. UE2		* @param p_cSeq_s current cSeq
	*/		*/
	function f_setHeadersReINVITE_ (inout CSeq p_cSeq_s) runs on ImsComponent		function f_setHeadersReINVITE_ (inout CSeq p_cSeq_s) runs on ImsComponent
	{		{
	@@ -203,7 +207,7 @@ module LibIms_Steps

	/**		/**
	*		*
	* @desc function for setting of component variables related to message header fields		* @desc sets component variables related to message header fields
	* when sending requests from the home I-CSCF (TS) to the visited P-CSCF (SUT)		* when sending requests from the home I-CSCF (TS) to the visited P-CSCF (SUT)
	* (message type independent: CSeq, contact, via), function uses information from		* (message type independent: CSeq, contact, via), function uses information from
	* userprofile and interfaceprofile		* userprofile and interfaceprofile
	@@ -235,7 +239,7 @@ module LibIms_Steps

	/**		/**
	*		*
	* @desc function sets header field for the next outgoing REGISTER message		* @desc sets header field for the next outgoing REGISTER message
	* from the visited P-CSCF to the home I-CSCF		* from the visited P-CSCF to the home I-CSCF
	* @param p_cSeq_s CSeq parameter to be applied		* @param p_cSeq_s CSeq parameter to be applied
	*/		*/
	@@ -286,7 +290,7 @@ module LibIms_Steps

	/*		/*
	*		*
	* @desc setting of REFER header fields (IMS addresses)		* @desc sets REFER header fields (IMS addresses)
	* extension of general settings from LibSip basic function		* extension of general settings from LibSip basic function
	* @param p_cSeq_s current cSeq		* @param p_cSeq_s current cSeq
	* @param p_to_user user_profile id of the user to be invited		* @param p_to_user user_profile id of the user to be invited
	@@ -310,7 +314,7 @@ module LibIms_Steps
	}// end f_setHeadersREFER		}// end f_setHeadersREFER

	/*		/*
	* @desc setting of REFER header fields (IMS addresses)		* @desc sets REFER header fields (IMS addresses)
	* extension of general settings from LibSip basic function		* extension of general settings from LibSip basic function
	* @param p_cSeq_s current cSeq		* @param p_cSeq_s current cSeq
	* @param p_uri SipUrl for request URI and To header		* @param p_uri SipUrl for request URI and To header
	@@ -352,7 +356,7 @@ module LibIms_Steps

	/*		/*
	*		*
	* @desc setting of user parameters with PIXIT values		* @desc sets user parameters with PIXIT values
	* @param p_user identifies the selected user configuration and location		* @param p_user identifies the selected user configuration and location
	* @verdict		* @verdict
	*/		*/
	@@ -691,7 +695,7 @@ module LibIms_Steps

	/*		/*
	*		*
	* @desc setting of user parameters with PIXIT values		* @desc sets user parameters with PIXIT values
	* @param p_user identifies the selected user configuration and location		* @param p_user identifies the selected user configuration and location
	* @verdict		* @verdict
	*/		*/
	@@ -748,7 +752,7 @@ module LibIms_Steps

	/*		/*
	*		*
	* @desc retrieve HostPort value of the interface profile		* @desc retrieves HostPort value of the interface profile
	* @param p_interface identifies the selected interface		* @param p_interface identifies the selected interface
	* @return HostPort template		* @return HostPort template
	*/		*/
	@@ -759,7 +763,7 @@ module LibIms_Steps

	/*		/*
	*		*
	* @desc retrieve DomainPort value of the interface profile		* @desc retrieves DomainPort value of the interface profile
	* @param p_interface identifies the selected interface		* @param p_interface identifies the selected interface
	* @return DomainPort template		* @return DomainPort template
	*/		*/
	@@ -769,7 +773,7 @@ module LibIms_Steps
	}		}

	/*		/*
	* @desc retrieve SipUrl of the interface profile		* @desc retrieves SipUrl of the interface profile
	* @param p_interface identifies the selected interface		* @param p_interface identifies the selected interface
	* @return SipUrl template		* @return SipUrl template
	*/		*/
	@@ -861,7 +865,7 @@ module LibIms_Steps

	/*		/*
	*		*
	* @desc Set variables and default initialization for user profile where proxy role is present		* @desc Sets variables and default initialization for user profile where proxy role is present
	* @param p_userprofile user profile of call		* @param p_userprofile user profile of call
	* @param p_cSeq_s cseq parameter		* @param p_cSeq_s cseq parameter
	*/		*/
	@@ -876,7 +880,7 @@ module LibIms_Steps

	/*		/*
	*		*
	* @desc Set variables and default initialization for user profile		* @desc Sets variables and default initialization for user profile
	* @param p_userprofile user profile of call		* @param p_userprofile user profile of call
	* @param p_cSeq_s cseq parameter		* @param p_cSeq_s cseq parameter
	*/		*/
	@@ -893,7 +897,7 @@ module LibIms_Steps

	/*		/*
	*		*
	* @desc Set variables and default initialization for user profile and handle registration and authentication with MD5		* @desc Sets variables and default initialization for user profile and handle registration and authentication with MD5
	* @param p_userprofile user profile of call		* @param p_userprofile user profile of call
	* @param p_cSeq_s cseq parameter		* @param p_cSeq_s cseq parameter
	* @param p_register register template		* @param p_register register template
	@@ -912,7 +916,7 @@ module LibIms_Steps

	/*		/*
	*		*
	* @desc Set variables and default initialization for user profile and handle registration and authentication with MD5		* @desc Sets variables and default initialization for user profile and handle registration and authentication with MD5
	* (basic registration template)		* (basic registration template)
	* @param p_userprofile user profile of call		* @param p_userprofile user profile of call
	* @param p_cSeq_s cseq parameter		* @param p_cSeq_s cseq parameter
	@@ -933,6 +937,11 @@ module LibIms_Steps

	group postambles {		group postambles {

			/*
			*
			* @desc Sets variables and default initialization for user profile and handle deregistration
			* @param p_cSeq_s cseq parameter
			*/
	function f_IMS_postamble_withDeRegistration (CSeq p_CSeq) runs on ImsComponent {		function f_IMS_postamble_withDeRegistration (CSeq p_CSeq) runs on ImsComponent {
	f_RemoveRegistration(p_CSeq); // TODO check if applicable for IMS		f_RemoveRegistration(p_CSeq); // TODO check if applicable for IMS

	@@ -999,7 +1008,7 @@ module LibIms_Steps

	/**		/**
	*		*
	* @desc function send BYE and awaits reponse		* @desc sends BYE and awaits response
	* @param p_CallId parameter for outgoing BYE		* @param p_CallId parameter for outgoing BYE
	* @param p_cSeq parameter for outgoing BYE		* @param p_cSeq parameter for outgoing BYE
	* @param p_from parameter for outgoing BYE		* @param p_from parameter for outgoing BYE
	@@ -1030,7 +1039,7 @@ module LibIms_Steps

	/**		/**
	*		*
	* @desc function send BYE and awaits reponse		* @desc sends BYE and awaits response
	* @param p_CallId parameter for outgoing BYE		* @param p_CallId parameter for outgoing BYE
	* @param p_cSeq parameter for outgoing BYE		* @param p_cSeq parameter for outgoing BYE
	* @param p_from parameter for outgoing BYE		* @param p_from parameter for outgoing BYE

LibIms_Templates.ttcn

+26 −26

Original line number	Original line	Diff line number	Diff line
	@@ -1574,8 +1574,8 @@ group request_send {
	contentLength := {fieldName := CONTENT_LENGTH_E, len:= f_MessageBodyLength(valueof(p_mb))},		contentLength := {fieldName := CONTENT_LENGTH_E, len:= f_MessageBodyLength(valueof(p_mb))},
	contentType := {fieldName := CONTENT_TYPE_E, mediaType := c_xmlAplication},		contentType := {fieldName := CONTENT_TYPE_E, mediaType := c_xmlAplication},
	event := {fieldName:=EVENT_E, eventType:="conference",eventParams:=omit},		event := {fieldName:=EVENT_E, eventType:="conference",eventParams:=omit},
	subscriptionState:={fieldName:=SUBSCRIPTION_STATE_E, subState:="active",substateParams:=omit}//,		subscriptionState:={fieldName:=SUBSCRIPTION_STATE_E, subState:="active",substateParams:=omit},
	//expires:={fieldName:=EXPIRES_E, deltaSec:="3600"}		expires:={fieldName:=EXPIRES_E, deltaSec:="3600"}

	},		},
	messageBody := p_mb		messageBody := p_mb