Commit ee1186ac authored by tepelmann's avatar tepelmann
Browse files

Checked TODO's.

Removed some commented stuff.
Made AtsIpv6_Security_Testcases Ed2 conform.
parent 7a9219c6
Loading
Loading
Loading
Loading
+0 −6
Original line number Original line Diff line number Diff line
@@ -758,7 +758,6 @@ module LibIpv6_Rfc3775Mipv6_Functions {
		var default localDef := activate(a_haReceiveBindingUpdateAndReplyOffHome(p_paramsRt, p_paramsIut, c_mobileCodeBindingUpdateAccepted));
		var default localDef := activate(a_haReceiveBindingUpdateAndReplyOffHome(p_paramsRt, p_paramsIut, c_mobileCodeBindingUpdateAccepted));


		tc_loop.start;
		tc_loop.start;
		//tc_ac.start;
		alt {
		alt {
			[]	tc_loop.timeout {
			[]	tc_loop.timeout {
				f_sendRtAdvWithPrefix_lifeTime( p_paramsRt.lla,
				f_sendRtAdvWithPrefix_lifeTime( p_paramsRt.lla,
@@ -774,11 +773,6 @@ module LibIpv6_Rfc3775Mipv6_Functions {
							repeat;
							repeat;
						}
						}
			}
			}
//				TODO DTE wait for TT compiler fix
//				[] a_receiveBindingUpdateAndReply(p_paramsRt.haGlas[0]);
//				[] tc_ac.timeout {//Guard timer
//					v_ret:= e_timeout;
//				}
		}
		}
		deactivate(localDef);
		deactivate(localDef);
		return v_ret;
		return v_ret;
+0 −3
Original line number Original line Diff line number Diff line
@@ -130,8 +130,6 @@
		*/
		*/
		//TODO SMU why not use the existing RT-ADV?
		//TODO SMU why not use the existing RT-ADV?
		type record MobileRouterAdvertisementMsg {
		type record MobileRouterAdvertisementMsg {
//smu			Ipv6Header			ipv6Hdr,
//smu			ExtensionHeaderList extHdrList		optional,
			UInt8 			icmpType(c_mobileRtAdv),
			UInt8 			icmpType(c_mobileRtAdv),
			UInt8 			icmpCode,
			UInt8 			icmpCode,
			Oct2 			checksum,
			Oct2 			checksum,
@@ -146,7 +144,6 @@
			MipRtAdvOptions	mobileRtAdvOptions optional
			MipRtAdvOptions	mobileRtAdvOptions optional
		}
		}
		with {
		with {
//			variant "isPDU=LibIpv6_Rfc3775MIPv6_TypesAndValues;use=com.testingtech.ttcn.tci.codec.helper.*;present=SupportFunctions.checkHeaderAndType(dec, 58, 134)";
			variant "present=bytes(1,134)&&(valueOf(getTag('nextHeader'))==58)";
			variant "present=bytes(1,134)&&(valueOf(getTag('nextHeader'))==58)";
		}
		}


+1 −2
Original line number Original line Diff line number Diff line
@@ -233,8 +233,7 @@
		with {
		with {
			variant "present=bytes(1,19)";
			variant "present=bytes(1,19)";
			variant (optionLength) "tag='NewLinkLayerAddress_optionLength';";
			variant (optionLength) "tag='NewLinkLayerAddress_optionLength';";
			//TODO: FIX ME
			variant (linkLayerAddr) "length=valueOf(getTag('NewLinkLayerAddress_optionLength'))*8-3;";
			//variant (data) "length=valueOf(getTag('NewLinkLayerAddress_optionLength'))*8-3;";
		}
		}


		/*
		/*
+10 −10
Original line number Original line Diff line number Diff line
@@ -71,7 +71,7 @@
	group ikeRfc4306Packets {
	group ikeRfc4306Packets {


		/*
		/*
		 * @desc TODO
		 * @desc Derived from RFC4306, clause 3.
		*/
		*/
		type record IkeMsg {
		type record IkeMsg {
			UInt16		        sourcePort,
			UInt16		        sourcePort,
@@ -172,7 +172,7 @@
		} // end group IkeRfc4306PayloadIDs
		} // end group IkeRfc4306PayloadIDs


		/*
		/*
		 * @desc TODO
		 * @desc Derived from RFC4306, clause 3.2ff
		*/
		*/
		type union IkePayload {
		type union IkePayload {
			SecurityAssociationPayload 	securityAssociation,
			SecurityAssociationPayload 	securityAssociation,
@@ -214,7 +214,7 @@
		const UInt8 c_maxIkePayloads  := 10; //FIXME
		const UInt8 c_maxIkePayloads  := 10; //FIXME


		/*
		/*
		 * @desc TODO
		 * @desc Derived from RFC4306, clause 3.2
		*/
		*/
		type set length(1 .. c_maxIkePayloads) of IkePayload IkePayloadList;
		type set length(1 .. c_maxIkePayloads) of IkePayload IkePayloadList;


@@ -265,7 +265,7 @@
				const UInt8 c_4Transforms := 4;
				const UInt8 c_4Transforms := 4;


				/*
				/*
				 * @desc TODO
				 * @desc Derived from RFC4306, clause 3.3
				*/
				*/
				type set length(1 .. c_maxIkeSaProposals) of SaProposal SaProposalList;
				type set length(1 .. c_maxIkeSaProposals) of SaProposal SaProposalList;
				
				
@@ -300,7 +300,7 @@
					const UInt8 c_maxIkeSaTransforms  := 10; //FIXME
					const UInt8 c_maxIkeSaTransforms  := 10; //FIXME


					/*
					/*
					 * @desc TODO
					 * @desc Derived from RFC4306, clause 3.3.1
					*/
					*/
					type set length(1 .. c_maxIkeSaTransforms) of SaTransform SaTransformList
					type set length(1 .. c_maxIkeSaTransforms) of SaTransform SaTransformList
					with {
					with {
@@ -314,7 +314,7 @@
						} // end group IkeRfc4306TransformAttributeTypes
						} // end group IkeRfc4306TransformAttributeTypes


						/*
						/*
						 * @desc TODO
						 * @desc Derived from RFC4306, clause 3.3.5
						*/
						*/
						type union SaTransformAttribute {
						type union SaTransformAttribute {
							SaTransformAttributeKeyLength	keyLength
							SaTransformAttributeKeyLength	keyLength
@@ -327,7 +327,7 @@
						const UInt8 c_maxIkeSaTransformAttributes  := 10; //FIXME
						const UInt8 c_maxIkeSaTransformAttributes  := 10; //FIXME


						/*
						/*
						 * @desc TODO
						 * @desc Derived from RFC4306, clause 3.3.2
						*/
						*/
						type set length(1 .. c_maxIkeSaTransformAttributes) of SaTransformAttribute SaTransformAttributeList;
						type set length(1 .. c_maxIkeSaTransformAttributes) of SaTransformAttribute SaTransformAttributeList;


@@ -766,7 +766,7 @@
				} // end group IkeRfc4306TrafficSelectorTypes
				} // end group IkeRfc4306TrafficSelectorTypes


				/*
				/*
				 * @desc TODO
				 * @desc Derived from RFC4306, clause 3.13.1
				*/
				*/
				type union TsTrafficSelector {
				type union TsTrafficSelector {
					TsIpv4TrafficSelector	tsIpv4TrafficSelector,
					TsIpv4TrafficSelector	tsIpv4TrafficSelector,
@@ -780,7 +780,7 @@
				const UInt8 c_maxTrafficSelectors  := 10; //FIXME
				const UInt8 c_maxTrafficSelectors  := 10; //FIXME


				/*
				/*
				 * @desc TODO
				 * @desc Derived from RFC4306, clause 3.13.
				*/
				*/
				type set length(1 .. c_maxTrafficSelectors) of TsTrafficSelector TrafficSelectorList
				type set length(1 .. c_maxTrafficSelectors) of TsTrafficSelector TrafficSelectorList
				with {
				with {
@@ -912,7 +912,7 @@
				const UInt8 c_maxConfigAttributes  := 10; //FIXME
				const UInt8 c_maxConfigAttributes  := 10; //FIXME


				/*
				/*
				 * @desc TODO
				 * @desc Derived from RFC4306, clause 3.15.1
				*/
				*/
				type set length(1 .. c_maxConfigAttributes) of ConfigAttribute ConfigAttributeList;
				type set length(1 .. c_maxConfigAttributes) of ConfigAttribute ConfigAttributeList;