Commit 17f704a7 authored by garciay's avatar garciay
Browse files

STF467 corrections: 

- Add new component variable for emergency service (support of urn)
- Add new PIXIT for security algorithms
- Consideration for AKA algorithm in respect to Credential calculation function
- Consideration for urn support in respect to f_setHeadersOnReceiptOfResponse function
- Support of contact header field in f_RemoveRegistration
- Use of key attribute for m_media_dynPT
- Consideration of encrypted SDP in MessageBody
parent 16fdc29d

trunk/ttcn/LibSip_Interface.ttcn

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ module LibSip_Interface 
	  var CSeq		vc_cSeq 		:= c_empty_cSeq;	// value of CSeq header

	  var RAck 		vc_rAck 		:= { fieldName := RACK_E, responseNum := 1, seqNumber := 1, method := "INVITE"}; // value of RAck header

	  var HostPort 	vc_reqHostPort 	:= {host:=PX_SIP_SUT_IPADDR, portField:=PX_SIP_SUT_PORT}; // address to send request

	  var UrnUriComponents vc_reqUrnUri := {namespaceId:="", namespaceSpecificString:=""};

	  var Privacy 	vc_privacy;

	  var HistoryInfo_List vc_historyInfoList := {}; // value of history list according to RFC4244

	  var SipUrl 	  vc_confURI; 	 // conference URI according to TS124147 ch. 5.3.1.3.2

trunk/ttcn/LibSip_PIXITS.ttcn

+6 −1
Original line number Diff line number Diff line
@@ -217,6 +217,11 @@ module LibSip_PIXITS //MRO 
	  /** @desc	charstring for REGISTRAR domain

	  */

	  modulepar charstring  PX_SIP_SUT_REGISTRAR_DOMAIN := "172.27.16.115";

	  

  	  /** @desc	charstring for PX_AUTH_ALGORITHM security algorithm

  	   * Possible values: MD5 or AKAv1-MD5

	  */

	  modulepar charstring  PX_AUTH_ALGORITHM := "AKAv1-MD5";

}// group Registration parameters

  

  group ReleaseCause{

trunk/ttcn/LibSip_SIPTypesAndValues.ttcn

+0 −1
Original line number Diff line number Diff line
@@ -181,7 +181,6 @@ group AuthorizationConstants { 


    const charstring c_ik := "";

    const charstring c_ck := "";

    const charstring c_algorithm := "MD5";

    const charstring c_nonce := "";

    const charstring c_nonce_value := "0edff6c521cc3f407f2d9e01cf6ed82b";

trunk/ttcn/LibSip_Templates.ttcn

+31 −3
Original line number Diff line number Diff line
@@ -2546,6 +2546,16 @@ group response_receive { 
     	userToUser := ?

       }

     }

          

    template Response mw_Response_Algorithm (template StatusLine p_statusLine, template CallId p_callId,

     template CSeq p_cSeq, template CredentialsList p_credentialsList) modifies mw_Response_Base:=

    {

    statusLine := {sipVersion := c_sipNameVersion, statusCode := p_statusLine.statusCode, reasonPhrase := ?},

    msgHeader :=

      {

        authorization:= {fieldName := AUTHORIZATION_E, body := p_credentialsList }

      }

    }

} //*  end group response_receive
@@ -2685,7 +2695,12 @@ group SDP_Templates { 
    		modifies m_SDP

    		:= {

    			protocol_version := 0,

    			bandwidth := {{PX_SIP_SDP_b_modifier, PX_SIP_SDP_b_bandwidth}}

    			bandwidth := {{PX_SIP_SDP_b_modifier, PX_SIP_SDP_b_bandwidth}}, 

    			key := {

        			method := "base64", //prompt

        			key := "blablabla"

    			}

    			

    		};

    }//* end group modified_templates
@@ -2720,7 +2735,7 @@ group SDP_Templates { 
                attributes := p_attributes

        };

		

		template SDP_media_desc m_media_dynPT(charstring p_PT, charstring p_encod) := {

		template SDP_media_desc m_media_dynPT(charstring p_PT, charstring p_encod, template SDP_key p_sdpKey:= omit) := {

				media_field := {

					media := c_audio,//* "audio",

					ports := { port_number := 8500, num_of_ports:=omit },
@@ -2730,7 +2745,7 @@ group SDP_Templates { 
				information := omit,

				connections := omit,

				bandwidth := omit,

				key := omit,						

				key := p_sdpKey,

				attributes := { { rtpmap := { attr_value := p_PT & " " & p_encod }

								}

							  } //* a=rtpmap:8 PCMA/8000
@@ -3029,6 +3044,19 @@ group MessageBodies { 
		}

	}



	

    template MessageBody m_MBody_MIMESdpEncrypted(template SDP_Message p_sdp):=

    {

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

            mimeEncapsulatedList:= {

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

            	//TODO add "Content-Transfer-Encoding:base64"

                content_disposition:="attachment;handling=required;filename=smime.p7", //TODO use PIXIT

                mime_encapsulated_part:={sdpMessageBody := p_sdp}}

            }

        }

    }

	

	template MessageBody mw_MBody_SDP(template SDP_Message p_SDP):=

	{

		sdpMessageBody := p_SDP