Commit 5afbcde3 authored by seb's avatar seb
Browse files

type fixes from AB

parent 65afd002

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2460Root_Templates.ttcn

+8 −8
Original line number Original line Diff line number Diff line
@@ -374,7 +374,7 @@ 
		 *          test component.

		 *          test component.

		 *	@param  p_dst Binary IPv6 address associated with NUT.

		 *	@param  p_dst Binary IPv6 address associated with NUT.

	    */

	    */

		template ExtensionHeader m_extHdr_tunnelHeader(	UInt8 p_nextHdr,

		template ExtensionHeader m_extHdr_tunneledHeader(	UInt8 p_nextHdr,

										template Ipv6Address p_src,

										template Ipv6Address p_src,

										template Ipv6Address p_dst) := {

										template Ipv6Address p_dst) := {

			tunnelIpv6 := {

			tunnelIpv6 := {
@@ -396,7 +396,7 @@ 
		 *          test component.

		 *          test component.

		 *	@param  p_dst Binary IPv6 address associated with NUT.

		 *	@param  p_dst Binary IPv6 address associated with NUT.

	    */

	    */

		template ExtensionHeader mw_extHdr_tunnelHeader(	UInt8 p_nextHdr,

		template ExtensionHeader mw_extHdr_tunneledHeader(	UInt8 p_nextHdr,

										template Ipv6Address p_src,

										template Ipv6Address p_src,

										template Ipv6Address p_dst) := {

										template Ipv6Address p_dst) := {

			tunnelIpv6 := {

			tunnelIpv6 := {
@@ -488,9 +488,9 @@ 
		*/

		*/

		template Ipv6ExtHdrs m_ipv6ExtHdrs_srcDst(

		template Ipv6ExtHdrs m_ipv6ExtHdrs_srcDst(

			UInt8 p_nextHeader,

			UInt8 p_nextHeader,

			template ExtensionHeaderList p_extHdrList,

			template Ipv6Address p_src,

			template Ipv6Address p_src,

			template Ipv6Address p_dst

			template Ipv6Address p_dst,

			template ExtensionHeaderList p_extHdrList

		) := {

		) := {

			ipv6Hdr := m_ipHdr_nextHdr_srcDst(p_nextHeader, p_src, p_dst),

			ipv6Hdr := m_ipHdr_nextHdr_srcDst(p_nextHeader, p_src, p_dst),

			extHdrList := p_extHdrList

			extHdrList := p_extHdrList
@@ -506,9 +506,9 @@ 
		*/

		*/

		template Ipv6ExtHdrs mw_ipv6ExtHdrs_srcDst(

		template Ipv6ExtHdrs mw_ipv6ExtHdrs_srcDst(

			UInt8 p_nextHeader,

			UInt8 p_nextHeader,

			template ExtensionHeaderList p_extHdrList,

			template Ipv6Address p_src,

			template Ipv6Address p_src,

			template Ipv6Address p_dst

			template Ipv6Address p_dst,

			template ExtensionHeaderList p_extHdrList

		) := {

		) := {

			ipv6Hdr := mw_ipHdr_nextHdr_srcDst(p_nextHeader, p_src, p_dst),

			ipv6Hdr := mw_ipHdr_nextHdr_srcDst(p_nextHeader, p_src, p_dst),

			extHdrList := p_extHdrList

			extHdrList := p_extHdrList

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2460Root_TypesAndValues.ttcn

+23 −0
Original line number Original line Diff line number Diff line
@@ -88,6 +88,7 @@ 
			RoutingHeader		routingHeader,

			RoutingHeader		routingHeader,

			FragmentHeader		fragmentHeader,

			FragmentHeader		fragmentHeader,

			DestOptionHeader 	destinationOptionHeader,

			DestOptionHeader 	destinationOptionHeader,

			//tunneledIpv6

			Ipv6Header			tunnelIpv6,

			Ipv6Header			tunnelIpv6,

			MipHeader			mipHeader,//defined in LibIpv6_MultiRfcs_TypesAndValues

			MipHeader			mipHeader,//defined in LibIpv6_MultiRfcs_TypesAndValues

			AuthHeader			authHeader, //defined in LibIpv6_MultiRfcs_TypesAndValues

			AuthHeader			authHeader, //defined in LibIpv6_MultiRfcs_TypesAndValues
@@ -175,6 +176,28 @@ 
//			encode (hdrExtLen) "tag=\"hdrExtLen\";intTag=\"hdrExtIntLen\"*8+8-2;intTag=\"IPv6Header_payloadLength\",getIntTag(\"IPv6Header_payloadLength\")-";

//			encode (hdrExtLen) "tag=\"hdrExtLen\";intTag=\"hdrExtIntLen\"*8+8-2;intTag=\"IPv6Header_payloadLength\",getIntTag(\"IPv6Header_payloadLength\")-";

//		}

//		}







		/*

	 * @desc Derived from RFC4303 clause 2. 

	*/

	group espHeader {

		type record EspHeader {

			// Header

			UInt32				securityParametersIndex,

			UInt32				sequenceNumber,		

			// Payload

			octetstring			initializationVector optional,

			ExtensionHeaderList extHdrList optional,

			octetstring			data optional,

			octetstring			trafficFlowConfidentialityPadding optional,

			// Trailer

			octetstring			padding optional,

			UInt8				padLength,

			UInt8				nextHdr,

			octetstring			integrityCheckValue

		}

	}//end group espHeader 		



	} // end extensionHeaders 

	} // end extensionHeaders 

	

	

	group generalIpv6MessageType {

	group generalIpv6MessageType {

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2463Icmpv6_Functions.ttcn

+8 −8
Original line number Original line Diff line number Diff line
@@ -612,9 +612,9 @@ 
	 *			up and running.

	 *			up and running.

	 * @remark  Time limit is defined by module parameter PX_TAC (see comp type)

	 * @remark  Time limit is defined by module parameter PX_TAC (see comp type)

	 * @param 	p_glaA Global address of tunnel entry point ( testing node 1)

	 * @param 	p_glaA Global address of tunnel entry point ( testing node 1)

	 * @param 	p_glaB Global address of relay point (IUT)

	 * @param 	p_glaB Global address of tunnel exit point (IUT)

	 * @param 	p_glaC Global address of tunneled packet ( MN Home Address)

	 * @param 	p_glaC Src Global address of tunneled packet ( MN Home Address)

	 * @param 	p_glaD Global address of tunnel exit point ( testing node 2)

	 * @param 	p_glaD Dst Global address of tunneled packet ( testing node 2)

	 * @param 	p_identifier Idenitifier to be used in ICMPv6 echo request 

	 * @param 	p_identifier Idenitifier to be used in ICMPv6 echo request 

	 * @param 	p_seqNo Sequence number to be used in ICMPv6 echo request 

	 * @param 	p_seqNo Sequence number to be used in ICMPv6 echo request 

	 * @param 	p_icmpPkt IPv6 packet which has been received 

	 * @param 	p_icmpPkt IPv6 packet which has been received
@@ -637,9 +637,9 @@ 
					m_echoRequest_extHdr_data (

					m_echoRequest_extHdr_data (

							c_tunneledIpHdr,

							c_tunneledIpHdr,

							m_extHdrList_elemNo1 (

							m_extHdrList_elemNo1 (

								m_extHdr_tunnelHeader (

								m_extHdr_tunneledHeader (

									c_icmpHdr,

									c_icmpHdr,

									p_glaA,

									p_glaC,

									p_glaD)),

									p_glaD)),

							p_glaA,

							p_glaA,

							p_glaB,

							p_glaB,
@@ -655,10 +655,10 @@ 
									p_glaA,

									p_glaA,

									c_tunneledIpHdr,

									c_tunneledIpHdr,

									m_extHdrList_elemNo1 (

									m_extHdrList_elemNo1 (

										mw_extHdr_tunnelHeader (

										mw_extHdr_tunneledHeader (

											c_icmpHdr,

											c_icmpHdr,

											p_glaA,

											p_glaD,

											p_glaD )),

											p_glaC )),

									c_defId,

									c_defId,

									c_defSeqNo,

									c_defSeqNo,

									c_8ZeroBytes)) -> value v_echoRep {

									c_8ZeroBytes)) -> value v_echoRep {

ttcn3/EtsiLibrary/LibIpv6/LibMultiRfcs/LibIpv6_MultiRfcs_TypesAndValues.ttcn

+7 −30
Original line number Original line Diff line number Diff line
@@ -15,8 +15,6 @@ module LibIpv6_MultiRfcs_TypesAndValues { 
	import from LibCommon_TextStrings all;

	import from LibCommon_TextStrings all;

	import from LibCommon_Time all ;

	import from LibCommon_Time all ;





	//

	import from LibIpv6_Rfc2460Root_TypesAndValues all;

	

	

	group commonConstants {

	group commonConstants {
@@ -169,6 +167,7 @@ module LibIpv6_MultiRfcs_TypesAndValues { 
			 * @desc Derived from RFC2473, used in IPsec processing

			 * @desc Derived from RFC2473, used in IPsec processing

			 * @url http://www.ietf.org/rfc/rfc2473.txt

			 * @url http://www.ietf.org/rfc/rfc2473.txt

			*/

			*/

			//todo rename to tunnel

			const UInt8		c_tunneledIpHdr := 41;

			const UInt8		c_tunneledIpHdr := 41;

			const UInt8		c_routeHdr := 43;

			const UInt8		c_routeHdr := 43;

			const UInt8		c_fragHdr := 44;

			const UInt8		c_fragHdr := 44;
@@ -233,10 +232,7 @@ module LibIpv6_MultiRfcs_TypesAndValues { 




		type UInt8 PrefixLength ;//indicates nr of bits to be used as Prefix

		type UInt8 PrefixLength ;//indicates nr of bits to be used as Prefix

		type Ipv6Address Prefix ;

		type Ipv6Address Prefix ;



		type Oct16 Ipv6Address;

		type Oct16 Ipv6Address;

		type Oct6  EthernetAddress;

		type Oct6  AtmAddress;

		

		

		type record length(1 .. c_maxNrIpv6Address) of Ipv6Address Ipv6AddressList;

		type record length(1 .. c_maxNrIpv6Address) of Ipv6Address Ipv6AddressList;

//		with {

//		with {
@@ -490,26 +486,7 @@ module LibIpv6_MultiRfcs_TypesAndValues { 
		}

		}

	}//end group authHeader

	}//end group authHeader





	/*

	

	 * @desc Derived from RFC4303 clause 2. 

	*/

	group espHeader {

		type record EspHeader {

			// Header

			UInt32				securityParametersIndex,

			UInt32				sequenceNumber,		

			// Payload

			octetstring			initializationVector optional,

			ExtensionHeaderList extHdrList optional,

			octetstring			data optional,

			octetstring			trafficFlowConfidentialityPadding optional,

			// Trailer

			octetstring			padding optional,

			UInt8				padLength,

			UInt8				nextHdr,

			octetstring			integrityCheckValue

		}

	}//end group espHeader
@@ -652,7 +629,7 @@ module LibIpv6_MultiRfcs_TypesAndValues { 
		type union MipOption {

		type union MipOption {

			OptPad1							optPad1,

			OptPad1							optPad1,

			OptPadN							optPadN,

			OptPadN							optPadN,

			MipOptBindingAdvice				mipOptBindingAdvice,

			MipOptBindingRefreshAdvice		mipOptBindingRefreshAdvice,

			MipOptAltCoA					mipOptAltCoA,

			MipOptAltCoA					mipOptAltCoA,

			MipOptNonceIndices				mipOptNonceIndices,

			MipOptNonceIndices				mipOptNonceIndices,

			MipBindingAuthorizationData		mipBindingAuthorizationData

			MipBindingAuthorizationData		mipBindingAuthorizationData
@@ -679,7 +656,7 @@ module LibIpv6_MultiRfcs_TypesAndValues { 
		/*

		/*

		 * @desc Derived from RFC3775 Section 6.2.4

		 * @desc Derived from RFC3775 Section 6.2.4

		*/

		*/

		type record MipOptBindingAdvice {

		type record MipOptBindingRefreshAdvice {

			UInt8	mipOptType (2),

			UInt8	mipOptType (2),

			UInt8	mipOptLen (2),

			UInt8	mipOptLen (2),

			UInt16	refreshInterval

			UInt16	refreshInterval
@@ -691,7 +668,7 @@ module LibIpv6_MultiRfcs_TypesAndValues { 
		type record MipOptAltCoA {

		type record MipOptAltCoA {

			UInt8	mipOptType (3),

			UInt8	mipOptType (3),

			UInt8	mipOptLen (16),

			UInt8	mipOptLen (16),

			Oct16	alternativeCoA

			Oct16	alternateCoA

		}

		}





		/*

		/*