Update TCT3 patches (f8d2a982) · Commits · ITS - Intelligent Transport Systems / ITS

patches/tct3_javasrc.patch

+66 −68

Original line number	Original line	Diff line number	Diff line
	Index: adapter/org/etsi/its/adapter/TestAdapter.java		Index: adapter/org/etsi/its/adapter/TestAdapter.java
	===================================================================		===================================================================
	--- adapter/org/etsi/its/adapter/TestAdapter.java (revision 2573)		--- adapter/org/etsi/its/adapter/TestAdapter.java (revision 2612)
	+++ adapter/org/etsi/its/adapter/TestAdapter.java (working copy)		+++ adapter/org/etsi/its/adapter/TestAdapter.java (working copy)
	@@ -20,7 +20,6 @@		@@ -20,7 +20,6 @@
	import org.etsi.its.adapter.ports.ProtocolPortFactory;		import org.etsi.its.adapter.ports.ProtocolPortFactory;
	@@ -63,9 +63,72 @@ Index: adapter/org/etsi/its/adapter/TestAdapter.java
	+ return null;		+ return null;
	+ }		+ }
	}		}
			Index: certificatesio/org/etsi/certificates/io/CertificatesIO.java
			===================================================================
			--- certificatesio/org/etsi/certificates/io/CertificatesIO.java (revision 2612)
			+++ certificatesio/org/etsi/certificates/io/CertificatesIO.java (working copy)
			@@ -149,7 +149,7 @@
			*/
			@Override
			public boolean readCertificate(final String key, final ByteArrayOutputStream certificate) {
			-// TERFactory.getInstance().logDebug(">>> CertificatesIO.readCertificate: " + key);
			+ TERFactory.getInstance().logDebug(">>> CertificatesIO.readCertificate: " + key);

			String certKey;
			if (_cachedReverseCertificatesDigest.containsKey(key)) {
			@@ -173,7 +173,7 @@

			@Override
			public boolean readCertificateDigest(final String certificateId, final ByteArrayOutputStream digest) {
			-// TERFactory.getInstance().logDebug(">>> CertificatesIO.readCertificateDigest: " + certificateId);
			+ TERFactory.getInstance().logDebug(">>> CertificatesIO.readCertificateDigest: " + certificateId);

			// Sanity check
			if (!_cachedCertificatesDigest.containsKey(certificateId)) {
			@@ -199,7 +199,7 @@
			*/
			@Override
			public boolean readSigningKey(final String keyName, final ByteArrayOutputStream key) {
			-// TERFactory.getInstance().logDebug(">>> CertificatesIO.readSigningKey: " + keyName);
			+ TERFactory.getInstance().logDebug(">>> CertificatesIO.readSigningKey: " + keyName);

			try {
			String certKey;
			@@ -305,11 +305,11 @@
			return;
			}
			_cachedCertificatesDigest.put(certName, bytes);
			-// TERFactory.getInstance().logDebug("CertificatesIO.addDigestItem: Store digest: " + ByteHelper.byteArrayToString(bytes) + " - " + certName);
			+ TERFactory.getInstance().logDebug("CertificatesIO.addDigestItem: Store digest: " + ByteHelper.byteArrayToString(bytes) + " - " + certName);
			}

			private void addCertItem(final File p_certFile) throws FileNotFoundException, IOException {
			-// TERFactory.getInstance().logDebug(">>> CertificatesIO.addItem: " + p_certFile);
			+ TERFactory.getInstance().logDebug(">>> CertificatesIO.addCertItem: " + p_certFile);

			// Load the keys file name
			String filename = p_certFile.getName();
			@@ -322,14 +322,14 @@
			fsKeys.close();
			bytes = ByteHelper.hexStringToByteArray(new String(bytes));
			_cachedCertificates.put(certName, bytes);
			-// TERFactory.getInstance().logDebug("CertificatesIO.addItem: Store cert " + certName + " - " + ByteHelper.byteArrayToString(bytes));
			+ TERFactory.getInstance().logDebug("CertificatesIO.addCertItem: Store cert " + certName + " - " + ByteHelper.byteArrayToString(bytes));

			// calculate digest
			bytes = calculateDigestFromCertificate(bytes);
			_cachedCertificatesDigest.put(certName, bytes);
			-// TERFactory.getInstance().logDebug("CertificatesIO.addItem: Store digest: " + ByteHelper.byteArrayToString(bytes) + " - " + certName);
			+ TERFactory.getInstance().logDebug("CertificatesIO.addCertItem: Store digest: " + ByteHelper.byteArrayToString(bytes) + " - " + certName);
			_cachedReverseCertificatesDigest.put(ByteHelper.byteArrayToString(bytes), certName);
			-// TERFactory.getInstance().logDebug("CertificatesIO.addItem: Store reverse digest " + ByteHelper.byteArrayToString(bytes) + " - " + certName);
			+ TERFactory.getInstance().logDebug("CertificatesIO.addCertItem: Store reverse digest " + ByteHelper.byteArrayToString(bytes) + " - " + certName);

			// Load Private Keys
			filename = p_certFile.getPath();
	Index: codec/org/etsi/ttcn/codec/CodecFactory.java		Index: codec/org/etsi/ttcn/codec/CodecFactory.java
	===================================================================		===================================================================
	--- codec/org/etsi/ttcn/codec/CodecFactory.java (revision 2573)		--- codec/org/etsi/ttcn/codec/CodecFactory.java (revision 2612)
	+++ codec/org/etsi/ttcn/codec/CodecFactory.java (working copy)		+++ codec/org/etsi/ttcn/codec/CodecFactory.java (working copy)
	@@ -83,7 +83,7 @@		@@ -83,7 +83,7 @@
	if(codec != null) {		if(codec != null) {
	@@ -102,7 +165,7 @@ Index: codec/org/etsi/ttcn/codec/CodecFactory.java
	return ctor.newInstance(mainCodec);		return ctor.newInstance(mainCodec);
	Index: codec/org/etsi/ttcn/codec/MainCodec.java		Index: codec/org/etsi/ttcn/codec/MainCodec.java
	===================================================================		===================================================================
	--- codec/org/etsi/ttcn/codec/MainCodec.java (revision 2573)		--- codec/org/etsi/ttcn/codec/MainCodec.java (revision 2612)
	+++ codec/org/etsi/ttcn/codec/MainCodec.java (working copy)		+++ codec/org/etsi/ttcn/codec/MainCodec.java (working copy)
	@@ -67,6 +67,8 @@		@@ -67,6 +67,8 @@

	@@ -113,68 +176,3 @@ Index: codec/org/etsi/ttcn/codec/MainCodec.java

	CodecFactory cf = CodecFactory.getInstance();		CodecFactory cf = CodecFactory.getInstance();
	TciCDProvided extCodec = cf.getExternalCodec(value.getValueEncoding());		TciCDProvided extCodec = cf.getExternalCodec(value.getValueEncoding());
	Index: tool/org/etsi/its/tool/elvior/res/ta.properties
	===================================================================
	--- tool/org/etsi/its/tool/elvior/res/ta.properties (revision 2573)
	+++ tool/org/etsi/its/tool/elvior/res/ta.properties (working copy)
	@@ -1,12 +1,12 @@
	# Debug level - Authorized values: OFF, ALL, INFO, SEVERE
	DEBUG_ENABLED=OFF
	# Define the port/layer configuration for CAM
	-#camPort=BTP/GN/ETH
	-camPort=BTP/GN/UdpIpCSG
	+camPort=BTP/GN/ETH
	+#camPort=BTP/GN/UdpIpCSG
	#camPort=BTP/GN/CSG
	# Define the port/layer configuration for DENM
	-#denmPort=BTP/GN/ETH
	-denmPort=BTP/GN/UdpIpCSG
	+denmPort=BTP/GN/ETH
	+#denmPort=BTP/GN/UdpIpCSG
	#denmPort=BTP/GN/CSG
	# Define the port/layer configuration for MAPEM-SPATEM
	mapemSpatemPort=BTP/GN/ETH
	@@ -32,7 +32,7 @@
	#fsapPort=FSAP/UdpIp
	#fsapPort=FSAP/UdpIp

	-# Commsignia RSU/OBU Simulator
	+# Commsignia RSU and OBU Simulator
	#UpperTesterSettings=10.200.1.101:12345
	# Commsignia Wireless OBU
	UpperTesterSettings=80.98.62.165:18502
	@@ -60,9 +60,10 @@
	#LocalEthernetMAC=0022191B7FDB
	# G5 bridge connected on USB3/Ethernet
	#LocalEthernetMAC=00E08F008855
	-# Post-mortem ATS execution mode
	+# Post-mortem ATS execution mode (G5 raw Ethernet only)
	OfflineMode=false
	-PcapFile=pcap/vendor/Livorno 20160914-2 DENM Full packet.pcap
	+#PcapFile=pcap/vendor/Livorno 20160914-2 DENM Full packet.pcap
	+PcapFile=F:/FSCOM/ETSI/ITS/STF517_ITS_Valid_Conform_Frmwk.2016/ITS-CMS5 PreQ/Savari/TC_SEC_ITSS_SND_MSG_01_01_BV.pcap
	# Start at time in seconds since 1970-01-01, e.g. 1421661427.233361
	OffsetTime=0
	# Define the Ethernet type value used by the IUT
	@@ -92,15 +93,15 @@
	# Interval between each beacon sent by TS (ms)
	TsBeaconInterval=1000
	# Latitude of Test System
	-#Commsignia
	-TsLatitude=514744250
	+#Commsignia TsLatitude=514744250
	#Yogoko TsLatitude=481210840
	-#Livorno TsLatitude=43551050
	+#Livorno
	+TsLatitude=43551050
	# Longitude of Test System
	-#Commsignia
	-TsLongitude=56240550
	+#Commsignia TsLongitude=56240550
	# Yogoko TsLongitude=-16287930
	-#Livorno TsLongitude=10298730
	+#Livorno
	+TsLongitude=10298730
	# Secured mode status
	UtSecuredMode=false
	# Secured configuration identifier

patches/tct3_ttcn.patch

+36 −729

File changed.

Preview size limit exceeded, changes collapsed.