Commit c52271c7 authored by nikolajev's avatar nikolajev
Browse files

Update to user input, after compilation with another ttcn-3 compiler

parent 6b3191c4

ttcn/LibSip_Steps.ttcn

+19 −12
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ group ParameterOperations { 
        var integer size_via_updated := size_via + 1;

        var ViaBody_List p_viaBody_List_updated;

        vc_branch := c_branchCookie & f_getRndTag();

        p_viaBody_List_updated[0] := m_ViaBody_currIpaddr(vc_branch, vc_userprofile);

        p_viaBody_List_updated[0] := valueof(m_ViaBody_currIpaddr(vc_branch, vc_userprofile));

        //p_viaBody_List_updated[0] := vc_request.msgHeader.route.routeBody[0];

        

        for (var integer i:=1; i<size_via_updated; i:=i+1) {
@@ -685,7 +685,7 @@ group ParameterOperations { 
     */	

    function f_updateRecordRouteHeaderAS(in template RecordRoute p_recordRoute) runs on SipComponent return RecordRoute

    {

        var RecordRoute v_recordRoute := m_recordRoute_currIpAddr_params(vc_userprofile, {{"lr",omit}});

        var RecordRoute v_recordRoute := valueof(m_recordRoute_currIpAddr_params(vc_userprofile, {{"lr",omit}}));

        var RouteBody_List v_routeBody_List;

        var integer size_recordRoute := 0;
@@ -2851,7 +2851,7 @@ group AwaitingMessage { 
			setverdict (pass);

		  }

	  }

	} //end f_awaitingResponsePassOnTimeout

	} //end f_awaitingNonePassOnTimeout

		

	/**

	 *
@@ -2963,7 +2963,10 @@ group AwaitingMessage { 
	function f_awaitingResponse(in template Response p_Response) runs on SipComponent

	{

	  tc_resp.start(PX_SIP_TRESP);

	  alt

	  a_awaitingResponse(p_Response);

	} //end f_awaitingResponse

	

	altstep a_awaitingResponse(in template Response p_Response) runs on SipComponent

	{

		[] SIPP.receive	(p_Response) -> value vc_response

		  {
@@ -2971,7 +2974,6 @@ group AwaitingMessage { 
			f_setHeadersOnReceiptOfResponse(vc_cSeq, vc_response);

			//setverdict(pass)

		  }

	  }

	} //end f_awaitingResponse

	

	// TODO STF471 addition
@@ -3644,7 +3646,7 @@ group SendMessage { 
	{

		vc_requestFor407 := valueof(p_request);

		SIPP.send(p_request) to vc_sent_label;

        vc_request := p_request;

        vc_request := vc_requestFor407;

		if(PX_SIP_INVITE_AUTHENTICATION_ENABLED) {a_altstep_401or407();};	

	}
@@ -4068,7 +4070,6 @@ group Registration { 
	  var Credentials v_credentials;

	  var template REGISTER_Request v_request;

	  var boolean v_receivedNotify := false;

	  var default v_notifyDef;

	  

	  // 		

	  if(vc_DeregDone)
@@ -4080,7 +4081,7 @@ group Registration { 
	  if (PX_SIP_REGISTRATION)

	  {

  	    // TODO STF471 added to receive Notify in case of Subcription and before 200OK for de-register

        v_notifyDef := activate(a_awaitNotify(mw_NOTIFY_Request_Base(vc_callIdSub), v_receivedNotify));

        //v_notifyDef := activate(a_awaitNotify(mw_NOTIFY_Request_Base(vc_callIdSub), v_receivedNotify));



		f_setHeaders_deREGISTER(p_cSeq);

		v_request := m_REGISTER_Request_expires(vc_requestUri, vc_callIdReg,
@@ -4118,14 +4119,20 @@ group Registration { 
        			f_setHeadersOnReceiptOfResponse(vc_cSeq, vc_response);

        			//log ("Authorization was not requested as expected");

				}

				[]a_awaitNotify(mw_NOTIFY_Request_Base(vc_callIdSub), v_receivedNotify)

				{}

			}

		}

		else

		{

		  f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callIdReg, p_cSeq));

			tc_resp.start(PX_SIP_TRESP);

	  		alt{

				[]a_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callIdReg, p_cSeq))

				{}

				[]a_awaitNotify(mw_NOTIFY_Request_Base(vc_callIdSub), v_receivedNotify)

				{}

			}

		}

		// TODO STF471 changed

		deactivate(v_notifyDef);

		

		// TODO STF471 changed

        //await NOTIFY and send reply 200 OK

ttcn/LibSip_Templates.ttcn

+2 −2
Original line number Diff line number Diff line
@@ -976,7 +976,7 @@ module LibSip_Templates 
		template Via mw_Via(template ViaBody p_viabody) :=

		{

		  fieldName := VIA_E,

		  viaBody:= superset(p_viabody)

		  viaBody:= {*,p_viabody,*}//superset(p_viabody)

		}

		

		template CallId mw_CallId_any :=
@@ -1033,7 +1033,7 @@ module LibSip_Templates 
		template RecordRoute mw_recordroute (template RouteBody p_routeBody):=

		{   

			fieldName := RECORD_ROUTE_E,

			routeBody := superset(p_routeBody)

			routeBody := {*,p_routeBody,*}//superset(p_routeBody)

		};

		

		template Route mw_route (template RouteBody_List p_routeBody):=