Some issues found when compiling with Tau (see related email) (f8679881) · Commits · TTCN-3 Libraries / LibSip

LibSip_Interface.ttcn

+9 −2

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		* for SIP-IMS tests. Module become from STF306 and STF334-336
		*/

		module LibSip_Interface
		module LibSip_Interface language "TTCN-3:2005"//MRO
		{
		//LibCommon
		import from LibCommon_Sync all;
		@@ -88,6 +88,7 @@ module LibSip_Interface
		var Request vc_requestFor407; // last INVITE request to be authorized if 407/401 received from Proxy

		var SipUrl vc_requestUri := c_empty_RequestUri;
		var SipUrl vc_requestUri2 := c_empty_RequestUri;//MRO
		var charstring vc_branch := "";
		var charstring vc_branch_ICSCF := "";
		var charstring vc_branch_SCSCF := "";
		@@ -100,6 +101,7 @@ module LibSip_Interface
		var To vc_cancel_To := c_empty_To; // used for next CANCEL
		var Via vc_via := c_empty_Via;
		var Via vc_via_REG := c_empty_Via; // via used in last REGISTER
		var ContentType vc_contentType:= c_empty_ContentType;//MRO

		var RecordRoute vc_recordRoute; // value of RecordRoute header
		var boolean vc_boo_recordRoute := false; // boolean indicates valid recordRoute
		@@ -140,7 +142,7 @@ module LibSip_Interface
		timer tc_noAct := PX_SIP_TNOACT; // time for SUT to get idle state
		// timer TRept;
		// timer TSync := PX_SIP_TSYNC;
		// timer TGuard := PX_SIP_TGUARD;
		timer tc_guard := PX_SIP_TGUARD;//MRO
		timer tc_tDelay := 32.0;

		var float vc_tcRESP := PX_SIP_TRESP; // standard value for TRESP (may be modified in particular tests)
		@@ -161,6 +163,11 @@ module LibSip_Interface
		var boolean vc_first_recv := false; // true after receipt of first incomming SIP message
		var boolean vc_firstREGISTER_sent := false; // true after sent of first REGISTER message

		var boolean v_white_space := false;//MRO

		// ETS address
		var address v_ets_label := { host := PX_SIP_TS1_IPADDR, portField := PX_SIP_TS1_PORT};

		// parts needed for Client/SelfSyncComp type compatibility
		var StringStack v_stateStack := c_initStringStack;
		port SyncPort syncSendPort;

LibSip_PIXITS.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@
		* - ParametersForHTTP_Authentication
		*/

		module LibSip_PIXITS
		module LibSip_PIXITS language "TTCN-3:2005"//MRO
		{
		//LibCommon
		import from LibCommon_BasicTypesAndValues all;

LibSip_SDPTypes.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* change requests shall be made to http://t-ort.etsi.org
		*/

		module LibSip_SDPTypes
		module LibSip_SDPTypes language "TTCN-3:2005"//MRO
		{
		group Constants
		{

LibSip_SIPTypesAndValues.ttcn

+13 −2

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* change requests shall be made to http://t-ort.etsi.org
		*/

		module LibSip_SIPTypesAndValues
		module LibSip_SIPTypesAndValues language "TTCN-3:2005"//MRO
		{
		// SipAts
		import from LibSip_SDPTypes all;
		@@ -46,7 +46,7 @@ group SimpleConstants
		const charstring c_branchId := "branch";

		// BRANCH_COOKIE
		const charstring c_brenchCookie := "z9hG4bK";
		const charstring c_branchCookie := "z9hG4bK";

		// EXPIRES_ID
		const charstring c_expiresId := "expires";
		@@ -131,6 +131,11 @@ group SimpleConstants

		// @ (at) sign
		const charstring c_AT := "@";
		//MRO
		const charstring c_SP := oct2char('20'O);
		const charstring c_SLASH := oct2char('2F'O);
		const charstring c_LT := oct2char('3C'O);
		const charstring c_GT := oct2char('3E'O);

		// * (wildchard) sign
		const charstring c_WILDCARD := "*";
		@@ -159,6 +164,12 @@ group HeaderFieldConstants {
		callid := ""
		};

		const ContentType c_empty_ContentType :=
		{
		fieldName := CONTENT_TYPE_E,
		mediaType := ""
		};

		const CSeq c_empty_cSeq := {
		fieldName := CSEQ_E,
		seqNumber:=0,

LibSip_Steps.ttcn

+16 −16

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		* for SIP-IMS tests.
		*/

		module LibSip_Steps
		module LibSip_Steps language "TTCN-3:2005"//MRO
		{
		//LibCommon
		import from LibCommon_Sync all ;
		@@ -914,7 +914,7 @@ group SetHeaders {
		vc_cSeq := p_cSeq_s;

		vc_contact := valueof(m_Contact(m_SipUrl_contactIpaddr(vc_userprofile)));
		vc_branch := c_brenchCookie & f_getRndTag();
		vc_branch := c_branchCookie & f_getRndTag();
		vc_via:={
		fieldName := VIA_E,
		viaBody := {valueof(m_ViaBody_currIpaddr(vc_branch, vc_userprofile))}
		@@ -1002,7 +1002,7 @@ group SetHeaders {
		{
		var CommaParam_List v_challenge;

		vc_branch := c_brenchCookie & f_getRndTag();
		vc_branch := c_branchCookie & f_getRndTag();

		vc_via_REG :={
		fieldName := VIA_E,
		@@ -1034,7 +1034,7 @@ group SetHeaders {
		{
		var CommaParam_List v_challenge;

		vc_branch := c_brenchCookie & f_getRndTag();
		vc_branch := c_branchCookie & f_getRndTag();

		vc_via_REG :={
		fieldName := VIA_E,
		@@ -1065,7 +1065,7 @@ group SetHeaders {
		{
		var CommaParam_List v_challenge;

		vc_branch := c_brenchCookie & f_getRndTag();
		vc_branch := c_branchCookie & f_getRndTag();

		vc_via_REG :={
		fieldName := VIA_E,
		@@ -1590,12 +1590,12 @@ group SDPOperations{
		}
		select (v_attribute)
		{
		case (mw_attribute_sendrecv) {return(m_attribute_sendrecv);}
		case (mw_attribute_sendrecv) {return(m_attribute_sendrecv);}
		case (mw_attribute_inactive) {return(m_attribute_inactive);}
		case (mw_attribute_recvonly) {return(m_attribute_sendonly);}
		case else {return(m_attribute_sendrecv);}
		//case (mw_attribute_sendrecv) {return(m_attribute_sendrecv);}
		case (mw_attribute_sendrecv) {return(valueof(m_attribute_sendrecv));}//MRO
		case (mw_attribute_inactive) {return(valueof(m_attribute_inactive));}//MRO
		case (mw_attribute_recvonly) {return(valueof(m_attribute_sendonly));}//MRO
		}
		return(valueof(m_attribute_sendrecv));//MRO
		//return(v_attribute); // not needed due to case else
		}

		@@ -1939,8 +1939,8 @@ group SDPOperations{
		//for every single media (that is not omit)
		v_cn := 0;

		if (ispresent(vc_sdp_local.media_list[i].media_field))
		{
		// if (ispresent(vc_sdp_local.media_list[i].media_field))//MRO media_field is not optional
		// {

		log("vc_sdp_local.media_list[i] ",vc_sdp_local.media_list[i]);
		// if (valueof(vc_sdp_local.media_list[i]) != omit)
		@@ -1976,7 +1976,7 @@ group SDPOperations{
		{ v_mediaAttributes[k] := valueof(p_direction)};
		vc_sdp_local.media_list[i].attributes := v_mediaAttributes;
		// }
		}
		//}//MRO
		}
		// add handling of prenegotiation, change ports if required etc.
		//if prenegotiation...
		@@ -2033,7 +2033,7 @@ group SDPOperations{
		// check incoming SDP attribute
		if (not (ispresent(vc_request.messageBody) and f_check_attribute(vc_request.messageBody.sdpMessageBody,p_direction_in)))
		{setverdict(fail);};
		if (not isvalue(v_direction_out))
		if (v_direction_out==omit)//not isvalue(v_direction_out))//MRO
		{v_direction_out := f_get_attribute_answer(vc_request.messageBody.sdpMessageBody, p_direction_in);}
		f_SIP_modMediaDirection(1, v_direction_out); // handling of attribute in media description
		f_SIP_modSessionDirection(v_direction_out); // handling of attribute in session
		@@ -3601,7 +3601,7 @@ group DefaultsTestStep
		stop;
		}

		vc_branch := c_brenchCookie & f_getRndTag();
		vc_branch := c_branchCookie & f_getRndTag();
		vc_via := {
		fieldName := VIA_E,
		viaBody := {