Commit fb82edd2 authored by pintar's avatar pintar

latest version from validation session week 16

parent a9f1725d
......@@ -37,9 +37,9 @@ module LibIms_Steps
*/
function f_setHeadersBYE(inout CSeq p_cSeq_s, in integer p_to_user) runs on ImsComponent
{
vc_to := f_initToHeader(p_to_user); // init of vc_to using userProfile identifier
vc_from := f_initFromHeader(vc_userprofile.id, f_getRndTag()); // init of vc_from using userProfile identifier
// vc_to := f_initToHeader(p_to_user); // init of vc_to using userProfile identifier
//
// vc_from := f_initFromHeader(vc_userprofile.id, f_getRndTag()); // init of vc_from using userProfile identifier
vc_requestUri := f_initSipUrl(p_to_user); // Request URI of Invite is identical with To header
vc_route := f_route(); // update the route header field depending on vc_boo_route
......@@ -832,7 +832,7 @@ module LibIms_Steps
}
case (c_conferenceProfile_factoryURI) {
p_sipUrl.userInfo := {userOrTelephoneSubscriber:=PX_IMS_SUT_CONF_FACTORY_NAME, password:=omit};
p_sipUrl.hostPort := {host := PX_IMS_SUT_CONF_HOME_DOMAIN, portField := PX_IMS_SUT_CONF_PORT}
p_sipUrl.hostPort := {host := PX_IMS_SUT_CONF_HOME_DOMAIN, portField := omit}
}
};
return(p_sipUrl)
......@@ -1271,6 +1271,7 @@ module LibIms_Steps
function f_terminateCall_IMS(SipUrl p_requestUri, CallId p_CallId, inout CSeq p_cSeq, From p_from,
template To p_to) runs on ImsComponent
{
LibSip_Steps.f_setHeadersBYE(p_cSeq);
// Sending of a BYE request to release the call and expect a final response
f_SendBYE(m_BYE_Request_IMS(p_requestUri, p_CallId, p_cSeq, p_from, valueof(p_to), vc_via, vc_route));
......
......@@ -165,7 +165,7 @@ group HeaderFieldTemplates{
hostPort := {
PX_IMS_TS_PCSCF_HOME_DOMAIN, PX_IMS_TS_PCSCF_PORT
},
urlParameters := omit,
urlParameters := { { id := "lr", paramValue := omit}},
headers := omit
}
},
......@@ -577,7 +577,7 @@ group XMLTemplates {
template Registration m_registration (template XSDAUX.anyURI p_user):= {
p_user, // XSDAUX.anyURI aor
"", // XSDAUX.string id
"a7", // XSDAUX.string id
init, //enumerated {active,init,terminated} state,
omit, // record of Contact contact_list optional,
omit // record of anytype elem_list optional
......@@ -1516,15 +1516,22 @@ group request_send {
* @desc INVITE message exchanged at Mw
*
*/
template INVITE_Request m_INVITE_Request_IMS
(SipUrl p_requestUri, CallId p_callId, CSeq p_cSeq, From p_from, To p_to,
Via p_via, Contact p_contact, template Require p_require,
template Route p_route, template RecordRoute p_recordRoute, template Supported p_supported, template PChargingVector p_pChargingVector, template MessageBody p_mb )
modifies m_INVITE_Request_Base
:=
{
msgHeader :=
{
template INVITE_Request m_INVITE_Request_IMS (
SipUrl p_requestUri,
CallId p_callId,
CSeq p_cSeq,
From p_from,
To p_to,
Via p_via,
Contact p_contact,
template Require p_require,
template Route p_route,
template RecordRoute p_recordRoute,
template Supported p_supported,
template PChargingVector p_pChargingVector,
template MessageBody p_mb
) modifies m_INVITE_Request_Base := {
msgHeader := {
contentLength := {fieldName := CONTENT_LENGTH_E, len:= f_MessageBodyLength(valueof(p_mb))},
contentType := {fieldName := CONTENT_TYPE_E, mediaType := c_sdpAplication},
require := p_require,
......@@ -2171,6 +2178,26 @@ group request_send {
}
}
template REGISTER_Request m_REGISTER_Request_IMS_3party (
SipUrl p_requestUri,
CallId p_callId,
CSeq p_cSeq,
From p_from,
To p_to,
Via p_via,
Contact p_contact,
template Authorization p_authorization,
template Path p_path
) modifies m_REGISTER_Request_IMS :=
{
msgHeader :=
{
path := p_path
}
}
template REGISTER_Request m_REGISTER_Request_expires_IMS (SipUrl p_requestUri, CallId p_callId, CSeq p_cSeq,
From p_from, To p_to, Via p_via, Contact p_contact, template Authorization p_authorization, template DeltaSec p_deltaSec)
modifies m_REGISTER_Request_IMS :=
......@@ -2644,7 +2671,7 @@ group request_receive {
modifies mw_REGISTER_Request_Base
:=
{
msgHeader := { authorization := ?
msgHeader := { authorization := *
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment