Commit 77030b20 authored by berge's avatar berge
Browse files

Fixed namin convention violations (STF320/Mantis#357)

parent 354eb556
Loading
Loading
Loading
Loading
+12 −12
Original line number Original line Diff line number Diff line
@@ -798,7 +798,7 @@ group rfc3775Mipv6_ExtHdrFunctions {
	 * @param 	p_msg MIPHeader to be sent	
	 * @param 	p_msg MIPHeader to be sent	
	 * @return 	execution status
	 * @return 	execution status
	*/
	*/
	function f_sendBU(template BindingUpdate p_msg)
	function f_sendBu(template BindingUpdate p_msg)
	runs on LibIpv6Node
	runs on LibIpv6Node
	return FncRetCode {
	return FncRetCode {
		//Variables
		//Variables
@@ -807,7 +807,7 @@ group rfc3775Mipv6_ExtHdrFunctions {
		
		
		//set extensionHeaders
		//set extensionHeaders
		if(f_setExtensionHeaders(	v_ipPkt ) != e_success) {
		if(f_setExtensionHeaders(	v_ipPkt ) != e_success) {
			log(" **** f_sendBU: Error when calculating length of extension headers ****");
			log(" **** f_sendBu: Error when calculating length of extension headers ****");
			return e_error;
			return e_error;
		}
		}


@@ -815,7 +815,7 @@ group rfc3775Mipv6_ExtHdrFunctions {
		ipPort.send(v_ipPkt);
		ipPort.send(v_ipPkt);


		return e_success;
		return e_success;
	}//end f_sendBU
	}//end f_sendBu


	/*
	/*
	 * @desc 	This sends a IPv6 packet with MipExtHdr - Binding Acknowledgement
	 * @desc 	This sends a IPv6 packet with MipExtHdr - Binding Acknowledgement
@@ -825,7 +825,7 @@ group rfc3775Mipv6_ExtHdrFunctions {
	 * @param 	p_msg MIPHeader to be sent	
	 * @param 	p_msg MIPHeader to be sent	
	 * @return 	execution status
	 * @return 	execution status
	*/
	*/
	function f_sendBA(template BindingAcknowledgement p_msg)
	function f_sendBa(template BindingAcknowledgement p_msg)
	runs on LibIpv6Node
	runs on LibIpv6Node
	return FncRetCode {
	return FncRetCode {
		//Variables
		//Variables
@@ -834,7 +834,7 @@ group rfc3775Mipv6_ExtHdrFunctions {


		//set extensionHeaders
		//set extensionHeaders
		if(f_setExtensionHeaders(	v_ipPkt ) != e_success) {
		if(f_setExtensionHeaders(	v_ipPkt ) != e_success) {
			log(" **** f_sendBA: Error when calculating length of extension headers ****");
			log(" **** f_sendBa: Error when calculating length of extension headers ****");
			return e_error;
			return e_error;
		}
		}
		
		
@@ -842,7 +842,7 @@ group rfc3775Mipv6_ExtHdrFunctions {
		ipPort.send(v_ipPkt);
		ipPort.send(v_ipPkt);


		return e_success;
		return e_success;
	}//end f_sendBA
	}//end f_sendBa


	/*
	/*
	 * @desc 	This sends a IPv6 packet with MipExtHdr - Binding Error
	 * @desc 	This sends a IPv6 packet with MipExtHdr - Binding Error
@@ -852,7 +852,7 @@ group rfc3775Mipv6_ExtHdrFunctions {
	 * @param 	p_msg MIPHeader to be sent	
	 * @param 	p_msg MIPHeader to be sent	
	 * @return 	execution status
	 * @return 	execution status
	*/
	*/
	function f_sendBE(template BindingError p_msg)
	function f_sendBe(template BindingError p_msg)
	runs on LibIpv6Node
	runs on LibIpv6Node
	return FncRetCode {
	return FncRetCode {
		//Variables
		//Variables
@@ -861,7 +861,7 @@ group rfc3775Mipv6_ExtHdrFunctions {


		//set extensionHeaders
		//set extensionHeaders
		if(f_setExtensionHeaders(	v_ipPkt ) != e_success) {
		if(f_setExtensionHeaders(	v_ipPkt ) != e_success) {
			log(" **** f_sendBE: Error when calculating length of extension headers ****");
			log(" **** f_sendBe: Error when calculating length of extension headers ****");
			return e_error;
			return e_error;
		}
		}


@@ -869,7 +869,7 @@ group rfc3775Mipv6_ExtHdrFunctions {
		ipPort.send(v_ipPkt);
		ipPort.send(v_ipPkt);


		return e_success;
		return e_success;
	}//end f_sendBE
	}//end f_sendBe


	/*
	/*
	 * @desc 	This sends a IPv6 packet with MipExtHdr - Binding Refresh Request
	 * @desc 	This sends a IPv6 packet with MipExtHdr - Binding Refresh Request
@@ -879,7 +879,7 @@ group rfc3775Mipv6_ExtHdrFunctions {
	 * @param 	p_msg MIPHeader to be sent	
	 * @param 	p_msg MIPHeader to be sent	
	 * @return 	execution status
	 * @return 	execution status
	*/
	*/
	function f_sendBR(template BindingRefreshRequest p_msg)
	function f_sendBr(template BindingRefreshRequest p_msg)
	runs on LibIpv6Node
	runs on LibIpv6Node
	return FncRetCode {
	return FncRetCode {
		//Variables
		//Variables
@@ -887,7 +887,7 @@ group rfc3775Mipv6_ExtHdrFunctions {
		v_ipPkt := valueof(p_msg);
		v_ipPkt := valueof(p_msg);


		if(f_setExtensionHeaders(	v_ipPkt ) != e_success) {
		if(f_setExtensionHeaders(	v_ipPkt ) != e_success) {
			log(" **** f_sendBR: Error when calculating length of extension headers ****");
			log(" **** f_sendBr: Error when calculating length of extension headers ****");
			return e_error;
			return e_error;
		}
		}


@@ -895,7 +895,7 @@ group rfc3775Mipv6_ExtHdrFunctions {
		ipPort.send(v_ipPkt);
		ipPort.send(v_ipPkt);


		return e_success;
		return e_success;
	}//end f_sendBR
	}//end f_sendBr


	/*
	/*
	 * @desc 	This sends a IPv6 packet with MipExtHdr - Home Test
	 * @desc 	This sends a IPv6 packet with MipExtHdr - Home Test
+15 −15
Original line number Original line Diff line number Diff line
@@ -1148,8 +1148,8 @@ module LibIpv6_Interface_Templates {
				optPadN := p_optPadN
				optPadN := p_optPadN
			}
			}


			template MobileOption m_mobileOpt_altCoa(template MipOptAltCoA p_mobileOptAltCoA) := {
			template MobileOption m_mobileOpt_altCoa(template MipOptAltCoa p_mobileOptAltCoa) := {
				mobileOptAltCoA := p_mobileOptAltCoA
				mobileOptAltCoa := p_mobileOptAltCoa
			}
			}


			template MobileOption m_mobileOpt_nonceIndices(template MipOptNonceIndices p_mobileOptNonceIndices) := {
			template MobileOption m_mobileOpt_nonceIndices(template MipOptNonceIndices p_mobileOptNonceIndices) := {
@@ -1211,24 +1211,24 @@ module LibIpv6_Interface_Templates {
				careOfNonceIndex := p_careOfNonceIndex
				careOfNonceIndex := p_careOfNonceIndex
			}
			}


			template MipOptAltCoA m_altCoA(in template Ipv6Address p_addr) := {
			template MipOptAltCoa m_altCoa(in template Ipv6Address p_addr) := {
				mobileOptType := c_mobileOptAltCoA,
				mobileOptType := c_mobileOptAltCoa,
				mobileOptLen := c_mobileOptAltCoALen,
				mobileOptLen := c_mobileOptAltCoaLen,
				alternateCoA := p_addr
				alternateCoa := p_addr
			}
			}


			//Modified by PK
			//Modified by PK
			template MipOptAltCoA mw_altCoA_any := {
			template MipOptAltCoa mw_altCoa_any := {
				mobileOptType := c_mobileOptAltCoA,
				mobileOptType := c_mobileOptAltCoa,
				mobileOptLen := c_mobileOptAltCoALen,
				mobileOptLen := c_mobileOptAltCoaLen,
				alternateCoA := ?
				alternateCoa := ?
			}
			}


			//Added by PK
			//Added by PK
			template MipOptAltCoA mw_altCoA(template Oct16 p_altCoa) := {
			template MipOptAltCoa mw_altCoa(template Oct16 p_altCoa) := {
				mobileOptType := c_mobileOptAltCoA,
				mobileOptType := c_mobileOptAltCoa,
				mobileOptLen := c_mobileOptAltCoALen,
				mobileOptLen := c_mobileOptAltCoaLen,
				alternateCoA := p_altCoa
				alternateCoa := p_altCoa
			}
			}
		} //end group mobileOptTemplates
		} //end group mobileOptTemplates
		group mobileHeaderTemplates {
		group mobileHeaderTemplates {
@@ -1302,7 +1302,7 @@ module LibIpv6_Interface_Templates {
	} //end group rfc4068HastHandovers_OptionTemplates
	} //end group rfc4068HastHandovers_OptionTemplates
	group rfc4302Ah_ExtHdrTemplates {
	group rfc4302Ah_ExtHdrTemplates {


			template ExtensionHeader m_extHdr_AHHeaders(UInt8 nextHeader_p, 
			template ExtensionHeader m_extHdr_AhHeaders(UInt8 nextHeader_p, 
												UInt32 securityParametersIndex_p,
												UInt32 securityParametersIndex_p,
												UInt32 sequenceNumber_p) := {
												UInt32 sequenceNumber_p) := {
				authHeader := {
				authHeader := {
+7 −7
Original line number Original line Diff line number Diff line
@@ -874,7 +874,7 @@ module LibIpv6_Interface_TypesAndValues {
					OptPad1							optPad1,
					OptPad1							optPad1,
					OptPadN							optPadN,
					OptPadN							optPadN,
					MipOptBindingRefreshAdvice		mobileOptBindingRefreshAdvice,
					MipOptBindingRefreshAdvice		mobileOptBindingRefreshAdvice,
					MipOptAltCoA					mobileOptAltCoA,
					MipOptAltCoa					mobileOptAltCoa,
					MipOptNonceIndices				mobileOptNonceIndices,
					MipOptNonceIndices				mobileOptNonceIndices,
					MipBindingAuthorizationData		mobileBindingAuthorizationData,
					MipBindingAuthorizationData		mobileBindingAuthorizationData,
					MobilityHeaderLinkLayerAddress	fHLinkLayerAddress
					MobilityHeaderLinkLayerAddress	fHLinkLayerAddress
@@ -895,10 +895,10 @@ module LibIpv6_Interface_TypesAndValues {
				/*
				/*
				 * @desc Derived from RFC3775 Section 6.2.5
				 * @desc Derived from RFC3775 Section 6.2.5
				*/
				*/
				type record MipOptAltCoA {
				type record MipOptAltCoa {
					UInt8	mobileOptType (c_mobileOptAltCoA),
					UInt8	mobileOptType (c_mobileOptAltCoa),
					UInt8	mobileOptLen (c_mobileOptAltCoALen),
					UInt8	mobileOptLen (c_mobileOptAltCoaLen),
					Oct16	alternateCoA
					Oct16	alternateCoa
				}
				}
				with {
				with {
					variant "present=bytes(0,1,3);";
					variant "present=bytes(0,1,3);";
@@ -940,12 +940,12 @@ module LibIpv6_Interface_TypesAndValues {
			
			
					//Type
					//Type
					const UInt8 c_mobileOptBindingRefreshAdvice := 2;
					const UInt8 c_mobileOptBindingRefreshAdvice := 2;
					const UInt8 c_mobileOptAltCoA := 3;
					const UInt8 c_mobileOptAltCoa := 3;
					const UInt8 c_mobileOptNonceIndices := 4;
					const UInt8 c_mobileOptNonceIndices := 4;
					const UInt8 c_mobileBindingAuthorizationData := 5;
					const UInt8 c_mobileBindingAuthorizationData := 5;
					//Length
					//Length
					const UInt8 c_mobileOptBindingRefreshAdviceLen := 2;
					const UInt8 c_mobileOptBindingRefreshAdviceLen := 2;
					const UInt8 c_mobileOptAltCoALen := 16;
					const UInt8 c_mobileOptAltCoaLen := 16;
					const UInt8 c_mobileOptNonceIndicesLen := 4;
					const UInt8 c_mobileOptNonceIndicesLen := 4;


				}//end group mobileOptionsConstants
				}//end group mobileOptionsConstants
+51 −51
Original line number Original line Diff line number Diff line
@@ -101,7 +101,7 @@ module LibIpv6_Rfc3775Mipv6_Functions {
		var NeighborSolicitation v_nbrSol;
		var NeighborSolicitation v_nbrSol;


		if(PX_USE_IPSEC_FOR_MIP == e_securityOff) {
		if(PX_USE_IPSEC_FOR_MIP == e_securityOff) {
			v_ret := f_sendBU(
			v_ret := f_sendBu(
						m_bindingUpdate(
						m_bindingUpdate(
							c_mobileHdr,
							c_mobileHdr,
							p_mnHoaTn,
							p_mnHoaTn,
@@ -119,9 +119,9 @@ module LibIpv6_Rfc3775Mipv6_Functions {
										p_timeUnits,
										p_timeUnits,
										m_mobileOptList_2Elem(
										m_mobileOptList_2Elem(
											m_mobileOpt_padN(m_optPad2),
											m_mobileOpt_padN(m_optPad2),
											m_mobileOpt_altCoa(m_altCoA(p_mnHoaTn))))))));
											m_mobileOpt_altCoa(m_altCoa(p_mnHoaTn))))))));
		} else { //e_securityOn
		} else { //e_securityOn
			v_ret := f_sendBU(
			v_ret := f_sendBu(
						m_bindingUpdate(
						m_bindingUpdate(
							c_espHdr,
							c_espHdr,
							p_mnHoaTn,
							p_mnHoaTn,
@@ -144,7 +144,7 @@ module LibIpv6_Rfc3775Mipv6_Functions {
													p_timeUnits,
													p_timeUnits,
													m_mobileOptList_2Elem(
													m_mobileOptList_2Elem(
														m_mobileOpt_padN(m_optPad2),
														m_mobileOpt_padN(m_optPad2),
														m_mobileOpt_altCoa(m_altCoA(p_mnHoaTn)))))),
														m_mobileOpt_altCoa(m_altCoa(p_mnHoaTn)))))),
										omit),
										omit),
									c_mobileHdr))));
									c_mobileHdr))));
			
			
