Commit 2b6014fa authored by pintar's avatar pintar
Browse files

Removal of m_BYE_Request_AS template due to general solution in LibIms

parent 6aacf4cc

BC/ttcn/AtsIms_Isc_TCFunctions.ttcn

+6 −6
Original line number Original line Diff line number Diff line
@@ -1016,7 +1016,7 @@ group InitialRequest { 
          f_awaitingBYE(mw_BYE_Request_Base(vc_callId));

          f_awaitingBYE(mw_BYE_Request_Base(vc_callId));





            f_setHeadersForwardRequestFromAS(vc_cSeq, PX_IMSR10_PROXY_MODE_FOR_AS);

            f_setHeadersForwardRequestFromAS(vc_cSeq, PX_IMSR10_PROXY_MODE_FOR_AS);

            f_SendBYE(m_BYE_Request_AS( vc_requestUri2, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_route, vc_recordRoute));

            f_SendBYE(m_BYE_Request_IMS( vc_requestUri2, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_route, vc_recordRoute));





            f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));

            f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));
@@ -2519,7 +2519,7 @@ group SubsequentRequest { 
		f_awaitingBYE(mw_BYE_Request_Base(vc_callId));

		f_awaitingBYE(mw_BYE_Request_Base(vc_callId));





 		f_setHeadersForwardRequestFromAS(vc_cSeq, PX_IMSR10_PROXY_MODE_FOR_AS);

 		f_setHeadersForwardRequestFromAS(vc_cSeq, PX_IMSR10_PROXY_MODE_FOR_AS);

        f_SendBYE(m_BYE_Request_AS( vc_requestUri2, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_route, vc_recordRoute));

        f_SendBYE(m_BYE_Request_IMS( vc_requestUri2, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_route, vc_recordRoute));





		f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));

		f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));
@@ -2760,7 +2760,7 @@ group TargetRefreshRequest { 
        f_awaitingBYE(mw_BYE_Request_Base(vc_callId));

        f_awaitingBYE(mw_BYE_Request_Base(vc_callId));





        f_setHeadersForwardRequestFromAS(vc_cSeq, PX_IMSR10_PROXY_MODE_FOR_AS);

        f_setHeadersForwardRequestFromAS(vc_cSeq, PX_IMSR10_PROXY_MODE_FOR_AS);

        f_SendBYE(m_BYE_Request_AS( vc_requestUri2, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_route, vc_recordRoute));

        f_SendBYE(m_BYE_Request_IMS( vc_requestUri2, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_route, vc_recordRoute));





        f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));

        f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));
@@ -2884,7 +2884,7 @@ group TargetRefreshRequest { 
        f_awaitingBYE(mw_BYE_Request_Base(vc_callId));

        f_awaitingBYE(mw_BYE_Request_Base(vc_callId));





        f_setHeadersForwardRequestFromAS(vc_cSeq, PX_IMSR10_PROXY_MODE_FOR_AS);

        f_setHeadersForwardRequestFromAS(vc_cSeq, PX_IMSR10_PROXY_MODE_FOR_AS);

        f_SendBYE(m_BYE_Request_AS( vc_requestUri2, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_route, vc_recordRoute));

        f_SendBYE(m_BYE_Request_IMS( vc_requestUri2, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_route, vc_recordRoute));





        f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));

        f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));
@@ -3151,7 +3151,7 @@ group TargetRefreshRequest { 
        f_awaitingBYE(mw_BYE_Request_Base(vc_callId));

        f_awaitingBYE(mw_BYE_Request_Base(vc_callId));





        f_setHeadersForwardRequestFromAS(vc_cSeq, PX_IMSR10_PROXY_MODE_FOR_AS);

        f_setHeadersForwardRequestFromAS(vc_cSeq, PX_IMSR10_PROXY_MODE_FOR_AS);

        f_SendBYE(m_BYE_Request_AS( vc_requestUri2, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_route, vc_recordRoute));

        f_SendBYE(m_BYE_Request_IMS( vc_requestUri2, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_route, vc_recordRoute));





        f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));

        f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));
@@ -3272,7 +3272,7 @@ group TargetRefreshRequest { 
        f_awaitingBYE(mw_BYE_Request_Base(vc_callId));

        f_awaitingBYE(mw_BYE_Request_Base(vc_callId));





        f_setHeadersForwardRequestFromAS(vc_cSeq, PX_IMSR10_PROXY_MODE_FOR_AS);

        f_setHeadersForwardRequestFromAS(vc_cSeq, PX_IMSR10_PROXY_MODE_FOR_AS);

        f_SendBYE(m_BYE_Request_AS( vc_requestUri2, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_route, vc_recordRoute));

        f_SendBYE(m_BYE_Request_IMS( vc_requestUri2, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_route, vc_recordRoute));





        f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));

        f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));

BC/ttcn/AtsIms_Templates.ttcn

+1 −12
Original line number Original line Diff line number Diff line
@@ -65,18 +65,7 @@ module AtsIms_Templates 
        group modified_templates {

        group modified_templates {

            group request_sent {

            group request_sent {

	  

	  

                template BYE_Request m_BYE_Request_AS

               

                    ( SipUrl p_requestUri, CallId p_callId, CSeq p_cSeq, From p_from, To p_to,

                    Via p_via, template Route p_route, template RecordRoute p_recordRoute)

                    modifies m_BYE_Request_Base

                    :=

                    {

                      msgHeader :=

                      {

                        route := p_route,

                        recordRoute := p_recordRoute 

                      }

                    }

            }//end group request_sent	

            }//end group request_sent	

            

            

            group request_receive { 

            group request_receive {