Commit 7c61f48e authored by validator's avatar validator
Browse files

""

parent 88fc0b37

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2460Root_TypesAndValues.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 


	group extensionHeaders {



		type set length(1 .. c_maxIpv6ExtHdrs) of ExtensionHeader ExtensionHeaderList

		type set length(1 .. c_maxIpv6ExtHdrs) of ExtensionHeader ExtensionHeaderList;

//		with {

//			encode "present=isEOF()== false && ((valueOf(dec.getTag(\"nextHeader\"))==0) || (valueOf(dec.getTag(\"nextHeader\"))==43) || (valueOf(dec.getTag(\"nextHeader\"))==44) || (valueOf(dec.getTag(\"nextHeader\"))==60) || (valueOf(dec.getTag(\"nextHeader\"))==51) || (valueOf(dec.getTag(\"nextHeader\"))==50) || (valueOf(dec.getTag(\"nextHeader\"))==41))";

//		}

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2463Icmpv6_TypesAndValues.ttcn

+21 −21
Original line number Diff line number Diff line
@@ -60,10 +60,10 @@ 
			Oct4		unused,

			octetstring	data optional

		}

//		with {

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

		with {

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

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

//		}

		}

		

		

		/*
@@ -78,10 +78,10 @@ 
			UInt32		mtu,

			octetstring	data optional

		}

//		with {

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

		with {

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

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

//		}

		}

		

		

		/*
@@ -96,10 +96,10 @@ 
			UInt32	unused(0), //always zero

			octetstring	data optional

		}

//		with {

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

		with {

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

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

//		}

		}
@@ -115,10 +115,10 @@ 
			UInt32		pointer,

			octetstring	data optional

		}

//		with {

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

		with {

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

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

//		}

		}

		

		

		/*
@@ -134,10 +134,10 @@ 
			UInt16 		sequenceNumber,

			octetstring	data optional

		}

//		with {

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

		with {

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

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

//		}

		}

		



		/*
@@ -153,10 +153,10 @@ 
			UInt16 		sequenceNumber,

			octetstring	data optional

		}

//		with {

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

		with {

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

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

//		}

		}

		

		/*

		** @desc Generic Icmpv6 header
@@ -169,10 +169,10 @@ 
			Oct2 		checksum,

			octetstring	data optional

		}

//		with {

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

		with {

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

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

//		}

		}

		



	} // end icmpRfc2463Packets

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2894RouterRenumbering_TypesAndValues.ttcn

+12 −12
Original line number Diff line number Diff line
@@ -43,10 +43,10 @@ 
		UInt32			reserved2,

		RrBody			rrBody optional

	}

//	with {

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

	with {

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

//		encode (icmpCode) "tag=\"icmpCode\";";

//	}

	}
@@ -64,9 +64,9 @@ 
	type record RrControlBody {

		RrPrefixControlOperationList rrPrefixControlOperationList optional

	}

//	with {

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

//	}

	with {

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

	}

	

	

	type set length (1..c_maxNrRrPrefixControlOperation) of RrPrefixControlOperation RrPrefixControlOperationList;
@@ -118,9 +118,9 @@ 
	type record RrResultBody {

		RrMatchReportList rrMatchReportList optional

	}

//	with {

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

//	}

	with {

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

	}

	

	type set length (1..c_maxNrRrMatchReport) of RrMatchReport RrMatchReportList;
@@ -137,8 +137,8 @@ 
	type record RrSeqNumberReset {

		octetstring data optional

	}

//	with {

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

//	}

	with {

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

	}

		

} // end module LibIpv6_Rfc2894RouterRenumbering_TypesAndValues

ttcn3/EtsiLibrary/LibIpv6/LibMultiRfcs/LibIpv6_MultiRfcs_TypesAndValues.ttcn

+2 −2
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ module LibIpv6_MultiRfcs_TypesAndValues { 
		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 {

//			encode "present=isEOF()== false && (valueOf(dec.getTag(\"routingType\")) == 0);";

//			encode "elements=valueOf(getTag(\"hdrExtLen\"));"
@@ -365,7 +365,7 @@ module LibIpv6_MultiRfcs_TypesAndValues { 
		/* @remark In a HopByHopOptionList value either the pad1 or padN 

		**         option can appear only once!

        */

		type set length (1..c_maxNrDestOption) of DestOption   DestOptionList

		type set length (1..c_maxNrDestOption) of DestOption   DestOptionList;

//		with {

//			encode "elements=valueOf(getTag(\"hdrExtLen\"));"

//		}

ttcn3/EtsiLibrary/LibIpv6/LibUdp/LibIpv6_Rfc0768Udp_TypesAndValues.ttcn

+3 −3
Original line number Diff line number Diff line
@@ -32,11 +32,11 @@ 
		Oct2		        checksum,

		octetstring	        data optional

	}

//	with {

//		encode "isPDU=LibIpv6_Rfc0768Udp_TypesAndValues;import=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeader(dec, 17)";

	with {

		encode "isPDU=LibIpv6_Rfc0768Udp_TypesAndValues;import=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeader(dec, 17)";

//		encode (extHdrList) "condition=if (valueOf(dec.getTag(\"nextHeader\")) != 17) return null";

//		encode (msgLength) "tag=\"msgLength\";";

//		encode (data) "length=valueOf(getTag(\"msgLength\"))-8;";

//	}

	}



} // end LibIpv6_Rfc0768Udp_TypesAndValues