Minor bug fixed (3d9dfa82) · Commits · ITS - Intelligent Transport Systems / ITS

etc/AtsDENM/AtsDENM.cfg

+5 −5

etc/AtsSecurity/AtsSecurity.cfg

+7 −8

Original line number	Original line	Diff line number	Diff line
	@@ -5,9 +5,9 @@
	# The GeoNetworking address of the IUT.		# The GeoNetworking address of the IUT.
	LibItsGeoNetworking_Pics.PICS_GN_LOCAL_GN_ADDR := {		LibItsGeoNetworking_Pics.PICS_GN_LOCAL_GN_ADDR := {
	typeOfAddress := e_initial, # e_manual(1)		typeOfAddress := e_initial, # e_manual(1)
	stationType := e_unknown, #e_roadSideUnit,		stationType := e_roadSideUnit,
	stationCountryCode := 0, #33,		stationCountryCode := 0, #33,
	mid := '4C5E0C14D2EA'O		mid := '080027425e63'O
	} # Simu		} # Simu
	#LibItsGeoNetworking_Pics.PICS_GN_LOCAL_GN_ADDR := {		#LibItsGeoNetworking_Pics.PICS_GN_LOCAL_GN_ADDR := {
	# typeOfAddress := e_initial,		# typeOfAddress := e_initial,
	@@ -109,7 +109,7 @@ LogEventTypes:= Yes

	# Single GeoNetworking component port		# Single GeoNetworking component port
	# its_aid = 36		# its_aid = 36
	system.geoNetworkingPort.params := "GN(ll_address=4C5E0C14D2EB,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,device_mode=0,secured_mode=1,its_aid=36,certificate=CERT_TS_A_AT,sec_db_path=/home/vagrant/tmp/asn1c_cert)/ETH(mac_src=e2b7b30429eb)/PCAP(mac_src=e2b7b30429eb,nic=eth3,filter=and ether proto 0x8947)" # Nordsys		system.geoNetworkingPort.params := "GN(ll_address=4C5E0C14D2EB,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,device_mode=0,secured_mode=1,its_aid=36,certificate=CERT_TS_A_AT,sec_db_path=/home/vagrant/tmp/asn1c_cert)/ETH(mac_src=e2b7b30429eb)/PCAP(mac_src=e2b7b30429eb,nic=eth1,filter=and ether proto 0x8947)" # Nordsys

	#system.geoNetworkingPort.params := "		#system.geoNetworkingPort.params := "
	# GN(ll_address=4C5E0C14D2EC,latitude=43551050,longitude=10298730,beaconing=0,expiry=1000)/		# GN(ll_address=4C5E0C14D2EC,latitude=43551050,longitude=10298730,beaconing=0,expiry=1000)/
	@@ -123,8 +123,8 @@ system.geoNetworkingPort.params := "GN(ll_address=4C5E0C14D2EB,latitude=43551050
	#system.camUtPort.params := "UT_CAM(loopback=1)"		#system.camUtPort.params := "UT_CAM(loopback=1)"
	#system.utPort.params := "UT_CAM/UDP(dst_ip=172.23.0.1,dst_port=8000)" # Nordsys		#system.utPort.params := "UT_CAM/UDP(dst_ip=172.23.0.1,dst_port=8000)" # Nordsys
	#system.camUtPort.params := "UT_CAM/UDP(dst_ip=172.23.0.1,dst_port=8000)" # Nordsys		#system.camUtPort.params := "UT_CAM/UDP(dst_ip=172.23.0.1,dst_port=8000)" # Nordsys
	system.utPort.params := "UT_CAM/UDP(dst_ip=192.168.9.20)" # Simu		system.utPort.params := "UT_CAM/UDP(dst_ip=192.168.56.101)" # Simu
	system.camUtPort.params := "UT_CAM/UDP(dst_ip=192.168.9.20)" # Simu		system.camUtPort.params := "UT_CAM/UDP(dst_ip=192.168.56.101)" # Simu

	[EXECUTE]		[EXECUTE]
	#Check that ITS-S sends a Ieee1609Dot2Data containing protocol version set to 3		#Check that ITS-S sends a Ieee1609Dot2Data containing protocol version set to 3
	@@ -132,7 +132,7 @@ system.camUtPort.params := "UT_CAM/UDP(dst_ip=192.168.9.20)" # Simu

	# ------------------------- CAM ---------------------------		# ------------------------- CAM ---------------------------
	# Check that IUT sends the secured CAM using SignedData container.		# Check that IUT sends the secured CAM using SignedData container.
	#ItsSecurity_TestCases.TC_SEC_ITSS_SND_CAM_01_BV		ItsSecurity_TestCases.TC_SEC_ITSS_SND_CAM_01_BV

	# Check that IUT sends the secured CAM containing the HeaderInfo field psid set to 'AID_CAM'.		# Check that IUT sends the secured CAM containing the HeaderInfo field psid set to 'AID_CAM'.
	#ItsSecurity_TestCases.TC_SEC_ITSS_SND_CAM_02_BV		#ItsSecurity_TestCases.TC_SEC_ITSS_SND_CAM_02_BV
	@@ -182,7 +182,7 @@ system.camUtPort.params := "UT_CAM/UDP(dst_ip=192.168.9.20)" # Simu
	# a CAM containing a request for unrecognized certificate that matches with the currently		# a CAM containing a request for unrecognized certificate that matches with the currently
	# used AT certificate ID of the IUT.		# used AT certificate ID of the IUT.
	# (PICS_SEC_P2P_AT_DISTRIBUTION)		# (PICS_SEC_P2P_AT_DISTRIBUTION)
	ItsSecurity_TestCases.TC_SEC_ITSS_SND_CAM_12_BV		#ItsSecurity_TestCases.TC_SEC_ITSS_SND_CAM_12_BV

	# Check that IUT sends the secured CAM containing the AA certificate in the requestedCertificate		# Check that IUT sends the secured CAM containing the AA certificate in the requestedCertificate
	# headerInfo field when it received a CAM containing a request for unrecognized certificate that		# headerInfo field when it received a CAM containing a request for unrecognized certificate that
	@@ -320,7 +320,6 @@ ItsSecurity_TestCases.TC_SEC_ITSS_SND_CAM_12_BV
	[MAIN_CONTROLLER]		[MAIN_CONTROLLER]
	# The options herein control the behavior of MC.		# The options herein control the behavior of MC.
	KillTimer := 10.0		KillTimer := 10.0
	TCPPort := 0
	LocalAddress := 127.0.0.1		LocalAddress := 127.0.0.1
	TCPPort := 12000		TCPPort := 12000
	NumHCs := 1		NumHCs := 1

ttcn/AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -10622,7 +10622,7 @@ module ItsGeoNetworking_TpFunctions {
	// empty on purpose		// empty on purpose
	}		}
	if(i < lengthof(vc_utInds)) {		if(i < lengthof(vc_utInds)) {
	log("* " & testcasename() & ": PASS: Pre-conditions: TSB correctly rebroadcasted and passed to Upper layer \*");		log("* " & testcasename() & ": PASS: Pre-conditions: TSB correctly rebroadcasted and passed to Upper layer *");
	vc_utInds := {};		vc_utInds := {};
	f_selfOrClientSyncAndVerdict(c_prDone, e_success);		f_selfOrClientSyncAndVerdict(c_prDone, e_success);
	}		}

