Commit 7eb46f65 authored by mullers's avatar mullers
Browse files

merge with localCopy from DT

parent 4c1b6ff3

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2461NeighborDiscovery_TypesAndValues.ttcn

+30 −12
Original line number Diff line number Diff line
@@ -123,8 +123,8 @@ 
			RtSolOptions		rtSolOptions optional

		}

		with {

			//DTE TODO

			encode "isPDU=LibIpv6_Rfc2461NeighborDiscovery_TypesAndValues;import=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 133)";

//			variant "isPDU=LibIpv6_Rfc2461NeighborDiscovery_TypesAndValues;import=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 133)";

			variant "present=bytes(1,133)&&(valueOf(getTag('nextHeader'))==58);intTag='hdrExtIntLen',getIntTag('hdrExtIntLen')-8";

		}

		

		/*
@@ -147,8 +147,8 @@ 
			RtAdvOptions		rtAdvOptions optional

		}

		with {

			//smu

			encode "isPDU=LibIpv6_Rfc2461NeighborDiscovery_TypesAndValues;import=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 134)";

//			variant "isPDU=LibIpv6_Rfc2461NeighborDiscovery_TypesAndValues;import=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 134)";

			variant "present=bytes(1,134)&&(valueOf(getTag('nextHeader'))==58);intTag='hdrExtIntLen',getIntTag('hdrExtIntLen')-16";

		}
@@ -166,7 +166,8 @@ 
			NbrSolOptions		nbrSolOptions optional

		}

		with {

			encode "isPDU=LibIpv6_Rfc2461NeighborDiscovery_TypesAndValues;import=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 135)";

//			variant "isPDU=LibIpv6_Rfc2461NeighborDiscovery_TypesAndValues;import=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 135)";

			variant "present=bytes(1,135)&&(valueOf(getTag('nextHeader'))==58);intTag='hdrExtIntLen',getIntTag('hdrExtIntLen')-24";

		}
@@ -187,7 +188,8 @@ 
			NbrAdvOptions		nbrAdvOptions optional

		} 

		with {

			encode "isPDU=LibIpv6_Rfc2461NeighborDiscovery_TypesAndValues;import=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 136)";

//			variant "isPDU=LibIpv6_Rfc2461NeighborDiscovery_TypesAndValues;import=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 136)";

			variant "present=bytes(1,136)&&(valueOf(getTag('nextHeader'))==58);intTag='hdrExtIntLen',getIntTag('hdrExtIntLen')-24";

		}

		

		/*
@@ -205,7 +207,8 @@ 
			RedirectOptions		redirectOptions optional

		} 

		with {

			encode "isPDU=LibIpv6_Rfc2461NeighborDiscovery_TypesAndValues;import=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 137)";

//			variant "isPDU=LibIpv6_Rfc2461NeighborDiscovery_TypesAndValues;import=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 137)";

			variant "present=bytes(1,137)&&(valueOf(getTag('nextHeader'))==58);intTag='hdrExtIntLen',getIntTag('hdrExtIntLen')-40";

		}

	

	} // end icmpRfc2461Messages
@@ -216,6 +219,9 @@ 
			SrcLinkLayerAddress srcLinkLayerAddr optional,

			octetstring         otherOption optional

		}

		with {

			variant (otherOption) "length=getIntTag('hdrExtIntLen')";

		}



		/*

		 * @remark Any RtAdvOptions value should at least have
@@ -229,10 +235,13 @@ 
			HomeAgentInfo 			homeAgentInfo optional,

			octetstring         	otherOption optional

		} 

		with {

			variant (otherOption) "length=getIntTag('hdrExtIntLen')";

		}



		type set length (1..c_maxNrPrefixInfo) of PrefixInfo PrefixInfoList

		with {

			encode "present=bytes(1, 0x03)"

			variant "present=bytes(1, 0x03)"

		}



		/*
@@ -252,24 +261,33 @@ 
			Prefix					prefix

		}

		with {

			encode "present=bytes(1, 0x03)"

			variant "present=bytes(1, 0x03)"

		}



		type set NbrSolOptions{

			SrcLinkLayerAddress  srcLinkLayerAddr optional,

			octetstring          otherOption optional

		}

		with {

			variant (otherOption) "length=getIntTag('hdrExtIntLen')";

		}



		type set NbrAdvOptions{

			TgtLinkLayerAddress  tgtLinkLayerAddr optional,

			octetstring          otherOption optional

		}

		with {

			variant (otherOption) "length=getIntTag('hdrExtIntLen')";

		}



		type set RedirectOptions {

			TgtLinkLayerAddress  tgtLinkLayerAddr optional,

			RedirectedHeader	 redirectHeader optional,

			octetstring          otherOption optional

		}

		with {

			variant (otherOption) "length=getIntTag('hdrExtIntLen')";

		}



		/*

		 * @desc Derived from RFC 2461 clause 4.6.3
@@ -281,9 +299,9 @@ 
			octetstring	data // no length limit?

		}

		with {

			encode "present=bytes(1, 0x04);";

			encode (optionLength) "tag='RedirectHeader_optionLength';";

			encode (data) "length=valueOf(getTag('RedirectHeader_optionLength'))*8-2-6;";

			variant "present=bytes(1, 0x04);";

			variant (optionLength) "tag='RedirectHeader_optionLength';";

			variant (data) "length=valueOf(getTag('RedirectHeader_optionLength'))*8-2-6;";

		}

	

	} // end  icmpRfc461Options

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2463Icmpv6_TypesAndValues.ttcn

+21 −21
Original line number Diff line number Diff line
@@ -62,9 +62,9 @@ 
			octetstring	data optional

		}

		with {

			//DTE TODO

			encode "isPDU=LibIpv6_Rfc2463Icmpv6_TypesAndValues;use=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 1)";

			encode (data) "length=getIntTag('IPv6Header_payloadLength')-8";

//			variant "isPDU=LibIpv6_Rfc2463Icmpv6_TypesAndValues;use=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 1)";

			variant "present=bytes(1,1)&&(valueOf(getTag('nextHeader'))==58)";

			variant (data) "length=getIntTag('IPv6Header_payloadLength')-8";

		}
@@ -81,9 +81,9 @@ 
			octetstring	data optional

		}

		with {

			//DTE TODO

			encode "isPDU=LibIpv6_Rfc2463Icmpv6_TypesAndValues;use=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 2)";

			encode (data) "length=getIntTag('IPv6Header_payloadLength')-8";

//			variant "isPDU=LibIpv6_Rfc2463Icmpv6_TypesAndValues;use=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 2)";

			variant "present=bytes(1,2)&&(valueOf(getTag('nextHeader'))==58)";

			variant (data) "length=getIntTag('IPv6Header_payloadLength')-8";

		}
@@ -100,9 +100,9 @@ 
			octetstring	data optional

		}

		with {

			//DTE TODO

			encode "isPDU=LibIpv6_Rfc2463Icmpv6_TypesAndValues;use=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 3)";

			encode (data) "length=getIntTag('IPv6Header_payloadLength')-8";

//			variant "isPDU=LibIpv6_Rfc2463Icmpv6_TypesAndValues;use=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 3)";

			variant "present=bytes(1,3)&&(valueOf(getTag('nextHeader'))==58)";

			variant (data) "length=getIntTag('IPv6Header_payloadLength')-8";

		}
@@ -120,9 +120,9 @@ 
			octetstring	data optional

		}

		with {

			//DTE TODO

			encode "isPDU=LibIpv6_Rfc2463Icmpv6_TypesAndValues;use=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 4)";

			encode (data) "length=getIntTag('IPv6Header_payloadLength')-8";

//			variant "isPDU=LibIpv6_Rfc2463Icmpv6_TypesAndValues;use=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 4)";

			variant "present=bytes(1,4)&&(valueOf(getTag('nextHeader'))==58)";

			variant (data) "length=getIntTag('IPv6Header_payloadLength')-8";

		}
@@ -140,9 +140,9 @@ 
			octetstring	data optional

		}

		with {

			//DTE TODO

			encode "isPDU=LibIpv6_Rfc2463Icmpv6_TypesAndValues;use=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 128)";

			encode (data) "length=getIntTag('IPv6Header_payloadLength')-8";

//			variant "isPDU=LibIpv6_Rfc2463Icmpv6_TypesAndValues;use=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 128)";

			variant "present=bytes(1,128)&&(valueOf(getTag('nextHeader'))==58)";

			variant (data) "length=getIntTag('IPv6Header_payloadLength')-8";

		}
@@ -160,9 +160,9 @@ 
			octetstring	data optional

		}

		with {

			//DTE TODO

			encode "isPDU=LibIpv6_Rfc2463Icmpv6_TypesAndValues;use=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 129)";

			encode (data) "length=getIntTag('IPv6Header_payloadLength')-8";

//			variant "isPDU=LibIpv6_Rfc2463Icmpv6_TypesAndValues;use=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 129)";

			variant "present=bytes(1,129)&&(valueOf(getTag('nextHeader'))==58)";

			variant (data) "length=getIntTag('IPv6Header_payloadLength')-8";

		}

		

		/*
@@ -177,9 +177,9 @@ 
			octetstring	data optional

		}

		with {

			//DTE TODO

			encode "isPDU=LibIpv6_Rfc2463Icmpv6_TypesAndValues;use=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeader(dec, 58)";

			encode (data) "length=getIntTag('IPv6Header_payloadLength')-4";

//			variant "isPDU=LibIpv6_Rfc2463Icmpv6_TypesAndValues;use=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeader(dec, 58)";

			variant "present=valueOf(getTag('nextHeader'))==58";

			variant (data) "length=getIntTag('IPv6Header_payloadLength')-4";

		}

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2894RouterRenumbering_TypesAndValues.ttcn

+17 −8
Original line number Diff line number Diff line
@@ -50,9 +50,9 @@ 
		RrBody			rrBody optional

	}

	with {

		//DTE TODO

		encode "isPDU=LibIpv6_Rfc2894RouterRenumbering_TypesAndValues;present=SupportFunctions.checkHeaderAndType(dec, 58, 138);use=com.testingtech.ttcn.tci.codec.helper.*;";

		encode (icmpCode) "tag='icmpCode';";

//		variant "isPDU=LibIpv6_Rfc2894RouterRenumbering_TypesAndValues;present=SupportFunctions.checkHeaderAndType(dec, 58, 138);use=com.testingtech.ttcn.tci.codec.helper.*;";

		variant "present=bytes(1,138)";

		variant (icmpCode) "tag='icmpCode';";

	}
@@ -72,7 +72,7 @@ 
		RrPrefixControlOperationList rrPrefixControlOperationList optional

	}

	with {

		encode "isPDU=LibIpv6_Rfc2894RouterRenumbering_TypesAndValues;present=(valueOf(getTag('icmpCode')) == 0);";

		variant "isPDU=LibIpv6_Rfc2894RouterRenumbering_TypesAndValues;present=(valueOf(getTag('icmpCode')) == 0);";

	}
@@ -82,7 +82,9 @@ 
		RrMatchPrefix	rrMatchPrefix,

		RrUsePrefixList	rrUsePrefixList optional

	}



	with {

		variant (rrUsePrefixList) "present=getIntTag('RrMatchPrefixOpLength')>3";

	}



	/*

	 * @desc Derived from RFC2894 Section 3.2.1.1
@@ -97,11 +99,17 @@ 
		UInt16	reserved,

		Oct16	matchPrefix

	}

	with {

		variant "intTag='RrMatchPrefixOpLength'";

	}



	/*

	 * @desc Derived from RFC2894  Section 3.2.1.2

	*/

	type set length (1..c_maxNrRrUsePrefix) of RrUsePrefix RrUsePrefixList;

	type set length (1..c_maxNrRrUsePrefix) of RrUsePrefix RrUsePrefixList

	with {

		variant "elements=(getIntTag('RrMatchPrefixOpLength')-3)/4";

	}



	type record RrUsePrefix {

		UInt8	useLen,
@@ -126,7 +134,7 @@ 
		RrMatchReportList rrMatchReportList optional

	}

	with {

		encode "isPDU=LibIpv6_Rfc2894RouterRenumbering_TypesAndValues;present=(valueOf(getTag('icmpCode')) == 1);";

		variant "isPDU=LibIpv6_Rfc2894RouterRenumbering_TypesAndValues;present=(valueOf(getTag('icmpCode')) == 1);";

	}

	

	type set length (1..c_maxNrRrMatchReport) of RrMatchReport RrMatchReportList;
@@ -145,7 +153,8 @@ 
		octetstring data optional

	}

	with {

		encode "isPDU=LibIpv6_Rfc2894RouterRenumbering_TypesAndValues;present=(valueOf(getTag('icmpCode')) == 255);";

		variant "isPDU=LibIpv6_Rfc2894RouterRenumbering_TypesAndValues;present=(valueOf(getTag('icmpCode')) == 255);";

		variant (data) "length=dec.infinity()";

	}

		

} // end module LibIpv6_Rfc2894RouterRenumbering_TypesAndValues

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2461NeighborDiscovery_Templates.ttcn

+828 −828

File changed.

Contains only whitespace changes.