Commit 1170ab19 authored by mullers's avatar mullers
Browse files

TC_TRA_4008_01 

TC_TRA_4020_01
TC_TRA_4061_01
TC_TRA_4048_01
TC_TRA_4067_01
TC_TRA_4067_02
TC_TRA_4071_01
TC_TRA_4075_01
TC_TRA_4078_06
TC_TRA_4078_08
added
parent a6bd4481

ttcn3/EtsiLibrary/LibIpv6/LibCore/LibIpv6_Rfc2461NeighborDiscovery_Templates.ttcn

+33 −2
Original line number Original line Diff line number Diff line
@@ -216,7 +216,23 @@ 
			}}

			}}

		}

		}





// Added by PK

		template NeighborAdvertisement mw_nbrAdv_noExtHdr_noOpts (	template Ipv6Address p_src,

															template Ipv6Address p_dst ) := {

			ipv6Hdr := mw_ipHdr_nextHdr_srcDst(c_icmpHdr, p_src, p_dst),

			extHdrList := omit,

			ipv6Payload := { nbrAdvMsg := {

				icmpType:= c_nbrAdvMsg,

				icmpCode:= c_icmpCode0,

				checksum:= ?,

				routerFlag:=?,

				solicitedFlag:=?,

				overrideFlag:=?,

				reserved:=0,

				targetAddr:=?,

				nbrAdvOptions := omit

			}}

		}



		/*

		/*

		 *	@param  p_src Binary IPv6 address associated with the

		 *	@param  p_src Binary IPv6 address associated with the

		 *          test component.

		 *          test component.
@@ -362,6 +378,21 @@ 
			 }}

			 }}

		 }

		 }





		template NeighborSolicitation m_nbrSol_noExtHdr_noOpts (	template Ipv6Address p_src,

															 template Ipv6Address p_dst,

															 template Ipv6Address p_targetAddr) := {

			 ipv6Hdr := m_ipHdr_nextHdr_srcDst(c_icmpHdr, p_src, p_dst),

			 extHdrList := omit,

			 ipv6Payload := { nbrSolMsg := {

				 icmpType:= c_nbrSolMsg,

				 icmpCode:= c_icmpCode0,

				 checksum:= c_2ZeroBytes,

				 reserved:= c_uInt31Max,

				 targetAddr:= p_targetAddr,

				 nbrSolOptions:= omit

			 }}

		 }



		template NeighborSolicitation mw_nbrSol := {

		template NeighborSolicitation mw_nbrSol := {

			ipv6Hdr := mw_ipHdr_nextHdr(c_icmpHdr),

			ipv6Hdr := mw_ipHdr_nextHdr(c_icmpHdr),

			extHdrList := *,

			extHdrList := *,

ttcn3/EtsiLibrary/LibIpv6/LibTransitioning/LibIpv6_CommonTrans_Functions.ttcn

+7 −19
Original line number Original line Diff line number Diff line
@@ -1471,11 +1471,8 @@ 
	function f_ipv4withTunneledIpv6NbrDiscovery(

	function f_ipv4withTunneledIpv6NbrDiscovery(

		in template Ipv4Address 			p_ipv4TnAddr,

		in template Ipv4Address 			p_ipv4TnAddr,

		in template Ipv4Address 			p_ipv4NutAddr,

		in template Ipv4Address 			p_ipv4NutAddr,

		in template Ipv6Address p_ipv6SrcAddr,

		in template NeighborSolicitation 	p_nbrSol,

		in template Ipv6Address p_ipv6DstAddr,

		in template NeighborAdvertisement 	p_nbrAdv,

		in template Ipv6Address p_ipv6TargetAddr,

		in template Oct6to15 	p_macSlla,

		in template Oct6to15 	p_macTlla,

		out Ipv4Packet						p_ipv4Packet

		out Ipv4Packet						p_ipv4Packet

	)

	)

	runs on LibIpv6Node

	runs on LibIpv6Node
@@ -1487,12 +1484,7 @@ 
			m_ipv4Packet_tunneledIpv6 (

			m_ipv4Packet_tunneledIpv6 (

				p_ipv4TnAddr,

				p_ipv4TnAddr,

				p_ipv4NutAddr,

				p_ipv4NutAddr,

				m_nbrSol_noExtHdr (

				p_nbrSol

					p_ipv6SrcAddr,

					p_ipv6DstAddr,

					p_ipv6TargetAddr,

					m_nbrSolOpt_sllaOpt ( p_macSlla )

				)

			)

			)

		);

		);

		if(v_ret != e_success) {

		if(v_ret != e_success) {
@@ -1505,11 +1497,7 @@ 
			[] ipv4Port.receive(mw_ipv4Packet_tunneledIpv6 (

			[] ipv4Port.receive(mw_ipv4Packet_tunneledIpv6 (

									p_ipv4NutAddr,

									p_ipv4NutAddr,

									p_ipv4TnAddr,

									p_ipv4TnAddr,

									mw_nbrAdv_noExtHdr_opts (

									p_nbrAdv )) -> value p_ipv4Packet {

										p_ipv6DstAddr,

										p_ipv6SrcAddr,

										m_nbrAdvOpt_tllaOpt ( p_macTlla )

									))) -> value p_ipv4Packet {

				tc_ac.stop;

				tc_ac.stop;

				return e_success;

				return e_success;

			}

			}