@@ -223,7 +223,7 @@ module LibIpv6_Rfc3775Mipv6_Functions {
		var FncRetCode v_ret;
		var FncRetCode v_ret;
	
	
		if(PX_USE_IPSEC_FOR_MIP == e_securityOff){
		if(PX_USE_IPSEC_FOR_MIP == e_securityOff){
			v_ret := f_sendBU(
			v_ret := f_sendBu(
						m_bindingUpdate(
						m_bindingUpdate(
							c_dstHdr,
							c_dstHdr,
							p_mnCoaTn,
							p_mnCoaTn,
@@ -247,9 +247,9 @@ module LibIpv6_Rfc3775Mipv6_Functions {
										p_timeUnits,
										p_timeUnits,
										m_mobileOptList_2Elem(
										m_mobileOptList_2Elem(
											m_mobileOpt_padN(m_optPad2),
											m_mobileOpt_padN(m_optPad2),
											m_mobileOpt_altCoa(m_altCoA(p_mnCoaTn))))))));
											m_mobileOpt_altCoa(m_altCoa(p_mnCoaTn))))))));
		} else { //e_securityOn									
		} else { //e_securityOn									
			v_ret := f_sendBU(
			v_ret := f_sendBu(
						m_bindingUpdate(
						m_bindingUpdate(
							c_dstHdr,
							c_dstHdr,
							p_mnCoaTn,
							p_mnCoaTn,
@@ -278,7 +278,7 @@ module LibIpv6_Rfc3775Mipv6_Functions {
													p_timeUnits,
													p_timeUnits,
													m_mobileOptList_2Elem(
													m_mobileOptList_2Elem(
														m_mobileOpt_padN(m_optPad2),
														m_mobileOpt_padN(m_optPad2),
														m_mobileOpt_altCoa(m_altCoA(p_mnCoaTn)))))),
														m_mobileOpt_altCoa(m_altCoa(p_mnCoaTn)))))),
										omit),
										omit),
									c_mobileHdr))));
									c_mobileHdr))));
		}		
		}		
