Commit 4a43aa8c authored by validator's avatar validator
Browse files

""

parent 96d52ffa

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2460Root_TypesAndValues.ttcn

+4 −1
Original line number Diff line number Diff line
@@ -189,6 +189,9 @@ 
			ExtensionHeaderList extHdrList optional,

			octetstring	data optional

        }

//        with {

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

//        }

        

    } //end group generalIpv6MessageType

//added by PK - end

ttcn3/EtsiLibrary/LibIpv6/LibMultiRfcs/LibIpv6_ExternalFunctions.ttcn

+3 −0
Original line number Diff line number Diff line
@@ -33,5 +33,8 @@ 
	external function fx_icmpv6Checksum( in Ipv6Packet p_packet) 

	return Oct2;

	

	external function fx_encodeMessage (in Ipv6Packet p_msg)

	return octetstring;



	

}// end module LibIpv6_ExternalFunctions

ttcn3/EtsiLibrary/LibIpv6/LibMultiRfcs/LibIpv6_Interface.ttcn

+12 −10
Original line number Diff line number Diff line
@@ -39,10 +39,7 @@ module LibIpv6_Interface { 


	type port Ipv6Port message {

		inout

//added by PK - begin

        //General IPv6 packet

        GeneralIpv6,

//added by PK - end



		//Imported from Rfc 2463

		DestinationUnreachable,

		PacketTooBig,
@@ -72,7 +69,11 @@ module LibIpv6_Interface { 
		//UDP

		UdpPacket,

		//MetaPdu

		Ipv6Packet

		Ipv6Packet,

//		added by PK - begin

		//General IPv6 packet

		GeneralIpv6

//		added by PK - end

	}



	/*
@@ -80,10 +81,7 @@ module LibIpv6_Interface { 
	**		 This type is used mainly for checksum calculation

	*/

        type union Ipv6Packet  {

//added by PK - begin

        //General IPv6 packet

        GeneralIpv6                         generalIpv6,

//added by PK - end



		//Imported from Rfc 2463

		DestinationUnreachable 				destinationUnreachable,

		PacketTooBig						packetTooBig,
@@ -108,7 +106,11 @@ module LibIpv6_Interface { 
		//Default value

		OtherIcmpv6Hdr						otherHeader,

		//Udp

		UdpPacket							udpPacket

		UdpPacket							udpPacket,

//		added by PK - begin

	  	//General IPv6 packet

	  	GeneralIpv6                         generalIpv6

//		added by PK - end

	}

	with {

		encode "isPDU=LibIpv6_Interface;"

ttcn3/EtsiLibrary/LibIpv6/LibMultiRfcs/LibIpv6_ModuleParameters.ttcn

+6 −6
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ module LibIpv6_ModuleParameters { 
		

	}//end IUT



	group HUT {

//	group HUT {

		

		/*

		** @desc   Link Local Address of Host Under Test<br>
@@ -198,10 +198,10 @@ module LibIpv6_ModuleParameters { 
		*/

//		modulepar {Oct6to15 PX_MAC_SOL_NODE_MCA_HUT := '3333FF276A31'O}

		

	}//end HUT

	//}//end HUT





	group RUT {

	//group RUT {

		

		/*

		** @desc   Link Local Address of Router Under Test sending in netA<br>
@@ -280,9 +280,9 @@ module LibIpv6_ModuleParameters { 
		modulepar {Oct6to15 PX_MAC_ACA}



	

	}//end group RUT

	//}//end group RUT

	

	group NUT {

	//group NUT {

		

		/*

		** @desc   Link Local Address of Node Under Test<br>
@@ -314,7 +314,7 @@ module LibIpv6_ModuleParameters { 
		*/

//		modulepar {Oct6to15 PX_MAC_SOL_NODE_MCA_NUT := '3333FF276A31'O}

	

	}//end NUT

//	}//end NUT

ttcn3/EtsiLibrary/LibIpv6/LibMultiRfcs/LibIpv6_MultiRfcs_TypesAndValues.ttcn

+2 −0
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ module LibIpv6_MultiRfcs_TypesAndValues { 
			Oct6to15			linkLayerAddr

		}

//		with {

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

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

//			encode (linkLayerAddr) "length=valueOf(getTag(\"SLA_optionLength\"))*8-2;";

//		}
@@ -229,6 +230,7 @@ module LibIpv6_MultiRfcs_TypesAndValues { 
			Oct6to15			linkLayerAddr

		}

//		with {

//			encode "present=bytes(0,1,2);"

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

//			encode (linkLayerAddr) "length=valueOf(getTag(\"TLA_optionLength\"))*8-2;";

//		}