Removed some commented stuff and checked for TODOs.

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2461NeighborDiscovery_TypesAndValues.ttcn

@@ -123,7 +123,6 @@
 			RtSolOptions		rtSolOptions optional
 		}
 		with {
-//			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";
 		}
 		
@@ -145,7 +144,6 @@
 			RtAdvOptions		rtAdvOptions optional
 		}
 		with {
-//			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";
 		}
 	
@@ -154,8 +152,6 @@
 		 * @desc PDU type derived from Rfc 2461 clause 4.3	
 		*/
 		type record NeighborSolicitationMsg {
-		//smu	Ipv6Header			ipv6Hdr,
-		//smu	ExtensionHeaderList extHdrList		optional,
 			UInt8 				icmpType(c_nbrSolMsg),
 			UInt8 				icmpCode,
 			Oct2 				checksum,
@@ -164,7 +160,6 @@
 			NbrSolOptions		nbrSolOptions optional
 		}
 		with {
-//			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";
 		}
 		
@@ -173,8 +168,6 @@
 		 * @desc PDU type derived from Rfc 2461 clause 4.4
 		*/
 		type record NeighborAdvertisementMsg {
-		//smu	Ipv6Header			ipv6Hdr,
-		//smu	ExtensionHeaderList extHdrList		optional,
 			UInt8 				icmpType(c_nbrAdvMsg),
 			UInt8 				icmpCode,
 			Oct2 				checksum,
@@ -186,7 +179,6 @@
 			NbrAdvOptions		nbrAdvOptions optional
 		} 
 		with {
-//			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";
 		}
 		
@@ -194,8 +186,6 @@
 		 * @desc PDU type derived from Rfc 2461 clause 4.5
 		*/
 		type record RedirectMsg {
-		//smu	Ipv6Header			ipv6Hdr,
-		//smu	ExtensionHeaderList extHdrList		optional,
 			UInt8 				icmpType(c_redirectMsg),
 			UInt8 				icmpCode,
 			Oct2 				checksum,
@@ -205,7 +195,6 @@
 			RedirectOptions		redirectOptions optional
 		} 
 		with {
-//			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";
 		}
 	

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2463Icmpv6_TypesAndValues.ttcn

@@ -86,8 +86,6 @@
 		 * @desc PDU type derived from RFC2463 clause 3.3
 		*/
 		type record TimeExceededMsg {
-			//smu Ipv6Header			ipv6Hdr,
-			//smu ExtensionHeaderList extHdrList optional,
 			UInt8 	icmpType(c_timeExceededMsg),
 			UInt8 	icmpCode,
 			Oct2 	checksum,
@@ -95,7 +93,6 @@
 			octetstring	data optional
 		}
 		with {
-//			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";
 		}
@@ -106,8 +103,6 @@
 		 * @desc PDU type derived from RFC2463 clause 3.4
 		*/
 		type record ParameterProblemMsg {
-			//smu Ipv6Header			ipv6Hdr,
-			//smu ExtensionHeaderList extHdrList optional,
 			UInt8 		icmpType(c_parameterProblemMsg),
 			UInt8 		icmpCode,
 			Oct2 		checksum,
@@ -115,7 +110,6 @@
 			octetstring	data optional
 		}
 		with {
-//			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";
 		}
@@ -125,8 +119,6 @@
 		 * @desc PDU type derived from RFC2463 clause 4.1
 		*/
 		type record EchoRequestMsg {
-		//smu	Ipv6Header			ipv6Hdr,
-		//smu	ExtensionHeaderList extHdrList optional,
 			UInt8 		icmpType(c_echoRequestMsg),
 			UInt8 		icmpCode,
 			Oct2 		checksum,
@@ -135,7 +127,6 @@
 			octetstring	data optional
 		}
 		with {
-//			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";
 		}
@@ -145,8 +136,6 @@
 		 * @desc PDU type derived from RFC2463 clause 4.2
 		*/
 		type record EchoReplyMsg {
-		//smu	Ipv6Header			ipv6Hdr,
-		//smu	ExtensionHeaderList extHdrList optional,
 			UInt8 		icmpType(c_echoReplyMsg),
 			UInt8 		icmpCode,
 			Oct2 		checksum,
@@ -155,7 +144,6 @@
 			octetstring	data optional
 		}
 		with {
-//			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";
 		}
