diff --git a/ttcn/AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn b/ttcn/AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn index 1924cf6f9b42428753818eeff30fb21eefa04cb3..3273ec1fddccfc5c13adeea7d47c5b7d247f152b 100644 --- a/ttcn/AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn +++ b/ttcn/AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn @@ -5428,6 +5428,7 @@ module ItsGeoNetworking_TpFunctions { -, c_defaultHopLimit ), + -, f_getIutMacAddress() ) ); @@ -6347,6 +6348,7 @@ module ItsGeoNetworking_TpFunctions { -, c_defaultHopLimit ), + -, f_getIutMacAddress() ) ); @@ -6436,6 +6438,7 @@ module ItsGeoNetworking_TpFunctions { vc_localSeqNumber ) ), + -, f_getIutMacAddress() ) ); @@ -6513,6 +6516,7 @@ module ItsGeoNetworking_TpFunctions { -, c_defaultHopLimit ), + -, f_getIutMacAddress() ) ); @@ -6629,6 +6633,7 @@ module ItsGeoNetworking_TpFunctions { -, 1 ), + -, f_getIutMacAddress() ) ); @@ -6676,7 +6681,7 @@ module ItsGeoNetworking_TpFunctions { vc_localSeqNumber ) ); - f_sendGeoNetMessage(m_geoNwReq_withLinkLayerDestination(v_gnPacket, f_getIutMacAddress())); + f_sendGeoNetMessage(m_geoNwReq_withLinkLayerDestination(v_gnPacket, -, f_getIutMacAddress())); f_sleep(PX_TAC); @@ -6832,6 +6837,7 @@ module ItsGeoNetworking_TpFunctions { -, c_defaultHopLimit ), + -, f_getIutMacAddress() ) ); @@ -6996,6 +7002,7 @@ module ItsGeoNetworking_TpFunctions { -, c_defaultHopLimit ), + -, f_getIutMacAddress() ) ); @@ -7105,6 +7112,7 @@ module ItsGeoNetworking_TpFunctions { -, c_defaultHopLimit - 1 ), + -, f_getIutMacAddress() ) ); @@ -7162,6 +7170,7 @@ module ItsGeoNetworking_TpFunctions { -, c_defaultHopLimit ), + -, f_getIutMacAddress() ) ); @@ -7310,6 +7319,7 @@ module ItsGeoNetworking_TpFunctions { -, c_defaultHopLimit ), + -, f_getIutMacAddress() ) ); @@ -7559,6 +7569,7 @@ module ItsGeoNetworking_TpFunctions { -, c_defaultHopLimit - 1 ), + -, f_getIutMacAddress() ) ); @@ -7611,6 +7622,7 @@ module ItsGeoNetworking_TpFunctions { -, c_defaultHopLimit ), + -, f_getIutMacAddress() ) ); @@ -7726,7 +7738,7 @@ module ItsGeoNetworking_TpFunctions { } // Test Body - f_sendGeoNetMessage(m_geoNwReq_withLinkLayerDestination(valueof(v_gnPacket), f_getIutMacAddress())); + f_sendGeoNetMessage(m_geoNwReq_withLinkLayerDestination(valueof(v_gnPacket), -, f_getIutMacAddress())); f_sleep(PX_TAC); @@ -7765,6 +7777,7 @@ module ItsGeoNetworking_TpFunctions { -, c_defaultHopLimit ), + -, f_getIutMacAddress() ) ); @@ -14205,6 +14218,7 @@ module ItsGeoNetworking_TpFunctions { f_getGeoBroadcastArea(c_area1) ) ), + -, f_getIutMacAddress() ) ); @@ -14321,6 +14335,7 @@ module ItsGeoNetworking_TpFunctions { f_getGeoBroadcastArea(c_area1) ) ), + -, f_getIutMacAddress() ) ); diff --git a/ttcn/AtsMapemSpatem/ItsMapem_TpFunctions.ttcn b/ttcn/AtsMapemSpatem/ItsMapem_TpFunctions.ttcn index c3fee995cd2d0392cc335524eb4d0c0751c0925a..448d4598131442128a4a099ebf0b7a7791e42236 100644 --- a/ttcn/AtsMapemSpatem/ItsMapem_TpFunctions.ttcn +++ b/ttcn/AtsMapemSpatem/ItsMapem_TpFunctions.ttcn @@ -315,6 +315,7 @@ module ItsMapem_TpFunctions { tc_ac.stop; log("*** " & testcasename() & ": INFO: Successfully received well-formed MAPEM. ***"); f_utTriggerEvent(m_utTriggerEvent(startTLMService)); + v_tlmServiceStarted := true; tc_ac.start; repeat; } diff --git a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn index b4b33628f9ac3e87af2ba8a9ebd81301484ea9d1..ddba54480e290cf19511de2fa6da3faaa8bb7d42 100644 --- a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn +++ b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn @@ -389,7 +389,8 @@ module ItsRSUsSimulator_Functions { } function f_send( - in template (value) Payload p_payload + in template (value) Payload p_payload, + in UInt32 p_its_aid ) runs on ItsRSUsSimulator { var GeoNetworkingPdu v_geoNetworkingPdu; @@ -405,7 +406,7 @@ module ItsRSUsSimulator_Functions { m_defaultLifetime, c_defaultHopLimit )); - f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_geoNetworkingPdu))); + f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_geoNetworkingPdu, p_its_aid))); } function f_processSrem( @@ -433,11 +434,11 @@ module ItsRSUsSimulator_Functions { PICS_SSEM_BTP_SOURCE_PORT ) ); - + // Send SSEM + f_send(v_payload, PICS_SSEM_ITS_AID); } // else, ignore message } // else, ignore message } // else, ignore message - // TODO Process message, and send SSEM } function f_incLocalSeqNumber() runs on ItsRSUsSimulator return UInt16 { diff --git a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn index df871e3d98ff789f9563c58e766128281005d54b..4b402fb098e287307faf4b374c724d4ef643d5b2 100644 --- a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn +++ b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn @@ -77,21 +77,21 @@ module ItsRSUsSimulator_TestCases { [PICS_GENERATE_CAM] tc_cam.timeout { log("*** " & testcasename() & ": DEBUG: Processing CAM ***"); f_prepare_cam(v_payload); - f_send(v_payload); + f_send(v_payload, PICS_CAM_ITS_AID); tc_cam.start; repeat; } [PICS_GENERATE_DENM] tc_denm.timeout { log("*** " & testcasename() & ": DEBUG: Processing DENM ***"); f_prepare_denm(v_payload); - f_send(v_payload); + f_send(v_payload, PICS_DENM_ITS_AID); tc_denm.start; repeat; } [PICS_GENERATE_MAPEM] tc_mapem.timeout { log("*** " & testcasename() & ": DEBUG: Processing MAPEM ***"); f_prepare_mapem(v_payload); - f_send(v_payload); + f_send(v_payload, PICS_MAPEM_ITS_AID); tc_mapem.start; repeat; } @@ -99,7 +99,7 @@ module ItsRSUsSimulator_TestCases { log("*** " & testcasename() & ": DEBUG: Processing SPATEM ***"); for (var integer v_counter := 0; v_counter < lengthof(vc_rsuMessagesValueList[PX_RSU_ID - 1].spatems); v_counter := v_counter + 1) { f_prepare_spatem(vc_rsuMessagesValueList[PX_RSU_ID - 1].spatems[v_counter], v_payload); - f_send(v_payload); + f_send(v_payload, PICS_SPATEM_ITS_AID); } tc_spatem.start; repeat; @@ -107,7 +107,7 @@ module ItsRSUsSimulator_TestCases { [PICS_GENERATE_IVIM] tc_ivim.timeout { log("*** " & testcasename() & ": DEBUG: Processing IVIM ***"); f_prepare_ivim(v_payload); - f_send(v_payload); + f_send(v_payload, PICS_IVIM_ITS_AID); tc_ivim.start; repeat; } diff --git a/unittests/codec/ttcn/test_LibItsMapSpat_TypesAndValues.ttcn3 b/unittests/codec/ttcn/test_LibItsMapSpat_TypesAndValues.ttcn3 index bf748178e5a0a069bd6e608f3c783d499c2b78ee..22e53bdc0887d5aa52ecc2d95763460072689c01 100644 --- a/unittests/codec/ttcn/test_LibItsMapSpat_TypesAndValues.ttcn3 +++ b/unittests/codec/ttcn/test_LibItsMapSpat_TypesAndValues.ttcn3 @@ -79,7 +79,7 @@ module test_LibItsMapemSpatem_TypesAndValues { v_spatReq := valueof( m_spatemReq( m_spatemPdu( - m_spat + m_spatem(m_intersections) ))); log("v_spatReq=", v_spatReq); test_PDU( diff --git a/unittests/codec/ttcn/test_all.ttcn3 b/unittests/codec/ttcn/test_all.ttcn3 index 0cc79ad5ebefeb9d111d0a6489ed2049c88d44dc..f6c5e25f0f159837af8809152f16ae97d9031df4 100644 --- a/unittests/codec/ttcn/test_all.ttcn3 +++ b/unittests/codec/ttcn/test_all.ttcn3 @@ -18,7 +18,7 @@ module test_all /*language "TTCN-3:2009 Advanced Parameterization"*/ { import from test_LibItsSecurity_TypesAndValues all; -// import from test_LibItsMapemSpatem_TypesAndValues all; + import from test_LibItsMapemSpatem_TypesAndValues all; // import from test_LibItsIvim_TypesAndValues all; //