Commit 4dfa3ff9 authored by peter's avatar peter
Browse files

No commit message

No commit message
parent d08e2a21
Loading
Loading
Loading
Loading
+22 −0
Original line number Diff line number Diff line
@@ -156,6 +156,28 @@
			destinationAddress := p_dst
		}

//added by PK
		/*
		 *	@param  p_nextHdr Next header identifier value to be used.
		 *	@param  p_hopLimit Number of hops 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_hop (	UInt8 p_nextHdr,
											UInt8 p_hopLimit,
											template Ipv6Address p_src,
											template Ipv6Address p_dst ) := {
			version 		:= c_ipv6Version ,
			trafficClass 	:= ?,
			flowLabel 		:= ?,
			payloadLength 	:= ?,
			nextHeader 		:= p_nextHdr,
			hopLimit 		:= p_hopLimit,
			sourceAddress 	:= p_src,
			destinationAddress := p_dst
		}

	}//end ipv6Header

	group extensionHeader {
+29 −1
Original line number Diff line number Diff line
@@ -540,6 +540,34 @@
			redirectOptions := p_redirectOptions
		}

		/*
		 *	@param  p_src Binary IPv6 address associated with the
		 *          test component.
		 *	@param  p_dst Binary IPv6 address associated with NUT.
		 *	@param  p_targetAddr Binary IPv6 address to be used as target
		 *          in redirect.
		 *	@param  p_destinationAddr Binary IPv6 address to be used as
		 *          destination in redirect.
		 *  @param  p_redirectOptions Redirect option value or template.
	    */
		template Redirect mw_redirect (
			Ipv6Address p_src,
			Ipv6Address p_dst,
			Ipv6Address p_targetAddr,
			Ipv6Address p_destinationAddr,
			template RedirectOptions p_redirectOptions
		) := {
			ipv6Hdr := mw_ipHdr_srcDst(c_icmpHdr, p_src, p_dst),
			extHdrList := *,
			icmpType := c_redirect,
			icmpCode := c_icmpCode0,
			checksum := ?,
			reserved := 0,
			targetAddr := p_targetAddr,
			destinationAddr := p_destinationAddr,
			redirectOptions := p_redirectOptions
		}

		/*
		 *	@param  p_src Binary IPv6 address associated with the
		 *          test component.
@@ -559,7 +587,7 @@
			Ipv6Address p_destinationAddr,
			template RedirectOptions p_redirectOptions
		) := {
			ipv6Hdr := m_ipHdr_hop(c_icmpHdr, p_hopLimit, p_src, p_dst),
			ipv6Hdr := mw_ipHdr_srcDst_hop(c_icmpHdr, p_hopLimit, p_src, p_dst),
			extHdrList := *,
			icmpType := c_redirect,
			icmpCode := c_icmpCode0,