No commit message (6967b40a) · Commits · TTCN-3 Libraries / LibIPv6

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2461NeighborDiscovery_Templates.ttcn

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -350,7 +350,8 @@
	*/		*/
	template RedirectOptions m_redirectOptions_macTlla (template Oct6to15 p_macTlla) := {		template RedirectOptions m_redirectOptions_macTlla (template Oct6to15 p_macTlla) := {
	tgtLinkLayerAddr := m_macTlla(p_macTlla),		tgtLinkLayerAddr := m_macTlla(p_macTlla),
	redirectHeader := omit		redirectHeader := omit,
			otherOption := omit
	}		}

	// modified by PK		// modified by PK
	@@ -422,7 +423,8 @@
	* link layer of test component		* link layer of test component
	*/		*/
	template RtSolOptions m_rtSolOpt_macSlla (template Oct6to15 p_macSlla):={		template RtSolOptions m_rtSolOpt_macSlla (template Oct6to15 p_macSlla):={
	srcLinkLayerAddr := m_macSlla(p_macSlla)		srcLinkLayerAddr := m_macSlla(p_macSlla),
			otherOption := omit
	}		}

	}//end group options		}//end group options

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2461NeighborDiscovery_Templates_PK.ttcn

+99 −0

Original line number	Original line	Diff line number	Diff line
	@@ -355,6 +355,92 @@

	} // end group neighborDiscovery		} // end group neighborDiscovery

			group redirect {

			/*
			* @param p_src Binary IPv6 address associated with the
			* test component.
			* @param p_dst Binary IPv6 address associated with NUT.
			* @param p_hopLimit Hop limit value to be used in the IPv6 header.
			* @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 m_redirect_noExtHdr_hopLimit_tlla ( Ipv6Address p_src,
			Ipv6Address p_dst,
			UInt8 p_hopLimit,
			Ipv6Address p_targetAddr,
			Ipv6Address p_destinationAddr,
			template RedirectOptions p_redirectOptions) := {
			ipv6Hdr := m_ipHdr_hop(c_icmpHdr, p_hopLimit, p_src, p_dst),
			extHdrList := omit,
			icmpType := c_redirect,
			icmpCode := c_icmpCode0,
			checksum := c_2ZeroBytes,
			reserved := 0,
			targetAddr := p_targetAddr,
			destinationAddr := p_destinationAddr,
			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_code ICMPv6 code value to be used.
			* @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 m_redirect_noExtHdr_code_tlla ( Ipv6Address p_src,
			Ipv6Address p_dst,
			UInt8 p_code,
			Ipv6Address p_targetAddr,
			Ipv6Address p_destinationAddr,
			template RedirectOptions p_redirectOptions) := {
			ipv6Hdr := m_ipHdr(c_icmpHdr, p_src, p_dst),
			extHdrList := omit,
			icmpType := c_redirect,
			icmpCode := p_code,
			checksum := c_2ZeroBytes,
			reserved := 0,
			targetAddr := p_targetAddr,
			destinationAddr := p_destinationAddr,
			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 m_redirect_noExtHdr_nonEmptyReserved_tlla ( Ipv6Address p_src,
			Ipv6Address p_dst,
			Ipv6Address p_targetAddr,
			Ipv6Address p_destinationAddr,
			template RedirectOptions p_redirectOptions) := {
			ipv6Hdr := m_ipHdr(c_icmpHdr, p_src, p_dst),
			extHdrList := omit,
			icmpType := c_redirect,
			icmpCode := c_icmpCode0,
			checksum := c_2ZeroBytes,
			reserved := c_uInt31Max,
			targetAddr := p_targetAddr,
			destinationAddr := p_destinationAddr,
			redirectOptions := p_redirectOptions
			}

			} // end group redirect

	group options {		group options {

	/*		/*
	@@ -610,6 +696,19 @@
	tgtLinkLayerAddr := m_macTlla(p_macTlla)		tgtLinkLayerAddr := m_macTlla(p_macTlla)
	}		}

			/*
			* @param p_macTlla Binary MAC source address associated with
			* link layer of target
			* @param p_otherOpt Other binary option
			*/
			template RedirectOptions m_redirectOptions_macTlla_otherOpt (
			template Oct6to15 p_macTlla,
			octetstring p_otherOpt ) := {
			tgtLinkLayerAddr := m_macTlla(p_macTlla),
			redirectHeader := omit,
			otherOption := p_otherOpt
			}

	}//end group options		}//end group options

	} // end module LibIpv6_Rfc2461NeighborDiscovery_Templates		} // end module LibIpv6_Rfc2461NeighborDiscovery_Templates

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2461NeighborDiscovery_TypesAndValues.ttcn

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -133,8 +133,10 @@

	group icmpRfc2461Options {		group icmpRfc2461Options {

			//modified by PK
	type set RtSolOptions{		type set RtSolOptions{
	SrcLinkLayerAddress srcLinkLayerAddr		SrcLinkLayerAddress srcLinkLayerAddr optional,
			octetstring otherOption optional
	}		}

	//modified by PK		//modified by PK
	@@ -182,9 +184,11 @@
	octetstring otherOption optional		octetstring otherOption optional
	}		}

			//modified by PK
	type set RedirectOptions {		type set RedirectOptions {
	TgtLinkLayerAddress tgtLinkLayerAddr, // optionality?		TgtLinkLayerAddress tgtLinkLayerAddr optional,
	RedirectedHeader redirectHeader optional // optionality?		RedirectedHeader redirectHeader optional,
			octetstring otherOption optional
	}		}

	/*		/*