Commit 3bea0e4b authored by Steffen Ludtke's avatar Steffen Ludtke
Browse files

Merge branch 'TTF016' of https://forge.etsi.org/rep/int/vxlte/sccas-con into TTF016

parents 496ca42f 1f6c5e3b
Loading
Loading
Loading
Loading
+5 −5
Original line number Original line Diff line number Diff line
@@ -1503,7 +1503,7 @@ module AtsSccas_TCFunctions {
                                            ));
                                            ));
                tc_ack.start;
                tc_ack.start;
                alt {
                alt {
                    [] SIPP.receive(mw_INVITE_Request_contact(?)) {
                    [] SIPP.receive(mw_INVITE_Request_contact(mw_sccas_contact())) {
                        tc_ack.stop;
                        tc_ack.stop;
                        log("*** " & __SCOPE__ & ": PASS: forwarded INVITE message was received ***");
                        log("*** " & __SCOPE__ & ": PASS: forwarded INVITE message was received ***");
                        f_selfOrClientSyncAndVerdict(c_tbDone, e_success); // sync
                        f_selfOrClientSyncAndVerdict(c_tbDone, e_success); // sync
@@ -2070,7 +2070,7 @@ module AtsSccas_TCFunctions {
                                            ));
                                            ));
                tc_ack.start;
                tc_ack.start;
                alt {
                alt {
                    [] SIPP.receive(mw_INVITE_Request(?,vc_requestUri)) {
                    [] SIPP.receive(mw_INVITE_Request_contact(mw_sccas_contact())) {
                        tc_ack.stop;
                        tc_ack.stop;
                        log("*** " & __SCOPE__ & ": PASS: forwarded INVITE message was received ***");
                        log("*** " & __SCOPE__ & ": PASS: forwarded INVITE message was received ***");
                        f_selfOrClientSyncAndVerdict(c_tbDone, e_success); // sync
                        f_selfOrClientSyncAndVerdict(c_tbDone, e_success); // sync
@@ -2138,7 +2138,7 @@ module AtsSccas_TCFunctions {
                                            ));
                                            ));
                tc_ack.start;
                tc_ack.start;
                alt {
                alt {
                    [] SIPP.receive(mw_INVITE_Request(?,vc_requestUri)) {
                    [] SIPP.receive(mw_INVITE_Request_contact(mw_sccas_contact())) {
                        tc_ack.stop;
                        tc_ack.stop;
                        log("*** " & __SCOPE__ & ": PASS: forwarded INVITE message was received ***");
                        log("*** " & __SCOPE__ & ": PASS: forwarded INVITE message was received ***");
                        f_selfOrClientSyncAndVerdict(c_tbDone, e_success); // sync
                        f_selfOrClientSyncAndVerdict(c_tbDone, e_success); // sync
@@ -2274,7 +2274,7 @@ module AtsSccas_TCFunctions {
                                            vc_callId, 
                                            vc_callId, 
                                            p_cSeq_s, 
                                            p_cSeq_s, 
                                            vc_from, vc_to, vc_via_REG, 
                                            vc_from, vc_to, vc_via_REG, 
                                            vc_contact, // TODO g3gppps2csSrvccTermPreAlerting
											m_contact_wildcard("g3gppps2csSrvccTermPreAlerting"),
                                            -, -, -,
                                            -, -, -,
                                            m_MBody_SDP(vc_sdp_local)
                                            m_MBody_SDP(vc_sdp_local)
                                            ));
                                            ));
@@ -2342,7 +2342,7 @@ module AtsSccas_TCFunctions {
                                            vc_callId, 
                                            vc_callId, 
                                            p_cSeq_s, 
                                            p_cSeq_s, 
                                            vc_from, vc_to, vc_via_REG, 
                                            vc_from, vc_to, vc_via_REG, 
                                            vc_contact, // TODO g3gppPs2csSrvccOrigPreAlerting
											m_contact_wildcard("g3gppPs2csSrvccOrigPreAlerting"), 
                                            -, -, -,
                                            -, -, -,
                                            m_MBody_SDP(vc_sdp_local)
                                            m_MBody_SDP(vc_sdp_local)
                                            ));
                                            ));
+9 −0
Original line number Original line Diff line number Diff line
@@ -92,6 +92,15 @@ module AtsSccas_Templates
        } // End of template mw_pAccessNetworkInfo
        } // End of template mw_pAccessNetworkInfo


        group HeaderTemplatesAxel {
        group HeaderTemplatesAxel {
        
		template LibSip_SIPTypesAndValues.Contact m_contact_wildcard (charstring p_wildcard):= {
						fieldName := CONTACT_E,
						contactBody := {
							wildcard :=
								p_wildcard
						}
					}        
        
        }
        }
        
        
        group HeaderTemplatesSteffen {
        group HeaderTemplatesSteffen {