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

Fixed misc bugs in MN TCs

parent f6598404
Loading
Loading
Loading
Loading
+50 −33
Original line number Diff line number Diff line
@@ -2187,12 +2187,12 @@ group mobileSecurityFns {


	/*
	 * @desc  receive Home Test Init And Reply Off Home
	 * @desc  receive Home Test Init Off Home
	 * @param p_paramsCn All IP params of CN
	 * @param p_paramsHa All IP params of HA
	 * @param p_paramsIut All IP params of node under test
	*/
	altstep a_cnReceiveHoTiAndReplyViaHaOffHome(	in template Ipv6NodeParams p_paramsCn,
	altstep a_cnReceiveHoTiViaHaOffHome(	in template Ipv6NodeParams p_paramsCn,
											in template Ipv6NodeParams p_paramsHa,
											in template Ipv6NodeParams p_paramsIut
										)
@@ -2229,24 +2229,6 @@ group mobileSecurityFns {
					valueof(p_paramsIut.mnHoa),
					vc_mobileSec.cnSimuParams.nonceList[vc_mobileSec.cnSimuParams.nonceIndex]);

			f_sendHot (
				m_homeTest (
					c_tunneledIpHdr,
					p_paramsHa.gla,
					p_paramsIut.mnCoa,
					m_extHdrList_2Elem (
						m_extHdr_tunneledHeader (
							c_mobileHdr, 
							p_paramsCn.gla,
							p_paramsIut.mnHoa ),
						m_extHdr_mobileHeader (
							c_noNextHdr,
							c_homeTest,
							m_hot (
								vc_mobileSec.cnSimuParams.nonceIndex,
								vc_mobileSec.cnSimuParams.receivedHomeInitCookie,
								vc_mobileSec.cnSimuParams.homeKeygenToken ) ) ) ) );

		}		
		
		[PX_IP_SEC == e_securityOff]	ipPort.receive ( 
@@ -2271,6 +2253,26 @@ group mobileSecurityFns {
					valueof(p_paramsIut.mnHoa),
					vc_mobileSec.cnSimuParams.nonceList[vc_mobileSec.cnSimuParams.nonceIndex]);

		}
				
	}//end a_cnReceiveHoTiViaHaOffHome


	/*
	 * @desc  receive Home Test Init And Reply Off Home
	 * @param p_paramsCn All IP params of CN
 	 * @param p_paramsHa All IP params of HA
	 * @param p_paramsIut All IP params of node under test
	*/
	altstep a_cnReceiveHoTiAndReplyViaHaOffHome(	in template Ipv6NodeParams p_paramsCn,
													in template Ipv6NodeParams p_paramsHa,
													in template Ipv6NodeParams p_paramsIut
												)
	runs on Ipv6Node {
		//Variables
		var Ipv6Packet v_ipv6Packet;
		
		[] a_cnReceiveHoTiViaHaOffHome(p_paramsCn, p_paramsHa, p_paramsIut) {
			f_sendHot (
				m_homeTest (
					c_tunneledIpHdr,
@@ -2294,11 +2296,11 @@ group mobileSecurityFns {
	}//end a_cnReceiveHoTiAndReplyViaHaOffHome

	/*
	 * @desc  receive Care-Of Test Init And Reply Off Home
	 * @desc  receive Care-Of Test Init Off Home
	 * @param p_paramsCn All IP params of CN
	 * @param p_paramsIut All IP params of node under test
	*/
	altstep a_cnReceiveCoTiAndReplyOffHome(	in template Ipv6NodeParams p_paramsCn,
	altstep a_cnReceiveCoTiOffHome(	in template Ipv6NodeParams p_paramsCn,
									in template Ipv6NodeParams p_paramsIut
									)
	runs on Ipv6Node {
@@ -2322,7 +2324,22 @@ group mobileSecurityFns {
					vc_mobileSec.cnSimuParams.kcnList[vc_mobileSec.cnSimuParams.nonceIndex],
					valueof(p_paramsIut.mnCoa),
					vc_mobileSec.cnSimuParams.nonceList[vc_mobileSec.cnSimuParams.nonceIndex]);
		}
	}//end a_cnReceiveCoTiOffHome
	
	/*
	 * @desc  receive Care-Of Test Init And Reply Off Home
	 * @param p_paramsCn All IP params of CN
	 * @param p_paramsIut All IP params of node under test
	*/
	altstep a_cnReceiveCoTiAndReplyOffHome(	in template Ipv6NodeParams p_paramsCn,
											in template Ipv6NodeParams p_paramsIut
											)
	runs on Ipv6Node {
		//Variables
		var Ipv6Packet v_ipv6Packet;
		
		[] a_cnReceiveCoTiOffHome(p_paramsCn, p_paramsIut) {
			f_sendCot (
				m_careOfTest (
					c_mobileHdr,
@@ -2338,7 +2355,7 @@ group mobileSecurityFns {
								vc_mobileSec.cnSimuParams.careOfKeygenToken ) ) ) ) );
	
		}
	}//end a_cnReceiveHoTiAndReplyViaHaOffHome
	}//end a_cnReceiveCoTiAndReplyOffHome
	
	}//end group mobileAltsteps