Bug fixes (eb25a658) · Commits · TTCN-3 Libraries / LibIPv6

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2460Root_Templates.ttcn

+21 −2

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@
		*/
		template Ipv6Header mw_ipHdr ( UInt8 p_nextHdr) := {
		version := c_ipv6Version ,
		trafficClass := c_trafficClassZero ,
		trafficClass := ?, //c_trafficClassZero ,
		flowLabel := c_flowLabelZero ,
		payloadLength := ?,
		nextHeader := p_nextHdr,
		@@ -106,6 +106,25 @@
		destinationAddress := p_dst
		}

		/*
		* @param p_nextHdr Next header identifier value to be used.
		* @param p_src Binary IPv6 address associated with the
		* test component.
		* @param p_dst Binary IPv6 address associated with NUT.
		*/
		template Ipv6Header mw_ipHdr_srcDst_nextHdr_hopL255 ( template UInt8 p_nextHdr,
		template Ipv6Address p_src,
		template Ipv6Address p_dst) := {
		version := c_ipv6Version ,
		trafficClass := ? ,
		flowLabel := ? ,
		payloadLength := ?,
		nextHeader := p_nextHdr,
		hopLimit := 255,
		sourceAddress := p_src,
		destinationAddress := p_dst
		}

		/*
		* @param p_nextHdr Next header identifier value to be used.
		* @param p_src Binary IPv6 address associated with the

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2460Root_TypesAndValues.ttcn

+7 −10

Original line number	Diff line number	Diff line
		@@ -107,8 +107,7 @@
		// with {
		// encode "present=(valueOf(getTag(\"nextHeader\")) == 0);";
		// encode (nextHeader) "tag=\"nextHeader\";";
		// encode (hdrExtLen) "tag=\"hdrExtLen\";";
		// encode (hdrExtLen) "intTag=\"hdrExtIntLen\";intTag=\"IPv6Header_payloadLength\",getIntTag(\"IPv6Header_payloadLength\")-";
		// encode (hdrExtLen) "tag=\"hdrExtLen\";intTag=\"hdrExtIntLen\"*8+8-2;intTag=\"IPv6Header_payloadLength\",getIntTag(\"IPv6Header_payloadLength\")-";
		// }


		@@ -126,8 +125,7 @@
		// with {
		// encode "present=(valueOf(getTag(\"nextHeader\")) == 43);";
		// encode (nextHeader) "tag=\"nextHeader\";";
		// encode (hdrExtLen) "tag=\"hdrExtLen\";";
		// encode (hdrExtLen) "intTag=\"IPv6Header_payloadLength\",getIntTag(\"IPv6Header_payloadLength\")-";
		// encode (hdrExtLen) "tag=\"hdrExtLen\";intTag=\"IPv6Header_payloadLength\",getIntTag(\"IPv6Header_payloadLength\")-";
		// encode (routingType) "tag=\"routingType\";";
		// }

		@@ -156,8 +154,7 @@
		}
		// with {
		// encode "present=(valueOf(getTag(\"nextHeader\")) == 44);";
		// encode (nextHeader) "tag=\"nextHeader\";";
		// encode (nextHeader) "intTag=\"IPv6Header_payjoadLength\",getIntTag(\"IPv6Header_payloadLength\")-8";
		// encode (nextHeader) "tag=\"nextHeader\";intTag=\"IPv6Header_payjoadLength\",getIntTag(\"IPv6Header_payloadLength\")-8";
		// }


		@@ -172,8 +169,7 @@
		// with {
		// encode "present=(valueOf(getTag(\"nextHeader\")) == 60);";
		// encode (nextHeader) "tag=\"nextHeader\";";
		// encode (hdrExtLen) "tag=\"hdrExtLen\";";
		// encode (hdrExtLen) "intTag=\"IPv6Header_payloadLength\",getIntTag(\"IPv6Header_payloadLength\")-";
		// encode (hdrExtLen) "tag=\"hdrExtLen\";intTag=\"hdrExtIntLen\"*8+8-2;intTag=\"IPv6Header_payloadLength\",getIntTag(\"IPv6Header_payloadLength\")-";
		// }

		} // end extensionHeaders
		@@ -188,9 +184,10 @@
		ExtensionHeaderList extHdrList optional,
		octetstring data optional
		}
		// with {
		with {
		encode "isPDU=LibIpv6_Rfc2460Root_TypesAndValues;";
		// encode (data) "length=getIntTag(\"IPv6Header_payloadLength\");";
		// }
		}

		} //end group generalIpv6MessageType

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2461NeighborDiscovery_Functions.ttcn

+3 −3

Original line number	Diff line number	Diff line
		@@ -64,10 +64,10 @@ module LibIpv6_Rfc2461NeighborDiscovery_Functions {
		** @param p_prefix Router advertisement option prefix value
		** @param p_glaAddrTn Global address of testing node which calls this function
		*/
		function f_sendRtAdvWithPrefix( in Ipv6Address p_llaAddrTn,
		in Ipv6Address p_dstAddr,
		function f_sendRtAdvWithPrefix( in template Ipv6Address p_llaAddrTn,
		in template Ipv6Address p_dstAddr,
		in PrefixLength p_prefixLength,
		in Ipv6Address p_glaAddrTn)
		in template Ipv6Address p_glaAddrTn)
		runs on LibIpv6Node
		return FncRetCode {

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2461NeighborDiscovery_Templates.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -251,7 +251,7 @@
		*/
		template RouterAdvertisement mw_rtAdv_srcDstAddr ( template Ipv6Address p_src,
		template Ipv6Address p_dst ) := {
		ipv6Hdr := m_ipHdr(c_icmpHdr, p_src, p_dst),
		ipv6Hdr := mw_ipHdr_srcDst_nextHdr_hopL255 (c_icmpHdr, p_src, p_dst), // FIXED (Alex) : m_ipHdr->mw_ipHdr_srcDst_nextHdr_hopL255
		extHdrList := *,
		icmpType:= c_rtAdv,
		icmpCode:= ?,

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2463Icmpv6_Functions.ttcn

+14 −14

Original line number	Diff line number	Diff line
		@@ -96,8 +96,8 @@
		** @return execution status
		*/
		function f_getIpPktAfterEchoReq( in UInt8 p_hops,
		in Ipv6Address p_llaAddrTn,
		in Ipv6Address p_llaAddrNut,
		in template Ipv6Address p_llaAddrTn,
		in template Ipv6Address p_llaAddrNut,
		out Ipv6Packet p_ipPkt)
		runs on LibIpv6Node
		return FncRetCode {
		@@ -133,9 +133,9 @@
		** @return execution status
		*/
		function f_getTimeExceededAfterEchoReq( in UInt8 p_hops,
		in Ipv6Address p_llaAddrTn,
		in Ipv6Address p_llaAddrNut,
		in Ipv6Address p_llaAddrRut)
		in template Ipv6Address p_llaAddrTn,
		in template Ipv6Address p_llaAddrNut,
		in template Ipv6Address p_llaAddrRut)
		runs on LibIpv6Node
		return FncRetCode {

		@@ -240,8 +240,8 @@
		** @param p_icmpPkt IPv6 packet which has been received
		** @return execution status
		*/
		function f_echoProcUp( in Ipv6Address p_llaAddrTn,
		in Ipv6Address p_llaAddrNut,
		function f_echoProcUp( in template Ipv6Address p_llaAddrTn,
		in template Ipv6Address p_llaAddrNut,
		in UInt16 p_identifier,
		in UInt16 p_seqNo,
		out EchoReply p_icmpPkt)
		@@ -280,8 +280,8 @@
		** @param p_seqNo Sequence number to be used in ICMPv6 echo request
		** @return execution status
		*/
		function f_replyToEchoRequest(in Ipv6Address p_llaAddrTn,
		in Ipv6Address p_llaAddrNut,
		function f_replyToEchoRequest(in template Ipv6Address p_llaAddrTn,
		in template Ipv6Address p_llaAddrNut,
		in UInt16 p_identifier,
		in UInt16 p_seqNo )
		runs on LibIpv6Node
		@@ -321,7 +321,7 @@
		** @param p_llaAddrNut Local link address of node under test
		** @return execution status
		*/
		function f_echoProcDown(Ipv6Address p_llaAddrTn, Ipv6Address p_llaAddrNut)
		function f_echoProcDown( template Ipv6Address p_llaAddrTn, template Ipv6Address p_llaAddrNut)
		runs on LibIpv6Node
		return FncRetCode {

		@@ -420,7 +420,7 @@
		** @param p_address Address used for prefix creation
		** @param p_prefixLength Length of the prefix
		*/
		function f_createPrefix ( Ipv6Address p_address, UInt8 p_prefixLength )
		function f_createPrefix ( template Ipv6Address p_address, UInt8 p_prefixLength )
		runs on LibIpv6Node
		return Ipv6Address {

		@@ -442,7 +442,7 @@
		** in 64. The first 64 bits remain unchanged, the others are set to zero.
		** @param p_address Address used for prefix creation
		*/
		function f_createPrefix64 ( Ipv6Address p_address )
		function f_createPrefix64 ( template Ipv6Address p_address )
		runs on LibIpv6Node
		return Ipv6Address {

		@@ -471,8 +471,8 @@
		** @return execution status
		*/
		function f_echoProcUp_withHopL255Len1280(
		in Ipv6Address p_llaAddrTn,
		in Ipv6Address p_llaAddrNut)
		in template Ipv6Address p_llaAddrTn,
		in template Ipv6Address p_llaAddrNut)
		runs on LibIpv6Node return FncRetCode {

		var FncRetCode v_ret;