Commit 9bff1816 authored by berge's avatar berge
Browse files

Fixed bugs in MN TCs

parent 2045fa94

ttcn3/EtsiLibrary/LibIpv6/LibMobility/LibIpv6_Rfc3775Mipv6_Functions.ttcn

+15 −9
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ module LibIpv6_Rfc3775Mipv6_Functions { 
		//Variables

		var FncRetCode v_ret := e_success;

		var UInt8 v_count := 0;

		var default localDef := activate(a_haReceiveBindingUpdateAndReplyOffHome(p_paramsRt, p_paramsIut));

		var default localDef := activate(a_haReceiveBindingUpdateAndReplyOffHome(p_paramsRt, p_paramsIut, c_mobileCodeBindingUpdateAccepted));



		tc_loop.start;

		//tc_ac.start;
@@ -712,7 +712,7 @@ module LibIpv6_Rfc3775Mipv6_Functions { 
				repeat;

			}

			

			[] a_haReceiveBindingUpdateAndReplyOffHome (p_paramsHa, p_paramsIut) {

			[] a_haReceiveBindingUpdateAndReplyOffHome (p_paramsHa, p_paramsIut, c_mobileCodeBindingUpdateAccepted) {

				tc_ac.stop;

				tc_loop.stop;

				v_ret := e_success;
@@ -1907,7 +1907,8 @@ group mobileSecurityFns { 
	 * @param p_paramsIut All IP params of node under test

	*/

	altstep a_haReceiveBindingUpdateAndReplyOffHome(in template Ipv6NodeParams p_paramsHa,

													template Ipv6NodeParams p_paramsIut

													template Ipv6NodeParams p_paramsIut,

													UInt8 p_status

													)

	runs on Ipv6Node {

		//Variables
@@ -1919,6 +1920,7 @@ group mobileSecurityFns { 
		var HomeAgentAddressDiscoveryRequest v_dhaadReq;

		var Ipv6Packet v_ipv6Packet ;



		//TODO: remove this

		[]	ipPort.receive(mw_dhaadReq(?, ?)) -> value v_dhaadReq {

			f_sendHaAddrDrep(

				m_dhaadRep(p_paramsHa.gla, p_paramsIut.mnCoa, v_dhaadReq.ipv6Payload.homeAgentAddrDiscRequestMsg.identifier));
@@ -1973,7 +1975,8 @@ group mobileSecurityFns { 
						m_extHdr_mobileHeader (

							c_noNextHdr,

							c_bindingAck,

							m_bindingAckMsg(

							m_bindingAckMsg_status(

								p_status,

								v_seqNr,

								v_lifetime,

								m_mobileOptList_1Elem (
@@ -2027,7 +2030,8 @@ group mobileSecurityFns { 
						m_extHdr_mobileHeader (

							c_noNextHdr,

							c_bindingAck,

							m_bindingAckMsg(

							m_bindingAckMsg_status(

								p_status,

								v_seqNr,

								v_lifetime,

								m_mobileOptList_1Elem (
@@ -2298,8 +2302,9 @@ group mobileSecurityFns { 
								m_bindingAckMsg(

									v_seqNr,

									v_lifetime,

									m_mobileOptList_1Elem (

										m_mobileOpt_padN(m_optPad4)))))));

									m_mobileOptList_2Elem (

										m_mobileOpt_nonceIndices(m_mobileOptNonceIndices_dummy),

										m_mobileOpt_bindingAuth (m_bindingAuthData_dummy)))))));

			}				

		}
@@ -2372,8 +2377,9 @@ group mobileSecurityFns { 
								m_bindingAckMsg(

									v_seqNr,

									v_lifetime,

									m_mobileOptList_1Elem (

										m_mobileOpt_padN(m_optPad4)))))));

									m_mobileOptList_2Elem (

										m_mobileOpt_nonceIndices(m_mobileOptNonceIndices_dummy),

										m_mobileOpt_bindingAuth (m_bindingAuthData_dummy)))))));

			}

		}