Commit ee9b1d11 authored by pintar's avatar pintar
Browse files

corrections due to validation of STF346 from week 45

parent 5b867275

LibSip_Interface.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ module LibSip_Interface language "TTCN-3:2005"//MRO 


	  // current address to send TCP/UDP messages

	  var SipUserProfile vc_userprofile; 		// PIXIT userinformation

	  var address		 vc_sent_label  := {host := PX_SIP_SUT_IPADDR, portField := PX_SIP_SUT_PORT};

	  var address		 vc_sent_label;//removed because this value is predefined and used to open socket  := {host := PX_SIP_SUT_IPADDR, portField := PX_SIP_SUT_PORT};



	  // last incoming message

	  var Response 	vc_response;	// last incoming response message

LibSip_SIPTypesAndValues.ttcn

+5 −5
Original line number Diff line number Diff line
@@ -157,8 +157,8 @@ group SimpleConstants 
	  

	  const integer c_CRlen := 2; // length of new line (0d0a)



	  const GenericParam c_Integrity_protected_yes := {"Integrity protected","yes"}

	  const GenericParam c_Integrity_protected_no := {"Integrity protected","no"}

	  const GenericParam c_Integrity_protected_yes := {"integrity-protected","yes"}

	  const GenericParam c_Integrity_protected_no := {"integrity-protected","no"}



} //end group SimpleConstants

LibSip_Steps.ttcn

+19 −7
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ group ParameterOperations { 
	 */

	function f_calculatecCredentials_empty(in SipUserProfile p_userprofile) return Credentials

	{

	  var Credentials v_result;

	  var template Credentials v_result;

	      

	  var charstring v_nonce := "";
@@ -102,8 +102,7 @@ group ParameterOperations { 
		  { id := "uri", paramValue := v_uri },

		  { id := "nonce=""""", paramValue := omit }, // already enclosed to " characters

		  { id := "response=""""", paramValue := omit } // already enclosed to " characters

		}

	  };

	  }};

	      

	  return v_result;

	}
@@ -122,7 +121,7 @@ group ParameterOperations { 
	function f_calculatecCredentials(in SipUserProfile p_userprofile, in charstring p_method, 

		in CommaParam_List p_challenge) return Credentials

	{

	  var Credentials v_result;

	  var template Credentials v_result;

      

	  var charstring v_nonce := "";
@@ -976,7 +975,7 @@ group SetHeaders { 
		*/	

		function f_setHeadersACK() runs on SipComponent

    	{

			vc_requestUri.hostPort := vc_reqHostPort;

			//vc_requestUri.hostPort := vc_reqHostPort;

			vc_branch := c_branchCookie & f_getRndTag();

			vc_via:={

        		fieldName := VIA_E,
@@ -1565,7 +1564,9 @@ group SetHeaders { 
	 vc_cSeq := p_Request.msgHeader.cSeq;

	 vc_iut_CSeq  := p_Request.msgHeader.cSeq;

	 vc_from := p_Request.msgHeader.fromField;

	 vc_caller_From := p_Request.msgHeader.fromField;

	 vc_to := p_Request.msgHeader.toField;

	 vc_caller_To := p_Request.msgHeader.toField;

	 vc_via := p_Request.msgHeader.via;

	 // update sent_label according to received via header field

	 f_getViaReplyAddr(vc_via.viaBody, vc_sent_label);
@@ -1573,6 +1574,12 @@ group SetHeaders { 
	 // Catch route

	 vc_boo_recordRoute:=false;

	  

	 //add tag field into To header if tag is not present

	 if (not(ispresent(p_Request.msgHeader.toField.toParams)))

	 {

		vc_to.toParams := {{id := c_tagId, paramValue := f_getRndTag()}};

		vc_caller_To := vc_to;

	 }

	 if (ispresent(p_Request.msgHeader.recordRoute))

	 {

	   vc_boo_recordRoute:=true;
@@ -2859,8 +2866,13 @@ group AwaitingMessage { 
			{

			  tc_resp.stop;

			  f_setHeadersOnReceiptOfRequest(v_MSG);

			  //Answer to the MESSAGE

			  //f_send200OK();

			}

		  [] SIPP.receive(mw_MESSAGE_Request_Base)-> value v_MSG sender vc_sent_label

			{

			  tc_resp.stop;

			  f_setHeadersOnReceiptOfRequest(v_MSG);

			  log("Received MESSAGE not as expected!");

			  setverdict (fail);

			}

		  [] tc_resp.timeout

			{

LibSip_Templates.ttcn

+3 −3
Original line number Diff line number Diff line
@@ -3279,13 +3279,13 @@ group others { 
 */



  function f_merge_CommaParam_List(CommaParam_List p_list1, CommaParam_List p_list2) return template CommaParam_List

  {	var CommaParam_List p_result;

  {	var template CommaParam_List p_result;

  	var integer limit1 := sizeof(p_list1);

  	for (var integer i:=0; i<limit1; i:=i+1) {

  		p_result[i] := p_list1[i]

  	};

	for (var integer i:=limit1; i<limit1+sizeof(p_list2); i:=i+1) {

		p_result[i] := p_list2[i]

	for (var integer i:=0; i<sizeof(p_list2); i:=i+1) {

		p_result[i+limit1] := p_list2[i]

	};

	return p_result

  }