Commit 428ccf0c authored by poglitsch's avatar poglitsch
Browse files

fix for Bug#0005293 (point 1, 3 and 4)

parent 2ec23503
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -836,7 +836,7 @@ module LibIms_Steps
		 * @desc  awaiting UE1 registration (with authentication)
		 * @param p_cSeq_s		cseq parameter 
		 */
		function f_awaitingRegistration_IMS(inout CSeq p_cSeq_s) runs on SipComponent
		function f_awaitingRegistration_IMS(inout CSeq p_cSeq_s) runs on ImsComponent
		{

		//Awaiting 1st REGISTER	
+46 −27
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ group PSTNTemplates {
	}											 
											 
	
	template BearerCapabilityType m_BearerCapabilityType (template Bit5 p_InfoTrfCap):= {
	template BearerCapabilityType m_BearerCapabilityType (Bit5 p_InfoTrfCap):= {
			BCoctet3 	:= {CodingStandard := bit2str('00'B),						//Coding standard = CCITT standardized coding
							InformationTransferCapability := bit2str(p_InfoTrfCap)},//Information transfer capability
			BCoctet4 	:= {TransferMode := bit2str('00'B),							//Coding standard = CCITT standardized coding
@@ -639,14 +639,14 @@ group PSTNTemplates {
			BCoctet7b  	:= omit 
	}	
	
	template ProgressIndicatorType m_ProgressIndicatorType (template Bit7 p_progDesc) := {
	template ProgressIndicatorType m_ProgressIndicatorType (Bit7 p_progDesc) := {
			ProgressOctet3 := {CodingStandard := bit2str('00'B),
							   Location := bit2str('0000'B)
							  },
			ProgressOctet4 := {ProgressDescription := bit2str(p_progDesc)}
	}
	
	template LowLayerCompatibilityType m_LowLayerCompatibilityType (template Bit5 p_InfoTrfCap) := {
	template LowLayerCompatibilityType m_LowLayerCompatibilityType (Bit5 p_InfoTrfCap) := {
			LLOctet3 := {CodingStandard := bit2str('00'B),						 //Coding standard = CCITT standardized coding
						 InformationTransferCapability := bit2str(p_InfoTrfCap)},//Information transfer capability
			LLOctet3a := omit,
@@ -673,7 +673,7 @@ group PSTNTemplates {
	}
	
	template HighLayerCompatibilityType m_HighLayerCompatibilityType 
		(template Bit7 p_HLOctet4):= {
		(Bit7 p_HLOctet4):= {
			HLOctet3 := {
				CodingStandard :=bit2str('00'B),
				Interpretation :=bit2str('100'B),
@@ -702,7 +702,7 @@ group PSTNTemplates {
			BCoctet7b  	:= * 
	}	

	template BearerCapabilityType mw_BearerCapabilityType_TrfCap  (template Bit5 p_InfoTrfCap):= {
	template BearerCapabilityType mw_BearerCapabilityType_TrfCap  (Bit5 p_InfoTrfCap):= {
    		BCoctet3 	:= {CodingStandard := bit2str('00'B),						//Coding standard = CCITT standardized coding
    						InformationTransferCapability := bit2str(p_InfoTrfCap)},//Information transfer capability
    		BCoctet4 	:= {TransferMode := bit2str('00'B),							//Coding standard = CCITT standardized coding
@@ -1586,17 +1586,32 @@ group request_send {
		* @desc REFER message exchanged at Mw
		*
		*/	
	template REFER_Request m_REFER_Request_IMS
	(SipUrl p_requestUri, CallId p_callId, CSeq p_cSeq, Contact p_contact, From p_from, template To p_to,
			Via p_via,  template ReferTo p_referTo, template ReferredBy p_referredBy, template Require p_require,
	template Route p_route, template RecordRoute p_recordRoute,  template Supported p_supported, template PChargingVector p_pChargingVector, template MessageBody p_mb )
	modifies m_REFER_Request_Base
	:=
	{
			msgHeader :=
			{
		contentLength	:= {fieldName := CONTENT_LENGTH_E, len:= f_MessageBodyLength(valueof(p_mb))},
		contentType := {fieldName := CONTENT_TYPE_E, mediaType :=  c_sdpAplication},
	template REFER_Request m_REFER_Request_IMS(
		SipUrl p_requestUri, 
		CallId p_callId, 
		CSeq p_cSeq, 
		Contact p_contact, 
		From p_from, 
		template To p_to,
		Via p_via,  
		template ReferTo p_referTo, 
		template ReferredBy p_referredBy, 
		template Require p_require,
		template Route p_route, 
		template RecordRoute p_recordRoute,  
		template Supported p_supported, 
		template PChargingVector p_pChargingVector, 
		template MessageBody p_mb 
	) modifies m_REFER_Request_Base := {
		msgHeader := {
    		contentLength	:= {
    			fieldName := CONTENT_LENGTH_E, 
    			len:= f_MessageBodyLength(valueof(p_mb))
    		},
    		contentType := {
    			fieldName := CONTENT_TYPE_E, 
    			mediaType :=  c_sdpAplication
    		},
    		require := p_require,
    		pChargingVector := p_pChargingVector,
    		recordRoute := p_recordRoute,
@@ -1750,7 +1765,7 @@ group request_send {
group request_receive {
	
	template ACK_Request mw_ACK_Request_noPaccessNetworkInfo (template CallId p_callId)
		modifies mw_MESSAGE_Request_Base
		modifies mw_ACK_Request_Base
		:=
		{
		  msgHeader := {  pAccessNetworkInfo := omit}
@@ -2054,8 +2069,12 @@ group request_receive {
						  }
		}

	template SUBSCRIBE_Request mw_SUBSCRIBE_Request_IMS (template From p_from, To p_to, template PAssertedID p_pAssertedID, template PChargingVector p_pChargingVector)  modifies mw_SUBSCRIBE_Request_Base :=
	{
	template SUBSCRIBE_Request mw_SUBSCRIBE_Request_IMS (
		template From p_from, 
		To p_to, 
		template PAssertedID p_pAssertedID, 
		template PChargingVector p_pChargingVector
	)  modifies mw_SUBSCRIBE_Request_Base := {
		requestLine	:=
		{
			method := SUBSCRIBE_E