Commit ce862558 authored by validator's avatar validator
Browse files

checked an corrected Seb's modifications

parent 4a6e1c42

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2463Icmpv6_Functions.ttcn

+27 −7
Original line number Diff line number Diff line
@@ -351,13 +351,33 @@ 
	runs on LibIpv6Node

	return FncRetCode {

		

		var EchoReply v_echoReply;

		if ( f_echoProcUp( p_llaAddrTn, p_llaAddrNut, c_defId, c_defSeqNo, v_echoReply) == e_timeout ) {

			// that means no echo reply was received - this is what we want here

			return e_success;

		} else {

//		var EchoReply v_echoReply;

//		if ( f_echoProcUp( p_llaAddrTn, p_llaAddrNut, c_defId, c_defSeqNo, v_echoReply) == e_timeout ) {

//			// that means no echo reply was received - this is what we want here

//			return e_success;

//		} else {

//			return e_error;

//		}

		

		var EchoReply v_echoRep;

		var FncRetCode v_ret;



		v_ret := f_sendEchoRequest( m_echoRequest_noExtHdr_noData( 	p_llaAddrTn,

																	p_llaAddrNut,

																	c_defId,

																	c_defSeqNo ));

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

		tc_noAc.start;

		alt {

			[]	ipPort.receive(mw_echoReply ( 	p_llaAddrNut,

												p_llaAddrTn )) -> value v_echoRep {

					tc_ac.stop;	

					return e_error;

				}

			[]	tc_noAc.timeout{

					return e_success;

				}		

		} // end alt

	}//end f_echoProcDown



	/*

ttcn3/EtsiLibrary/LibIpv6/LibMobility/LibIpv6_Rfc3775Mipv6_Functions.ttcn

+12 −12
Original line number Diff line number Diff line
@@ -928,18 +928,18 @@ module LibIpv6_Rfc3775Mipv6_Functions { 
		var Ipv6Address v_receivedTargetAddr := c_16ZeroBytes;

		var NeighborSolicitation v_nbrSol ;



		[]	ipPort.receive(mw_nbrSol_addressDetermination(p_paramsIut.solNodeMca /*PX_SOL_NODE_MCA_IUT_A*/, ?)) -> value v_nbrSol{

				v_receivedTargetAddr := v_nbrSol.targetAddr ;

		

				f_sendNbrAdv (m_nbrAdv_noExtHdr( 	p_paramsTn.lla,

													c_allNodesMca,

													c_rFlag0,

													c_sFlag0,

													c_oFlag0,

													v_receivedTargetAddr,

													m_nbrAdvOpt_tllaOpt(p_paramsTn.macUca)  )) ;	

				repeat;

			}

//		[]	ipPort.receive(mw_nbrSol_addressDetermination(p_paramsIut.solNodeMca /*PX_SOL_NODE_MCA_IUT_A*/, ?)) -> value v_nbrSol{

//				v_receivedTargetAddr := v_nbrSol.targetAddr ;

//		

//				f_sendNbrAdv (m_nbrAdv_noExtHdr( 	p_paramsTn.lla,

//													c_allNodesMca,

//													c_rFlag0,

//													c_sFlag0,

//													c_oFlag0,

//													v_receivedTargetAddr,

//													m_nbrAdvOpt_tllaOpt(p_paramsTn.macUca)  )) ;	

//				repeat;

//			}

		//1st alternative : m_optPad2 + Coa

		[]	ipPort.receive(mw_generalIpv6_dst(	c_dstHdr,

												p_paramsTn.haGlas[0],//p_haGlaTn,