Commit b8a8be56 authored by schmitting's avatar schmitting
Browse files

No commit message

No commit message
parent a642b922
Loading
Loading
Loading
Loading
+95 −199
Original line number Diff line number Diff line
@@ -267,15 +267,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		f_awaitingOkResponse(vc_cSeq);
            		
            		// send PRACK
            		f_SendPRACK(m_PRACK_Request_Base(
            			vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
            			vc_from, 
            			vc_to, 
            			vc_via,
            			vc_rAck
            		));
            		f_SendPRACK();
            		
            		// await 200 OK response
            		f_awaitingOkResponse(vc_cSeq);
@@ -307,15 +299,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		));
            		
					// send PRACK
            		f_SendPRACK(m_PRACK_Request_Base(
            			vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
            			vc_from, 
            			vc_to, 
            			vc_via,
            			vc_rAck
            		));
                    f_SendPRACK();
            		
            		// await 200 OK PRACK response
            		f_awaitingOkResponse(vc_cSeq);
@@ -657,15 +641,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		f_awaitingOkResponse(vc_cSeq);
            		
            		// send PRACK
            		f_SendPRACK(m_PRACK_Request_Base(
            			vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
            			vc_from, 
            			vc_to, 
            			vc_via,
            			vc_rAck
            		));
                    f_SendPRACK();
            		
            		// await 200 OK response
            		f_awaitingOkResponse(vc_cSeq);
@@ -697,15 +673,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		));
            		
					// send PRACK
            		f_SendPRACK(m_PRACK_Request_Base(
            			vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
            			vc_from, 
            			vc_to, 
            			vc_via,
            			vc_rAck
            		));
                    f_SendPRACK();
            		
            		// await 200 OK PRACK response
            		f_awaitingOkResponse(vc_cSeq);
@@ -1106,15 +1074,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		));
            		
            		// send PRACK
            		f_SendPRACK(m_PRACK_Request_Base(
            			vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
            			vc_from, 
            			vc_to, 
            			vc_via,
            			vc_rAck
            		));
                    f_SendPRACK();
            		
            		// await 200 OK response
            		f_awaitingOkResponse(vc_cSeq);
@@ -1147,15 +1107,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		));
            		
					// send PRACK
            		f_SendPRACK(m_PRACK_Request_Base(
            			vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
            			vc_from, 
            			vc_to, 
            			vc_via,
            			vc_rAck
            		));
                    f_SendPRACK();
            		
            		// await 200 OK PRACK response
            		f_awaitingOkResponse(vc_cSeq);
@@ -1489,11 +1441,11 @@ module AtsNIT_SipSip_BC_TCFunctions {
					
            		// send RE-INVITE
					vc_sdp_local := valueof(m_SDP_bandwidth(valueof(m_media_dynPT(PX_SIP_SDP_dyn, PX_SIP_SDP_encoding)), vc_userprofile)); // TODO check SDP
            		LibIms_Steps.f_setHeadersReINVITE(p_cSeq_s, false);
            		LibIms_Steps.f_setHeadersReINVITE(vc_cSeq, false);
	 				f_SendINVITE(m_INVITE_Request_UE(
	 					vc_requestUri, 
	 					vc_callId, 
	 					p_cSeq_s, 
                    	vc_cSeq, 
	 					vc_from, 
	 					vc_to, 
	 					vc_via, 
@@ -1529,8 +1481,8 @@ module AtsNIT_SipSip_BC_TCFunctions {
						vc_requestUri, 
						vc_callId, 
						vc_cSeq, 
						vc_callee_From, 
						vc_callee_To
                    	vc_from, 
                    	vc_to
					);
            		
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
@@ -1610,15 +1562,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		));
            		
            		// send PRACK
            		f_SendPRACK(m_PRACK_Request_Base(
            			vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
            			vc_from, 
            			vc_to, 
            			vc_via,
            			vc_rAck
            		));
                    f_SendPRACK();
            		
            		// await 200 OK response
            		f_awaitingOkResponse(vc_cSeq);
@@ -1651,15 +1595,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		));
            		
					// send PRACK
            		f_SendPRACK(m_PRACK_Request_Base(
            			vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
            			vc_from, 
            			vc_to, 
            			vc_via,
            			vc_rAck
            		));
                    f_SendPRACK();
            		
            		// await 200 OK PRACK response
            		f_awaitingOkResponse(vc_cSeq);
@@ -1698,14 +1634,8 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		// check media
            		f_check_Conversation();
            		
            		//SendBYE and await response
					f_terminateCall_UE(
						vc_requestUri, 
						vc_callId, 
						vc_cSeq, 
						vc_caller_From, 
						vc_caller_To
					);
					//await BYE and send 200OK
                    f_awaitingBYE_sendReply(mw_BYE_Request_Base(vc_callId));
            		
                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
            		
