Commit 8b50fc85 authored by berge's avatar berge
Browse files

Fixed some bugs in HA TCs

parent 79a907df

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2461NeighborDiscovery_Templates.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -845,7 +845,7 @@ 
	    */

		template RouterAdvertisement mw_rtAdv_noExtHdr (	template Ipv6Address p_src,

															template Ipv6Address p_dst ) := {

			ipv6Hdr := m_ipHdr_nextHdr_srcDst(c_icmpHdr, p_src, p_dst),

			ipv6Hdr := mw_ipHdr_nextHdr_srcDst(c_icmpHdr, p_src, p_dst),

			extHdrList := omit,

			ipv6Payload := { routerAdvMsg := {

				icmpType:= c_rtAdvMsg,

ttcn3/EtsiLibrary/LibIpv6/LibMobility/LibIpv6_Rfc3775Mipv6_Functions.ttcn

+63 −49
Original line number Diff line number Diff line
@@ -102,13 +102,17 @@ module LibIpv6_Rfc3775Mipv6_Functions { 
		var FncRetCode v_ret;

		var NeighborSolicitation v_nbrSol;



		v_ret := f_sendBU(m_bindingUpdate(c_mobileHdr,

		v_ret := f_sendBU(

					m_bindingUpdate(

						c_mobileHdr,

						p_mnHoaTn,

						p_haGlaNut,

						m_extHdrList_1Elem(

															m_extHdr_mobileHeader (c_noNextHdr,

							m_extHdr_mobileHeader (

								c_noNextHdr,

								c_bindingUpdate,

																				m_bindingUpdateMsg(p_seqNr,

								m_bindingUpdateMsg(

									p_seqNr,

									c_aFlag1,

									c_hFlag1,

									c_lFlag0,
@@ -170,18 +174,23 @@ module LibIpv6_Rfc3775Mipv6_Functions { 
	return FncRetCode {

		var FncRetCode v_ret;

	

		v_ret := f_sendBU(m_bindingUpdate(c_dstHdr,

		v_ret := f_sendBU(

					m_bindingUpdate(

						c_dstHdr,

						p_mnCoaTn,

						p_haGlaNut,

						m_extHdrList_2Elem(

															m_extHdr_dstOptHeader(	c_mobileHdr,

							m_extHdr_dstOptHeader(	

								c_mobileHdr,

								c_optLen2,

								m_dstOptList_2Elem(

									m_dstOpt_padN(m_optPad4),

									m_dstOpt_homeAddr(p_mnHoaTn))),

															m_extHdr_mobileHeader (c_noNextHdr,

							m_extHdr_mobileHeader (

								c_noNextHdr,

								c_bindingUpdate,

																				m_bindingUpdateMsg(p_seqNr,

								m_bindingUpdateMsg(

									p_seqNr,

									c_aFlag1,

									c_hFlag1,

									p_lFlag,
@@ -190,19 +199,24 @@ module LibIpv6_Rfc3775Mipv6_Functions { 
									m_mobileOptList_2Elem(

										m_mobileOpt_padN(m_optPad2),

										m_mobileOpt_altCoa(m_altCoA(p_mnCoaTn))))))));

										

		if ( v_ret != e_success ) {return v_ret;}

		tc_ac.start;

		alt {

			[]	ipPort.receive(mw_bindingAck_noData(	c_routeHdr,

			[]	ipPort.receive(

					mw_bindingAck_noData(	

						c_routeHdr,

						p_haGlaNut,

						p_mnCoaTn,

						m_extHdrList_2Elem(

													mw_extHdr_routingHeader(	c_mobileHdr,

						mw_extHdr_routingHeader(	

							c_mobileHdr,

							c_routeHdrLen2,

							c_routeHdrType2,

							c_routeHdrSegmentsLeft1,

							m_routingHeaderData_homeAddress(p_mnHoaTn)),

													mw_extHdr_mobileHeader (	c_noNextHdr,

						mw_extHdr_mobileHeader (	

							c_noNextHdr,

							c_bindingAck,

							mw_bindingAckMsg(p_seqNr))))) {

					tc_ac.stop;