Commit 4dea0bdb authored by nikolajev's avatar nikolajev
Browse files

Update for modifications in LibIMS after compilation with another tool

parent dff0ebd2

ttcn/LibIms_Steps.ttcn

+15 −15
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ module LibIms_Steps 
                v_intVia := v_intVia - 1;

            }

            vc_branch := c_branchCookie & f_getRndTag();

            p_message.msgHeader.via.viaBody[0] := m_ViaBody_currIpaddr(vc_branch, vc_userprofile);

            p_message.msgHeader.via.viaBody[0] := valueof(m_ViaBody_currIpaddr(vc_branch, vc_userprofile));

            vc_via := p_message.msgHeader.via;

          }

        }
@@ -106,7 +106,7 @@ module LibIms_Steps 
              p_rr.routeBody[v_intRecordRoute] := p_rr.routeBody[v_intRecordRoute-1];

              v_intRecordRoute := v_intRecordRoute - 1;

          }

          p_rr.routeBody[0] := m_routeBody_currIpAddr(vc_userprofile);

          p_rr.routeBody[0] := valueof(m_routeBody_currIpAddr(vc_userprofile));

          vc_recordRoute := p_rr;

          return vc_recordRoute;

         }
@@ -282,7 +282,7 @@ module LibIms_Steps 
				vc_branch := c_branchCookie & f_getRndTag();

				vc_via:={

					fieldName := VIA_E,

					viaBody 	 := {m_ViaBody_virtual_XCSCF(vc_branch, vc_userprofile)}

					viaBody 	 := {valueof(m_ViaBody_virtual_XCSCF(vc_branch, vc_userprofile))}

				};

				

				vc_to := f_initToHeader(p_to_user); // init of vc_to using userProfile identifier
@@ -311,7 +311,7 @@ module LibIms_Steps 
				vc_branch := c_branchCookie & f_getRndTag();

				vc_via:={

					fieldName := VIA_E,

					viaBody 	 := {m_ViaBody_virtual_XCSCF(vc_branch, vc_userprofile)}

					viaBody 	 := {valueof(m_ViaBody_virtual_XCSCF(vc_branch, vc_userprofile))}

				};

		

				vc_to := f_initToHeader(p_to_user); // init of vc_to using userProfile identifier
@@ -440,8 +440,8 @@ module LibIms_Steps 


	  vc_via:={

		fieldName := VIA_E,

		viaBody 	 := {m_ViaBody_currIpaddr(vc_branch, vc_userprofile),

						 m_ViaBody_virtualUEinPCSCF(vc_branch_ICSCF, vc_userprofile)

		viaBody 	 := {valueof(m_ViaBody_currIpaddr(vc_branch, vc_userprofile)),

						 valueof(m_ViaBody_virtualUEinPCSCF(vc_branch_ICSCF, vc_userprofile))

						 }

	  };

	}// end function f_setHeadersGeneral_ICSCF
@@ -473,7 +473,7 @@ module LibIms_Steps 
	  vc_callId := { fieldName:=CALL_ID_E, callid:=f_getRndCallId(p_cSeq_s) & c_AT & vc_userprofile.currIpaddr };

	  vc_callIdReg := vc_callId;

      

	  vc_to := m_To(m_SipUrl_currDomain(vc_userprofile));

	  vc_to := valueof(m_To(m_SipUrl_currDomain(vc_userprofile)));

	  v_params := {{id:=c_tagId, paramValue:=f_getRndTag()}}

	  vc_from := {fieldName := FROM_E,

		addressField :=vc_to.addressField,
@@ -1180,7 +1180,7 @@ module LibIms_Steps 
		f_sendResponse(m_Response_WWWauthenticate_IMS(c_statusLine401,

			vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,

			m_wwwAuthenticate(f_calculatecChallenge_forWWWAuthorization

									(PX_IMS_SUT_UE1_QOP,vc_authorization.body[0].digestResponse)))

									(PX_IMS_SUT_UE1_QOP,valueof(vc_authorization.body[0].digestResponse))))

			);



		//Awaiting 2nd REGISTER	with authorization header