@@ -1800,11 +1730,11 @@ module AtsNIT_SipSip_BC_TCFunctions {
					
					// send RE-INVITE
					vc_sdp_local := valueof(m_SDP_bandwidth(valueof(m_media_dynPT(PX_SIP_SDP_dyn, PX_SIP_SDP_encoding)), vc_userprofile)); // TODO check SDP
            		LibIms_Steps.f_setHeadersReINVITE(p_cSeq_s, false);
            		LibIms_Steps.f_setHeadersReINVITE(vc_cSeq, false);
	 				f_SendINVITE(m_INVITE_Request_UE(
	 					vc_requestUri, 
	 					vc_callId, 
	 					p_cSeq_s, 
                   		vc_cSeq, 
	 					vc_from, 
	 					vc_to, 
	 					vc_via, 
@@ -1835,8 +1765,14 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		// check media
            		f_check_Conversation();
            		
            		//await BYE and send 200OK
					f_awaitingBYE_sendReply(mw_BYE_Request_Base(vc_callId));
                    //SendBYE and await response
                    f_terminateCall_UE(
                        vc_requestUri, 
                        vc_callId, 
                        vc_cSeq, 
                        vc_from, 
                        vc_to
                    );
					
                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
            		
@@ -1898,15 +1834,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		));
            		
            		// send PRACK
            		f_SendPRACK(m_PRACK_Request_Base(
            			vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
            			vc_from, 
            			vc_to, 
            			vc_via,
            			vc_rAck
            		));
                    f_SendPRACK();
            		
            		// await 200 OK PRACK response
            		f_awaitingOkResponse(vc_cSeq);
@@ -1918,7 +1846,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		f_SendACK(m_ACK_Request_Base(
            			vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
                    	v_INVITE_CSeq, 
            			vc_from, 
            			vc_to, 
            			vc_via
@@ -1942,6 +1870,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
				*/
				function f_AtsNIT_TC_SS___CN__05UE2(in CSeq p_cSeq_s) runs on ImsComponent {
                    var REGISTER_Request v_register;
                    var Via v_via;
                                
                    v_register :=
                    valueof(m_REGISTER_Request_Base(vc_requestUri, vc_callId,
@@ -1973,15 +1902,21 @@ module AtsNIT_SipSip_BC_TCFunctions {
						vc_caller_To, 
						vc_via,
						vc_contact,
						mw_require_100rel,
						m_Require_100rel,
						m_MBody_SDP(vc_sdp_local)
					));
					
                    p_cSeq_s := vc_cSeq;
                    v_via := vc_via;
                    
					// await PRACK
					f_awaitingPRACK_sendReply(
						mw_PRACK_Request_Base(vc_callId)
					);
					
                    vc_cSeq := p_cSeq_s;
                    vc_via := v_via;
					
					// send 200 OK Invite
					f_send200OK(); // TODO must be checked
            		
@@ -2051,7 +1986,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		
            		// await 183 response
            		f_awaitingResponse(mw_Response_messageBody(
            			c_statusLine180,
            			c_statusLine183,
            			vc_callId, 
            			vc_cSeq,
            			mw_require_100rel,
@@ -2059,15 +1994,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		));
            		
            		// send PRACK
            		f_SendPRACK(m_PRACK_Request_Base(
            			vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
            			vc_from, 
            			vc_to, 
            			vc_via,
            			vc_rAck
            		));
                    f_SendPRACK();
            		
            		// await 200 OK PRACK response
            		f_awaitingOkResponse(vc_cSeq);
@@ -2076,7 +2003,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		f_awaitingResponse(mw_Response_Base(
            			c_statusLine180,
            			vc_callId, 
            			vc_cSeq
                    	v_INVITE_CSeq
            		));
            		
            		// await 200 OK INVITE response
@@ -2086,7 +2013,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		f_SendACK(m_ACK_Request_Base(
            			vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
                    	v_INVITE_CSeq, 
            			vc_from, 
            			vc_to, 
            			vc_via
@@ -2110,6 +2037,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
				*/
				function f_AtsNIT_TC_SS___CN__06UE2(in CSeq p_cSeq_s) runs on ImsComponent {
                    var REGISTER_Request v_register;
                    var Via v_via;
                    
                    v_register :=
                    valueof(m_REGISTER_Request_Base(vc_requestUri, vc_callId,
@@ -2141,15 +2069,21 @@ module AtsNIT_SipSip_BC_TCFunctions {
						vc_caller_To, 
						vc_via,
						vc_contact,
						mw_require_100rel,
						m_Require_100rel,
						m_MBody_SDP(vc_sdp_local)
					));
					
                    p_cSeq_s := vc_cSeq;
                    v_via := vc_via;
					
					// await PRACK
					f_awaitingPRACK_sendReply(
						mw_PRACK_Request_Base(vc_callId)
					);
					
                    vc_cSeq := p_cSeq_s;
                    vc_via := v_via;
					
					// send 180 response 
					f_sendResponse(m_Response_18XonINVITE_UE(
						c_statusLine180,
@@ -2570,15 +2504,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		));
            		
            		// send PRACK
            		f_SendPRACK(m_PRACK_Request_Base(
            			vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
            			vc_from, 
            			vc_to, 
            			vc_via,
            			vc_rAck
            		));
                    f_SendPRACK();
            		
            		// await 200 OK response
            		f_awaitingOkResponse(vc_cSeq);
@@ -2611,15 +2537,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		));
            		
					// send PRACK
            		f_SendPRACK(m_PRACK_Request_Base(
            			vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
            			vc_from, 
            			vc_to, 
            			vc_via,
            			vc_rAck
            		));
                    f_SendPRACK();
            		
            		// await 200 OK PRACK response
            		f_awaitingOkResponse(vc_cSeq);
@@ -2906,8 +2824,8 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		    vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
            			vc_from, 
            			vc_to, 
                    	vc_callee_From, 
                    	vc_callee_To, 
            			vc_via, 
            			vc_contact, 
            			m_MBody_SDP(vc_sdp_local) // TODO SDP body shall be changed? 
@@ -3003,15 +2921,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		));
            		
            		// send PRACK
            		f_SendPRACK(m_PRACK_Request_Base(
            			vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
            			vc_from, 
            			vc_to, 
            			vc_via,
            			vc_rAck
            		));
                    f_SendPRACK();
            		
            		// await 200 OK response
            		f_awaitingOkResponse(vc_cSeq);
@@ -3044,15 +2954,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		));
            		
					// send PRACK
            		f_SendPRACK(m_PRACK_Request_Base(
            			vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
            			vc_from, 
            			vc_to, 
            			vc_via,
            			vc_rAck
            		));
                    f_SendPRACK();
            		
            		// await 200 OK PRACK response
            		f_awaitingOkResponse(vc_cSeq);
@@ -3183,8 +3085,8 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		    vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
            			vc_from, 
            			vc_to, 
            			vc_callee_From, 
                    	vc_callee_To, 
            			vc_via, 
            			vc_contact, 
            			m_MBody_SDP(vc_sdp_local) // TODO SDP body shall be changed? 
@@ -3262,15 +3164,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		f_awaitingResponse(v_response);
            		
            		// send PRACK
            		f_SendPRACK(m_PRACK_Request_Base(
            			vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
            			vc_from, 
            			vc_to, 
            			vc_via,
            			vc_rAck
            		));
                    f_SendPRACK();
            		
            		// await 200 OK PRACK response
            		f_awaitingOkResponse(vc_cSeq);
@@ -3456,15 +3350,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		f_awaitingResponse(v_response);
            		
            		// send PRACK
            		f_SendPRACK(m_PRACK_Request_Base(
            			vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
            			vc_from, 
            			vc_to, 
            			vc_via,
            			vc_rAck
            		));
                    f_SendPRACK();
            		
            		// await 200 OK PRACK response
            		f_awaitingOkResponse(vc_cSeq);
@@ -3520,6 +3406,8 @@ module AtsNIT_SipSip_BC_TCFunctions {
				*/
				function f_AtsNIT_TC_SS___UP__06UE2(in CSeq p_cSeq_s) runs on ImsComponent {
                    var REGISTER_Request v_register;
                    var Via v_via;
                    var CSeq v_cSeq;
                                
                    v_register :=
                    valueof(m_REGISTER_Request_Base(vc_requestUri, vc_callId,
@@ -3551,6 +3439,9 @@ module AtsNIT_SipSip_BC_TCFunctions {
						valueof(m_MBody_SDP(vc_sdp_local))
					));
					
					v_via := vc_via;
					v_cSeq := vc_cSeq;
					
            		// await PRACK
					f_awaitingPRACK_sendReply(
						mw_PRACK_Request_Base(vc_callId)
@@ -3562,8 +3453,8 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		    vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
            			vc_from, 
            			vc_to, 
            			vc_callee_From, 
            			vc_callee_To, 
            			vc_via, 
            			vc_contact, 
            			m_MBody_SDP(vc_sdp_local)
@@ -3572,6 +3463,10 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		// await 200 OK UPDATE response
            		f_awaitingOkResponse(vc_cSeq);
					
                    vc_via := v_via;
                    vc_cSeq := v_cSeq;
					
					
					// send 200 OK Invite
					f_send200OK(); // TODO must be checked
            		
@@ -3627,7 +3522,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
            			c_userProfile_UE2atSUThome
            		);
            		v_INVITE_CSeq := vc_cSeq;
            		f_SendINVITE(m_INVITE_Request_Allow_UE(
            		f_SendINVITE(m_INVITE_Request_noBody_Allow_UE(
            			vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
@@ -3638,7 +3533,6 @@ module AtsNIT_SipSip_BC_TCFunctions {
            			omit, 
            			vc_route_REG, 
						m_Supported_100rel, 
            			omit,
            			m_Allow({"UPDATE"})
            		));
            		
@@ -3656,15 +3550,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		f_awaitingResponse(v_response);
            		
            		// send PRACK
            		f_SendPRACK(m_PRACK_Request_Base(
            			vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
            			vc_from, 
            			vc_to, 
            			vc_via,
            			vc_rAck
            		));
                    f_SendPRACK();
            		
            		// await 200 OK PRACK response
            		f_awaitingOkResponse(vc_cSeq);
@@ -3827,7 +3713,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
            			c_userProfile_UE2atSUThome
            		);
            		v_INVITE_CSeq := vc_cSeq;
            		f_SendINVITE(m_INVITE_Request_Allow_UE(
            		f_SendINVITE(m_INVITE_Request_noBody_Allow_UE(
            			vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
@@ -3838,7 +3724,6 @@ module AtsNIT_SipSip_BC_TCFunctions {
            			omit, 
            			vc_route_REG, 
						m_Supported_100rel, 
            			omit,
            			m_Allow({"UPDATE"})
            		));
            		
@@ -3856,15 +3741,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		f_awaitingResponse(v_response);
            		
            		// send PRACK
            		f_SendPRACK(m_PRACK_Request_Base(
            			vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
            			vc_from, 
            			vc_to, 
            			vc_via,
            			vc_rAck
            		));
                    f_SendPRACK();
            		
            		// await 200 OK PRACK response
            		f_awaitingOkResponse(vc_cSeq);
@@ -3921,6 +3798,8 @@ module AtsNIT_SipSip_BC_TCFunctions {
				function f_AtsNIT_TC_SS___UP__08UE2(in CSeq p_cSeq_s) runs on ImsComponent {
					var Response v_response;
                    var REGISTER_Request v_register;
                    var Via v_via;
                    var CSeq v_cSeq;
                   
                    v_register :=
                    valueof(m_REGISTER_Request_Base(vc_requestUri, vc_callId,
@@ -3956,6 +3835,10 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		
					f_sendResponse(v_response);
					
					
                    v_via := vc_via;
                    v_cSeq := vc_cSeq;
					
            		// await PRACK
					f_awaitingPRACK_sendReply(
						mw_PRACK_Request_Base(vc_callId)
@@ -3967,8 +3850,8 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		    vc_requestUri, 
            			vc_callId, 
            			vc_cSeq, 
            			vc_from, 
            			vc_to, 
            			vc_callee_From, 
            			vc_callee_To, 
            			vc_via, 
            			vc_contact, 
            			m_MBody_SDP(vc_sdp_local)
@@ -3977,6 +3860,9 @@ module AtsNIT_SipSip_BC_TCFunctions {
            		// await 200 OK UPDATE response
            		f_awaitingOkResponse(vc_cSeq);
					
                    vc_via := v_via;
                	vc_cSeq := v_cSeq;
					
					// send 200 OK Invite
					f_send200OK(); // TODO must be checked
            		
@@ -4618,6 +4504,16 @@ module AtsNIT_SipSip_BC_TCFunctions {
    			vc_cSeq
    		));
    		
    		// send ACK
    		f_SendACK(m_ACK_Request_Base(
    			vc_requestUri, 
    			vc_callId, 
    			vc_cSeq, 
    			vc_from, 
    			vc_to, 
    			vc_via
    		));
    		
    		// check media
            f_check_Conversation();
            
+135 −157

File changed.

Preview size limit exceeded, changes collapsed.

+2 −2
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ module AtsNIT_SipSip_Steps {
    			CSeq cSeq optional, 
    			SipUrl remoteURI,
    			HostPort remoteTarget,
    			Route route,
    			RecordRoute recordRoute,
    			Route route optional,
    			RecordRoute recordRoute optional,
    			Via	via
    		}
    	}
+2681 −2681

File changed.

Preview size limit exceeded, changes collapsed.