Commit ff18eca4 authored by validator's avatar validator
Browse files

Added new Mipv6 to the java implementations of the Codec and the TestAdapter. 

Minor changes.
parent 3e0aa1c7

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2460Root_TypesAndValues.ttcn

+3 −3
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ 
		with {

			encode "present=(valueOf(getTag('nextHeader')) == 0);";

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

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

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

		}
@@ -140,7 +140,7 @@ 
		with {

			encode "present=(valueOf(getTag('nextHeader')) == 43);";

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

			encode (hdrExtLen) "tag='hdrExtLen';intTag='IPv6Header_payloadLength',getIntTag('IPv6Header_payloadLength')-value";

			encode (hdrExtLen) "tag='hdrExtLen';intTag='IPv6Header_payloadLength',getIntTag('IPv6Header_payloadLength')-value*8-8";

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

		}
@@ -184,7 +184,7 @@ 
		with {

			encode "present=(valueOf(getTag('nextHeader')) == 60);";

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

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

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

		}

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2461NeighborDiscovery_TypesAndValues.ttcn

+5 −4
Original line number Diff line number Diff line
@@ -234,10 +234,11 @@ 
			UInt48		reserved,

			octetstring	data // no length limit?

		}

//		with {

//			encode (optionLength) "tag=\"RedirectHeader_optionLength\";";

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

//		}

		with {

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

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

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

		}

	

	} // end  icmpRfc461Options