@@ -164,15 +152,12 @@
 		 * @desc Generic Icmpv6 header
 		*/
 		type record OtherIcmpv6Msg {
-		//smu	Ipv6Header			ipv6Hdr,
-		//smu	ExtensionHeaderList extHdrList optional,
 			UInt8 		icmpType,
 			UInt8 		icmpCode,
 			Oct2 		checksum,
 			octetstring	data optional
 		}
 		with {
-//			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

@@ -32,8 +32,6 @@
 	 * @desc PDU type derived from RFC2894 clause 3.1
 	*/
 	type record RouterRenumberingMsg {
-	//smu	Ipv6Header			ipv6Hdr,
-	//smu	ExtensionHeaderList extHdrList		optional,
 		UInt8 			icmpType(c_routerRenumberingMsg),
 		UInt8 			icmpCode,
 		Oct2 			checksum,
@@ -50,7 +48,6 @@
 		RrBody			rrBody optional
 	}
 	with {
-//		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';";
 	}

ttcn3/EtsiLibrary/LibIpv6/LibMobility/LibIpv6_Rfc3775Mipv6_TypesAndValues.ttcn

@@ -53,8 +53,6 @@
 		 * @desc Derived from RFC3775, clause 6.5
 		*/
 		type record HomeAgentAddressDiscoveryRequestMsg {
-//smu			Ipv6Header			ipv6Hdr,
-//smu			ExtensionHeaderList extHdrList		optional,
 			UInt8 			icmpType(c_homeAgentAddressDiscoveryRequest),
 			UInt8 			icmpCode,
 			Oct2 			checksum,
@@ -62,7 +60,6 @@
 			UInt16			reserved
 		}
 		with {
-//			encode "isPDU=LibIpv6_Rfc3775MIPv6_TypesAndValues;use=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 144)";
 			variant "present=bytes(1,144)&&(valueOf(getTag('nextHeader'))==58)";
 		}
 		
@@ -70,8 +67,6 @@
 		 * @desc Derived from RFC3775, clause 6.6
 		*/
 		type record HomeAgentAddressDiscoveryReplyMsg {
-//smu			Ipv6Header			ipv6Hdr,
-//smu			ExtensionHeaderList extHdrList		optional,
 			UInt8 			icmpType(c_homeAgentAddressDiscoveryReply),
 			UInt8 			icmpCode,
 			Oct2 			checksum,
@@ -80,7 +75,6 @@
 			Ipv6AddressList	homeAgentAddresses optional
 		}
 		with {
-//			variant "isPDU=LibIpv6_Rfc3775MIPv6_TypesAndValues;use=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 145)";
 			variant "present=bytes(1,145)&&(valueOf(getTag('nextHeader'))==58)";
 		}
 
@@ -88,8 +82,6 @@
 		 * @desc Derived from RFC3775, clause 6.7
 		*/
 		type record MobilePrefixSolicitationMsg {
-//smu			Ipv6Header			ipv6Hdr,
-//smu			ExtensionHeaderList extHdrList		optional,
 			UInt8 			icmpType(c_mobilePrefixSolicitation),
 			UInt8 			icmpCode,
 			Oct2 			checksum,
@@ -97,7 +89,6 @@
 			UInt16			reserved
 		}
 		with {
-//			variant "isPDU=LibIpv6_Rfc3775MIPv6_TypesAndValues;use=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 146)";
 			variant "present=bytes(1,146)&&(valueOf(getTag('nextHeader'))==58)";
 		}
 		
@@ -107,8 +98,6 @@
 		 *         of PrefixAdvertisement specified in  RFC2461!
 		*/
 		type record MobilePrefixAdvertisementMsg {
-//smu			Ipv6Header			ipv6Hdr,
-//smu			ExtensionHeaderList extHdrList		optional,
 			UInt8 			icmpType(c_mobilePrefixAdvertisement),
 			UInt8 			icmpCode,
 			Oct2 			checksum,
@@ -119,7 +108,6 @@
 			MipPrefixInfoList	mobilePrefixInfoList
 		}
 		with {
-//			variant "isPDU=LibIpv6_Rfc3775MIPv6_TypesAndValues;use=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 147)";
 			variant "present=bytes(1,147)&&(valueOf(getTag('nextHeader'))==58)";
 		}
 

ttcn3/EtsiLibrary/LibIpv6/LibUdp/LibIpv6_Rfc0768Udp_TypesAndValues.ttcn

@@ -23,8 +23,6 @@
 	} // end udpConstants
 
 	type record UdpMsg {
-//smu		Ipv6Header			ipv6Hdr,
-//smu		ExtensionHeaderList extHdrList optional,
 		Oct2		        sourcePort,
 		Oct2		        destPort,
 		UInt16		        msgLength,																																								
@@ -33,7 +31,6 @@
 	}
 	with {
 		variant "present=valueOf(getTag('nextHeader'))==17";
-//smu		variant (extHdrList) "condition=if (valueOf(dec.getTag('nextHeader')) != 17) return null";
 		variant (msgLength) "tag='msgLength';";
 		variant (data) "length=valueOf(getTag('msgLength'))-8;";
 	}