Commit 5fa63aba authored by berge's avatar berge
Browse files

Fixed cleanup issues in many CN TCs 

Fixed padding problem in CN TCs
Fixed some MN tests according to TC_MOB_1063_01
parent 238bf411

ttcn3/EtsiLibrary/LibIpv6/LibCommonRfcs/LibIpv6_CommonRfcs_Templates.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ module LibIpv6_CommonRfcs_Templates { 
		

		template OptPadN  m_optPad6 := {

			optType := 1,

			optLen := 2,

			optLen := 4,

			padding := c_4ZeroBytes

		}

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2461NeighborDiscovery_Functions.ttcn

+15 −13
Original line number Diff line number Diff line
@@ -190,7 +190,8 @@ module LibIpv6_Rfc2461NeighborDiscovery_Functions { 
		function f_sendMipRtAdvWithPrefix( in template Ipv6Address 	p_llaAddrTn,

										in template Ipv6Address 	p_dstAddr,

										in template PrefixLength 	p_prefixLength,

										in template Ipv6Address 	p_glaAddrTn)

										in template Ipv6Address 	p_glaAddrTn,

										in template Oct6to15		p_linkLayerAddr)

		runs on LibIpv6Node

		return FncRetCode {
@@ -204,8 +205,9 @@ module LibIpv6_Rfc2461NeighborDiscovery_Functions { 
														c_infiniteLifetime,

														c_unspecifiedReachTime,

														c_unspecifiedRetransTime,

														m_mobileRtAdvOpt_prefixOpt (	p_prefixLength,

													//	m_mobileRtAdvOpt_prefixOpt_noHaInfo (	p_prefixLength,

														m_mobileRtAdvOpt_sllaPrefixOpt (	

															p_linkLayerAddr,

															p_prefixLength,

															c_lFlag1,

															c_aFlag1,

															c_rtAddrFlag1,

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2461NeighborDiscovery_Templates.ttcn

+36 −0
Original line number Diff line number Diff line
@@ -1439,6 +1439,42 @@ 
			homeAgentInfo := p_homeAgentInfo,

			otherOption := omit

		}





		/*

		 *	@param  p_macSlla Binary MAC source address associated with

		 *          link layer of test component		

		 *	@param  p_prefixLength Length of the prefix.

		 *	@param  p_lFlag Value for link flag.

		 *	@param  p_aFlag Value for autoconfiguration flag.

		 *	@param  p_validLifetime Value for valid life time duration.

		 *	@param  p_preferredLifetime Value for preffered life time duration.

		 *	@param  p_prefix Address prefix to be used

		*/

		template RtAdvOptions m_mobileRtAdvOpt_sllaPrefixOpt ( template Oct6to15 p_macSlla,		

														template UInt8 p_prefixLength,

														UInt1 p_lFlag,

														UInt1 p_aFlag,

														UInt1 p_rtAddrFlag,

														UInt32 p_validLifetime,

														UInt32 p_preferredLifetime,

														template Ipv6Address p_prefix,

														template AdvertisementInterval p_advertisementInterval,

														template HomeAgentInfo p_homeAgentInfo):={

			srcLinkLayerAddr := m_macSlla(p_macSlla),

			mtuOption:= omit,

			prefixInfoList := {  m_mobilePrefixInfo(	p_prefixLength,

												p_lFlag,

												p_aFlag,

												p_rtAddrFlag,

												p_validLifetime,

												p_preferredLifetime,

												p_prefix) },

			advertisementInterval := p_advertisementInterval,

			homeAgentInfo := p_homeAgentInfo,

			otherOption := omit

		}		

		

		/*

		 *	@param  p_prefixLength Length of the prefix.

		 *	@param  p_lFlag Value for link flag.

ttcn3/EtsiLibrary/LibIpv6/LibMobility/LibIpv6_Rfc3775Mipv6_Functions.ttcn

+2 −1
Original line number Diff line number Diff line
@@ -857,7 +857,8 @@ module LibIpv6_Rfc3775Mipv6_Functions { 
						f_sendMipRtAdvWithPrefix( 	p_paramsHa.lla,

													c_allNodesMca,

													p_paramsHa.prefixLength,

													p_paramsHa.gla	) ;

													p_paramsHa.gla,

													p_paramsHa.macUca	) ;

						tc_loop.stop;

						v_count := v_count + 1;

						if (v_count <= p_nrOfRtAdv) {