Compare Revisions

The credentials to download the source code are:
 Username: svnusers
 Password: svnusers

Ignore whitespace Rev 499 → Rev 500

/trunk/ttcn/LibSip_SIPTypesAndValues.ttcn
1417,11 → 1417,11
 
type record of HistoryInfoEntry HistoryInfo_List;
 
type record of integer IntegerList;
type record of charstring StringList;
 
type record HistoryInfoEntry {
NameAddr nameAddr,
IntegerList hiIndex optional,
StringList hiIndex optional,
SemicolonParam_List hiExtention optional
}
}//end group RFC4244HeaderFieldTypes
/trunk/ttcn/LibSip_Steps.ttcn
1037,7 → 1037,7
{
 
p_cSeq_s.method := "CANCEL";
//vc_branch := c_branchCookie & f_getRndTag();
//vc_branch := c_branchCookie & f_getRndTag(); // STF 406: CANCEL and ACK should have the same branch as the INVITE
vc_via:={
fieldName := VIA_E,
viaBody := {valueof(m_ViaBody_currIpaddr(vc_branch, vc_userprofile))}
2138,7 → 2138,7
{
if (ischosen(vc_sdp_remote.media_list[i].attributes[j].rtpmap))
{
if (v_PT == regexp(vc_sdp_remote.media_list[i].attributes[j].rtpmap.attr_value, valueof(v_mypat), 0))
if (v_PT == regexp(vc_sdp_remote.media_list[i].attributes[j].rtpmap.attr_value, /*valueof(*/v_mypat/*)//Within validation for STF406 valueof was removed due to ERROR which was provided by TTWorkbench in running process. After this correction Tests runs without error.*/, 0))
{
v_rtpmap := vc_sdp_remote.media_list[i].attributes[j].
rtpmap.attr_value;
3174,9 → 3174,9
*/
function f_SendPRACK() runs on SipComponent
{
f_setHeadersGeneral(vc_cSeq, "PRACK"); // cseq, contact, branch, via
vc_rAck := valueof(m_RAck(vc_response.msgHeader.rSeq.responseNum, vc_cSeq.seqNumber, vc_cSeq.method));
f_setHeadersGeneral(vc_cSeq, "PRACK"); // cseq, contact, branch, via
SIPP.send(m_PRACK_Request_Base(
vc_requestUri,
vc_callId,
/trunk/ttcn/LibSip_Templates.ttcn
303,6 → 303,24
headers := *
};
template SipUrl m_SipUrl_NumberHostHeader(charstring p_number, charstring p_host, template AmpersandParam_List p_urlParameters) := //* SIP-URL with a calling party number
{
scheme := c_sipScheme, //* contains "sip"
userInfo:= {userOrTelephoneSubscriber:=p_number, password:=omit},
hostPort := {host:=p_host, portField:=omit},
urlParameters := omit,
headers := p_urlParameters
};
template SipUrl mw_SipUrl_NumberHostHeader(charstring p_number, charstring p_host, template AmpersandParam_List p_urlParameters) := //* SIP-URL with a calling party number
{
scheme := c_sipScheme, //* contains "sip"
userInfo:= {userOrTelephoneSubscriber:=p_number, password:=*},
hostPort := {host:=p_host, portField:=*},
urlParameters := *,
headers := p_urlParameters
};
template SipUrl m_SipUrl_NumberHostParam(charstring p_number, charstring p_host, template SemicolonParam_List p_urlParameters) := //* SIP-URL with a calling party number
{
scheme := c_sipScheme, //* contains "sip"
312,6 → 330,15
headers := omit
};
template SipUrl m_SipUrl_NumberHostParam_woPort(charstring p_number, charstring p_host, template SemicolonParam_List p_urlParameters) := //* SIP-URL with a calling party number
{
scheme := c_sipScheme, //* contains "sip"
userInfo:= {userOrTelephoneSubscriber:=p_number, password:=omit},
hostPort := {host:=p_host, portField:=omit},
urlParameters := p_urlParameters,
headers := omit
};
template SipUrl mw_SipUrl_Anonymous := //* SIP-URL with a calles party number
{
scheme := c_sipScheme, //* contains "sip"
586,7 → 613,7
historyInfoList := p_HistoryInfo_List
};
 
template HistoryInfoEntry mw_HistoryInfoEntry(template SipUrl p_Url, template IntegerList p_index, template SemicolonParam_List p_paramlist) :=
template HistoryInfoEntry mw_HistoryInfoEntry(template SipUrl p_Url, template StringList p_index, template SemicolonParam_List p_paramlist) :=
{
nameAddr := {displayName:=*, addrSpec:= p_Url},
hiIndex := p_index,
599,7 → 626,7
historyInfoList := p_HistoryInfo_List
};
template HistoryInfoEntry m_HistoryInfoEntry(template SipUrl p_Url, template IntegerList p_index, template SemicolonParam_List p_paramlist) :=
template HistoryInfoEntry m_HistoryInfoEntry(template SipUrl p_Url, template StringList p_index, template SemicolonParam_List p_paramlist) :=
{
nameAddr := {displayName:=omit, addrSpec:= p_Url},
hiIndex := p_index,
2152,10 → 2179,12
From p_from,
To p_to,
Via p_via,
Contact p_contact,
AlertInfo p_alertInfo
) modifies m_Response_Base:= {
msgHeader := {
alertInfo := p_alertInfo
alertInfo := p_alertInfo,
contact := p_contact
}
}