Commit 019501b6 authored by rennoch's avatar rennoch
Browse files

update due to LibSipV2 types modifications

parent e4afc4d3

ttcn/LibSip_Steps.ttcn

+27 −23
Original line number Diff line number Diff line
@@ -710,11 +710,11 @@ group FieldOperations { 
		  v_SipUrl := p_contact.addressField.addrSpecUnion;

		}

      

		v_locAddr.host := v_SipUrl.hostPort.host;

		v_locAddr.host := v_SipUrl.components.sip.hostPort.host;

      

		if (ispresent(v_SipUrl.hostPort.portField))

		if (ispresent(v_SipUrl.components.sip.hostPort.portField))

		{

			v_locAddr.portField := v_SipUrl.hostPort.portField;

			v_locAddr.portField := v_SipUrl.components.sip.hostPort.portField;

		}

		else

		{
@@ -763,7 +763,7 @@ group FieldOperations { 
			v_SipUrl := p_to.addressField.addrSpecUnion;

		}

  

		return(v_SipUrl.userInfo.userOrTelephoneSubscriber);

		return(v_SipUrl.components.sip.userInfo.userOrTelephoneSubscriber);

	} // end f_getUserfromTo



	/**
@@ -844,7 +844,7 @@ group FieldOperations { 
	{

	  if (ispresent(p_message.msgHeader.route)) {

		if (sizeof(p_message.msgHeader.route.routeBody)>p_index) {

			return(p_message.msgHeader.route.routeBody[p_index].nameAddr.addrSpec.hostPort)}

			return(p_message.msgHeader.route.routeBody[p_index].nameAddr.addrSpec.components.sip.hostPort)}

		};

	setverdict(fail);

	return(c_hostport_dummy)
@@ -861,7 +861,7 @@ group FieldOperations { 
	{

	  if (ispresent(p_message.msgHeader.recordRoute)) {

		if (sizeof(p_message.msgHeader.recordRoute.routeBody)>p_index) {

			return(p_message.msgHeader.recordRoute.routeBody[p_index].nameAddr.addrSpec.hostPort)}

			return(p_message.msgHeader.recordRoute.routeBody[p_index].nameAddr.addrSpec.components.sip.hostPort)}

		};

	setverdict(fail);

	return(c_hostport_dummy)
@@ -878,7 +878,7 @@ group FieldOperations { 
	{

	  if (ispresent(p_message.msgHeader.recordRoute)) {

		if (sizeof(p_message.msgHeader.recordRoute.routeBody)>p_index) {

			return(p_message.msgHeader.recordRoute.routeBody[p_index].nameAddr.addrSpec.hostPort)}

			return(p_message.msgHeader.recordRoute.routeBody[p_index].nameAddr.addrSpec.components.sip.hostPort)}

		};

	setverdict(fail);

	return(c_hostport_dummy)
@@ -1022,7 +1022,7 @@ group SetHeaders { 
      

	  vc_caller_From := vc_from;

           

	  vc_reqHostPort := vc_requestUri.hostPort;

	  vc_reqHostPort := vc_requestUri.components.sip.hostPort;

      

	}// end function f_setHeadersBYE
@@ -1056,13 +1056,14 @@ group SetHeaders { 
	  vc_requestUri:=

	  {

		scheme := c_sipScheme,

        components := {sip:={

		userInfo := omit,

		hostPort := {host:=vc_userprofile.registrarDomain, portField:=omit},

		hostPort := {host:=vc_userprofile.registrarDomain, portField:=omit}}},

		urlParameters := omit,

		headers := omit

	  };

      

	  vc_reqHostPort := vc_requestUri.hostPort;

	  vc_reqHostPort := vc_requestUri.components.sip.hostPort;

 

	  vc_callId := { fieldName:=CALL_ID_E, callid:=f_getRndCallId(p_cSeq_s) & c_AT & vc_userprofile.currIpaddr };

	  vc_callIdReg := vc_callId; //remember callId for de-registration
@@ -1109,8 +1110,9 @@ group SetHeaders { 
		vc_requestUri:=

    	{

            scheme := c_sipScheme,

            components := {sip:={

            userInfo := omit,

            hostPort := {host:=vc_userprofile.registrarDomain, portField:=omit},

            hostPort := {host:=vc_userprofile.registrarDomain, portField:=omit}}},

            urlParameters := omit,

            headers := omit

    	};
@@ -1189,8 +1191,9 @@ group SetHeaders { 
		vc_requestUri:=

		{

			scheme := c_sipScheme,

            components := {sip:={

			userInfo := omit,

			hostPort := {host:=vc_userprofile.registrarDomain, portField:=omit},

			hostPort := {host:=vc_userprofile.registrarDomain, portField:=omit}}},

			urlParameters := omit,

			headers := omit

		};
@@ -1231,8 +1234,9 @@ group SetHeaders { 
		vc_requestUri:=

		{

			scheme := c_sipScheme,

            components := {sip:={

    		userInfo := omit,

    		hostPort := {host:=vc_userprofile.registrarDomain, portField:=omit},

    		hostPort := {host:=vc_userprofile.registrarDomain, portField:=omit}}},

    		urlParameters := omit,

    		headers := omit

		};
@@ -1268,7 +1272,7 @@ group SetHeaders { 
      

	  vc_caller_From := vc_from;

            

	  vc_reqHostPort := vc_requestUri.hostPort;

	  vc_reqHostPort := vc_requestUri.components.sip.hostPort;

      

	}// end function f_setHeadersINVITE
@@ -1289,7 +1293,7 @@ group SetHeaders { 
  

			vc_caller_From := vc_from;

        

			vc_reqHostPort := vc_requestUri.hostPort;

			vc_reqHostPort := vc_requestUri.components.sip.hostPort;

  

	}// end function f_setHeadersUPDATE
@@ -1310,7 +1314,7 @@ group SetHeaders { 
      

	  vc_caller_From := vc_from;

            

	  vc_reqHostPort := vc_requestUri.hostPort;

	  vc_reqHostPort := vc_requestUri.components.sip.hostPort;

      

	}// end function f_setHeadersMESSAGE
@@ -1328,7 +1332,7 @@ group SetHeaders { 
			vc_caller_To := vc_to;

			vc_caller_From := vc_from;

            

			vc_reqHostPort := vc_requestUri.hostPort;

			vc_reqHostPort := vc_requestUri.components.sip.hostPort;

      

	}// end function f_setHeadersNOTIFY
@@ -1350,7 +1354,7 @@ group SetHeaders { 
      

			vc_caller_From := vc_from;

            

			vc_reqHostPort := vc_requestUri.hostPort;

			vc_reqHostPort := vc_requestUri.components.sip.hostPort;

      

	}// end function f_setHeadersPUBLISH
@@ -1367,7 +1371,7 @@ group SetHeaders { 
  

  	  vc_requestUri:=valueof(m_SipUrl_currDomain(vc_userprofile));

  	  

	  vc_reqHostPort := vc_requestUri.hostPort;

	  vc_reqHostPort := vc_requestUri.components.sip.hostPort;

      

	  vc_callId := {

		fieldName := CALL_ID_E,
@@ -1402,7 +1406,7 @@ group SetHeaders { 
      

			vc_caller_From := vc_from;

            

			vc_reqHostPort := vc_requestUri.hostPort;

			vc_reqHostPort := vc_requestUri.components.sip.hostPort;

      

	}// end function f_setHeadersMESSAGE
@@ -1423,7 +1427,7 @@ group SetHeaders { 
      

	  vc_caller_From := vc_from;

            

	  vc_reqHostPort := vc_requestUri.hostPort;

	  vc_reqHostPort := vc_requestUri.components.sip.hostPort;

      

	}// end function f_setHeadersREFER
@@ -1698,12 +1702,12 @@ group SetHeaders { 
	 {

	   if (ischosen(vc_to.addressField.nameAddr))

	   {

		 vc_reqHostPort := vc_to.addressField.nameAddr.addrSpec.hostPort;

		 vc_reqHostPort := vc_to.addressField.nameAddr.addrSpec.components.sip.hostPort;

		 vc_requestUri := vc_to.addressField.nameAddr.addrSpec;

	   }

	   else

	   {

		 vc_reqHostPort := vc_to.addressField.addrSpecUnion.hostPort;

		 vc_reqHostPort := vc_to.addressField.addrSpecUnion.components.sip.hostPort;

		 vc_requestUri := vc_to.addressField.addrSpecUnion;

	   }

	 }