@@ -378,7 +378,7 @@ module LibIpv6_Rfc3775Mipv6_Functions {
								p_timeUnits,
								p_timeUnits,
								m_mobileOptList_2Elem(
								m_mobileOptList_2Elem(
									m_mobileOpt_padN(m_optPad2),
									m_mobileOpt_padN(m_optPad2),
									m_mobileOpt_altCoa(m_altCoA(p_mnCoaTn)))))),
									m_mobileOpt_altCoa(m_altCoa(p_mnCoaTn)))))),
					omit) );
					omit) );


//		v_ret := f_buildEspExtHdr( 	vc_sad[c_saIni],
//		v_ret := f_buildEspExtHdr( 	vc_sad[c_saIni],
@@ -386,7 +386,7 @@ module LibIpv6_Rfc3775Mipv6_Functions {
//									v_extHdr_espHeader);
//									v_extHdr_espHeader);
//		if ( v_ret != e_success ) {return v_ret;}
//		if ( v_ret != e_success ) {return v_ret;}


		v_ret := f_sendBU(m_bindingUpdate(c_dstHdr,
		v_ret := f_sendBu(m_bindingUpdate(c_dstHdr,
														p_mnCoaTn,
														p_mnCoaTn,
														p_haGlaNut,
														p_haGlaNut,
														m_extHdrList_2Elem(
														m_extHdrList_2Elem(
@@ -423,7 +423,7 @@ module LibIpv6_Rfc3775Mipv6_Functions {
	return FncRetCode {
	return FncRetCode {
		var FncRetCode v_ret;
		var FncRetCode v_ret;
	
	
		v_ret := f_sendBU(m_bindingUpdate(c_dstHdr,
		v_ret := f_sendBu(m_bindingUpdate(c_dstHdr,
														p_mnCoaTn,
														p_mnCoaTn,
														p_haGlaNut,
														p_haGlaNut,
														m_extHdrList_2Elem(
														m_extHdrList_2Elem(
@@ -442,7 +442,7 @@ module LibIpv6_Rfc3775Mipv6_Functions {
																								p_timeUnits,
																								p_timeUnits,
																								m_mobileOptList_5Elem(
																								m_mobileOptList_5Elem(
																									m_mobileOpt_padN(m_optPad2),
																									m_mobileOpt_padN(m_optPad2),
																									m_mobileOpt_altCoa(m_altCoA(p_mnCoaTn)),
																									m_mobileOpt_altCoa(m_altCoa(p_mnCoaTn)),
																									m_mobileOpt_nonceIndices(m_mobileOptNonceIndices_dummy), 
																									m_mobileOpt_nonceIndices(m_mobileOptNonceIndices_dummy), 
																									m_mobileOpt_padN(m_optPad4),
																									m_mobileOpt_padN(m_optPad4),
																									m_mobileOpt_bindingAuth(m_bindingAuthData_dummy)))))));
																									m_mobileOpt_bindingAuth(m_bindingAuthData_dummy)))))));
@@ -490,7 +490,7 @@ module LibIpv6_Rfc3775Mipv6_Functions {
	return FncRetCode {
	return FncRetCode {
		var FncRetCode v_ret;
		var FncRetCode v_ret;
	
	
		v_ret := f_sendBU(m_bindingUpdate(c_mobileHdr,
		v_ret := f_sendBu(m_bindingUpdate(c_mobileHdr,
														p_mnHoaTn,
														p_mnHoaTn,
														p_cnGlaNut,
														p_cnGlaNut,
														m_extHdrList_1Elem(
														m_extHdrList_1Elem(
@@ -504,7 +504,7 @@ module LibIpv6_Rfc3775Mipv6_Functions {
																								p_timeUnits,
																								p_timeUnits,
																								m_mobileOptList_5Elem(
																								m_mobileOptList_5Elem(
																									m_mobileOpt_padN(m_optPad2),
																									m_mobileOpt_padN(m_optPad2),
																									m_mobileOpt_altCoa(m_altCoA(p_mnHoaTn)),
																									m_mobileOpt_altCoa(m_altCoa(p_mnHoaTn)),
																									m_mobileOpt_nonceIndices(m_mobileOptNonceIndices_dummy),
																									m_mobileOpt_nonceIndices(m_mobileOptNonceIndices_dummy),
																									m_mobileOpt_padN(m_optPad4),
																									m_mobileOpt_padN(m_optPad4),
																									m_mobileOpt_bindingAuth(m_bindingAuthData_dummy)))))));
																									m_mobileOpt_bindingAuth(m_bindingAuthData_dummy)))))));
@@ -1450,7 +1450,7 @@ group mobileSecurityFns {
	 * @param p_mnHoaTn Home Agent Addresses of test node
	 * @param p_mnHoaTn Home Agent Addresses of test node
	 * @param p_haAcaNut Home Agent Anycast Address of node under test
	 * @param p_haAcaNut Home Agent Anycast Address of node under test
	*/
	*/
	function f_mnNull2MipPrefixDiscoveryWithHa(	in template Ipv6Address p_mnCoaTn,
	function f_mnNullToMipPrefixDiscoveryWithHa(	in template Ipv6Address p_mnCoaTn,
												in template Ipv6Address p_mnHoaTn,
												in template Ipv6Address p_mnHoaTn,
												in template Ipv6Address p_haAcaNut)
												in template Ipv6Address p_haAcaNut)
	runs on LibIpv6Node
	runs on LibIpv6Node
@@ -1479,7 +1479,7 @@ group mobileSecurityFns {
														v_haGlasNut[0]);
														v_haGlasNut[0]);
		}
		}
		return v_ret;
		return v_ret;
	}//end function f_mnNull2MipPrefixDiscoveryWithHa
	}//end function f_mnNullToMipPrefixDiscoveryWithHa


	/*
	/*
	 * @desc  Null to Return Routabilty (HA = IUT)
	 * @desc  Null to Return Routabilty (HA = IUT)
@@ -1489,7 +1489,7 @@ group mobileSecurityFns {
	 * @param p_haAcaNut Home Agent Anycast Address of node under test
	 * @param p_haAcaNut Home Agent Anycast Address of node under test
	 * @param p_haGlasNut Global Addresses of node under test
	 * @param p_haGlasNut Global Addresses of node under test
	*/
	*/
	function f_mnNull2ReturnRoutabilityWithHa(	in template Ipv6Address p_mnCoaTn,
	function f_mnNullToReturnRoutabilityWithHa(	in template Ipv6Address p_mnCoaTn,
												in template Ipv6Address p_mnHoaTn,
												in template Ipv6Address p_mnHoaTn,
												in template Ipv6Address p_glaCnTn,
												in template Ipv6Address p_glaCnTn,
												in template Ipv6Address p_haAcaNut,
												in template Ipv6Address p_haAcaNut,
@@ -1521,7 +1521,7 @@ group mobileSecurityFns {
		}
		}
		p_haGlasNut := v_haGlasNut;
		p_haGlasNut := v_haGlasNut;
		return v_ret ;
		return v_ret ;
	}//end function f_mnNull2ReturnRoutabilityWithHa
	}//end function f_mnNullToReturnRoutabilityWithHa


	
	
	/*
	/*
@@ -1531,7 +1531,7 @@ group mobileSecurityFns {
	 * @param p_glaCnTn Global Address of test node 2
	 * @param p_glaCnTn Global Address of test node 2
	 * @param p_haAcaNut Home Agent Anycast Address of node under test
	 * @param p_haAcaNut Home Agent Anycast Address of node under test
	*/
	*/
	function f_mnNull2ReverseTunnelingWithHa(	in template Ipv6Address p_mnCoaTn,
	function f_mnNullToReverseTunnelingWithHa(	in template Ipv6Address p_mnCoaTn,
											in template Ipv6Address p_mnHoaTn,
											in template Ipv6Address p_mnHoaTn,
											in template Ipv6Address p_glaCnTn,
											in template Ipv6Address p_glaCnTn,
											in template Ipv6Address p_haAcaNut)
											in template Ipv6Address p_haAcaNut)
@@ -1542,7 +1542,7 @@ group mobileSecurityFns {
		var Ipv6AddressList v_haGlasNut := {c_16ZeroBytes};
		var Ipv6AddressList v_haGlasNut := {c_16ZeroBytes};
		var EchoReply v_echoRep;
		var EchoReply v_echoRep;


		v_ret := f_mnNull2ReturnRoutabilityWithHa(	p_mnCoaTn,
		v_ret := f_mnNullToReturnRoutabilityWithHa(	p_mnCoaTn,
													p_mnHoaTn,
													p_mnHoaTn,
													p_glaCnTn,
													p_glaCnTn,
													p_haAcaNut,
													p_haAcaNut,
@@ -1557,14 +1557,14 @@ group mobileSecurityFns {
											v_echoRep);
											v_echoRep);
		}
		}
		return v_ret ;
		return v_ret ;
	}//end function f_mnNull2ReverseTunnelingWithHa
	}//end function f_mnNullToReverseTunnelingWithHa


	/*
	/*
	 * @desc  Null to Reverse Tunneling (HA = IUT) on HA's interface towards CN
	 * @desc  Null to Reverse Tunneling (HA = IUT) on HA's interface towards CN
 	 * @param p_glaCnTn Global Address of test node
 	 * @param p_glaCnTn Global Address of test node
	 * @param p_mnHoaTn Home Agent Addresses of test node
	 * @param p_mnHoaTn Home Agent Addresses of test node
	 */
	 */
	function f_cnNull2ReverseTunnelingWithHa(	in template Ipv6Address p_glaCnTn,
	function f_cnNullToReverseTunnelingWithHa(	in template Ipv6Address p_glaCnTn,
											in template Ipv6Address p_mnHoaTn)
											in template Ipv6Address p_mnHoaTn)
	runs on LibIpv6Node
	runs on LibIpv6Node
	return FncRetCode {
	return FncRetCode {
@@ -1582,7 +1582,7 @@ group mobileSecurityFns {
											v_receivedEchoRequest);
											v_receivedEchoRequest);
		}
		}
		return v_ret;
		return v_ret;
	}//end function f_cnNull2ReverseTunnelingWithHa
	}//end function f_cnNullToReverseTunnelingWithHa


	}//end group statefulMipFns
	}//end group statefulMipFns


