Commit 8399d06e authored by mullers's avatar mullers
Browse files

IKE msg registered to IPv6Port and Req/Response introduced

parent 31bcb1d8

ttcn3/EtsiLibrary/LibIpv6/LibCommonRfcs/LibIpv6_Interface_TypesAndValues.ttcn

+53 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ module LibIpv6_Interface_TypesAndValues { 
	import from LibIpv6_Rfc4068FastHandovers_TypesAndValues all;

	import from LibIpv6_Rfc0768Udp_TypesAndValues all ;

	import from LibIpv6_CommonRfcs_TypesAndValues all;

	import from LibIpv6_Rfc4306Ikev2_TypesAndValues all;



	group libTestSystem {

		/*
@@ -87,6 +88,15 @@ module LibIpv6_Interface_TypesAndValues { 
			RawIpv6Packet,

			//UDP

			UdpPacket,

			//IKE

			IkeSaInitRequest,

			IkeSaInitResponse,

			IkeAuthRequest,

			IkeAuthResponse,

			CreateChildSaRequest,

			CreateChildSaResponse,

			InformationalRequest,

			InformationalResponse,

			//MetaPdu

			Ipv6Packet

			//General IPv6 packet
@@ -288,6 +298,47 @@ module LibIpv6_Interface_TypesAndValues { 
			variant "isPDU;use=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeader(dec, 17)";

		}

		

		//Ike

		type Ipv6Packet IkeSaInitRequest

		with {

			variant "DT TODO";

		}

		

		type Ipv6Packet IkeSaInitResponse

		with {

			variant "DT TODO";

		}

			

		type Ipv6Packet IkeAuthRequest

		with {

			variant "DT TODO";

		}

		

		type Ipv6Packet IkeAuthResponse

		with {

			variant "DT TODO";

		}

		

		type Ipv6Packet CreateChildSaRequest

		with {

			variant "DT TODO";

		}	

			

		type Ipv6Packet CreateChildSaResponse

		with {

			variant "DT TODO";

		}	

			

		type Ipv6Packet InformationalRequest

		with {

			variant "DT TODO";

		}



		type Ipv6Packet InformationalResponse

		with {

			variant "DT TODO";

		}



	  	//General IPv6 packet

	//  	type octetstring Ipv6Packet;//TODO SMU+DTE check this
@@ -330,6 +381,8 @@ module LibIpv6_Interface_TypesAndValues { 
			OtherIcmpv6Msg							otherIcmpv6Msg,

			//Udp

			UdpMsg									udpMsg,

			//Ike

			IkeMsg									ikeMsg,

		  	//General IPv6 packet

		  	//GeneralIpv6                         	generalIpv6

			octetstring								octetstringMsg

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_TypesAndValues.ttcn

+8 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 
		/*

		 * @desc TODO

		*/

		type record IkePacket {

		type record IkeMsg {

			//Ipv6Header			ipv6Hdr,

			//ExtensionHeaderList extHdrList optional,

			Oct2		        sourcePort, // TODO: UDP Header
@@ -91,9 +91,15 @@ 
			UInt4				majorVersion,

			UInt4				minorVersion,

			UInt8				exchangeType,

			UInt8				flags,

			//UInt8				flags,

			UInt3				threeXFlags,

			UInt1				iFlag, 

			UInt1				vFlag,

			UInt1				rFlag,

			UInt2				twoXFlags,

			Oct4				messageID,

			Oct4				messageLength,

			// IKE Payloads

			IkePayloadList		payloadList

		}

		with {