Commit c0934b3c authored by peter's avatar peter
Browse files

No commit message

No commit message
parent 6c80a2c3
Loading
Loading
Loading
Loading
+2 −5
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@
			sourceAddress 	:= c_unspecifiedAdd,
			destinationAddress := p_dst
		}
// Added AF

		/*
		 *	@param  p_src Binary IPv6 address associated with the
		 *          test component.
@@ -156,7 +156,6 @@
			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.
@@ -297,7 +296,6 @@

	} // end extensionHeader

//added by PK - begin
	group generalIpv6MessageType {

		/*
@@ -327,6 +325,5 @@
        template Ipv6Address mw_anyIpv6Address := ?

    } //end group ipv6Address
//added by PK - end

} // end module LibIpv6_Rfc2460Root_Templates
+0 −2
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@
		
	} // end extensionHeaders 
	
//added by PK - begin
	group generalIpv6MessageType {	

		/*
@@ -194,6 +193,5 @@
//        }
        
    } //end group generalIpv6MessageType
//added by PK - end

} // end module LibIpv6_Rfc2460Root_TypesAndValues
+0 −5
Original line number Diff line number Diff line
@@ -376,7 +376,6 @@

	group neighborDiscovery {

//		modified by PK
		 /*
		  *	@param  p_src Binary IPv6 address associated with the
		  *          test component.
@@ -919,7 +918,6 @@
			prefix:= p_prefix
		}

// modified by PK
		/*
		 *	@param  p_macSlla Binary MAC source address associated with
		 *          link layer of test component
@@ -939,7 +937,6 @@
			otherOption := omit
		}

// modified by PK
		/*
		 *	@param  p_macTlla Binary MAC source address associated with
		 *          link layer of target
@@ -949,7 +946,6 @@
			otherOption := omit
		}

// modified by PK
		/*
		 *	@param  p_macSlla Binary MAC source address associated with
		 *          link layer of test component
@@ -977,7 +973,6 @@
												p_prefix) },
			otherOption := omit }

// modified by PK
		/*
		 *	@param  p_prefixLength Length of the prefix.
		 *	@param  p_lFlag Value for link flag.
+0 −5
Original line number Diff line number Diff line
@@ -161,13 +161,11 @@

	group icmpRfc2461Options {

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

//modified by PK
		/*
		** @remark Any RtAdvOptions value should at least have 
		**         one of the first three options present!
@@ -200,19 +198,16 @@
			encode "present=bytes(1, 0x03)"
		}

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

//modified by PK
		type set NbrAdvOptions{
			TgtLinkLayerAddress  tgtLinkLayerAddr optional,
			octetstring          otherOption optional
		}

//modified by PK
		type set RedirectOptions {
			TgtLinkLayerAddress  tgtLinkLayerAddr optional,
			RedirectedHeader	 redirectHeader optional,
+0 −29
Original line number Diff line number Diff line
@@ -26,24 +26,6 @@ module LibIpv6_Rfc2462StatelessAddressAutoconf_Functions {
	import from LibIpv6_MultiRfcs_Templates all;
	import from LibIpv6_Rfc2462StatelessAddressAutoconf_Templates all;

	// AF: had to define an altstep; if not: pb with return
	altstep a_unknownMsgDuringAutoconf ()
	runs on LibIpv6Node {
		[]	ipPort.receive {
				log("**** DAD: WARNING: Could not match or received unknown IP message! **** ");
				repeat;
		}
	}

	/*
	** @desc  	This sends an ICMPv6 router advertisement from a router node
	**			to any NUT. Prior it modifies IPv6 packet payload length
	**			and ICMPv6 checksum to their correct values
	** @remark  The template passed in must NOT contain any matching expressions!
	** @param 	Ipv6 packet template with router advertisement to be sent
	** @returns	execution status
	*/

	/*
	** @desc  	This waits the NUT to send a Neighbor Sollicitation message for
	**			Address Autoconfiguration (source: Unspecified address, not tested)
@@ -76,17 +58,6 @@ module LibIpv6_Rfc2462StatelessAddressAutoconf_Functions {
		return v_ret;

	}// end f_get_autoconfNs
	/*
	** @desc	TN sends a NS message to NUT after autoconfiguration is completed.
	**			Then, NUT answers by sending a valid NS to TN
	*/
//	function f_answerNaToNs (
//				in  Ipv6Address 	p_src,
//				in  Oct6to15  	 	p_tnMacUca)
//	runs on LibIpv6Node
//	return FncRetCode {
//
//	} // end f_answerNaToNs

	/*
	** @desc  	This waits for the NUT to send a neighborhood solicitation
Loading