Unify STF525 TTCN-3 code with spirent (0181ca54) · Commits · TTCN-3 Libraries / LibIts

ttcn/CAM/LibItsCam_TypesAndValues.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -143,7 +143,7 @@ module LibItsCam_TypesAndValues {
		}

		/**
		* @desc Upper Tester message to activate position and/or time
		* @desc Upper Tester result message of request of triggering of an event at IUT
		*/
		type record UtActivatePositionTime {
		// empty on purpose

ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn

+0 −156

Original line number	Diff line number	Diff line
		@@ -1356,86 +1356,6 @@ module LibItsGeoNetworking_Templates {

		} // end group geoNwPacketTsbTemplates

		group geoNwPacketSaTemplates {

		/**
		* @desc Send template for GeoNetworking SA Packet
		* @param p_seqNumber Sequence number of SA packet
		* @param p_sourceLongPosVec Long position vector of source
		* @param p_hopLimit The maximum number of hops (Default: c_defaultHopLimit)
		*/
		template (value) GnNonSecuredPacket m_geoNwSaPacket(
		in template (value) UInt16 p_seqNumber,
		in template (value) LongPosVector p_sourceLongPosVec,
		in template (value) UInt8 p_hopLimit := c_defaultHopLimit,
		in template (value) TrafficClass p_trafficClass := m_trafficClass
		) := {
		commonHeader := valueof(m_commonHeader(
		PX_GN_UPPER_LAYER,
		m_saHeaderType_sa,
		p_trafficClass,
		p_hopLimit
		)),
		extendedHeader := valueof(m_tsbHeader(
		p_seqNumber,
		p_sourceLongPosVec
		)),
		payload := '00100011010203CAFEDECA'O
		}

		/**
		* @desc Receive template for GeoNetworking SA Packet
		* @param p_seqNumber Sequence number of SA packet (Default: ?)
		* @param p_sourceLongPosVec Long position vector of source (Default: ?)
		*/
		template (present) GnNonSecuredPacket mw_geoNwSaPacket(
		in template (present) UInt16 p_seqNumber := ?,
		in template (present) LongPosVector p_sourceLongPosVec := ?
		) := {
		commonHeader := mw_commonHeader(
		PX_GN_UPPER_LAYER,
		m_saHeaderType_sa
		),
		extendedHeader := mw_saHeader(p_seqNumber, p_sourceLongPosVec),
		payload := *
		}

		/**
		* @desc Receive template for GeoNetworking SA Packet
		* @param p_seqNumber Sequence number of SA packet (Default: ?)
		* @param p_sourceLongPosVec Long position vector of source (Default: ?)
		* @param p_hopLimit The maximum number of hops (Default: ?)
		*/
		template (present) GnNonSecuredPacket mw_geoNwSaPacketWithHl(
		in template (present) UInt16 p_seqNumber := ?,
		in template (present) LongPosVector p_sourceLongPosVec := ?,
		in template (present) UInt8 p_hopLimit := ?
		) modifies mw_geoNwSaPacket := {
		commonHeader := mw_commonHeaderWithHopLimit(
		PX_GN_UPPER_LAYER,
		m_saHeaderType_sa,
		p_hopLimit
		)
		}

		/**
		* @desc Receive template for GeoNetworking SA Packet
		* @param p_seqNumber Sequence number of SA packet (Default: ?)
		* @param p_sourceLongPosVec Long position vector of source (Default: ?)
		* @param p_nextHeader Id of next header
		*/
		template (present) GnNonSecuredPacket mw_geoNwSaPacketWithNextHeader(
		in template (present) UInt16 p_seqNumber := ?,
		in template (present) LongPosVector p_sourceLongPosVec := ?,
		in template (value) NextHeader p_nextHeader
		) modifies mw_geoNwSaPacket := {
		commonHeader := {
		nextHeader := p_nextHeader
		}
		}

		} // end group geoNwPacketSaTemplates

		} // end group geoNwPacketTemplates

		group geoNwHeadersTemplates {
		@@ -2332,82 +2252,6 @@ module LibItsGeoNetworking_Templates {

		} // end tsbHeaderTemplates

		group saHeaderTemplates {

		/**
		* @desc Send template for SA header
		* @param p_seqNumber Sequence number of TSB packet
		* @param p_srcPosVector Long position vector of source
		*/
		template ExtendedHeader m_saHeader(
		in template (value) UInt16 p_seqNumber,
		in template (value) LongPosVector p_srcPosVector
		) := {
		tsbHeader := {
		seqNumber := p_seqNumber,
		reserved := c_uInt8Zero,
		srcPosVector := p_srcPosVector
		}
		}

		/**
		* @desc Receive template for TSB header
		* @param p_seqNumber Sequence number of TSB packet
		* @param p_sourceLongPosVec Long position vector of source
		*/
		template (present) ExtendedHeader mw_saHeader(
		in template (present) UInt16 p_seqNumber,
		in template (present) LongPosVector p_sourceLongPosVec
		) := {
		tsbHeader := {
		seqNumber := p_seqNumber,
		reserved := ?,
		srcPosVector := p_sourceLongPosVec
		}
		}

		/**
		* @desc Send template for SA header type
		*/
		template (value) HeaderTST m_saHeaderType_sa := {
		saHdr := {
		headerType := e_serviceAnnouncement,
		headerSubType := e_sa
		}
		}

		/**
		* @desc Receive template for SA header type
		*/
		template (present) HeaderTST mw_saHeaderType_sa := {
		saHdr := {
		headerType := e_serviceAnnouncement,
		headerSubType := e_sa
		}
		}

		/**
		* @desc Send template for SA header type
		*/
		template (value) HeaderTST m_saHeaderType_eos := {
		saHdr := {
		headerType := e_serviceAnnouncement,
		headerSubType := e_saEos
		}
		}

		/**
		* @desc Receive template for SA header type
		*/
		template (present) HeaderTST mw_saHeaderType_eos := {
		saHdr := {
		headerType := e_serviceAnnouncement,
		headerSubType := e_saEos
		}
		}

		} // end saHeaderTemplates

		} // end geoNwHeadersTemplates

		group geoMiscTemplates {

ttcn/GeoNetworking/LibItsGeoNetworking_TypesAndValues.ttcn

+0 −2

Original line number	Diff line number	Diff line
		@@ -379,8 +379,6 @@ module LibItsGeoNetworking_TypesAndValues {
		BeaconHeader beaconHeader,
		LSRequestHeader lsRequestHeader,
		LSReplyHeader lsReplyHeader,
		AnyHeader saHeader, // FIXME Cannot find description, AnyHeader was used as default
		AnyHeader saEosHeader, // FIXME Cannot find description, AnyHeader was used as default
		AnyHeader anyHeader
		} with {
		variant ""

ttcn/Pki/LibItsPki_Functions.ttcn

+6 −2

Original line number	Diff line number	Diff line
		@@ -76,6 +76,8 @@ module LibItsPki_Functions {
		connect(self:syncPort, mtc:syncPort);
		connect(p_itss:syncPort, self:syncPort);
		connect(p_pki:syncPort, self:syncPort);

		connect(p_pki:infoPort, p_itss:infoPort);
		} // End of function f_cfMtcUp01

		function f_cfMtcUp02(
		@@ -108,7 +110,7 @@ module LibItsPki_Functions {
		}
		f_connect4SelfOrClientSync();

		f_initialiseSecuredMode(p_ea_certificate_id, p_aa_certificate_id);
		f_initialiseSecuredMode(p_ea_certificate_id, p_aa_certificate_id); // TODO To be removed???

		// Setup EA certificate shared with PKI EA entity
		f_readCertificate(p_ea_certificate_id, vc_eaCertificate);
		@@ -304,6 +306,8 @@ module LibItsPki_Functions {
		disconnect(p_itss:syncPort, self:syncPort);
		disconnect(p_pki:syncPort, self:syncPort);

		disconnect(p_pki:infoPort, p_itss:infoPort);

		p_itss.done;
		p_pki.done;
		}
		@@ -2064,7 +2068,7 @@ module LibItsPki_Functions {
		);
		// Signed the encoded InnerEcRequestSignedForPop
		log("f_generate_inner_ec_request_signed_for_pop: tbs= ", v_tbs);
		log("f_generate_inner_ec_request_signed_for_pop: tbs= ", bit2oct(encvalue(v_tbs, "", "LibItsSecurity_asn1")));
		log("f_generate_inner_ec_request_signed_for_pop: tbs= ", bit2oct(encvalue(v_tbs)));
		v_tbs_signed := f_signWithEcdsa(bit2oct(encvalue(v_tbs)), int2oct(0, 32), p_private_key);
		// Finalyse signed InnerEcRequestSignedForPop
		if (PX_VE_ALG == e_nist_p256) {

ttcn/Pki/LibItsPki_Pics.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -73,7 +73,7 @@ module LibItsPki_Pics {
		/**
		* @desc Certificate used by the Test System acting as ITS-S
		*/
		modulepar charstring PICS_TS_CERTIFICATE_ID := "CERT_TS_A_EA";
		modulepar charstring PICS_TS_CERTIFICATE_ID := "CERT_TS_A_AT";

		/**
		* @desc Certificate used by the Test System acting as EA

Admin message