@@ -1219,7 +1219,7 @@ module LibIms_Steps 
    		f_sendResponse(m_Response_WWWauthenticate_IMS(c_statusLine401,

    			vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,

    			m_wwwAuthenticate(f_calculatecChallenge_forWWWAuthorization

    									(PX_IMS_SUT_UE1_QOP,vc_authorization.body[0].digestResponse)))

    									(PX_IMS_SUT_UE1_QOP,valueof(vc_authorization.body[0].digestResponse))))

    			);

    

    		//Awaiting 2nd REGISTER	with authorization header
@@ -1328,7 +1328,7 @@ module LibIms_Steps 


			//Preamble

			f_init_userprofile(p_userprofile); // assignment of PIXIT values to component variable

			vc_sdp_local := m_SDP_bandwidth(m_media_dynPT(PX_SIP_SDP_dyn, PX_SIP_SDP_encoding), vc_userprofile);

			vc_sdp_local := valueof(m_SDP_bandwidth(m_media_dynPT(PX_SIP_SDP_dyn, PX_SIP_SDP_encoding), vc_userprofile));

			vc_contact := m_Contact(m_SipUrl_contactIpaddr(vc_userprofile));

		}
@@ -1351,7 +1351,7 @@ module LibIms_Steps 


      //Preamble

      f_init_userprofile(p_userprofile); // assignment of PIXIT values to component variable

      vc_sdp_local := m_SDP_bandwidth(m_media_dynPT(PX_SIP_SDP_dyn, PX_SIP_SDP_encoding), vc_userprofile);

      vc_sdp_local := valueof(m_SDP_bandwidth(m_media_dynPT(PX_SIP_SDP_dyn, PX_SIP_SDP_encoding), vc_userprofile));

    }



		/*
@@ -1442,7 +1442,7 @@ module LibIms_Steps 
            //Preamble

            f_init_interfaceprofile(p_interface);

            f_init_userprofile(p_userprofile); // assignment of PIXIT values to component variable

            vc_sdp_local := m_SDP_bandwidth(m_media_dynPT(PX_SIP_SDP_dyn, PX_SIP_SDP_encoding), vc_userprofile);

            vc_sdp_local := valueof(m_SDP_bandwidth(m_media_dynPT(PX_SIP_SDP_dyn, PX_SIP_SDP_encoding), vc_userprofile));

            vc_contact := m_Contact(m_SipUrl_contactIpaddr(vc_userprofile));

        }
@@ -1489,7 +1489,7 @@ module LibIms_Steps 
			f_sendResponse(m_Response_WWWauthenticate_IMS(c_statusLine401,

				vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,

				m_wwwAuthenticate(f_calculatecChallenge_forWWWAuthorization

										(PX_IMS_SUT_UE1_QOP,vc_authorization.body[0].digestResponse)))

										(PX_IMS_SUT_UE1_QOP,valueof(vc_authorization.body[0].digestResponse))))

				);



			//Awaiting 2nd REGISTER	with authorization header
@@ -1516,7 +1516,7 @@ module LibIms_Steps 
			f_sendResponse(m_Response_WWWauthenticate_IMS(c_statusLine401,

				vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,

				m_wwwAuthenticate(f_calculatecChallenge_forWWWAuthorization

										(PX_IMS_SUT_UE1_QOP,vc_authorization.body[0].digestResponse)))

										(PX_IMS_SUT_UE1_QOP,valueof(vc_authorization.body[0].digestResponse))))

				);



			//Awaiting 2nd REGISTER	with authorization header
@@ -1543,7 +1543,7 @@ module LibIms_Steps 
            f_sendResponse(m_Response_WWWauthenticate_IMS(c_statusLine401,

                vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,

                m_wwwAuthenticate(f_calculatecChallenge_forWWWAuthorization

                                        (PX_IMS_SUT_UE1_QOP,vc_authorization.body[0].digestResponse)))

                                        (PX_IMS_SUT_UE1_QOP,valueof(vc_authorization.body[0].digestResponse))))

                );



            //Awaiting 2nd REGISTER	with authorization header