@@ -1673,7 +1673,7 @@ group mobileSecurityFns {
							m_mobileOptList_2Elem (
							m_mobileOptList_2Elem (
								m_mobileOpt_padN(m_optPad2),
								m_mobileOpt_padN(m_optPad2),
								m_mobileOpt_altCoa(
								m_mobileOpt_altCoa(
									m_altCoA(
									m_altCoa(
										p_paramsIut.mnHoa)))))))) -> value v_ipv6Packet {
										p_paramsIut.mnHoa)))))))) -> value v_ipv6Packet {
			//Get SeqNr
			//Get SeqNr
			v_seqNr := v_ipv6Packet.extHdrList[0].mobileHeader.mobileMessage.bindingUpdateMsg.sequenceNumber;
			v_seqNr := v_ipv6Packet.extHdrList[0].mobileHeader.mobileMessage.bindingUpdateMsg.sequenceNumber;
@@ -1681,7 +1681,7 @@ group mobileSecurityFns {
			v_lifetime := v_ipv6Packet.extHdrList[0].mobileHeader.mobileMessage.bindingUpdateMsg.lifeTime;
			v_lifetime := v_ipv6Packet.extHdrList[0].mobileHeader.mobileMessage.bindingUpdateMsg.lifeTime;
			v_ret := e_success;
			v_ret := e_success;


			v_ret := f_sendBA (
			v_ret := f_sendBa (
				m_bindingAck (
				m_bindingAck (
					c_mobileHdr,
					c_mobileHdr,
					p_paramsHa.gla,
					p_paramsHa.gla,
@@ -1697,7 +1697,7 @@ group mobileSecurityFns {
									m_mobileOpt_padN(m_optPad4)))))));
									m_mobileOpt_padN(m_optPad4)))))));
		}				
		}				
		
		
		//1st alternative bis: m_optPad2 + Coa + HoADestOpt
		//1st alternative bis: m_optPad2 + Coa + HoaDestOpt
		[PX_USE_IPSEC_FOR_MIP == e_securityOff]	ipPort.receive (
		[PX_USE_IPSEC_FOR_MIP == e_securityOff]	ipPort.receive (
			mw_bindingUpdate_srcDst (
			mw_bindingUpdate_srcDst (
				c_dstHdr,
				c_dstHdr,
@@ -1721,7 +1721,7 @@ group mobileSecurityFns {
							m_mobileOptList_2Elem (
							m_mobileOptList_2Elem (
								m_mobileOpt_padN(m_optPad2),
								m_mobileOpt_padN(m_optPad2),
								m_mobileOpt_altCoa(
								m_mobileOpt_altCoa(
									m_altCoA(
									m_altCoa(
										p_paramsIut.mnHoa)))))))) -> value v_ipv6Packet {
										p_paramsIut.mnHoa)))))))) -> value v_ipv6Packet {
			//Get SeqNr
			//Get SeqNr
			v_seqNr := v_ipv6Packet.extHdrList[1].mobileHeader.mobileMessage.bindingUpdateMsg.sequenceNumber;
			v_seqNr := v_ipv6Packet.extHdrList[1].mobileHeader.mobileMessage.bindingUpdateMsg.sequenceNumber;
@@ -1729,7 +1729,7 @@ group mobileSecurityFns {
			v_lifetime := v_ipv6Packet.extHdrList[1].mobileHeader.mobileMessage.bindingUpdateMsg.lifeTime;
			v_lifetime := v_ipv6Packet.extHdrList[1].mobileHeader.mobileMessage.bindingUpdateMsg.lifeTime;
			v_ret := e_success;
			v_ret := e_success;


			v_ret := f_sendBA (
			v_ret := f_sendBa (
				m_bindingAck (
				m_bindingAck (
					c_routeHdr,
					c_routeHdr,
					p_paramsHa.gla,
					p_paramsHa.gla,
@@ -1774,7 +1774,7 @@ group mobileSecurityFns {
			v_lifetime := v_ipv6Packet.extHdrList[0].mobileHeader.mobileMessage.bindingUpdateMsg.lifeTime;
			v_lifetime := v_ipv6Packet.extHdrList[0].mobileHeader.mobileMessage.bindingUpdateMsg.lifeTime;
			v_ret := e_success;
			v_ret := e_success;


			v_ret := f_sendBA (
			v_ret := f_sendBa (
				m_bindingAck (
				m_bindingAck (
					c_mobileHdr,
					c_mobileHdr,
					p_paramsHa.gla,
					p_paramsHa.gla,
@@ -1791,7 +1791,7 @@ group mobileSecurityFns {
		}
		}


				
				
		//2nd alternative bis: m_optPad4 + HoADestOpt
		//2nd alternative bis: m_optPad4 + HoaDestOpt
		[PX_USE_IPSEC_FOR_MIP == e_securityOff]	ipPort.receive (
		[PX_USE_IPSEC_FOR_MIP == e_securityOff]	ipPort.receive (
			mw_bindingUpdate_srcDst (
			mw_bindingUpdate_srcDst (
				c_dstHdr,
				c_dstHdr,
@@ -1820,7 +1820,7 @@ group mobileSecurityFns {
			v_lifetime := v_ipv6Packet.extHdrList[1].mobileHeader.mobileMessage.bindingUpdateMsg.lifeTime;
			v_lifetime := v_ipv6Packet.extHdrList[1].mobileHeader.mobileMessage.bindingUpdateMsg.lifeTime;
			v_ret := e_success;
			v_ret := e_success;


			v_ret := f_sendBA (
			v_ret := f_sendBa (
				m_bindingAck (
				m_bindingAck (
					c_routeHdr,
					c_routeHdr,
					p_paramsHa.gla,
					p_paramsHa.gla,
@@ -1865,7 +1865,7 @@ group mobileSecurityFns {
										m_mobileOptList_2Elem (
										m_mobileOptList_2Elem (
											m_mobileOpt_padN(m_optPad2),
											m_mobileOpt_padN(m_optPad2),
											m_mobileOpt_altCoa(
											m_mobileOpt_altCoa(
												m_altCoA(
												m_altCoa(
													p_paramsIut.mnHoa)))))),
													p_paramsIut.mnHoa)))))),
							omit),
							omit),
					c_mobileHdr)))) -> value v_ipv6Packet {
					c_mobileHdr)))) -> value v_ipv6Packet {
@@ -1875,7 +1875,7 @@ group mobileSecurityFns {
			v_lifetime := v_ipv6Packet.extHdrList[0].espHeader.espPayload.espIpDatagram.extHdrList[0].mobileHeader.mobileMessage.bindingUpdateMsg.lifeTime;
			v_lifetime := v_ipv6Packet.extHdrList[0].espHeader.espPayload.espIpDatagram.extHdrList[0].mobileHeader.mobileMessage.bindingUpdateMsg.lifeTime;
			v_ret := e_success;
			v_ret := e_success;
									
									
			v_ret := f_sendBA (
			v_ret := f_sendBa (
				m_bindingAck (
				m_bindingAck (
					c_espHdr,
					c_espHdr,
					p_paramsHa.gla,
					p_paramsHa.gla,
@@ -1898,7 +1898,7 @@ group mobileSecurityFns {
							c_mobileHdr))));
							c_mobileHdr))));
		}
		}


		//1st alternative bis: m_optPad2 + Coa + HoADestOpt
		//1st alternative bis: m_optPad2 + Coa + HoaDestOpt
		[PX_USE_IPSEC_FOR_MIP == e_securityOn]	ipPort.receive (
		[PX_USE_IPSEC_FOR_MIP == e_securityOn]	ipPort.receive (
			mw_bindingUpdate_srcDst (
			mw_bindingUpdate_srcDst (
				c_dstHdr,
				c_dstHdr,
@@ -1927,7 +1927,7 @@ group mobileSecurityFns {
										m_mobileOptList_2Elem (
										m_mobileOptList_2Elem (
											m_mobileOpt_padN(m_optPad2),
											m_mobileOpt_padN(m_optPad2),
											m_mobileOpt_altCoa(
											m_mobileOpt_altCoa(
												m_altCoA(
												m_altCoa(
													p_paramsIut.mnHoa)))))),
													p_paramsIut.mnHoa)))))),
							omit),
							omit),
					c_mobileHdr)))) -> value v_ipv6Packet {
					c_mobileHdr)))) -> value v_ipv6Packet {
@@ -1937,7 +1937,7 @@ group mobileSecurityFns {
			v_lifetime := v_ipv6Packet.extHdrList[1].espHeader.espPayload.espIpDatagram.extHdrList[0].mobileHeader.mobileMessage.bindingUpdateMsg.lifeTime;
			v_lifetime := v_ipv6Packet.extHdrList[1].espHeader.espPayload.espIpDatagram.extHdrList[0].mobileHeader.mobileMessage.bindingUpdateMsg.lifeTime;
			v_ret := e_success;
			v_ret := e_success;
									
									
			v_ret := f_sendBA (
			v_ret := f_sendBa (
				m_bindingAck (
				m_bindingAck (
					c_routeHdr,
					c_routeHdr,
					p_paramsHa.gla,
					p_paramsHa.gla,
@@ -1997,7 +1997,7 @@ group mobileSecurityFns {
			v_lifetime := v_ipv6Packet.extHdrList[0].espHeader.espPayload.espIpDatagram.extHdrList[0].mobileHeader.mobileMessage.bindingUpdateMsg.lifeTime;
			v_lifetime := v_ipv6Packet.extHdrList[0].espHeader.espPayload.espIpDatagram.extHdrList[0].mobileHeader.mobileMessage.bindingUpdateMsg.lifeTime;
			v_ret := e_success;
			v_ret := e_success;
									
									
			v_ret := f_sendBA (
			v_ret := f_sendBa (
				m_bindingAck (
				m_bindingAck (
					c_espHdr,
					c_espHdr,
					p_paramsHa.gla,
					p_paramsHa.gla,
@@ -2020,7 +2020,7 @@ group mobileSecurityFns {
							c_mobileHdr))));
							c_mobileHdr))));
		}
		}


		//2nd alternative bis: m_optPad4 + HoADestOpt
		//2nd alternative bis: m_optPad4 + HoaDestOpt
		[PX_USE_IPSEC_FOR_MIP == e_securityOn]	ipPort.receive (
		[PX_USE_IPSEC_FOR_MIP == e_securityOn]	ipPort.receive (
			mw_bindingUpdate_srcDst (
			mw_bindingUpdate_srcDst (
				c_dstHdr,
				c_dstHdr,
@@ -2056,7 +2056,7 @@ group mobileSecurityFns {
			v_lifetime := v_ipv6Packet.extHdrList[1].espHeader.espPayload.espIpDatagram.extHdrList[0].mobileHeader.mobileMessage.bindingUpdateMsg.lifeTime;
			v_lifetime := v_ipv6Packet.extHdrList[1].espHeader.espPayload.espIpDatagram.extHdrList[0].mobileHeader.mobileMessage.bindingUpdateMsg.lifeTime;
			v_ret := e_success;
			v_ret := e_success;
									
									
			v_ret := f_sendBA (
			v_ret := f_sendBa (
				m_bindingAck (
				m_bindingAck (
					c_routeHdr,
					c_routeHdr,
					p_paramsHa.gla,
					p_paramsHa.gla,
@@ -2134,18 +2134,18 @@ group mobileSecurityFns {
							c_kFlag0,
							c_kFlag0,
							m_mobileOptList_2Elem (
							m_mobileOptList_2Elem (
								m_mobileOpt_padN(m_optPad2),
								m_mobileOpt_padN(m_optPad2),
								m_mobileOpt_altCoa(mw_altCoA_any))))))) -> value v_ipv6Packet {
								m_mobileOpt_altCoa(mw_altCoa_any))))))) -> value v_ipv6Packet {
			//Get SeqNr
			//Get SeqNr
			v_seqNr := v_ipv6Packet.extHdrList[1].mobileHeader.mobileMessage.bindingUpdateMsg.sequenceNumber;
			v_seqNr := v_ipv6Packet.extHdrList[1].mobileHeader.mobileMessage.bindingUpdateMsg.sequenceNumber;
			//Get Lifetime
			//Get Lifetime
			v_lifetime := v_ipv6Packet.extHdrList[1].mobileHeader.mobileMessage.bindingUpdateMsg.lifeTime;
			v_lifetime := v_ipv6Packet.extHdrList[1].mobileHeader.mobileMessage.bindingUpdateMsg.lifeTime;
			//Get CareOfAddress
			//Get CareOfAddress
			v_mnCareOfAddr := v_ipv6Packet.extHdrList[1].mobileHeader.mobileMessage.bindingUpdateMsg.mobileOptions[1].mobileOptAltCoA.alternateCoA;
			v_mnCareOfAddr := v_ipv6Packet.extHdrList[1].mobileHeader.mobileMessage.bindingUpdateMsg.mobileOptions[1].mobileOptAltCoa.alternateCoa;
			//GetHomeAddress
			//GetHomeAddress
			v_mnHomeAddr := v_ipv6Packet.extHdrList[0].destinationOptionHeader.destOptionList[1].homeAddressOption.homeAddress;
			v_mnHomeAddr := v_ipv6Packet.extHdrList[0].destinationOptionHeader.destOptionList[1].homeAddressOption.homeAddress;
			v_ret := e_success;
			v_ret := e_success;


			v_ret := f_sendBA (
			v_ret := f_sendBa (
				m_bindingAck (
				m_bindingAck (
					c_routeHdr,
					c_routeHdr,
					p_paramsHa.gla,
					p_paramsHa.gla,
@@ -2200,7 +2200,7 @@ group mobileSecurityFns {
			v_mnHomeAddr := v_ipv6Packet.extHdrList[0].destinationOptionHeader.destOptionList[1].homeAddressOption.homeAddress;
			v_mnHomeAddr := v_ipv6Packet.extHdrList[0].destinationOptionHeader.destOptionList[1].homeAddressOption.homeAddress;
			v_ret := e_success;
			v_ret := e_success;


			v_ret := f_sendBA (
			v_ret := f_sendBa (
				m_bindingAck (
				m_bindingAck (
					c_routeHdr,
					c_routeHdr,
					p_paramsHa.gla,
					p_paramsHa.gla,
@@ -2250,7 +2250,7 @@ group mobileSecurityFns {
										c_kFlag0,
										c_kFlag0,
										m_mobileOptList_2Elem (
										m_mobileOptList_2Elem (
											m_mobileOpt_padN(m_optPad2),
											m_mobileOpt_padN(m_optPad2),
											m_mobileOpt_altCoa(mw_altCoA_any))))),
											m_mobileOpt_altCoa(mw_altCoa_any))))),
							omit),
							omit),
					c_mobileHdr)))) -> value v_ipv6Packet {
					c_mobileHdr)))) -> value v_ipv6Packet {
			//Get SeqNr
			//Get SeqNr
@@ -2263,7 +2263,7 @@ group mobileSecurityFns {
			v_mnHomeAddr := v_ipv6Packet.extHdrList[0].destinationOptionHeader.destOptionList[1].homeAddressOption.homeAddress;
			v_mnHomeAddr := v_ipv6Packet.extHdrList[0].destinationOptionHeader.destOptionList[1].homeAddressOption.homeAddress;
			v_ret := e_success;
			v_ret := e_success;
									
									
			v_ret := f_sendBA (
			v_ret := f_sendBa (
				m_bindingAck (
				m_bindingAck (
					c_routeHdr,
					c_routeHdr,
					p_paramsHa.gla,
					p_paramsHa.gla,
@@ -2333,7 +2333,7 @@ group mobileSecurityFns {
			v_mnHomeAddr := v_ipv6Packet.extHdrList[0].destinationOptionHeader.destOptionList[1].homeAddressOption.homeAddress;
			v_mnHomeAddr := v_ipv6Packet.extHdrList[0].destinationOptionHeader.destOptionList[1].homeAddressOption.homeAddress;
			v_ret := e_success;
			v_ret := e_success;


			v_ret := f_sendBA (
			v_ret := f_sendBa (
				m_bindingAck (
				m_bindingAck (
					c_routeHdr,
					c_routeHdr,
					p_paramsHa.gla,
					p_paramsHa.gla,
@@ -2437,7 +2437,7 @@ group mobileSecurityFns {
							c_kFlag0,
							c_kFlag0,
							m_mobileOptList_6Elem (
							m_mobileOptList_6Elem (
								m_mobileOpt_padN(m_optPad2),
								m_mobileOpt_padN(m_optPad2),
								m_mobileOpt_altCoa(mw_altCoA_any),
								m_mobileOpt_altCoa(mw_altCoa_any),
								m_mobileOpt_padN(m_optPad2),	
								m_mobileOpt_padN(m_optPad2),	
								m_mobileOpt_nonceIndices (
								m_mobileOpt_nonceIndices (
									m_mobileOptNonceIndices(
									m_mobileOptNonceIndices(
@@ -2495,7 +2495,7 @@ group mobileSecurityFns {
							c_kFlag0,
							c_kFlag0,
							m_mobileOptList_6Elem (
							m_mobileOptList_6Elem (
								m_mobileOpt_padN(m_optPad2),
								m_mobileOpt_padN(m_optPad2),
								m_mobileOpt_altCoa(mw_altCoA_any),
								m_mobileOpt_altCoa(mw_altCoa_any),
								m_mobileOpt_padN(m_optPad2),	
								m_mobileOpt_padN(m_optPad2),	
								m_mobileOpt_nonceIndices (
								m_mobileOpt_nonceIndices (
									m_mobileOptNonceIndices(
									m_mobileOptNonceIndices(
@@ -2579,7 +2579,7 @@ group mobileSecurityFns {
							c_kFlag0,
							c_kFlag0,
							m_mobileOptList_6Elem (
							m_mobileOptList_6Elem (
								m_mobileOpt_padN(m_optPad2),
								m_mobileOpt_padN(m_optPad2),
								m_mobileOpt_altCoa(mw_altCoA_any),
								m_mobileOpt_altCoa(mw_altCoa_any),
								m_mobileOpt_padN(m_optPad2),	
								m_mobileOpt_padN(m_optPad2),	
								m_mobileOpt_nonceIndices (
								m_mobileOpt_nonceIndices (
									m_mobileOptNonceIndices(
									m_mobileOptNonceIndices(
@@ -2610,7 +2610,7 @@ group mobileSecurityFns {
				//GetHomeAddress
				//GetHomeAddress
				v_mnHomeAddr := v_ipv6Packet.extHdrList[0].destinationOptionHeader.destOptionList[1].homeAddressOption.homeAddress;
				v_mnHomeAddr := v_ipv6Packet.extHdrList[0].destinationOptionHeader.destOptionList[1].homeAddressOption.homeAddress;
				
				
				v_ret := f_sendBA (
				v_ret := f_sendBa (
					m_bindingAck (
					m_bindingAck (
						c_routeHdr,
						c_routeHdr,
						p_paramsCn.gla,
						p_paramsCn.gla,
@@ -2685,7 +2685,7 @@ group mobileSecurityFns {
				//GetHomeAddress
				//GetHomeAddress
				v_mnHomeAddr := v_ipv6Packet.extHdrList[0].destinationOptionHeader.destOptionList[1].homeAddressOption.homeAddress;
				v_mnHomeAddr := v_ipv6Packet.extHdrList[0].destinationOptionHeader.destOptionList[1].homeAddressOption.homeAddress;
				
				
				v_ret := f_sendBA (
				v_ret := f_sendBa (
					m_bindingAck (
					m_bindingAck (
						c_routeHdr,
						c_routeHdr,
						p_paramsCn.gla,
						p_paramsCn.gla,
+3 −3
Original line number Original line Diff line number Diff line
@@ -129,14 +129,14 @@ module LibIpv6_Rfc4068FastHandovers_Functions {
	 *			to any NUT. Prior it modifies IPv6 packet payload length
	 *			to any NUT. Prior it modifies IPv6 packet payload length
	 *			and ICMPv6 checksum to their correct values
	 *			and ICMPv6 checksum to their correct values
	 * @remark  The template passed in must NOT contain any matching expressions!
	 * @remark  The template passed in must NOT contain any matching expressions!
	 * @param 	p_hoAck Ipv6 packet template with Handover Initiate to be sent
	 * @param 	p_hoack Ipv6 packet template with Handover Initiate to be sent
	 * @return 	execution status
	 * @return 	execution status
	*/
	*/
	function f_sendHoAck (in template HandoverAcknowledge p_hoAck)
	function f_sendHoAck (in template HandoverAcknowledge p_hoack)
	runs on LibIpv6Node
	runs on LibIpv6Node
	return FncRetCode {
	return FncRetCode {
		var HandoverAcknowledge v_ipPkt;
		var HandoverAcknowledge v_ipPkt;
		v_ipPkt := valueof(p_hoAck);
		v_ipPkt := valueof(p_hoack);


		//set extensionHeaders
		//set extensionHeaders
		if(f_setExtensionHeaders(	v_ipPkt ) != e_success) {
		if(f_setExtensionHeaders(	v_ipPkt ) != e_success) {
Loading