Commit c2e21a72 authored by tepelmann's avatar tepelmann
Browse files

Further reduction of warnings.

parent 484244a7

ttcn/LibSip_Interface.ttcn

+9 −9
Original line number Diff line number Diff line
@@ -95,10 +95,10 @@ module LibSip_Interface 
	  var charstring vc_branch_SCSCF	:= "";



	  // SIP message header fields (for building next message)

	  var CallId	vc_callId    	:= c_empty_CallId;

	  var CallId	vc_callIdReg 	:= c_empty_CallId;

	  // TODO: TT change

      var CallId	vc_callIdSub 	:= c_empty_CallId;

	  var template(omit) CallId	vc_callId    	:= c_empty_CallId;

	  var template(omit) CallId	vc_callIdReg 	:= c_empty_CallId;

	  // TODO: STF471 added

      var template(omit) CallId	vc_callIdSub 	:= c_empty_CallId;

	  var From		vc_from      	:= c_empty_From;

	  var To		vc_to        	:= c_empty_To;

	  var To		vc_cancel_To 	:= c_empty_To;	// used for next CANCEL
@@ -106,17 +106,17 @@ module LibSip_Interface 
	  var Via 		vc_via_REG		:= c_empty_Via; // via used in last REGISTER

	  var ContentType vc_contentType:= c_empty_ContentType;//MRO

	  

	  var template(value) RecordRoute vc_recordRoute; 			 // value of RecordRoute header

	  var template(omit) RecordRoute vc_recordRoute; 			 // value of RecordRoute header

	  var boolean  vc_boo_recordRoute := false; // boolean indicates valid recordRoute

	  var template(omit) Route		vc_route; 					 // value of Route header

	  var template(omit) Route		vc_route_REG;				 // value of Route header from registration ServiceRoute header for initial Requests

	  var boolean  vc_boo_route 	:= false; 	 // boolean indicates valid Route



	  var Contact	vc_contact; 			// value of Contact header

	  var template(omit) Contact	vc_contact; 			// value of Contact header

	  var CSeq		vc_cSeq 		:= c_empty_cSeq;	// value of CSeq header

	  var template(value) RAck 		vc_rAck 		:= { fieldName := RACK_E, responseNum := 1, seqNumber := 1, method := "INVITE"}; // value of RAck header

	  var HostPort 	vc_reqHostPort 	:= {host:=PX_SIP_SUT_IPADDR, portField:=PX_SIP_SUT_PORT}; // address to send request

	  var Privacy 	vc_privacy;

	  var template(omit) Privacy 	vc_privacy;

	  var HistoryInfo_List vc_historyInfoList := {}; // value of history list according to RFC4244

	  var SipUrl 	  vc_confURI; 	 // conference URI according to TS124147 ch. 5.3.1.3.2

	  var SDP_Message vc_sdp_remote; // incoming SDP offers
@@ -124,14 +124,14 @@ module LibSip_Interface 
	  var XmlBody 	vc_xml_remote;	 // incoming XML value

	  var template XmlBody 	vc_xml_local;	 //SDP values to be sent

	  

	  var CSeq		vc_iut_CSeq 	:= c_empty_cSeq;	// value of last CSeq header used by the IUT in request

	  var template(omit) CSeq		vc_iut_CSeq 	:= c_empty_cSeq;	// value of last CSeq header used by the IUT in request

	  // To/From header-fields to be used if the callee will release the session

	  var To 		vc_callee_To 	:= c_empty_To; 

	  var From 		vc_callee_From 	:= c_empty_From;

	  // To/From header-fields to be used if the caller will release the session

	  var To 		vc_caller_To 	:= c_empty_To;

	  var From 		vc_caller_From	:= c_empty_From;

	  var Authorization vc_authorization;

	  var template(omit) Authorization vc_authorization;

	          

	  // variables for storing default references

	  var default 	vc_default;

ttcn/LibSip_Steps.ttcn

