Commit ccccff73 authored by tepelmann's avatar tepelmann
Browse files

Minor correction for ipv4 cimp types. 

Corrected log statement in IKE... to be Ed2 compliant.
Improved version of TabularCodec.
parent b9ea1753

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_Functions.ttcn

+4 −4
Original line number Original line Diff line number Diff line
@@ -1591,7 +1591,7 @@ module LibIpv6_Rfc4306Ikev2_Functions { 
					// get Notify payload data

					// get Notify payload data

					v_ret_local := f_getPayload(v_ikePayloadList,v_nextPayload,c_notifyPL,v_ikePayload);

					v_ret_local := f_getPayload(v_ikePayloadList,v_nextPayload,c_notifyPL,v_ikePayload);

					if (v_ret_local == e_success)

					if (v_ret_local == e_success)

					{ log("**** f_waitForIkeSaInitRsp: ERROR: IKE_SA_INIT response with Notify payload received, error/status value = ",v_ikePayload.notify.notifyMessageType," **** ");

					{ log("**** f_waitForIkeSaInitRsp: ERROR: IKE_SA_INIT response with Notify payload received, error/status value = " & int2str(v_ikePayload.notify.notifyMessageType) & " **** ");

					  v_ret := e_error;}

					  v_ret := e_error;}

					else

					else

					{ log("**** f_waitForIkeSaInitRsp: ERROR: Unexpected IKE_SA_INIT response received **** ");

					{ log("**** f_waitForIkeSaInitRsp: ERROR: Unexpected IKE_SA_INIT response received **** ");
@@ -1855,7 +1855,7 @@ module LibIpv6_Rfc4306Ikev2_Functions { 
					// get Notify payload data

					// get Notify payload data

					v_ret_local := f_getPayload(v_ikePayloadList,v_nextPayload,c_notifyPL,v_ikePayload);

					v_ret_local := f_getPayload(v_ikePayloadList,v_nextPayload,c_notifyPL,v_ikePayload);

					if (v_ret_local == e_success)

					if (v_ret_local == e_success)

					{ log("**** f_waitForIkeAuthRsp: ERROR: IKE_AUTH response with unexpected Notify payload received, error/status value = ",v_ikePayload.notify.notifyMessageType," **** ");

					{ log("**** f_waitForIkeAuthRsp: ERROR: IKE_AUTH response with unexpected Notify payload received, error/status value = " & int2str(v_ikePayload.notify.notifyMessageType) & " **** ");

					  v_ret := e_error;}

					  v_ret := e_error;}

					else

					else

					{ log("**** f_waitForIkeAuthRsp: ERROR: Unexpected IKE_AUTH response received **** ");

					{ log("**** f_waitForIkeAuthRsp: ERROR: Unexpected IKE_AUTH response received **** ");
@@ -2107,7 +2107,7 @@ module LibIpv6_Rfc4306Ikev2_Functions { 
					// get Notify payload data

					// get Notify payload data

					v_ret_local := f_getPayload(v_ikePayloadList,v_nextPayload,c_notifyPL,v_ikePayload);

					v_ret_local := f_getPayload(v_ikePayloadList,v_nextPayload,c_notifyPL,v_ikePayload);

					if (v_ret_local == e_success)

					if (v_ret_local == e_success)

					{ log("**** f_waitForCreateChildSaRsp: ERROR: CREATE_CHILD_SA response with unexpected Notify payload received, error/status value = ",v_ikePayload.notify.notifyMessageType," **** ");

					{ log("**** f_waitForCreateChildSaRsp: ERROR: CREATE_CHILD_SA response with unexpected Notify payload received, error/status value = " & int2str(v_ikePayload.notify.notifyMessageType) & " **** ");

					  v_ret := e_error;}

					  v_ret := e_error;}

					else

					else

					{ log("**** f_waitForCreateChildSaRsp: ERROR: Unexpected CREATE_CHILD_SA response received **** ");

					{ log("**** f_waitForCreateChildSaRsp: ERROR: Unexpected CREATE_CHILD_SA response received **** ");
@@ -2198,7 +2198,7 @@ module LibIpv6_Rfc4306Ikev2_Functions { 
					// get Notify payload data

					// get Notify payload data

					v_ret_local := f_getPayload(v_ikePayloadList,v_nextPayload,c_notifyPL,v_ikePayload);

					v_ret_local := f_getPayload(v_ikePayloadList,v_nextPayload,c_notifyPL,v_ikePayload);

					if (v_ret_local == e_success)

					if (v_ret_local == e_success)

					{ log("**** f_waitForCreateChildSaRsp_ParamPLL: ERROR: CREATE_CHILD_SA response with unexpected Notify payload received, error/status value = ",v_ikePayload.notify.notifyMessageType," **** ");

					{ log("**** f_waitForCreateChildSaRsp_ParamPLL: ERROR: CREATE_CHILD_SA response with unexpected Notify payload received, error/status value = " & int2str(v_ikePayload.notify.notifyMessageType) & " **** ");

					  v_ret := e_error;}

					  v_ret := e_error;}

					else

					else

					{ log("**** f_waitForCreateChildSaRsp_ParamPLL: ERROR: Unexpected CREATE_CHILD_SA response received **** ");

					{ log("**** f_waitForCreateChildSaRsp_ParamPLL: ERROR: Unexpected CREATE_CHILD_SA response received **** ");

ttcn3/EtsiLibrary/LibIpv6/LibTransitioning/LibIpv6_Rfc792Icmpv4_TypesAndValues.ttcn

+2 −2
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ 
			octetstring	data optional

			octetstring	data optional

		}

		}

		with {

		with {

			variant "present=getIntTag('protocol')==1";

			variant "present=(getIntTag('protocol')==1) && bytes(1, 0x8)";

			variant (data) "fieldPresent=(getIntTag('payloadLength')-8)>0;length=getIntTag('payloadLength')-8"

			variant (data) "fieldPresent=(getIntTag('payloadLength')-8)>0;length=getIntTag('payloadLength')-8"

		}

		}
@@ -53,7 +53,7 @@ 
			octetstring	data optional

			octetstring	data optional

		}

		}

		with {

		with {

			variant "present=getIntTag('protocol')==1";

			variant "present=(getIntTag('protocol')==1) && bytes(1, 0x0)";

			variant (data) "fieldPresent=(getIntTag('payloadLength')-8)>0;length=getIntTag('payloadLength')-8"

			variant (data) "fieldPresent=(getIntTag('payloadLength')-8)>0;length=getIntTag('payloadLength')-8"

		}

		}