Commit ad6f48f4 authored by seb's avatar seb
Browse files

Complete project analyses correctly now

parent e8f0c6c3
Loading
Loading
Loading
Loading
+2 −6
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ module LibIpv6_Interface {
		EchoRequestMsg							echoRequestMsg,
		EchoReplyMsg							echoReplyMsg,
		//Imported from Rfc 2461
		RouterAdvertisementMsg					routerAdvertMsg,
		RouterAdvertisementMsg					routerAdvMsg,
		RouterSolicitationMsg      				routerSolMsg,
		NeighborSolicitationMsg					nbrSolMsg,
		NeighborAdvertisementMsg				nbrAdvMsg,
@@ -156,7 +156,7 @@ module LibIpv6_Interface {
		HomeAgentAddressDiscoveryReplyMsg		homeAgentAddrDiscReplyMsg,
		MobilePrefixSolicitationMsg				mobilePrefixSolMsg,
		MobilePrefixAdvertisementMsg			mobilePrefixAdvMsg,
		MobileRouterAdvertisementMsg			mobileRouterAdvMsg,
		MobileRouterAdvertisementMsg			mobileRouterAdvMsg,//TODO check this
		//Default value
		OtherIcmpv6Msg							otherIcmpv6Msg,
		//Udp
@@ -172,10 +172,6 @@ module LibIpv6_Interface {

	template Ipv6Packet mw_ipPkt := ? ;

//smu	template Ipv6Packet m_ipPkt_echoRequest (in template EchoRequest p_echoRequest) := {
//smu		echoRequest := p_echoRequest
//smu	}

	/*
	*  @desc This type is intended to be used to send "hand encoded"
	*        IPv6 packets. It can also be used to create incorrect
+16 −0
Original line number Diff line number Diff line
@@ -530,6 +530,22 @@ group generalIpv6MessageTemplates{
		ipv6Payload :=  *
	}

	/*
	 *	@param  p_nextHeader 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 Ipv6Packet mw_generalIpv6 (
							UInt8 p_nextHeader,
							template Ipv6Address p_src,
							template Ipv6Address p_dst) := {
		ipv6Hdr := mw_ipHdr_nextHdr_srcDst(p_nextHeader, p_src, p_dst),
		extHdrList := *,
		ipv6Payload :=  *
	}

	/*
	 *	@param  p_nextHeader Next header identifier value to be used.
	 *	@param  p_dst Binary IPv6 address associated with NUT.
+2 −2
Original line number Diff line number Diff line
@@ -96,9 +96,9 @@ module LibIpv6_Rfc2461NeighborDiscovery_Functions {
			//calc payloadLen
			v_ipPkt.ipv6Hdr.payloadLength := fx_payloadLength (v_ipPkt);
			//set checksum to zero
			v_ipPkt.ipv6Payload.routerAdvertMsg.checksum := c_2ZeroBytes;
			v_ipPkt.ipv6Payload.routerAdvMsg.checksum := c_2ZeroBytes;
			//calc checksum
			v_ipPkt.ipv6Payload.routerAdvertMsg.checksum := fx_icmpv6Checksum(v_ipPkt);
			v_ipPkt.ipv6Payload.routerAdvMsg.checksum := fx_icmpv6Checksum(v_ipPkt);
			//send
			ipPort.send(v_ipPkt);

+9 −9
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@
															template RtAdvOptions p_options) := {
			ipv6Hdr := m_ipHdr_nextHdr_srcDst(c_icmpHdr, p_src, p_dst),
			extHdrList := omit,
			ipv6Payload := { routerAdvertMsg := {
			ipv6Payload := { routerAdvMsg := {
				icmpType:= c_rtAdvMsg,
				icmpCode:= c_icmpCode0,
				checksum:= c_2ZeroBytes,
@@ -637,7 +637,7 @@
															template RtAdvOptions p_options) := {
			ipv6Hdr := m_ipHdr_nextHdr_srcDst(c_icmpHdr, p_src, p_dst),
			extHdrList := omit,
			ipv6Payload := { routerAdvertMsg := {
			ipv6Payload := { routerAdvMsg := {
				icmpType:= c_rtAdvMsg,
				icmpCode:= c_icmpCode0,
				checksum:= c_2ZeroBytes,
@@ -676,7 +676,7 @@
															template RtAdvOptions p_options) := {
			ipv6Hdr := m_ipHdr_nextHdr_srcDst(c_icmpHdr, p_src, p_dst),
			extHdrList := omit,														
			ipv6Payload := { routerAdvertMsg := {
			ipv6Payload := { routerAdvMsg := {
				icmpType:= c_rtAdvMsg,
				icmpCode:= p_icmpCode,
				checksum:= c_2ZeroBytes,
@@ -715,7 +715,7 @@
															template RtAdvOptions p_options) := {
			ipv6Hdr := m_ipHdr_nextHdr_hop_srcDst(c_icmpHdr, p_hopLimit, p_src, p_dst),
			extHdrList := omit,
			ipv6Payload := { routerAdvertMsg := {
			ipv6Payload := { routerAdvMsg := {
				icmpType:= c_rtAdvMsg,
				icmpCode:= c_icmpCode0,
				checksum:= c_2ZeroBytes,
@@ -752,7 +752,7 @@
															template RtAdvOptions p_options) := {
			ipv6Hdr := m_ipHdr_nextHdr_srcDst(c_icmpHdr, p_src, p_dst),
			extHdrList := omit,
			ipv6Payload := { routerAdvertMsg := {
			ipv6Payload := { routerAdvMsg := {
				icmpType:= c_rtAdvMsg,
				icmpCode:= c_icmpCode0,
				checksum:= c_2ZeroBytes,
@@ -776,7 +776,7 @@
		 template RouterAdvertisement m_rtAdv_noExtHdr_currHop0_infLifetime_unspecReachAndRetransTime_noOpts (template Ipv6Address p_src, template Ipv6Address p_dst) := {
			ipv6Hdr := m_ipHdr_nextHdr_srcDst(c_icmpHdr, p_src, p_dst),
			extHdrList := omit,
			ipv6Payload := { routerAdvertMsg := {
			ipv6Payload := { routerAdvMsg := {
				icmpType:= c_rtAdvMsg,
				icmpCode:= c_icmpCode0,
				checksum:= c_2ZeroBytes,
@@ -797,7 +797,7 @@
		template RouterAdvertisement mw_rtAdv := {
			ipv6Hdr := mw_ipHdr_nextHdr(c_icmpHdr),
			extHdrList := *,
			ipv6Payload := { routerAdvertMsg := {
			ipv6Payload := { routerAdvMsg := {
				icmpType:= c_rtAdvMsg,
				icmpCode:= ?,
				checksum:= ?,
@@ -822,7 +822,7 @@
															template Ipv6Address p_dst ) := {
			ipv6Hdr := m_ipHdr_nextHdr_srcDst(c_icmpHdr, p_src, p_dst),
			extHdrList := omit,
			ipv6Payload := { routerAdvertMsg := {
			ipv6Payload := { routerAdvMsg := {
				icmpType:= c_rtAdvMsg,
				icmpCode:= c_icmpCode0,
				checksum:= ?,
@@ -847,7 +847,7 @@
															template Ipv6Address p_dst ) := {
			ipv6Hdr := mw_ipHdr_nextHdr_hop_srcDst ( c_icmpHdr, c_hopLimit255, p_src, p_dst ),  // FIXED (Alex) : m_ipHdr_nextHdr_srcDst->mw_ipHdr_srcDst_nextHdr_hopL255
			extHdrList := omit,
			ipv6Payload := { routerAdvertMsg := {
			ipv6Payload := { routerAdvMsg := {
				icmpType:= c_rtAdvMsg,
				icmpCode:= c_icmpCode0,
				checksum:= ?,