+50 −43
Original line number Diff line number Diff line
@@ -604,7 +604,9 @@ group ParameterOperations { 
	  {

		if (fx_putInLowercase(p_challenge[i].id) == v_id)

		{

		  v_result := p_challenge[i].paramValue;

			if (isvalue(p_challenge[i].paramValue)) {

		      v_result := valueof(p_challenge[i].paramValue);

			}

		}

	  }
@@ -1215,7 +1217,7 @@ group SetHeaders { 
	 * @desc setting of general and basic CANCEL header fields

	 * @param p_cSeq_s

	 */

	function f_setHeadersCANCEL(inout CSeq p_cSeq_s) runs on SipComponent

	function f_setHeadersCANCEL(inout template(value) CSeq p_cSeq_s) runs on SipComponent

	{      



		p_cSeq_s.method := "CANCEL";
@@ -1657,7 +1659,7 @@ group SetHeaders { 
		addressField := vc_caller_To.addressField,

		fromParams := vc_caller_To.toParams};



	  if (ispresent(p_Request.msgHeader.authorization)) {

	  if (isvalue(p_Request.msgHeader.authorization)) {

		vc_authorization := p_Request.msgHeader.authorization;

	    };
@@ -1755,7 +1757,7 @@ group SetHeaders { 
	   addressField := vc_caller_To.addressField,

	   fromParams := vc_caller_To.toParams};

        

	if (ispresent(p_Request.msgHeader.privacy)) {

	if (isvalue(p_Request.msgHeader.privacy)) {

		vc_privacy := p_Request.msgHeader.privacy;

		};
@@ -1839,7 +1841,7 @@ group SetHeaders { 
	function f_setHeadersOnReceiptOfRequest(Request p_Request) runs on SipComponent {

     vc_request := p_Request;

     vc_callId := p_Request.msgHeader.callId;

	 vc_cSeq := p_Request.msgHeader.cSeq;

	 vc_cSeq := valueof(p_Request.msgHeader.cSeq); //CSeq is mandatory

	 vc_iut_CSeq  := p_Request.msgHeader.cSeq;

	 vc_from := p_Request.msgHeader.fromField;

	 vc_caller_From := p_Request.msgHeader.fromField;
@@ -1853,12 +1855,12 @@ group SetHeaders { 
	 vc_boo_recordRoute:=false;

	  

	 //add tag field into To header if tag is not present

	 if (not(ispresent(p_Request.msgHeader.toField.toParams)))

	 if (not(isvalue(p_Request.msgHeader.toField.toParams)))

	 {

		vc_to.toParams := {{id := c_tagId, paramValue := f_getRndTag()}};

		vc_caller_To := vc_to;

	 }

	 if (ispresent(p_Request.msgHeader.recordRoute))

	 if (isvalue(p_Request.msgHeader.recordRoute))

	 {

	   vc_boo_recordRoute:=true;

	   vc_recordRoute := p_Request.msgHeader.recordRoute;
@@ -1875,7 +1877,7 @@ group SetHeaders { 
    function f_setHeadersOnReceiptOfResponse(inout CSeq p_cSeq, Response p_response) runs on SipComponent

   {

	 var integer v_i, v_j, v_nbroute;

	 var Contact v_contact; //only for local purpose

	 var template(omit) Contact v_contact; //only for local purpose

	       

	 vc_response := p_response;

	 //vc_cSeq := p_cSeq; //must not save global c_seq because it can overwrite temporary cSeq
@@ -1884,7 +1886,7 @@ group SetHeaders { 
	 vc_caller_To := vc_to;

	 vc_caller_From := vc_from;

      

	 if (ispresent(p_response.msgHeader.contact))

	 if (isvalue(p_response.msgHeader.contact))

	 {

	   v_contact := p_response.msgHeader.contact;

	   if (ischosen(v_contact.contactBody.contactAddresses))
@@ -1918,7 +1920,7 @@ group SetHeaders { 
	 vc_via:= p_response.msgHeader.via;

      

	 // Route Management

	 if (ispresent(p_response.msgHeader.recordRoute))

	 if (isvalue(p_response.msgHeader.recordRoute))

	 {

	   vc_recordRoute := p_response.msgHeader.recordRoute;

	   v_nbroute := lengthof(vc_recordRoute.routeBody);
@@ -1940,24 +1942,24 @@ group SetHeaders { 




	 // extentions due to new fields in PRACK and UPDATE messages

	 if (ispresent(p_response.msgHeader.rSeq)) {

	 if (isvalue(p_response.msgHeader.rSeq)) {

	 	vc_rAck := 

			 { fieldName := RACK_E, 

			   responseNum := valueof(p_response.msgHeader.rSeq.responseNum),

			   seqNumber := valueof(p_response.msgHeader.cSeq.seqNumber),

			   method := valueof(p_response.msgHeader.cSeq.method)

			   responseNum := valueof(p_response.msgHeader.rSeq).responseNum,

			   seqNumber := valueof(p_response.msgHeader.cSeq).seqNumber,

			   method := valueof(p_response.msgHeader.cSeq).method

			 };

		 };



	 // extentions due to new HistoryInfo fields 180 or 200OK messages

	 if (ispresent(p_response.msgHeader.historyInfo)) {

	 	vc_historyInfoList := valueof(p_response.msgHeader.historyInfo.historyInfoList);

	 if (isvalue(p_response.msgHeader.historyInfo)) {

	 	vc_historyInfoList := valueof(p_response.msgHeader.historyInfo).historyInfoList;

		vc_history_is_valid := true

		}

	   else {vc_history_is_valid := false};



	 //sdpMessageBody answer

	 if (ispresent(p_response.messageBody)) { 

	 if (isvalue(p_response.messageBody)) { 

		if ( ischosen(p_response.messageBody.sdpMessageBody))

		{

			vc_sdp_remote := p_response.messageBody.sdpMessageBody;
@@ -1996,10 +1998,10 @@ group SetHeaders { 
    function f_getServiceRouteMapIntoRouteInRegistration(inout CSeq p_cSeq, Response p_response) runs on SipComponent

   {

	 var integer v_i, v_j, v_nbroute;

	 var ServiceRoute v_serviceRoute;

	 var template(omit) ServiceRoute v_serviceRoute;

	       

	 // Route Management

	 if (ispresent(p_response.msgHeader.serviceRoute))

	 if (isvalue(p_response.msgHeader.serviceRoute))

	 {

	   v_serviceRoute := p_response.msgHeader.serviceRoute;

	   v_nbroute := lengthof(v_serviceRoute.routeBody);
@@ -2025,10 +2027,10 @@ group SetHeaders { 
    function f_getRouteMapIntoRecordRoute(inout CSeq p_cSeq, Request p_request) runs on SipComponent

   {

	 var integer v_i, v_j, v_nbroute;

	 var Route v_route;

	 var template(omit) Route v_route;

	       

	 // Route Management

	 if (ispresent(p_request.msgHeader.route))

	 if (isvalue(p_request.msgHeader.route))

	 {

	   v_route := p_request.msgHeader.route;

	   v_nbroute := lengthof(v_route.routeBody);
@@ -3599,7 +3601,7 @@ group SendMessage { 
 	* @desc  send ACK message, update the route and recordRoute header fields depending on boolean flags

 	* @param p_request template of the message to be sent

 	*/	

	function f_SendACK(template ACK_Request p_request) runs on SipComponent

	function f_SendACK(template(value) ACK_Request p_request) runs on SipComponent

	{

		//p_request.msgHeader.route 		:= f_route(); 		// update the route header field depending on vc_boo_route

		// n/a p_request.msgHeader.recordRoute := f_recordroute(); // update the route header field depending on vc_boo_route
@@ -3611,7 +3613,7 @@ group SendMessage { 
	* @desc  send BYE message, update the route and recordRoute header fields depending on boolean flags

	* @param p_request template of the message to be sent

	*/	

	function f_SendBYE(template BYE_Request p_request) runs on SipComponent

	function f_SendBYE(template(value) BYE_Request p_request) runs on SipComponent

	{

		SIPP.send(p_request) to vc_sent_label;	  

	}
@@ -3621,7 +3623,7 @@ group SendMessage { 
	* @desc  send CANCEL message

	* @param p_request template of the message to be sent

	*/	

	function f_SendCANCEL(template CANCEL_Request p_request) runs on SipComponent

	function f_SendCANCEL(template(value) CANCEL_Request p_request) runs on SipComponent

	{

		SIPP.send(p_request) to vc_sent_label;	  

	}
@@ -3631,7 +3633,7 @@ group SendMessage { 
	* @desc  send INFO message

	* @param p_request template of the message to be sent

	*/	

	function f_SendINFO(template INFO_Request p_request) runs on SipComponent

	function f_SendINFO(template(value) INFO_Request p_request) runs on SipComponent

	{

		f_setHeadersGeneral(vc_cSeq, "INFO"); // cseq, contact, branch, via

		SIPP.send(p_request) to vc_sent_label;
@@ -3712,7 +3714,7 @@ group SendMessage { 
	* @desc  send PUBLISH message

	* @param p_request template of the message to be sent

	*/

	function f_SendPUBLISH(template PUBLISH_Request p_request) runs on SipComponent

	function f_SendPUBLISH(template(value) PUBLISH_Request p_request) runs on SipComponent

	{

		SIPP.send(p_request) to vc_sent_label;	  

	}
@@ -3722,7 +3724,7 @@ group SendMessage { 
	* @desc  send REGISTER message

	* @param p_request template of the message to be sent

	*/

	function f_SendREGISTER(template REGISTER_Request p_request) runs on SipComponent

	function f_SendREGISTER(template(value) REGISTER_Request p_request) runs on SipComponent

	{

		SIPP.send(p_request) to vc_sent_label;	  

	}
@@ -3732,7 +3734,7 @@ group SendMessage { 
	* @desc  send SUBSCRIBE message

	* @param p_request template of the message to be sent

	*/

	function f_SendSUBSCRIBE(template SUBSCRIBE_Request p_request) runs on SipComponent

	function f_SendSUBSCRIBE(template(value) SUBSCRIBE_Request p_request) runs on SipComponent

	{

		SIPP.send(p_request) to vc_sent_label;	  

	}
@@ -3758,7 +3760,7 @@ group SendMessage { 
	 * @desc function send MESSAGE message

	 * @param p_request template of the message to be sent

	 */

	function f_SendMESSAGE(template MESSAGE_Request p_request) runs on SipComponent

	function f_SendMESSAGE(template(value) MESSAGE_Request p_request) runs on SipComponent

	{

		SIPP.send(p_request) to vc_sent_label;	  

	}
@@ -3768,7 +3770,7 @@ group SendMessage { 
	 * @desc function send NOTIFY message

	 * @param p_request template of the notify to be sent

	 */

	function f_SendNOTIFY(template NOTIFY_Request p_request) runs on SipComponent

	function f_SendNOTIFY(template(value) NOTIFY_Request p_request) runs on SipComponent

	{

		SIPP.send(p_request) to vc_sent_label;	  

	}
@@ -3778,7 +3780,7 @@ group SendMessage { 
	* @desc  send REFER message

	* @param p_request template of the message to be sent

	*/	

	function f_SendREFER(template REFER_Request p_request) runs on SipComponent

	function f_SendREFER(template(value) REFER_Request p_request) runs on SipComponent

	{

		SIPP.send(p_request) to vc_sent_label;

	}
@@ -3797,7 +3799,7 @@ group SendMessage { 
	* @desc  send response

	* @param p_request template of the message to be sent

	*/

	function f_sendResponse(template Response p_response) runs on SipComponent

	function f_sendResponse(template(value) Response p_response) runs on SipComponent

	{

		//p_response.msgHeader.route 		 := f_route(); 		// update the route header field depending on vc_boo_route//TODO check if route header is needed in responses

		p_response.msgHeader.recordRoute := f_recordroute(); // update the route header field depending on vc_boo_route
@@ -3951,7 +3953,7 @@ group Registration { 
	 * @param p_register	register template

	 * @param p_auth		flag indicating if authentication is needed

	 */

	function f_Registration(inout CSeq p_cSeq_s, out template REGISTER_Request p_register, in boolean p_auth) runs on SipComponent

	function f_Registration(inout CSeq p_cSeq_s, out template(value) REGISTER_Request p_register, in boolean p_auth) runs on SipComponent

	{

	  if (PX_SIP_REGISTRATION)

	  {
@@ -4006,7 +4008,7 @@ group Registration { 
	 * @param p_register	register template

	 * @param p_auth		flag indicating if authentication is needed

	 */

	function f_Registration_withTemplate(inout CSeq p_cSeq_s, inout template REGISTER_Request p_register, in boolean p_auth) runs on SipComponent

	function f_Registration_withTemplate(inout CSeq p_cSeq_s, inout template(value) REGISTER_Request p_register, in boolean p_auth) runs on SipComponent

	{

	  if (PX_SIP_REGISTRATION)

	  {
@@ -4068,7 +4070,7 @@ group Registration { 
	{

	  var CommaParam_List v_challenge;

	  var Credentials v_credentials;

	  var template REGISTER_Request v_request;

	  var template(value) REGISTER_Request v_request;

	  var boolean v_receivedNotify := false;

	  

	  //
@@ -4170,7 +4172,7 @@ group Registration { 
		 * @param p_cSeq_s		cseq parameter 

		 * @param p_subscribe	subscribe template

		 */

		function f_Subscription(inout CSeq p_cSeq_s,template SUBSCRIBE_Request p_subscribe) runs on SipComponent

		function f_Subscription(inout CSeq p_cSeq_s,template(value) SUBSCRIBE_Request p_subscribe) runs on SipComponent

		{

		  //f_setHeaders_SUBSCRIBE(p_cSeq_s);

		  //send SUBSCRIBE
@@ -4189,7 +4191,7 @@ group Registration { 
		 * @param p_subscribe	subscribe template

		 * @param p_notify		notify template

		 */

		function f_SubscriptionWithNotification(inout CSeq p_cSeq_s, template SUBSCRIBE_Request p_subscribe, template NOTIFY_Request p_notify) runs on SipComponent

		function f_SubscriptionWithNotification(inout CSeq p_cSeq_s, template(value) SUBSCRIBE_Request p_subscribe, template NOTIFY_Request p_notify) runs on SipComponent

		{

		  f_setHeaders_SUBSCRIBE(p_cSeq_s);

		  //send SUBSCRIBE
@@ -4306,7 +4308,7 @@ group Postambles { 
	  }

	} // end function f_terminateCall



	function f_cancelCall(template CANCEL_Request p_request)

	function f_cancelCall(template(value) CANCEL_Request p_request)

	runs on SipComponent

	{

	  // This function is called to bring back the IUT in idle condition
@@ -4325,7 +4327,7 @@ group Postambles { 
	  }

	}



    function f_cancelCall_await487(template CANCEL_Request p_request)

    function f_cancelCall_await487(template(value) CANCEL_Request p_request)

    runs on SipComponent

    {

      // This function is called to bring back the IUT in idle condition
@@ -4599,6 +4601,7 @@ group DefaultsTestStep 
	{

		var Response v_response;

		var Request v_request;

		var CSeq v_cSeq;

		 

		[] any timer.timeout 

		{
@@ -4636,7 +4639,8 @@ group DefaultsTestStep 
		//	ignore 181 if flag is set (following TS 183004 4.5.2.1)		  

		[vc_ignore181] SIPP.receive(mw_Response_Base(c_statusLine181,vc_callId, vc_cSeq))-> value v_response sender vc_sent_label

		  { 

			f_setHeadersOnReceiptOfResponse(v_response.msgHeader.cSeq, v_response); 

		  	v_cSeq := valueof(v_response.msgHeader.cSeq);

			f_setHeadersOnReceiptOfResponse(v_cSeq, v_response); //CSeq is mandatory 

			repeat;

		  }
@@ -4654,7 +4658,8 @@ group DefaultsTestStep 
		

		[vc_ignore4xx] SIPP.receive(mw_Response_Base(mw_statusLine4xx,vc_callId, ?))-> value v_response sender vc_sent_label

		  { 

			f_setHeadersOnReceiptOfResponse(v_response.msgHeader.cSeq, v_response); 

            v_cSeq := valueof(v_response.msgHeader.cSeq);

			f_setHeadersOnReceiptOfResponse(v_cSeq, v_response); //CSeq is mandatory 

			f_SendACK(m_ACK_Request_route(vc_requestUri, vc_callId, v_response.msgHeader.cSeq, vc_from, vc_to, vc_via, vc_route));

			repeat

		  }
@@ -4725,7 +4730,8 @@ group DefaultsTestStep 
		[] SIPP.receive(mw_Response_Base(mw_statusLine4xx, vc_callId, ?))-> value v_response sender vc_sent_label

		{ 

			setverdict(fail);

    		f_setHeadersOnReceiptOfResponse(v_response.msgHeader.cSeq, v_response); 

            v_cSeq := valueof(v_response.msgHeader.cSeq);

    		f_setHeadersOnReceiptOfResponse(v_cSeq, v_response); //CSeq is mandatory 

			LibSip_Steps.f_setHeadersACK();

    		f_SendACK(m_ACK_Request_route(vc_requestUri, vc_callId, v_response.msgHeader.cSeq, vc_from, vc_to, vc_via, vc_route));

//          TODO STF471 do we need an update here???
@@ -4736,7 +4742,8 @@ group DefaultsTestStep 
		[] SIPP.receive(mw_Response_Base(mw_statusLine5xx, vc_callId, ?))-> value v_response sender vc_sent_label

		{ 

			setverdict(fail);

			f_setHeadersOnReceiptOfResponse(v_response.msgHeader.cSeq, v_response); 

            v_cSeq := valueof(v_response.msgHeader.cSeq);

			f_setHeadersOnReceiptOfResponse(v_cSeq, v_response); //CSeq is mandatory 

			LibSip_Steps.f_setHeadersACK();

			f_SendACK(m_ACK_Request_route(vc_requestUri, vc_callId, v_response.msgHeader.cSeq, vc_from, vc_to, vc_via, vc_route));

//          TODO STF471 do we need an update here???

ttcn/LibSip_Templates.ttcn

+58 −59

File changed.

Preview size limit exceeded, changes collapsed.