Commit 0eef3bf9 authored by nikolajev's avatar nikolajev
Browse files

Updates for LibSip modification after compilation with another tool

parent c2e21a72

ttcn/LibSip_Steps.ttcn

+3 −3
Original line number Diff line number Diff line
@@ -1217,7 +1217,7 @@ group SetHeaders { 
	 * @desc setting of general and basic CANCEL header fields

	 * @param p_cSeq_s

	 */

	function f_setHeadersCANCEL(inout template(value) CSeq p_cSeq_s) runs on SipComponent

	function f_setHeadersCANCEL(inout CSeq p_cSeq_s) runs on SipComponent

	{      



		p_cSeq_s.method := "CANCEL";
@@ -1891,8 +1891,8 @@ group SetHeaders { 
	   v_contact := p_response.msgHeader.contact;

	   if (ischosen(v_contact.contactBody.contactAddresses))

	   {

		 vc_reqHostPort := f_getContactAddr(v_contact.contactBody.contactAddresses[0]);

		 vc_requestUri := f_getContactUri(v_contact.contactBody.contactAddresses[0]);

		 vc_reqHostPort := f_getContactAddr(valueof(v_contact.contactBody.contactAddresses[0]));

		 vc_requestUri := f_getContactUri(valueof(v_contact.contactBody.contactAddresses[0]));

	   }

	 }

	 else

ttcn/LibSip_Templates.ttcn

+6 −17
Original line number Diff line number Diff line
@@ -428,9 +428,6 @@ module LibSip_Templates { 
            headers := *

        }



        //     TODO: this temlate is possibly incorrectly defined, or

        //     "p_urlParameters" parameter name is incorrect, since it is

        //     assigned to "headers"

        template(value) SipUrl m_SipUrl_NumberHostHeader(template(value) charstring p_number, template(value) charstring p_host,

                                                         template(omit) AmpersandParam_List p_urlParameters) := {

            scheme := c_sipScheme,  //*     contains "sip"
@@ -439,9 +436,6 @@ module LibSip_Templates { 
            headers := omit

        }



        //     TODO: this temlate is possibly incorrectly defined, or

        //     "p_urlParameters" parameter name is incorrect, since it is

        //     assigned to "headers"

        template(present) SipUrl mw_SipUrl_NumberHostHeader(template(value) charstring p_number, template(value) charstring p_host,

                                                            template AmpersandParam_List p_urlParameters) := {

            scheme := c_sipScheme,  //*     contains "sip"
@@ -588,9 +582,8 @@ module LibSip_Templates { 
        template(value) Authorization m_add_Authorization_digest(template(value) Authorization p_auth, template(value) CommaParam_List p_CommaParam_List) := {

            fieldName := AUTHORIZATION_E, body := {{digestResponse := f_merge_CommaParam_List(p_auth.body[0].digestResponse, p_CommaParam_List)}}

        }

        //     TODO: STF471 this template contains matching symbol, but name

        //     suggests it is send template

        template(present) Authorization m_Authorization_other := {fieldName := AUTHORIZATION_E, body := {{otherResponse := ?}}}



        template(present) Authorization mw_Authorization_other := {fieldName := AUTHORIZATION_E, body := {{otherResponse := ?}}}



        template(value) Contact m_Contact(template(value) SipUrl p_sipUrl) := {

            fieldName := CONTACT_E,
@@ -878,8 +871,6 @@ module LibSip_Templates { 
            sentProtocol := m_SentProtocol(PX_SIP_TRANSPORT), sentBy := {host := p_hostport.host, portField := p_hostport.portField}, viaParams := *

        }



        //     TODO STF471 check superset, can it be applied to ViaBody (record

        //     of)

        template(present) Via mw_Via(template(present) ViaBody p_viabody) := {

            fieldName := VIA_E,

            viaBody := {*, p_viabody, *} //     superset(p_viabody)
@@ -892,8 +883,6 @@ module LibSip_Templates { 


        template(present) Require mw_require_100rel modifies mw_Require_Base := {optionsTags := superset(c_tag100rel)}



        //     TODO STF471 check superset, can it be applied to RouteBody

        //     (record of)

        template(present) RecordRoute mw_recordroute(template(present) RouteBody p_routeBody) := {

            fieldName := RECORD_ROUTE_E,

            routeBody := {*, p_routeBody, *} //     superset(p_routeBody)
@@ -2335,7 +2324,7 @@ module LibSip_Templates { 
            template(value) SDP_attribute m_attribute_PCMA_DPT := {rtpmap := {attr_value := PX_SIP_SDP_dyn & " " & PX_SIP_SDP_media_transport_PCMA}}

            //     TODO: STF471 template name suggests that this is a send

            //     template, while it contains matching mechanisms

            template SDP_attribute m_attribute_T38 := {unknown := {name := ?, attr_value := pattern "*t38*"}}

            template SDP_attribute mw_attribute_T38 := {unknown := {name := ?, attr_value := pattern "*t38*"}}



            template(value) SDP_attribute m_attribute_curr(template(value) charstring p_preconditionType, template(value) charstring p_statusType,

                                                           template(value) charstring p_direction) := {
@@ -2432,15 +2421,15 @@ module LibSip_Templates { 
        //     TODO STF471 check fixed values vs. PIXITs

        template(value) MessageBody m_MBody_MIMESdpXml(template(value) SDP_Message p_sdp, template(value) XmlBody p_xmlBody) := {

            mimeMessageBody := {

                boundary := "--boundary1",  //     "PX_SIP_MIME_Boundary",

                boundary := "--" & PX_SIP_MIME_Boundary,

                mimeEncapsulatedList := {

                    {

                        content_type := "application/sdp",  //     "PX_SIP_SDP_ContentType",

                        content_type := c_sdpApplication,

                        content_disposition := omit,

                        mime_encapsulated_part := {sdpMessageBody := p_sdp}

                    },

                    {

                        content_type := "application/vnd.3gpp.cw+xml",  //     "PX_SIP_ISUP_ContentType",

                        content_type := c_ims3gppCwApplication,

                        content_disposition := omit,

                        mime_encapsulated_part := {xmlBody := p_xmlBody}

                    }