changes in cfg from rut hut to iut (067c38e4) · Commits · TTCN-3 Libraries / LibIPv6

ttcn3/EtsiLibrary/LibIpv6/LibMultiRfcs/LibIpv6_MultiRfcs_TypesAndValues.ttcn

+59 −54

Original line number	Diff line number	Diff line
		@@ -179,6 +179,11 @@ module LibIpv6_MultiRfcs_TypesAndValues {

		group commonTypes {

		type enumerated IutRole {
		e_iutHs(0),
		e_iutRt(1)
		}

		type enumerated MacLayer {
		e_eth(0),
		e_atm(1)
		@@ -195,10 +200,10 @@ module LibIpv6_MultiRfcs_TypesAndValues {
		type Oct6 AtmAddress;

		type record length(1 .. c_maxNrIpv6Address) of Ipv6Address Ipv6AddressList
		with {
		encode "present=isEOF()== false && (valueOf(dec.getTag(\"routingType\")) == 0);";
		encode "elements=valueOf(getTag(\"hdrExtLen\"));"
		}
		// with {
		// encode "present=isEOF()== false && (valueOf(dec.getTag(\"routingType\")) == 0);";
		// encode "elements=valueOf(getTag(\"hdrExtLen\"));"
		// }

		/*
		** @desc Derived from RFC2461 clause4.6.1 + MIPv6
		@@ -209,10 +214,10 @@ module LibIpv6_MultiRfcs_TypesAndValues {
		UInt8 optionLength,
		Oct6to15 linkLayerAddr
		}
		with {
		encode (optionLength) "tag=\"SLA_optionLength\";";
		encode (linkLayerAddr) "length=valueOf(getTag(\"SLA_optionLength\"))*8-2;";
		}
		// with {
		// encode (optionLength) "tag=\"SLA_optionLength\";";
		// encode (linkLayerAddr) "length=valueOf(getTag(\"SLA_optionLength\"))*8-2;";
		// }

		/*
		** @desc Derived from RFC 2461 clause 4.6.1
		@@ -223,10 +228,10 @@ module LibIpv6_MultiRfcs_TypesAndValues {
		UInt8 optionLength,
		Oct6to15 linkLayerAddr
		}
		with {
		encode (optionLength) "tag=\"TLA_optionLength\";";
		encode (linkLayerAddr) "length=valueOf(getTag(\"TLA_optionLength\"))*8-2;";
		}
		// with {
		// encode (optionLength) "tag=\"TLA_optionLength\";";
		// encode (linkLayerAddr) "length=valueOf(getTag(\"TLA_optionLength\"))*8-2;";
		// }


		/*
		@@ -239,9 +244,9 @@ module LibIpv6_MultiRfcs_TypesAndValues {
		UInt16 reserved,
		UInt32 mtu
		}
		with {
		encode "present=bytes(0,1,5);"
		}
		// with {
		// encode "present=bytes(0,1,5);"
		// }

		} // end group commonTypes

		@@ -250,10 +255,10 @@ module LibIpv6_MultiRfcs_TypesAndValues {
		type record OptPad1 {
		UInt8 optType(c_optPad1)
		}
		with {
		encode "present=bytes(0,1,0);";
		encode "intTag=\"hdrExtIntLen\",getIntTag(\"hdrExtIntLen\")-1";
		}
		// with {
		// encode "present=bytes(0,1,0);";
		// encode "intTag=\"hdrExtIntLen\",getIntTag(\"hdrExtIntLen\")-1";
		// }


		type record OptPadN {
		@@ -261,12 +266,12 @@ module LibIpv6_MultiRfcs_TypesAndValues {
		UInt8 optLen,
		octetstring padding optional
		}
		with {
		encode "present=bytes(0,1,1);";
		encode (optLen) "tag=\"optLen\";";
		encode (optLen) "intTag=\"hdrExtIntLen\",getIntTag(\"hdrExtIntLen\")-";
		encode (padding) "length=valueOf(getTag(\"optLen\"))-2;";
		}
		// with {
		// encode "present=bytes(0,1,1);";
		// encode (optLen) "tag=\"optLen\";";
		// encode (optLen) "intTag=\"hdrExtIntLen\",getIntTag(\"hdrExtIntLen\")-";
		// encode (padding) "length=valueOf(getTag(\"optLen\"))-2;";
		// }

		/*
		** @desc Derived from RFC 2473 Section 4.1.1
		@@ -277,10 +282,10 @@ module LibIpv6_MultiRfcs_TypesAndValues {
		UInt8 optLen (1),
		UInt8 optTunnelEncapLimitValue
		}
		with {
		encode "present=bytes(0,1,4);";
		encode "intTag=\"hdrExtIntLen\",getIntTag(\"hdrExtIntLen\")-3";
		}
		// with {
		// encode "present=bytes(0,1,4);";
		// encode "intTag=\"hdrExtIntLen\",getIntTag(\"hdrExtIntLen\")-3";
		// }


		/*
		@@ -292,10 +297,10 @@ module LibIpv6_MultiRfcs_TypesAndValues {
		UInt8 optLen(4),
		UInt32 optJumboPayloadLength
		}
		with {
		encode "present=bytes(0,1,194);";
		encode "intTag=\"hdrExtIntLen\",getIntTag(\"hdrExtIntLen\")-6";
		}
		// with {
		// encode "present=bytes(0,1,194);";
		// encode "intTag=\"hdrExtIntLen\",getIntTag(\"hdrExtIntLen\")-6";
		// }

		/*
		** @desc Derived from RFC 2711 Section 2.1
		@@ -306,10 +311,10 @@ module LibIpv6_MultiRfcs_TypesAndValues {
		UInt8 optLen(2),
		UInt16 optValue
		}
		with {
		encode "present=bytes(0,1,201);";
		encode "intTag=\"hdrExtIntLen\",getIntTag(\"hdrExtIntLen\")-4";
		}
		// with {
		// encode "present=bytes(0,1,201);";
		// encode "intTag=\"hdrExtIntLen\",getIntTag(\"hdrExtIntLen\")-4";
		// }

		/* @desc Derived from RFCxxxx MIpv6, clause 6.2
		** @remark This extension shall be inserted:
		@@ -322,10 +327,10 @@ module LibIpv6_MultiRfcs_TypesAndValues {
		UInt8 ipv6OptLen(16),
		Oct16 homeAddress
		}
		with {
		encode "present=bytes(0,1,5);";
		encode "intTag=\"hdrExtIntLen\",getIntTag(\"hdrExtIntLen\")-18";
		}
		// with {
		// encode "present=bytes(0,1,5);";
		// encode "intTag=\"hdrExtIntLen\",getIntTag(\"hdrExtIntLen\")-18";
		// }

		type set length(1 .. c_maxIpv6Options) of Ipv6Option Ipv6OptionList;

		@@ -334,10 +339,10 @@ module LibIpv6_MultiRfcs_TypesAndValues {
		UInt8 optionDataLen,
		Oct1to255 optionData optional
		}
		with {
		encode (optionDataLen) "tag=\"Ipv6optionDataLen\";";
		encode (optionData) "length=valueOf(getTag(\"Ipv6optionDataLen\"))-2;";
		}
		// with {
		// encode (optionDataLen) "tag=\"Ipv6optionDataLen\";";
		// encode (optionData) "length=valueOf(getTag(\"Ipv6optionDataLen\"))-2;";
		// }

		/* @remark In a HopByHopOptionList value either the pad1 or padN
		** option can appear only once!
		@@ -351,9 +356,9 @@ module LibIpv6_MultiRfcs_TypesAndValues {
		OptRouterAlert routerAlert,
		octetstring generalOptionString
		}
		with {
		encode (generalOptionString) "length=valueOf(getTag(\"hdrExtLen\"))-2;";
		}
		// with {
		// encode (generalOptionString) "length=valueOf(getTag(\"hdrExtLen\"))-2;";
		// }



		@@ -361,9 +366,9 @@ module LibIpv6_MultiRfcs_TypesAndValues {
		** option can appear only once!
		*/
		type set length (1..c_maxNrDestOption) of DestOption DestOptionList
		with {
		encode "elements=valueOf(getTag(\"hdrExtLen\"));"
		}
		// with {
		// encode "elements=valueOf(getTag(\"hdrExtLen\"));"
		// }

		type union DestOption {
		OptPad1 pad1 ,
		@@ -372,9 +377,9 @@ module LibIpv6_MultiRfcs_TypesAndValues {
		OptHomeAddress homeAddressOption,
		octetstring generalOptionString
		}
		with {
		encode (generalOptionString) "length=valueOf(getTag(\"hdrExtLen\"))-2;";
		}
		// with {
		// encode (generalOptionString) "length=valueOf(getTag(\"hdrExtLen\"))-2;";
		// }

		} // end ipv6Options