Commit b7479371 authored by mullers's avatar mullers
Browse files

valueof bugs fixed

parent b21932e1
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -687,10 +687,10 @@
				ipv6Payload :=  *
			}

			template MobileMessage mw_bindingUpdateMsg(	UInt1 p_aFlag,
													UInt1 p_hFlag,
													UInt1 p_lFlag,
													UInt1 p_kFlag,
			template MobileMessage mw_bindingUpdateMsg(	template UInt1 p_aFlag,
													template UInt1 p_hFlag,
													template UInt1 p_lFlag,
													template UInt1 p_kFlag,
													template MobileOptionList p_mobileOptions) := {	
				bindingUpdateMsg := {
					sequenceNumber := ?,
+11 −11
Original line number Diff line number Diff line
@@ -1195,11 +1195,11 @@
		 *	@param  p_prefix Address prefix to be used
	    */
		template PrefixInfo mw_prefixInfo (	template UInt8 p_prefixLength,
											UInt1 p_lFlag,
											UInt1 p_aFlag,
											UInt1 p_rAFlag,
											UInt32 p_validLifetime,
											UInt32 p_preferredLifetime,
											template UInt1 p_lFlag,
											template UInt1 p_aFlag,
											template UInt1 p_rAFlag,
											template UInt32 p_validLifetime,
											template UInt32 p_preferredLifetime,
											template Ipv6Address p_prefix):= {
			icmpType:= c_prefixInfo,
			optionLength:= c_prefixInfoLen,
@@ -1624,12 +1624,12 @@
		 *	@param  p_prefix Address prefix to be used
		*/
		template RtAdvOptions mw_mobileRtAdvOpt_sllaPrefixOpt  (	template Oct6to15 p_macSlla,
																	UInt8 p_prefixLength,
																	UInt1 p_lFlag,
																	UInt1 p_aFlag,
																	UInt1 p_rAFlag,
																	UInt32 p_validLifetime,
																	UInt32 p_preferredLifetime,
																	template UInt8 p_prefixLength,
																	template UInt1 p_lFlag,
																	template UInt1 p_aFlag,
																	template UInt1 p_rAFlag,
																	template UInt32 p_validLifetime,
																	template UInt32 p_preferredLifetime,
																	template Ipv6Address p_prefix):={
			srcLinkLayerAddr := m_macSlla(p_macSlla),
			mtuOption:= omit,
+8 −8
Original line number Diff line number Diff line
@@ -978,8 +978,8 @@ module LibIpv6_Rfc3775Mipv6_Functions {
				[] ipPort.receive(mw_nbrSol) -> value v_nbrSol{
						v_receivedSrcAddr := v_nbrSol.ipv6Hdr.sourceAddress ;
						v_receivedTargetAddr := v_nbrSol.ipv6Payload.nbrSolMsg.targetAddr ;
						if (	v_receivedTargetAddr == p_paramsIut.mnHoa
							or 	v_receivedTargetAddr == p_paramsIut.lla) {	
						if (	v_receivedTargetAddr == valueof(p_paramsIut.mnHoa)
							or 	v_receivedTargetAddr == valueof(p_paramsIut.lla)) {	
							f_sendNbrAdv (m_nbrAdv_noExtHdr( 	p_paramsHa.lla,
																c_allNodesMca,
																c_rFlag0,
@@ -989,8 +989,8 @@ module LibIpv6_Rfc3775Mipv6_Functions {
																m_nbrAdvOpt_tllaOpt(p_paramsHa.macUca)  )) ;
						}
						else {
							if (	v_receivedTargetAddr == p_paramsHa.gla
								or	v_receivedTargetAddr == p_paramsHa.lla) {
							if (	v_receivedTargetAddr == valueof(p_paramsHa.gla)
								or	v_receivedTargetAddr == valueof(p_paramsHa.lla)) {
								f_sendNbrAdv (m_nbrAdv_noExtHdr( 	p_paramsHa.lla,
																	c_allNodesMca,
																	c_rFlag1,
@@ -1062,8 +1062,8 @@ module LibIpv6_Rfc3775Mipv6_Functions {
			[] ipPort.receive(mw_nbrSol) -> value v_nbrSol{
					v_receivedSrcAddr := v_nbrSol.ipv6Hdr.sourceAddress ;
					v_receivedTargetAddr := v_nbrSol.ipv6Payload.nbrSolMsg.targetAddr ;
					if (	v_receivedTargetAddr == p_paramsIut.mnHoa
						or 	v_receivedTargetAddr == p_paramsIut.lla) {	
					if (	v_receivedTargetAddr == valueof(p_paramsIut.mnHoa)
						or 	v_receivedTargetAddr == valueof(p_paramsIut.lla)) {	
						f_sendNbrAdv (m_nbrAdv_noExtHdr( 	p_paramsHa.lla,
															c_allNodesMca,
															c_rFlag0,
@@ -1073,8 +1073,8 @@ module LibIpv6_Rfc3775Mipv6_Functions {
															m_nbrAdvOpt_tllaOpt(p_paramsHa.macUca)  )) ;
					}
					else {
						if (	v_receivedTargetAddr == p_paramsHa.gla
							or	v_receivedTargetAddr == p_paramsHa.lla) {
						if (	v_receivedTargetAddr == valueof(p_paramsHa.gla)
							or	v_receivedTargetAddr == valueof(p_paramsHa.lla)) {
							f_sendNbrAdv (m_nbrAdv_noExtHdr( 	p_paramsHa.lla,
																c_allNodesMca,
																c_rFlag1,