Commit 677116a6 authored by tepelmann's avatar tepelmann
Browse files

Added new codec variant tags.

parent fe5b1b08
Loading
Loading
Loading
Loading
+17 −7
Original line number Original line Diff line number Diff line
@@ -73,8 +73,7 @@
			variant "present=SupportFunctions.isIKEmsg(dec);use=com.testingtech.ttcn.tci.codec.helper.*;";
			variant "present=SupportFunctions.isIKEmsg(dec);use=com.testingtech.ttcn.tci.codec.helper.*;";
			variant (sourcePort) "intTag='sourcePortIKE'";
			variant (sourcePort) "intTag='sourcePortIKE'";
			variant (destPort) "intTag='destPortIKE'";
			variant (destPort) "intTag='destPortIKE'";
			//variant (padding) "fieldPresent=(getIntTag('sourcePortIKE') == 4500) && (getIntTag('destPortIKE') == 4500)";
			variant (padding) "fieldPresent=(getIntTag('sourcePortIKE') == 4500) && (getIntTag('destPortIKE') == 4500)";
			//variant (nextPayload) "tag='nextPayload';";
		}
		}


		type record Ikev2Header {
		type record Ikev2Header {
@@ -92,6 +91,9 @@
			UInt32				messageID,
			UInt32				messageID,
			UInt32				messageLength
			UInt32				messageLength
		}
		}
		with {
			variant (nextPayload) "tag='nextPayload';";
		}


		group IkeRfc4306udpPortTypes {
		group IkeRfc4306udpPortTypes {
			const UInt16	c_udpPort500 	:= 500;
			const UInt16	c_udpPort500 	:= 500;
@@ -1010,7 +1012,11 @@
		}
		}


		//Security Association Database
		//Security Association Database
		type record length (1 .. c_maxNrDa) of Sa Sad;
		type record length (1 .. c_maxNrDa) of Sa Sad
		with {
			variant "noCodec";
		}
		
		const UInt8 c_maxNrDa := 8;
		const UInt8 c_maxNrDa := 8;
		const UInt8 c_saOut := 0;
		const UInt8 c_saOut := 0;
		const UInt8 c_saIn := 1;
		const UInt8 c_saIn := 1;
@@ -1039,7 +1045,7 @@
		}
		}
		with {
		with {
			//variant "use=com.testingtech.ttcn.tci.*;";
			//variant "use=com.testingtech.ttcn.tci.*;";
			variant "DTE TODO";
			variant "noCodec";
		}
		}


		/* @desc Result of fx_encrypt
		/* @desc Result of fx_encrypt
@@ -1065,11 +1071,15 @@
			octetstring sK_pr
			octetstring sK_pr
		}
		}
		with {
		with {
			variant "TODO";
			variant "noCodec";
		}
		}


	//IKE Security Association Database
	//IKE Security Association Database
		type record length (1 .. c_maxNrIkeDa) of IkeSa IkeSad;
		type record length (1 .. c_maxNrIkeDa) of IkeSa IkeSad
		with {
			variant "noCodec";
		}
		
		const UInt8 c_maxNrIkeDa := 8;
		const UInt8 c_maxNrIkeDa := 8;




@@ -1096,7 +1106,7 @@
			octetstring iDr //new ps identification responder
			octetstring iDr //new ps identification responder
		}
		}
		with {
		with {
			variant "TODO";
			variant "noCodec";
		}
		}
	}//end group ikeSecurity
	}//end group ikeSecurity
}//end group cryptoTypes
}//end group cryptoTypes