LibIts @ c7d7b24f

Original line number	Original line	Diff line number	Diff line
	Subproject commit dceb5e02e8cfc9dbf68b6721b951c9832628d437		Subproject commit c7d7b24f14bed9f6088cc9df85d9f45327f4db96

Original line number	Original line	Diff line number	Diff line
	@@ -87,23 +87,23 @@ LogEventTypes:= Yes
	# time_offset : Time offset, used to skip packets with time offset < time_offset		# time_offset : Time offset, used to skip packets with time offset < time_offset
	# save_mode : Set to 1 to save sent packet, 0 otherwise		# save_mode : Set to 1 to save sent packet, 0 otherwise

	system.denmPort.params := "DENM(next_header=btpB,header_type=tsb)/BTP(dst_port=2002)/GN(ll_address=4C5E0C14D2EA,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,device_mode=1)/ETH(mac_src=e2b7b30429eb)/PCAP(mac_src=e2b7b30429eb,nic=tap0,filter=and ether proto 0x8947)"		system.denmPort.params := "DENM(next_header=btpB,header_type=tsb)/BTP(dst_port=2002)/GN(ll_address=4C5E0C14D2EA,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,device_mode=1)/ETH(mac_src=e2b7b30429eb)/PCAP(mac_src=e2b7b30429eb,nic=eth1,filter=and ether proto 0x8947)"

	# DENM UpperTester port based on UDP (ETSI Wlan)		# DENM UpperTester port based on UDP (ETSI Wlan)
	system.utPort.params := "UT_DENM/UDP(dst_ip=172.23.0.1,dst_port=8000)"		system.utPort.params := "UT_DENM/UDP(dst_ip=192.168.56.101)"

	[EXECUTE]		[EXECUTE]
	#ItsDenm_TestCases.TC_DEN_MSGF_BV_01		ItsDenm_TestCases.TC_DEN_MSGF_BV_01
	#ItsDenm_TestCases.TC_DEN_MSGF_BV_02		#ItsDenm_TestCases.TC_DEN_MSGF_BV_02
	#ItsDenm_TestCases.TC_DEN_EVGN_BV_03		#ItsDenm_TestCases.TC_DEN_EVGN_BV_03
	#ItsDenm_TestCases.TC_DEN_EVGN_BV_04		#ItsDenm_TestCases.TC_DEN_EVGN_BV_04
	#ItsDenm_TestCases.TC_DEN_EVUP_BV_01		#ItsDenm_TestCases.TC_DEN_EVUP_BV_01
	#ItsDenm_TestCases.TC_DEN_EVUP_BO_04		#ItsDenm_TestCases.TC_DEN_EVUP_BO_04
	ItsDenm_TestCases.TC_DEN_EVTR_BV_01		#ItsDenm_TestCases.TC_DEN_EVTR_BV_01

	[MAIN_CONTROLLER]		[MAIN_CONTROLLER]
	# The options herein control the behavior of MC.		# The options herein control the behavior of MC.
	KillTimer := 10.0		KillTimer := 10.0
	LocalAddress := 127.0.0.1		LocalAddress := 127.0.0.1
	TCPPort := 12001		TCPPort := 12000
	NumHCs := 1		NumHCs := 1

Admin message