corrected initiator/responder problem for id and ts payloads (4dfdf451) · Commits · TTCN-3 Libraries / LibIPv6

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_Templates.ttcn

+28 −4

Original line number	Diff line number	Diff line
		@@ -311,10 +311,10 @@
		{ mw_encryptedPL(p_ikepayloads) };

		template IkePayloadList mw_ikeAuthReqPLL :=
		superset ( mw_securityAssociationPL, mw_identificationPL, mw_trafficSelectorPL, mw_trafficSelectorPL, mw_authPL);
		superset ( mw_securityAssociationPL, mw_idInitiatorPL, mw_tsInitiatorPL, mw_tsResponderPL, mw_authPL);

		template IkePayloadList mw_ikeAuthRspPLL :=
		superset ( mw_securityAssociationPL, mw_identificationPL, mw_trafficSelectorPL, mw_trafficSelectorPL, mw_authPL);
		superset ( mw_securityAssociationPL, mw_idResponderPL, mw_tsInitiatorPL, mw_tsResponderPL, mw_authPL);

		template IkePayloadList mw_ikeAuthRsp_Notify :=
		superset ( mw_notifyPL);
		@@ -630,7 +630,7 @@ group payloadTemplates {

		group identificationPLTmplts {

		template IkePayload mw_identificationPL := {
		template IkePayload mw_idInitiatorPL := {
		idInitiator := {
		nextPayload := ?,
		criticalFlag := ?,
		@@ -642,6 +642,18 @@ group identificationPLTmplts {
		}
		}

		template IkePayload mw_idResponderPL := {
		idResponder := {
		nextPayload := ?,
		criticalFlag := ?,
		reserved1 := ?,
		payloadLength := ?,
		idType := c_identificationIpv6Addr,
		reserved2 := ?,
		data := ?
		}
		}

		template IkePayload m_idInitiatorPL(
		UInt8 p_nextPayload,
		template octetstring p_data) := {
		@@ -690,7 +702,7 @@ group identificationPLTmplts {

		group trafficSelectionPLTmplts {

		template IkePayload mw_trafficSelectorPL := {
		template IkePayload mw_tsInitiatorPL := {
		tsInitiator := {
		nextPayload := ?,
		criticalFlag := 0,
		@@ -702,6 +714,18 @@ group trafficSelectionPLTmplts {
		}
		}

		template IkePayload mw_tsResponderPL := {
		tsResponder := {
		nextPayload := ?,
		criticalFlag := 0,
		reserved1 := ?,
		payloadLength := ?,
		numberOfTs := ?,
		reserved2 := ?,
		trafficSelectorList := ?
		}
		}

		template IkePayload m_tsInitiatorPL(
		UInt8 p_nextPayload,
		template TrafficSelectorList p_trafficSelectorList) := {