Ipv4 port and Ipv4TestNode added (35d04a1b) · Commits · TTCN-3 Libraries / LibIPv6

ttcn3/EtsiLibrary/LibIpv6/LibCommonRfcs/LibIpv6_Interface_Functions.ttcn

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1199,7 +1199,7 @@ group rfc791Fns {
	* @return execution status		* @return execution status
	*/		*/
	function f_sendIpv4Packet (in template Ipv4Packet p_ipv4Packet)		function f_sendIpv4Packet (in template Ipv4Packet p_ipv4Packet)
	runs on LibIpv6Node		runs on LibIpv4Node
	return FncRetCode {		return FncRetCode {
	var Ipv4Packet v_ipPkt;		var Ipv4Packet v_ipPkt;
	v_ipPkt := valueof(p_ipv4Packet);		v_ipPkt := valueof(p_ipv4Packet);
	@@ -1226,7 +1226,7 @@ group rfc791Fns {
	);		);

	//send		//send
	ipPort.send(v_ipPkt);		ipv4Port.send(v_ipPkt);

	return e_success;		return e_success;

ttcn3/EtsiLibrary/LibIpv6/LibCommonRfcs/LibIpv6_Interface_TypesAndValues.ttcn

+36 −16

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,7 @@ module LibIpv6_Interface_TypesAndValues {
	import from LibIpv6_Rfc4306Ikev2_TypesAndValues all;		import from LibIpv6_Rfc4306Ikev2_TypesAndValues all;
	import from LibIpv6_Rfc792Icmpv4_TypesAndValues all;		import from LibIpv6_Rfc792Icmpv4_TypesAndValues all;

	group libTestSystem {		group ipv6TestSystem {
	/*		/*
	* @desc This type is used to define behavior within the IPv6 library		* @desc This type is used to define behavior within the IPv6 library
	* which can be executed on both, host as well as router,		* which can be executed on both, host as well as router,
	@@ -66,14 +66,6 @@ module LibIpv6_Interface_TypesAndValues {
	PrefixLength prefixLength optional		PrefixLength prefixLength optional
	}		}

	type record Ipv4NodeParams {
	boolean useInTa,
	Ipv4Address gla optional,
	Oct6to15 macUca optional
	//Oct6to15 macSolNodeMca optional, TODO check if needed
	//PrefixLength prefixLength optional TODO check if needed
	}

	type port Ipv6Port message {		type port Ipv6Port message {
	inout		inout
	//Imported from Rfc 2463		//Imported from Rfc 2463
	@@ -128,14 +120,42 @@ module LibIpv6_Interface_TypesAndValues {
	InformationalRequest,		InformationalRequest,
	InformationalResponse,		InformationalResponse,
	//MetaPdu		//MetaPdu
	Ipv6Packet,		Ipv6Packet
			}//end type port Ipv6Port


			}//end group ipv6TestSystem

			group ipv4TestSystem {

			type component LibIpv4Node {
			port Ipv4Port ipv4Port;
			timer tc_ac:= PX_TAC;
			timer tc_noAc:= PX_TNOAC;
			timer tc_wait:= PX_TWAIT;
			timer tc_loop := PX_LOOP ;
			var StringStack v_stateStack:= c_initStringStack;
			port SyncPort syncSendPort;
			port SyncPort syncPort;
			timer tc_sync := PX_TSYNC_TIME_LIMIT;
			}

			type record Ipv4NodeParams {
			boolean useInTa,
			Ipv4Address ipv4Addr optional,
			Oct6to15 macUca optional
			}


			type port Ipv4Port message {
			inout
	//Ipv4		//Ipv4
	Ipv4EchoRequest,//TODO rename in test componennt from ipv6Port to ipPort		Ipv4EchoRequest,
	Ipv4EchoReply,		Ipv4EchoReply,
	Ipv4Packet		Ipv4Packet
	}//end type port Ipv6Port		}

	}//end group libTestSystem		}//end ipv4TestSystem

	group ipv6PacketDefs {		group ipv6PacketDefs {

ttcn3/EtsiLibrary/LibIpv6/LibTransitioning/LibIpv6_Rfc792Icmpv4_Functions.ttcn

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -36,7 +36,7 @@
	* @return execution status		* @return execution status
	*/		*/
	function f_sendIpv4EchoRequest (in template Ipv4EchoRequest p_ipv4EchoRequest)		function f_sendIpv4EchoRequest (in template Ipv4EchoRequest p_ipv4EchoRequest)
	runs on LibIpv6Node		runs on LibIpv4Node
	return FncRetCode {		return FncRetCode {
	var Ipv4EchoRequest v_ipPkt;		var Ipv4EchoRequest v_ipPkt;
	v_ipPkt := valueof(p_ipv4EchoRequest);		v_ipPkt := valueof(p_ipv4EchoRequest);
	@@ -63,7 +63,7 @@
	);		);

	//send		//send
	ipPort.send(v_ipPkt);		ipv4Port.send(v_ipPkt);

	return e_success;		return e_success;

Admin message