preambles/defaults included (e8f0c6c3) · Commits · TTCN-3 Libraries / LibIPv6

NewTypeStructure/EtsiLibrary/LibIpv6/LibCommonRfcs/LibIpv6_CommonRfcs_TypesAndValues.ttcn

+0 −4

Original line number	Diff line number	Diff line
		@@ -400,10 +400,6 @@ module LibIpv6_CommonRfcs_TypesAndValues {
		//Security Association Database
		type record length (1 .. c_maxNrDa) of Sa Sad;





		type record EncryptResult {
		octetstring iv optional,
		octetstring espPayloadData,

NewTypeStructure/EtsiLibrary/LibIpv6/LibCommonRfcs/LibIpv6_ExternalFunctions.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		import from LibCommon_DataStrings all;
		//LibIpv6
		import from LibIpv6_CommonRfcs_TypesAndValues { type all };
		import from LibIpv6_Interface { type Ipv6Packet };
		import from LibIpv6_Interface all;
		import from LibIpv6_Rfc2460Root_TypesAndValues {type all};

		import from LibIpv6_Rfc3775Mipv6_ExtHdrTypesAndValues all;

NewTypeStructure/EtsiLibrary/LibIpv6/LibCommonRfcs/LibIpv6_Interface.ttcn

+22 −9

Original line number	Diff line number	Diff line
		@@ -88,6 +88,19 @@ module LibIpv6_Interface {
		encode "TODO";
		}

		/*
		* @desc PDU type to be used when building ESP payload for encryption
		*/
		//TODO as well possib;e todelete this type and make Ipv6Packet.ipv6Hdr optional
		type record ModularIpv6Packet {
		Ipv6Header ipv6Hdr optional,
		ExtensionHeaderList extHdrList optional,
		Ipv6Payload ipv6Payload optional
		}
		with {
		encode "TODO";
		}

		//Alias
		//Imported from Rfc 2463
		type Ipv6Packet DestinationUnreachable;
		@@ -132,25 +145,25 @@ module LibIpv6_Interface {
		EchoReplyMsg echoReplyMsg,
		//Imported from Rfc 2461
		RouterAdvertisementMsg routerAdvertMsg,
		RouterSolicitationMsg routerSolicitationMsg,
		NeighborSolicitationMsg nbrSolicitationMsg,
		NeighborAdvertisementMsg nbrAdvertMsg,
		RouterSolicitationMsg routerSolMsg,
		NeighborSolicitationMsg nbrSolMsg,
		NeighborAdvertisementMsg nbrAdvMsg,
		RedirectMsg redirectMsg,
		//Imported from Rfc 2894
		RouterRenumberingMsg routerRenumberingMsg,
		//Imported from Rfc XXXX Mipv6
		HomeAgentAddressDiscoveryRequestMsg homeAgentAddressDiscoveryRequestMsg,
		HomeAgentAddressDiscoveryReplyMsg homeAgentAddressDiscoveryReplyMsg,
		MobilePrefixSolicitationMsg mobilePrefixSolicitationMsg,
		MobilePrefixAdvertisementMsg mobilePrefixAdvertisementMsg,
		MobileRouterAdvertisementMsg mobileRouterAdvertisementMsg,
		HomeAgentAddressDiscoveryRequestMsg homeAgentAddrDiscRequestMsg,
		HomeAgentAddressDiscoveryReplyMsg homeAgentAddrDiscReplyMsg,
		MobilePrefixSolicitationMsg mobilePrefixSolMsg,
		MobilePrefixAdvertisementMsg mobilePrefixAdvMsg,
		MobileRouterAdvertisementMsg mobileRouterAdvMsg,
		//Default value
		OtherIcmpv6Msg otherIcmpv6Msg,
		//Udp
		UdpMsg udpMsg,
		//General IPv6 packet
		//GeneralIpv6 generalIpv6
		octetstring generalIpv6Msg
		octetstring octetstringMsg
		}
		with {
		//DTE TODO

NewTypeStructure/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2460Root_Templates.ttcn

+89 −113

Original line number	Diff line number	Diff line
		@@ -462,17 +462,17 @@
		* @param p_dst Binary IPv6 address associated with NUT.
		* @param p_data Data sent in the Echo Request packet.
		*/
		template Ipv6Packet m_generalIpv6_extHdr_srcDst_data (
		template Ipv6Packet m_generalIpv6_extHdr_data (
		UInt8 p_nextHeader,
		template ExtensionHeaderList p_extHdrList,
		template Ipv6Address p_src,
		template Ipv6Address p_dst,
		template ExtensionHeaderList p_extHdrList,
		octetstring p_data
		) := {
		ipv6Hdr := m_ipHdr_nextHdr_srcDst(p_nextHeader, p_src, p_dst),
		extHdrList := p_extHdrList,
		ipv6Payload := {
		generalIpv6Msg := p_data
		octetstringMsg := p_data
		}
		}

		@@ -484,65 +484,43 @@
		* @param p_dst Binary IPv6 address associated with NUT.
		*
		*/
		template Ipv6Packet mw_extHdr_srcDst(
		template Ipv6Packet m_generalIpv6_extHdr(
		UInt8 p_nextHeader,
		template ExtensionHeaderList p_extHdrList,
		template Ipv6Address p_src,
		template Ipv6Address p_dst
		) := {
		ipv6Hdr := mw_ipHdr_nextHdr_srcDst(p_nextHeader, p_src, p_dst),
		template Ipv6Address p_dst,
		template ExtensionHeaderList p_extHdrList ) := {
		ipv6Hdr := m_ipHdr_nextHdr_srcDst(p_nextHeader, p_src, p_dst),
		extHdrList := p_extHdrList,
		ipv6Payload := omit
		}

		/*
		* @param p_nextHeader Next header identifier value to be used.
		* @param p_extHdrList List of extension header in the packet.
		* @param p_src Binary IPv6 address associated with the
		* test component.
		* @param p_dst Binary IPv6 address associated with NUT.
		*/
		template Ipv6Packet mw_generalIpv6_extHdr_srcDst (
		UInt8 p_nextHeader,
		template ExtensionHeaderList p_extHdrList,
		template Ipv6Address p_src,
		template Ipv6Address p_dst ) := {
		ipv6Hdr := mw_ipHdr_nextHdr_srcDst(p_nextHeader, p_src, p_dst),
		extHdrList := p_extHdrList,
		ipv6Payload := *
		}

		} //end group generalIpv6MessageTemplates

		group ipPacketsWithOnlyExtensionHdrsTemplates {

		/*
		* @param p_nextHeader Next header identifier value to be used.
		* @param p_extHdrList List of extension header in the packet.
		* @param p_src Binary IPv6 address associated with the
		* test component.
		* @param p_dst Binary IPv6 address associated with NUT.
		*
		*/
		template Ipv6Packet m_generalIpv6_srcDst(
		template Ipv6Packet mw_generalIpv6_extHdr_noData(
		UInt8 p_nextHeader,
		template Ipv6Address p_src,
		template Ipv6Address p_dst,
		template ExtensionHeaderList p_extHdrList) := {
		ipv6Hdr := m_ipHdr_nextHdr_srcDst(p_nextHeader, p_src, p_dst),
		ipv6Hdr := mw_ipHdr_nextHdr_srcDst(p_nextHeader, p_src, p_dst),
		extHdrList := p_extHdrList,
		ipv6Payload := omit
		}

		/*
		* @param p_nextHeader Next header identifier value to be used.
		* @param p_extHdrList List of extension header in the packet.
		* @param p_src Binary IPv6 address associated with the
		* test component.
		* @param p_dst Binary IPv6 address associated with NUT.
		* @param p_extHdrList List of extension header in the packet.
		*
		*/
		template Ipv6Packet mw_generalIpv6_srcDst(
		template Ipv6Packet mw_generalIpv6_extHdr(
		UInt8 p_nextHeader,
		template Ipv6Address p_src,
		template Ipv6Address p_dst,
		@@ -554,13 +532,11 @@

		/*
		* @param p_nextHeader Next header identifier value to be used.
		* @param p_extHdrList List of extension header in the packet.
		* @param p_src Binary IPv6 address associated with the
		* test component.
		* @param p_dst Binary IPv6 address associated with NUT.
		* @param p_extHdrList List of extension header in the packet.
		*
		*/
		template Ipv6Packet mw_generalIpv6_dst(
		template Ipv6Packet mw_generalIpv6_extHdr_dst(
		UInt8 p_nextHeader,
		template Ipv6Address p_dst,
		template ExtensionHeaderList p_extHdrList ) := {
		@@ -569,7 +545,7 @@
		ipv6Payload := *
		}

		}//end group ipPacketsWithOnlyExtensionHdrsTemplates
		} //end group generalIpv6MessageTemplates

		group ipv6AddressTemplates {

NewTypeStructure/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2460Root_TypesAndValues.ttcn

+5 −37

Original line number	Diff line number	Diff line
		@@ -86,10 +86,10 @@
		FragmentHeader fragmentHeader,
		DestOptionHeader destinationOptionHeader,
		TunneledIpv6Header tunneledIpv6,
		MipHeader mipHeader,//defined in LibIpv6_CommonRfcs_TypesAndValues
		AuthHeader authHeader, //defined in LibIpv6_CommonRfcs_TypesAndValues
		MipHeader mipHeader,
		AuthHeader authHeader,
		EspHeader_snd espHeader_snd,
		EspHeader_rcv espHeader_rcv //defined in LibIpv6_CommonRfcs_TypesAndValues
		EspHeader_rcv espHeader_rcv
		// OtherIpv6ExtHdr otherHeader
		}
		with {
		@@ -264,7 +264,7 @@



		group generalIpv6MessageType {
		//smu group generalIpv6MessageType {

		/*
		* @desc PDU type derived from RFC2460
		@@ -279,38 +279,6 @@
		//smu encode (data) "length=getIntTag('IPv6Header_payloadLength');";
		//smu }


		/*
		* @desc PDU type to be used when building ESP payload for encryption
		*/
		type record ModularIpv6Packet {
		Ipv6Header ipv6Hdr optional,
		ExtensionHeaderList extHdrList optional,
		Ipv6PacketPayload ipv6PacketPayload optional
		}
		with {
		encode "TODO";
		}

		type union Ipv6PacketPayload {

		HomeAgentAddressDiscoveryRequest_payload homeAgentAddressDiscoveryRequest_payload
		}

		/*
		* @desc Derived from RFC3775, clause 6.5
		*/
		type record HomeAgentAddressDiscoveryRequest_payload {
		UInt8 icmpType(144),
		UInt8 icmpCode,
		Oct2 checksum,
		UInt16 identifier,
		UInt16 reserved
		}
		with {
		encode "TODO";
		}

		} //end group generalIpv6MessageType
		//smu } //end group generalIpv6MessageType

		} // end module LibIpv6_Rfc2460Root_TypesAndValues