Some v_ret checks added (406d3605) · Commits · TTCN-3 Libraries / LibIPv6

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_Functions.ttcn

+19 −6

Original line number	Diff line number	Diff line
		@@ -1107,13 +1107,24 @@ group establishSAFns {

		//TODO tunnel mode
		}

		if (v_ret == e_success)
		// wait for IKE_SA_INIT response
		v_ret := f_waitForIkeSaInitres(p_addrIut,p_addrTn);
		{ v_ret := f_waitForIkeSaInitres(p_addrIut,p_addrTn); }
		else
		{ log("** f_ikeSaUp: ERROR: Call of f_sendIkeSaInitReq failed ** "); }

		v_ret := fx_setIkeSecurityParameters(vc_ikeSad[0]);
		if (v_ret == e_success)
		// set security parameters before using pseudo random function!
		{ v_ret := fx_setIkeSecurityParameters(vc_ikeSad[0]); }
		else
		{ log("** f_ikeSaUp: ERROR: Call of f_waitForIkeSaInitres failed ** "); }

		if (v_ret == e_success)
		// calculate and store the seven secrets
		vc_ikeSad[0].sevenSecrets := f_calculateSevenSecrets(vc_ikeSad[0]);
		{ vc_ikeSad[0].sevenSecrets := f_calculateSevenSecrets(vc_ikeSad[0]); }
		else
		{ log("** f_ikeSaUp: ERROR: Call of fx_setIkeSecurityParameters failed ** "); }

		return v_ret;

		@@ -1193,14 +1204,16 @@ group establishSAFns {
		)
		);

		if (v_ret == e_success)
		// wait for IKE_AUTH response
		v_ret := f_waitForIkeAuthres(p_dst,p_src);
		{ v_ret := f_waitForIkeAuthres(p_dst,p_src); }
		else
		{ log("** f_ikeAuthUp_forEsp: ERROR: Call of f_sendIkeAuthReq failed ** "); }

		return v_ret;

		}//end f_ikeAuthUp_forEsp


		}//end establishSAFns