diff --git a/patches/titanization.patch b/patches/titanization.patch index a46459819f7806ca5267454a489e9a16640e604b..cc48684e9e428b1c6ae0f369c3d92434379a1622 100644 --- a/patches/titanization.patch +++ b/patches/titanization.patch @@ -1,6 +1,6 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn =================================================================== ---- AtsCAM/ItsCam_TpFunctions.ttcn (revision 2627) +--- AtsCAM/ItsCam_TpFunctions.ttcn (revision 2630) +++ AtsCAM/ItsCam_TpFunctions.ttcn (working copy) @@ -26,6 +26,7 @@ import from LibItsCommon_Templates all; @@ -186,7 +186,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn // Postamble Index: AtsDENM/ItsDenm_TpFunctions.ttcn =================================================================== ---- AtsDENM/ItsDenm_TpFunctions.ttcn (revision 2627) +--- AtsDENM/ItsDenm_TpFunctions.ttcn (revision 2630) +++ AtsDENM/ItsDenm_TpFunctions.ttcn (working copy) @@ -18,6 +18,7 @@ import from LibItsCommon_TypesAndValues all; @@ -196,18 +196,441 @@ Index: AtsDENM/ItsDenm_TpFunctions.ttcn // LibIts import from DENM_PDU_Descriptions language "ASN.1:1997" all; +@@ -256,7 +257,7 @@ + // Preamble + f_prInitialState(); + for (i := 0; i < lengthof(v_situations) - 1; i := i + 1) { +- f_utTriggerEvent(m_utTriggerEvent(v_situations[i])); ++ f_utTriggerEvent(m_utTriggerEvent(valueof(v_situations[i]))); + f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd); + v_actionIds[i] := v_denmInd.msgIn.denm.management.actionID; + } +@@ -263,7 +264,7 @@ + f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success); + + // Test Body +- f_utTriggerEvent(m_utTriggerEvent(v_situations[lengthof(v_situations) - 1])); ++ f_utTriggerEvent(m_utTriggerEvent(valueof(v_situations[lengthof(v_situations) - 1]))); + f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd); + v_actionIds[lengthof(v_actionIds) - 1] := v_denmInd.msgIn.denm.management.actionID; + +@@ -447,7 +448,7 @@ + // Preamble + f_prInitialState(); + for (i := 0; i < lengthof(v_situations) - 1; i := i + 1) { +- f_utTriggerEvent(m_utTriggerEvent(v_situations[i])); ++ f_utTriggerEvent(m_utTriggerEvent(valueof(v_situations[i]))); + f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd); + v_actionIds[i] := v_denmInd.msgIn.denm.management.actionID; + v_timestampIts := v_denmInd.msgIn.denm.management.referenceTime; +@@ -455,7 +456,7 @@ + f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success); + + // Test Body +- f_utTriggerEvent(m_utTriggerEvent(v_situations[lengthof(v_situations) - 1])); ++ f_utTriggerEvent(m_utTriggerEvent(valueof(v_situations[lengthof(v_situations) - 1]))); + + tc_ac.start; + alt { +@@ -530,7 +531,7 @@ + // Preamble + f_prInitialState(); + for (i := 0; i < lengthof(v_situations) - 1; i := i + 1) { +- f_utTriggerEvent(m_utTriggerEvent(v_situations[i])); ++ f_utTriggerEvent(m_utTriggerEvent(valueof(v_situations[i]))); + f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd); + f_poCancelEvent(e_iut, v_denmInd.msgIn.denm.management.actionID); + } +@@ -539,7 +540,7 @@ + f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success); + + // Test Body +- f_utTriggerEvent(m_utTriggerEvent(v_situations[lengthof(v_situations) - 1])); ++ f_utTriggerEvent(m_utTriggerEvent(valueof(v_situations[lengthof(v_situations) - 1]))); + + tc_ac.start; + alt { +@@ -1254,7 +1255,7 @@ + // Preamble + f_prInitialState(); + for (i := 0; i < lengthof(v_situations); i := i + 1) { +- f_utTriggerEvent(m_utTriggerEvent(v_situations[i])); ++ f_utTriggerEvent(m_utTriggerEvent(valueof(v_situations[i]))); + f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd); + v_actionIds[i] := v_denmInd.msgIn.denm.management.actionID; + } Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn =================================================================== ---- AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn (revision 2627) +--- AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn (revision 2630) +++ AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn (working copy) -@@ -24,6 +24,7 @@ +@@ -23,7 +23,8 @@ + import from LibItsGeoNetworking_Templates all; import from LibItsGeoNetworking_TypesAndValues all; import from LibItsGeoNetworking_Pics all; - import from LibItsGeoNetworking_Pixits all; +- import from LibItsGeoNetworking_Pixits all; ++ import from LibItsGeoNetworking_Pixits all; + import from LibItsGeoNetworking_EncdecDeclarations all; // 6.2.1 group geoFormatingAndDataValidity { +@@ -107,7 +108,7 @@ + f_prNeighbour(); + v_gnPacket := m_geoNwPdu(m_geoNwShbPacket(v_longPosVectorNodeB)); + +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket)); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket))); + + f_sleep(PX_TAC); + +@@ -125,7 +126,7 @@ + // Test Body + v_gnPacket.basicHeader.version := valueof(v_gnPacket.basicHeader.version) + 1; + +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket)); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket))); + + f_sleep(PX_TAC); + +@@ -221,8 +222,8 @@ + // Preamble + f_prNeighbour(); + if ( not f_utTriggerEvent(m_generateShbMessageWithPayload(v_payload)) ) { +- log("*** " & testcasename() & ": INCONC: Trigger failed ***"); +- f_selfOrClientSyncAndVerdict(c_prDone, e_timeout); ++ log("*** " & testcasename() & ": INCONC: Trigger failed ***"); ++ f_selfOrClientSyncAndVerdict(c_prDone, e_timeout); + } + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + +@@ -380,7 +381,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwTsbPacket( + vc_localSeqNumber, +@@ -391,7 +392,7 @@ + v_hopLimit + ) + ) +- ); ++ )); + + tc_noac.start; + alt { +@@ -1379,7 +1380,7 @@ + f_prNeighbour(); + } + else { +- f_prNonNeighbour(); ++ f_prNonNeighbour(); + } + + return v_longPosVectorNode; +@@ -1392,7 +1393,7 @@ + + //preamble part II + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(p_packet, -, c_hopLimit1)) ++ valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(p_packet, -, c_hopLimit1))) + ); + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + } // end f_TP_GEONW_PON_LOT_BV_03_pre_2 +@@ -1456,7 +1457,7 @@ + + // Preamble + f_prDefault(); // NodeB will send Beacon only once +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(m_geoNwBeaconPacket(f_getPosition(c_compNodeB)), -, c_hopLimit1))); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(m_geoNwBeaconPacket(f_getPosition(c_compNodeB)), -, c_hopLimit1)))); + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + + // Test Body +@@ -1717,7 +1718,7 @@ + f_prDefault(); + + // Act as a neighbor and send one beacon +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(m_geoNwBeaconPacket(f_getPosition(c_compNodeB)), -, c_hopLimit1))); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(m_geoNwBeaconPacket(f_getPosition(c_compNodeB)), -, c_hopLimit1)))); + } // end f_TP_GEONW_PON_LOT_BV_05_pre_1 + + /** +@@ -1727,7 +1728,7 @@ + + //preamble part II + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(p_packet)) ++ valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(p_packet))) + ); + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + } // end f_TP_GEONW_PON_LOT_BV_05_pre_2 +@@ -1992,10 +1993,10 @@ + } + else { + v_expectedSequenceNumber := v_expectedSequenceNumber + 1; +- if ( not f_utTriggerEvent(m_generateGeoBroadcastMessage(f_getArea(c_area1))) ) { +- log("*** " & testcasename() & ": INCONC: Trigger failed ***"); +- f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); +- } ++ if ( not f_utTriggerEvent(m_generateGeoBroadcastMessage(f_getArea(c_area1))) ) { ++ log("*** " & testcasename() & ": INCONC: Trigger failed ***"); ++ f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); ++ } + tc_ac.start; + repeat; + } +@@ -2185,7 +2186,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwLsReplyPacket( + v_longPosVectorNodeA, +@@ -2194,7 +2195,7 @@ + ) + ) + ) +- ); ++ )); + + tc_ac.start; + alt { +@@ -2275,12 +2276,12 @@ + if ( v_firstLsRequestReceived == true ) { + log("*** " & testcasename() & ": Second LsRequest received ***"); + tc_ac.stop; +- f_sendGeoNetMessage ( m_geoNwReq_linkLayerBroadcast( ++ f_sendGeoNetMessage ( valueof( m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu ( + m_geoNwLsReplyPacket( + v_longPosVectorNodeA, + f_longPosVector2ShortPosVector(v_longPosVectorIut), +- vc_localSeqNumber ) ) ) ); ++ vc_localSeqNumber ) ) ) ) ); + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + } + else { +@@ -2424,7 +2425,7 @@ + } + + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwLsReplyPacket( + v_longPosVectorNodeA, +@@ -2433,7 +2434,7 @@ + ) + ) + ) +- ); ++ )); + + // Check for messages send to Tester + tc_noac.start; +@@ -2562,7 +2563,7 @@ + f_prNeighbour(); + if ( not f_utTriggerEvent(m_generateGeoUnicastMessageWithLifetime( + v_longPosVectorNodeA.gnAddr, +- float2int(int2float(v_maxNbrRetrans + 2) * f_getLsRetransmitTimer() * 1000.0))) ) { ++ float2int(int2float(v_maxNbrRetrans + 2) * f_getLsRetransmitTimer() * 1000.0))) ) { + log("*** " & testcasename() & ": INCONC: Trigger failed ***"); + f_selfOrClientSyncAndVerdict(c_prDone, e_timeout); + } +@@ -2767,7 +2768,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwLsRequestPacket( + v_longPosVectorNodeB, +@@ -2776,7 +2777,7 @@ + ) + ) + ) +- ); ++ )); + + tc_noac.start; + alt { +@@ -2899,7 +2900,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwLsRequestPacket( + f_getPosition(c_compNodeA), +@@ -2910,7 +2911,7 @@ + c_defaultHopLimit + ) + ) +- ); ++ )); + f_selfOrClientSyncAndVerdict(c_tbDone, e_success); + + // Postamble +@@ -3013,7 +3014,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwLsReplyPacket( + f_getPosition(c_compNodeA), +@@ -3024,7 +3025,7 @@ + c_defaultHopLimit + ) + ) +- ); ++ )); + f_selfOrClientSyncAndVerdict(c_tbDone, e_success); + + // Postamble +@@ -3077,7 +3078,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwUnicastPacket( + v_longPosVectorNodeA, +@@ -3086,7 +3087,7 @@ + ) + ) + ) +- ); ++ )); + + tc_ac.start; + alt { +@@ -3165,7 +3166,7 @@ + f_sleepIgnoreDef(int2float(v_lt2)); + + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwLsReplyPacket( + v_longPosVectorNodeA, +@@ -3174,7 +3175,7 @@ + ) + ) + ) +- ); ++ )); + + tc_ac.start; + alt { +@@ -3310,7 +3311,7 @@ + // Test Body + if (tc_wait.running) { + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwUnicastPacket( + v_longPosVectorNodeA, +@@ -3319,7 +3320,7 @@ + ) + ) + ) +- ); ++ )); + tc_wait.stop; + + tc_noac.start; +@@ -3392,7 +3393,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwUnicastPacket( + v_longPosVectorNodeA, +@@ -3401,7 +3402,7 @@ + ) + ) + ) +- ); ++ )); + + tc_ac.start; + alt { +@@ -3467,7 +3468,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwUnicastPacket( + v_longPosVectorNodeA, +@@ -3476,7 +3477,7 @@ + ) + ) + ) +- ); ++ )); + + tc_noac.start; + alt { +@@ -3546,7 +3547,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwUnicastPacket( + v_longPosVectorNodeA, +@@ -3555,7 +3556,7 @@ + ) + ) + ) +- ); ++ )); + + tc_noac.start; + alt { +@@ -3677,22 +3678,22 @@ + f_prNeighbour(); + + // Make sure IUT has LocE for NodeA by sending unsolicited LS_REPLY +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu( ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu( + m_geoNwLsReplyPacket( + v_longPosVectorNodeA, + f_longPosVector2ShortPosVector(v_longPosVectorIut), + vc_localSeqNumber + ) +- ))); ++ )))); + + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + + // Test Body + // /!\ This pre-condition has impact on test body +- if ( not f_utTriggerEvent(m_generateGeoUnicastMessage(v_longPosVectorNodeA.gnAddr)) ) { +- log("*** " & testcasename() & ": INCONC: Trigger failed ***"); +- f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); +- } ++ if ( not f_utTriggerEvent(m_generateGeoUnicastMessage(v_longPosVectorNodeA.gnAddr)) ) { ++ log("*** " & testcasename() & ": INCONC: Trigger failed ***"); ++ f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); ++ } + tc_noac.start; + alt { + [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(?))) { @@ -3723,7 +3724,9 @@ // Local variables var ItsGeoNetworking v_nodeB; @@ -219,6 +642,24 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn // Test control if (not PICS_GN_GUC_SRC) { +@@ -3812,7 +3815,7 @@ + vc_localSeqNumber := p_sequenceNumberC; + + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwUnicastPacket( + v_longPosVectorNodeC, +@@ -3823,7 +3826,7 @@ + c_defaultHopLimit + ) + ) +- ); ++ )); + + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + @@ -3847,7 +3850,9 @@ // Local variables var ItsGeoNetworking v_nodeB; @@ -230,6 +671,466 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn const integer c_messageCount := 2; // Test control +@@ -3949,7 +3954,7 @@ + + for(i:=0; i < vc_multipleMessagesCount; i:=i+1) { + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwUnicastPacket( + v_longPosVectorNodeC, +@@ -3958,7 +3963,7 @@ + ) + ) + ) +- ); ++ )); + } + + f_selfOrClientSyncAndVerdict(c_prDone, e_success); +@@ -4063,7 +4068,7 @@ + f_prNeighbour(); + + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwUnicastPacket( + v_longPosVectorNodeC, +@@ -4074,7 +4079,7 @@ + c_defaultHopLimit + ) + ) +- ); ++ )); + + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + +@@ -4245,10 +4250,10 @@ + f_prDefault(); + vc_multipleMessagesCount := p_messageCount; + for(i:=0; i < vc_multipleMessagesCount; i:=i+1) { +- if(not f_utTriggerEvent(m_generateGeoBroadcastMessage(f_getArea(c_area1))) ) { +- log("*** " & testcasename() & ": INCONC: Trigger failed ***"); +- f_selfOrClientSyncAndVerdict(c_prDone, e_timeout); +- } ++ if(not f_utTriggerEvent(m_generateGeoBroadcastMessage(f_getArea(c_area1))) ) { ++ log("*** " & testcasename() & ": INCONC: Trigger failed ***"); ++ f_selfOrClientSyncAndVerdict(c_prDone, e_timeout); ++ } + } + + tc_ac.start(1.0); +@@ -4573,13 +4578,13 @@ + f_prNeighbour(); + + // Make sure IUT has LocE for NodeA by sending unsolicited LS_REPLY +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu( ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu( + m_geoNwLsReplyPacket( + v_longPosVectorNodeA, + f_longPosVector2ShortPosVector(v_longPosVectorIut), + vc_localSeqNumber + ) +- ))); ++ )))); + + if ( not f_utTriggerEvent(m_generateGeoUnicastMessage(v_longPosVectorNodeA.gnAddr)) ) { + log("*** " & testcasename() & ": INCONC: Trigger failed ***"); +@@ -4803,13 +4808,13 @@ + // Preamble + f_prNonNeighbour(); + // Make sure IUT has LocE for NodeA by sending unsolicited LS_REPLY +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu( ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu( + m_geoNwLsReplyPacket( + v_longPosVectorNodeA, + f_longPosVector2ShortPosVector(v_longPosVectorIut), + vc_localSeqNumber + ) +- ))); ++ )))); + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + + // Test Body +@@ -5418,7 +5423,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_withLinkLayerDestination( ++ valueof(m_geoNwReq_withLinkLayerDestination( + m_geoNwPdu( + m_geoNwUnicastPacket( + f_getPosition(c_compNodeC), +@@ -5433,7 +5438,7 @@ + -, + f_getIutMacAddress() + ) +- ); ++ )); + + tc_ac.start; + alt { +@@ -5551,7 +5556,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwAnycastPacket( + v_longPosVectorNodeC, +@@ -5562,7 +5567,7 @@ + ) + ) + ) +- ); ++ )); + + tc_ac.start; + alt { +@@ -5680,7 +5685,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeC, +@@ -5691,7 +5696,7 @@ + ) + ) + ) +- ); ++ )); + + tc_ac.start; + alt { +@@ -5809,7 +5814,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwTsbPacket( + vc_localSeqNumber, +@@ -5821,7 +5826,7 @@ + c_defaultHopLimit + ) + ) +- ); ++ )); + + tc_ac.start; + alt { +@@ -5970,7 +5975,7 @@ + + // Test Body + v_longPosVectorNodeB.gnAddr := v_iutGnAddress; +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(m_geoNwShbPacket(v_longPosVectorNodeB), -, c_hopLimit1))); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(m_geoNwShbPacket(v_longPosVectorNodeB), -, c_hopLimit1)))); + + f_sleep(0.5); + +@@ -6340,7 +6345,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_withLinkLayerDestination( ++ valueof(m_geoNwReq_withLinkLayerDestination( + m_geoNwPdu( + m_geoNwUnicastPacket( + f_getPosition(c_compNodeC), +@@ -6353,7 +6358,7 @@ + -, + f_getIutMacAddress() + ) +- ); ++ )); + + f_selfOrClientSyncAndVerdict(c_tbDone, e_success); + +@@ -6432,7 +6437,7 @@ + f_prNeighbour(); + + f_sendGeoNetMessage( +- m_geoNwReq_withLinkLayerDestination( ++ valueof(m_geoNwReq_withLinkLayerDestination( + m_geoNwPdu( + m_geoNwUnicastPacket( + v_longPosVectorNodeA, +@@ -6443,7 +6448,7 @@ + -, + f_getIutMacAddress() + ) +- ); ++ )); + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + + // Test Body +@@ -6507,7 +6512,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_withLinkLayerDestination( ++ valueof(m_geoNwReq_withLinkLayerDestination( + m_geoNwPdu( + m_geoNwUnicastPacket( + f_getPosition(c_compNodeC), +@@ -6521,7 +6526,7 @@ + -, + f_getIutMacAddress() + ) +- ); ++ )); + + f_selfOrClientSyncAndVerdict(c_tbDone, e_success); + +@@ -6625,7 +6630,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_withLinkLayerDestination( ++ valueof(m_geoNwReq_withLinkLayerDestination( + m_geoNwPdu( + m_geoNwUnicastPacket( + f_getPosition(c_compNodeC), +@@ -6638,7 +6643,7 @@ + -, + f_getIutMacAddress() + ) +- ); ++ )); + + f_selfOrClientSyncAndVerdict(c_tbDone, e_success); + +@@ -6683,7 +6688,7 @@ + vc_localSeqNumber + ) + ); +- f_sendGeoNetMessage(m_geoNwReq_withLinkLayerDestination(v_gnPacket, -, f_getIutMacAddress())); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_withLinkLayerDestination(v_gnPacket, -, f_getIutMacAddress()))); + + f_sleep(PX_TAC); + +@@ -6829,7 +6834,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_withLinkLayerDestination( ++ valueof(m_geoNwReq_withLinkLayerDestination( + m_geoNwPdu( + m_geoNwUnicastPacket( + f_getPosition(c_compNodeC), +@@ -6842,7 +6847,7 @@ + -, + f_getIutMacAddress() + ) +- ); ++ )); + log("*** " & testcasename() & ": INFO: Message sent ***"); + f_selfOrClientSyncAndVerdict(c_msgSent, e_success); + +@@ -6955,7 +6960,7 @@ + ) { + tc_ac.stop; + if(t_toCbf.running) { +- t_toCbf.stop; ++ t_toCbf.stop; + log("*** " & testcasename() & ": FAIL: IUT re-broadcasted the packet too early ***"); + f_selfOrClientSyncAndVerdict(c_tbDone, e_error); + } +@@ -6994,7 +6999,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_withLinkLayerDestination( ++ valueof(m_geoNwReq_withLinkLayerDestination( + m_geoNwPdu( + m_geoNwUnicastPacket( + f_getPosition(c_compNodeC), +@@ -7007,7 +7012,7 @@ + -, + f_getIutMacAddress() + ) +- ); ++ )); + log("*** " & testcasename() & ": INFO: Message sent ***"); + f_selfOrClientSyncAndVerdict(c_msgSent, e_success); + +@@ -7104,7 +7109,7 @@ + f_sleepIgnoreDef(int2float(f_getGeoUnicastCbfMaxTime())/2000.0); + + f_sendGeoNetMessage( +- m_geoNwReq_withLinkLayerDestination( ++ valueof(m_geoNwReq_withLinkLayerDestination( + m_geoNwPdu( + m_geoNwUnicastPacket( + f_getPosition(c_compNodeC), +@@ -7117,7 +7122,7 @@ + -, + f_getIutMacAddress() + ) +- ); ++ )); + + tc_noac.start; + alt { +@@ -7162,7 +7167,7 @@ + // Test Body + //Note: Sending of the GUC packet move to test body in contrast to the test purpose due to time critical behaviour + f_sendGeoNetMessage( +- m_geoNwReq_withLinkLayerDestination( ++ valueof(m_geoNwReq_withLinkLayerDestination( + m_geoNwPdu( + m_geoNwUnicastPacket( + f_getPosition(c_compNodeC), +@@ -7175,7 +7180,7 @@ + -, + f_getIutMacAddress() + ) +- ); ++ )); + + tc_noac.start; + alt { +@@ -7311,7 +7316,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_withLinkLayerDestination( ++ valueof(m_geoNwReq_withLinkLayerDestination( + m_geoNwPdu( + m_geoNwUnicastPacket( + f_getPosition(c_compNodeC), +@@ -7324,7 +7329,7 @@ + -, + f_getIutMacAddress() + ) +- ); ++ )); + + f_sleepIgnoreDef(int2float(f_getGeoUnicastCbfMaxTime())/2000.0); + +@@ -7561,7 +7566,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_withLinkLayerDestination( ++ valueof(m_geoNwReq_withLinkLayerDestination( + m_geoNwPdu( + m_geoNwUnicastPacket( + f_getPosition(c_compNodeC), +@@ -7574,7 +7579,7 @@ + -, + f_getIutMacAddress() + ) +- ); ++ )); + + tc_noac.start; + alt { +@@ -7614,7 +7619,7 @@ + // Preamble + f_prNeighbour(); + f_sendGeoNetMessage( +- m_geoNwReq_withLinkLayerDestination( ++ valueof(m_geoNwReq_withLinkLayerDestination( + m_geoNwPdu( + m_geoNwUnicastPacket( + f_getPosition(c_compNodeC), +@@ -7627,7 +7632,7 @@ + -, + f_getIutMacAddress() + ) +- ); ++ )); + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + + // Test Body +@@ -7724,8 +7729,8 @@ + // Preamble + f_prNeighbour(); + f_sleep(PX_TAC); +- v_sentRawPayload := f_adaptPayloadForUtInd_m(valueof(v_gnPacket.gnPacket.packet.payload)); +- for(i:=0; i < lengthof(vc_utInds) and not match(vc_utInds[i].rawPayload, v_sentRawPayload); i:=i+1) { ++ v_sentRawPayload := f_adaptPayloadForUtInd_m(valueof(v_gnPacket.gnPacket.packet.payload)); ++ for(i:=0; i < lengthof(vc_utInds) and not match(vc_utInds[i].rawPayload, v_sentRawPayload); i:=i+1) { + // empty on purpose + } + if(i < lengthof(vc_utInds)) { +@@ -7740,7 +7745,7 @@ + } + + // Test Body +- f_sendGeoNetMessage(m_geoNwReq_withLinkLayerDestination(valueof(v_gnPacket), -, f_getIutMacAddress())); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_withLinkLayerDestination(v_gnPacket, -, f_getIutMacAddress()))); + + f_sleep(PX_TAC); + +@@ -7769,7 +7774,7 @@ + // Preamble + f_prNeighbour(); + f_sendGeoNetMessage( +- m_geoNwReq_withLinkLayerDestination( ++ valueof(m_geoNwReq_withLinkLayerDestination( + m_geoNwPdu( + m_geoNwUnicastPacket( + f_getPosition(c_compNodeC), +@@ -7782,7 +7787,7 @@ + -, + f_getIutMacAddress() + ) +- ); ++ )); + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + + // Test Body +@@ -7850,10 +7855,10 @@ + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + + // Test Body +- if ( not f_utTriggerEvent(m_generateGeoBroadcastMessage(f_getArea(c_area1))) ) { +- log("*** " & testcasename() & ": INCONC: Trigger failed ***"); +- f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); +- } ++ if ( not f_utTriggerEvent(m_generateGeoBroadcastMessage(f_getArea(c_area1))) ) { ++ log("*** " & testcasename() & ": INCONC: Trigger failed ***"); ++ f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); ++ } + + tc_ac.start; + alt { +@@ -8085,7 +8090,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeB, +@@ -8094,7 +8099,7 @@ + ) + ) + ) +- ); ++ )); + + tc_ac.start; + alt { +@@ -8215,7 +8220,7 @@ + -, + c_defaultHopLimit + ); +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(valueof(v_gnPacket))); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket))); + + tc_ac.start; + alt { @@ -8262,7 +8267,9 @@ // Local variables @@ -241,9 +1142,12 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn // Preamble f_prNeighbour(); -@@ -8288,7 +8295,9 @@ +@@ -8286,9 +8293,11 @@ + // Test Body + // send geoBroadcast for second time (same source + same seq Nr + lower RHL) v_msgInd.msgIn.basicHeader.routerHopLimit := valueof(v_msgInd.msgIn.basicHeader.routerHopLimit) - 1; - f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(valueof(v_msgInd.msgIn))); +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(valueof(v_msgInd.msgIn))); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_msgInd.msgIn))); - v_msgInd.msgIn.basicHeader.routerHopLimit := ?; +//FIXME RGY variable is not used after asigning AnyValue; @@ -252,6 +1156,24 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn tc_noac.start; alt { [] a_receiveGeoBroadcast( +@@ -8400,7 +8409,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeC, +@@ -8409,7 +8418,7 @@ + ) + ) + ) +- ); ++ )); + f_selfOrClientSyncAndVerdict(c_tbDone, e_success); + + // Postamble @@ -8507,7 +8516,9 @@ // Local variables @@ -286,6 +1208,115 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn tc_noac.stop; log("*** " & testcasename() & ": FAIL: GBC message re-forwarded to area center ***"); f_selfOrClientSyncAndVerdict(c_tbDone, e_error); +@@ -8559,7 +8573,7 @@ + // Preamble + f_prNeighbour(); + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeC, +@@ -8570,7 +8584,7 @@ + c_defaultHopLimit + ) + ) +- ); ++ )); + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + + // Test Body +@@ -8611,7 +8625,7 @@ + // Test Body + // send geoBroadcast for second time (same source + same seq Nr + lower RHL) + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeC, +@@ -8622,7 +8636,7 @@ + c_defaultHopLimit - 1 + ) + ) +- ); ++ )); + + tc_noac.start; + alt { +@@ -8699,7 +8713,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeB, +@@ -8711,7 +8725,7 @@ + c_defaultHopLimit + ) + ) +- ); ++ )); + + tc_ac.start; + alt { +@@ -8826,7 +8840,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeB, +@@ -8837,7 +8851,7 @@ + c_hopLimit1 + ) + ) +- ); ++ )); + + tc_noac.start; + alt { +@@ -8929,7 +8943,7 @@ + f_getGeoBroadcastArea(c_area1) + ) + ); +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket)); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket))); + + f_sleep(PX_TAC); + +@@ -9015,7 +9029,7 @@ + -, + c_defaultHopLimit + ); +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(valueof(v_gnPacket))); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket))); + + // IUT should also rebroadcast the packet. Get ready + tc_ac.start; +@@ -9035,14 +9049,14 @@ + + f_sleep(PX_TAC); + +- v_sentRawPayload := f_adaptPayloadForUtInd_m(valueof(v_gnPacket.gnPacket.packet.payload)); +- for(i:=0; i < lengthof(vc_utInds) and not match(vc_utInds[i].rawPayload, v_sentRawPayload); i:=i+1) { ++ v_sentRawPayload := f_adaptPayloadForUtInd_m(valueof(v_gnPacket.gnPacket.packet.payload)); ++ for(i:=0; i < lengthof(vc_utInds) and not match(vc_utInds[i].rawPayload, v_sentRawPayload); i:=i+1) { + // empty on purpose + } + if(i < lengthof(vc_utInds)) { + log("*** " & testcasename() & ": PASS: GN was transmitted to upper layer ***"); +- //flush received upper indications +- vc_utInds := {}; ++ //flush received upper indications ++ vc_utInds := {}; + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + } + else { @@ -9074,7 +9088,9 @@ // Local variables @@ -297,6 +1328,105 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn var integer i; // Preamble +@@ -9100,7 +9116,7 @@ + + // Test Body + v_msgInd.msgIn.basicHeader.routerHopLimit := valueof(v_msgInd.msgIn.basicHeader.routerHopLimit) / 2; +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_msgInd.msgIn)); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_msgInd.msgIn))); + f_selfOrClientSyncAndVerdict(c_tbDone, e_success); + + // Postamble +@@ -9145,7 +9161,7 @@ + f_getGeoBroadcastArea(c_area2) + ) + ); +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket)); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket))); + + f_sleep(PX_TAC); + +@@ -9379,7 +9395,7 @@ + p_distanceTooBig + ); + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeC, +@@ -9388,7 +9404,7 @@ + ) + ) + ) +- ); ++ )); + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + + // Test Body +@@ -9565,7 +9581,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeC, +@@ -9574,7 +9590,7 @@ + ) + ) + ) +- ); ++ )); + tc_ac.start; + alt { + [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacketWithArea( +@@ -9726,7 +9742,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeC, +@@ -9735,7 +9751,7 @@ + ) + ) + ) +- ); ++ )); + tc_ac.start; + alt { + [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacketWithArea( +@@ -9933,7 +9949,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwTsbPacket( + vc_localSeqNumber, +@@ -9943,7 +9959,7 @@ + c_defaultHopLimit + ) + ) +- ); ++ )); + + tc_ac.start; + alt { +@@ -10071,7 +10087,7 @@ + c_defaultHopLimit + ); + +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(valueof(v_gnPacket))); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket))); + v_gnPacket.basicHeader.routerHopLimit := ?; + tc_noac.start; + alt { @@ -10130,7 +10146,9 @@ // Local variables @@ -308,6 +1438,78 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn // Preamble f_prNeighbour(); +@@ -10158,7 +10176,7 @@ + + // Test Body + v_msgInd.msgIn.basicHeader.routerHopLimit := valueof(v_msgInd.msgIn.basicHeader.routerHopLimit) -1; +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_msgInd.msgIn)); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_msgInd.msgIn))); + + tc_noac.start; + alt { +@@ -10204,7 +10222,7 @@ + // Preamble + + // Start components +- v_nodeB := f_getComponent(c_compNodeB); ++ v_nodeB := f_getComponent(c_compNodeB); + v_nodeD := f_getComponent(c_compNodeD); + v_nodeB.start(f_GEONW_PON_TSB_BV_04_nodeB()); + v_nodeD.start(f_GEONW_PON_TSB_BV_04_nodeD()); +@@ -10231,7 +10249,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwTsbPacket( + vc_localSeqNumber, +@@ -10242,7 +10260,7 @@ + c_defaultHopLimit + ) + ) +- ); ++ )); + + tc_ac.start; + alt { +@@ -10401,7 +10419,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwTsbPacket( + vc_localSeqNumber, +@@ -10411,7 +10429,7 @@ + 1 + ) + ) +- ); ++ )); + f_selfOrClientSyncAndVerdict(c_tbDone, e_success); + + // Postamble +@@ -10495,7 +10513,7 @@ + v_longPosVectorNodeB + ) + ); +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket)); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket))); + + f_sleep(PX_TAC); + +@@ -10578,7 +10596,7 @@ + -, + c_defaultHopLimit + ); +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(valueof(v_gnPacket))); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(valueof(v_gnPacket)))); + + tc_ac.start; + alt { @@ -10644,7 +10662,9 @@ // Local variables @@ -319,6 +1521,60 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn var integer i; var template (value) GeoNetworkingPdu v_gnPacket; +@@ -10676,7 +10696,7 @@ + // Test Body + v_msgInd.msgIn.basicHeader.routerHopLimit := valueof(v_msgInd.msgIn.basicHeader.routerHopLimit) - 1; + v_gnPacket := v_msgInd.msgIn; +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_msgInd.msgIn)); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_msgInd.msgIn))); + f_selfOrClientSyncAndVerdict(c_tbDone, e_success); + + // Postamble +@@ -10839,7 +10859,7 @@ + + // Test Body + v_gnPacket := m_geoNwPdu(m_geoNwShbPacket(v_longPosVectorNodeB)); +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket)); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket))); + + f_sleep(PX_TAC); + +@@ -11147,7 +11167,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwAnycastPacket( + v_longPosVectorNodeB, +@@ -11156,7 +11176,7 @@ + ) + ) + ) +- ); ++ )); + + tc_noac.start; + alt { +@@ -11303,7 +11323,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwAnycastPacket( + v_longPosVectorNodeC, +@@ -11312,7 +11332,7 @@ + ) + ) + ) +- ); ++ )); + f_selfOrClientSyncAndVerdict(c_tbDone, e_success); + + // Postamble @@ -11404,7 +11424,9 @@ // Local variables @@ -353,9 +1609,884 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn tc_noac.stop; log("*** " & testcasename() & ": FAIL: GAC message re-forwarded to area center ***"); f_selfOrClientSyncAndVerdict(c_tbDone, e_error); +@@ -11462,7 +11487,7 @@ + // Preamble + f_prNeighbour(); + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwAnycastPacket( + v_longPosVectorNodeC, +@@ -11473,7 +11498,7 @@ + c_defaultHopLimit + ) + ) +- ); ++ )); + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + + // Test Body +@@ -11528,7 +11553,7 @@ + // Test Body + // send geoAnycast for second time (same source + same seq Nr + lower RHL) + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwAnycastPacket( + v_longPosVectorNodeC, +@@ -11539,7 +11564,7 @@ + c_defaultHopLimit - 1 + ) + ) +- ); ++ )); + + tc_noac.start; + alt { +@@ -11652,7 +11677,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwAnycastPacket( + v_longPosVectorNodeC, +@@ -11664,7 +11689,7 @@ + c_defaultHopLimit + ) + ) +- ); ++ )); + f_selfOrClientSyncAndVerdict(c_tbDone, e_success); + + // Postamble +@@ -11759,7 +11784,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwAnycastPacket( + v_longPosVectorNodeC, +@@ -11770,7 +11795,7 @@ + c_hopLimit1 + ) + ) +- ); ++ )); + f_selfOrClientSyncAndVerdict(c_tbDone, e_success); + + // Postamble +@@ -11815,7 +11840,7 @@ + f_getGeoAnycastArea(c_area1) + ) + ); +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket)); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket))); + + f_sleep(PX_TAC); + +@@ -11919,7 +11944,7 @@ + + // Test Body + v_gnPacket.basicHeader.routerHopLimit := valueof(v_gnPacket.basicHeader.routerHopLimit) / 2; +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket)); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket))); + + f_sleep(PX_TAC); + +@@ -11957,7 +11982,7 @@ + -, + c_defaultHopLimit + ); +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket)); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket))); + + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + +@@ -12006,7 +12031,7 @@ + f_getGeoAnycastArea(c_area2) + ) + ); +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket)); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket))); + + f_sleep(PX_TAC); + +@@ -12123,7 +12148,7 @@ + p_distanceTooBig + ); + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwAnycastPacket( + v_longPosVectorNodeC, +@@ -12132,7 +12157,7 @@ + ) + ) + ) +- ); ++ )); + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + + // Test Body +@@ -12405,7 +12430,7 @@ + // Preamble + f_prNeighbour(); + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeC, +@@ -12414,7 +12439,7 @@ + ) + ) + ) +- ); ++ )); + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + + // Test Body +@@ -12454,7 +12479,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeC, +@@ -12463,7 +12488,7 @@ + ) + ) + ) +- ); ++ )); + + tc_noac.start; + alt { +@@ -12595,7 +12620,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeC, +@@ -12604,7 +12629,7 @@ + ) + ) + ) +- ); ++ )); + + t_toCbf.start; + tc_ac.start; +@@ -12781,7 +12806,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeC, +@@ -12790,7 +12815,7 @@ + ) + ) + ) +- ); ++ )); + + tc_noac.start; + alt { +@@ -12967,7 +12992,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeD, +@@ -12976,7 +13001,7 @@ + ) + ) + ) +- ); ++ )); + + tc_noac.start; + alt { +@@ -13134,7 +13159,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeC, +@@ -13143,7 +13168,7 @@ + ) + ) + ) +- ); ++ )); + + t_toCbf.start; + tc_ac.start; +@@ -13312,7 +13337,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeC, +@@ -13321,7 +13346,7 @@ + ) + ) + ) +- ); ++ )); + + tc_ac.start; + alt { +@@ -13446,7 +13471,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeA, +@@ -13455,7 +13480,7 @@ + ) + ) + ) +- ); ++ )); + + tc_ac.start; + alt { +@@ -13655,7 +13680,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeC, +@@ -13664,7 +13689,7 @@ + ) + ) + ) +- ); ++ )); + + t_toCbf.start; + tc_ac.start; +@@ -13804,12 +13829,12 @@ + f_getGeoBroadcastArea(c_area1) + ) + ); +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket)); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket))); + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + + // Test Body + for(i:=1; i < f_getAdvancedGbcForwardingMaxCounter(); i:=i+1) { +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket)); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket))); + f_sleepIgnoreDef(0.5); + } + tc_noac.start; +@@ -13890,7 +13915,7 @@ + + // Preamble + f_prNeighbour(); +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast( ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu(m_geoNwBroadcastPacket( + v_longPosVectorNodeB, + 0, +@@ -13897,7 +13922,7 @@ + f_getGeoBroadcastArea(c_area1) + ) + ) +- )); ++ ))); + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + + // Test Body +@@ -13932,7 +13957,7 @@ + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + + // Test Body +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast( ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu(m_geoNwBroadcastPacket( + v_longPosVectorNodeB, + 0, +@@ -13939,7 +13964,7 @@ + f_getGeoBroadcastArea(c_area1) + ) + ) +- )); ++ ))); + tc_noac.start; + alt { + [] geoNetworkingPort.receive (mw_geoNwInd(mw_geoNwPdu(?))){ +@@ -14018,7 +14043,7 @@ + + // Preamble + f_prNeighbour(); +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast( ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu(m_geoNwBroadcastPacket( + v_longPosVectorNodeB, + 0, +@@ -14025,7 +14050,7 @@ + f_getGeoBroadcastArea(c_area1) + ) + ) +- )); ++ ))); + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + + // Test Body +@@ -14071,14 +14096,15 @@ + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + + // Test Body +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast( +- m_geoNwPdu(m_geoNwBroadcastPacket( ++ f_sendGeoNetMessage( ++ valueof(m_geoNwReq_linkLayerBroadcast( ++ m_geoNwPdu(m_geoNwBroadcastPacket( + v_longPosVectorNodeB, + 0, + f_getGeoBroadcastArea(c_area1) + ) + ) +- )); ++ ))); + t_toCbf.start; + tc_ac.start; + alt { +@@ -14089,7 +14115,7 @@ + )))) { + tc_ac.stop; + +- if(t_toCbf.running) { ++ if(t_toCbf.running) { + t_toCbf.stop; + log("*** " & testcasename() & ": FAIL: GBC retransmitted before CBF timer expiration ***"); + f_selfOrClientSyncAndVerdict(c_tbDone, e_error); +@@ -14178,8 +14204,8 @@ + + // Test Body + tc_ac.start; +- alt { +- [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacketWithArea( ++ alt { ++ [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacketWithArea( + mw_longPosVectorPosition(v_longPosVectorNodeA), + ?, + f_getGeoBroadcastArea(c_area1) +@@ -14213,17 +14239,17 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_withLinkLayerDestination( +- m_geoNwPdu(m_geoNwBroadcastPacket( +- v_longPosVectorNodeA, +- 0, +- f_getGeoBroadcastArea(c_area1) +- ) +- ), ++ valueof(m_geoNwReq_withLinkLayerDestination( ++ m_geoNwPdu(m_geoNwBroadcastPacket( ++ v_longPosVectorNodeA, ++ 0, ++ f_getGeoBroadcastArea(c_area1) ++ ) ++ ), + -, +- f_getIutMacAddress() +- ) +- ); ++ f_getIutMacAddress() ++ ) ++ )); + f_selfOrClientSyncAndVerdict(c_tbDone, e_success); + + // Postamble +@@ -14295,7 +14321,7 @@ + + // Test Body + tc_ac.start; +- alt { ++ alt { + [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacketWithArea( + mw_longPosVectorPosition(v_longPosVectorNodeA), + ?, +@@ -14330,7 +14356,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_withLinkLayerDestination( ++ valueof(m_geoNwReq_withLinkLayerDestination( + m_geoNwPdu(m_geoNwBroadcastPacket( + v_longPosVectorNodeA, + 0, +@@ -14340,9 +14366,9 @@ + -, + f_getIutMacAddress() + ) +- ); ++ )); + tc_ac.start; +- alt { ++ alt { + [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacketWithArea( + mw_longPosVectorPosition(v_longPosVectorNodeA), + ?, +@@ -14487,7 +14513,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu(m_geoNwBroadcastPacket( + v_longPosVectorNodeE, + 0, +@@ -14495,7 +14521,7 @@ + ) + ) + ) +- ); ++ )); + + t_toCbf.start; + tc_ac.start; +@@ -14634,7 +14660,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu(m_geoNwBroadcastPacket( + v_longPosVectorNodeC, + 0, +@@ -14642,7 +14668,7 @@ + ) + ) + ) +- ); ++ )); + f_selfOrClientSyncAndVerdict(c_tbDone, e_success); + + // Postamble +@@ -14807,7 +14833,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu(m_geoNwBroadcastPacket( + v_longPosVectorNodeD, + 0, +@@ -14815,7 +14841,7 @@ + ) + ) + ) +- ); ++ )); + f_selfOrClientSyncAndVerdict(c_tbDone, e_success); + + // Postamble +@@ -14898,7 +14924,7 @@ + tc_ac.stop; + + if(t_toCbf.running) { +- t_toCbf.stop; ++ t_toCbf.stop; + log("*** " & testcasename() & ": FAIL: GBC retransmitted before CBF timer expiration ***"); + f_selfOrClientSyncAndVerdict(c_tbDone, e_error); + } +@@ -14937,7 +14963,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu(m_geoNwBroadcastPacket( + v_longPosVectorNodeB, + 0, +@@ -14945,7 +14971,7 @@ + ) + ) + ) +- ); ++ )); + + t_toCbf.start; + tc_ac.start; +@@ -15084,7 +15110,7 @@ + + // Test Body + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu(m_geoNwBroadcastPacket( + v_longPosVectorNodeC, + 0, +@@ -15092,7 +15118,7 @@ + ) + ) + ) +- ); ++ )); + tc_ac.start; + alt { + [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacketWithArea( +@@ -15210,7 +15236,7 @@ + + // Preamble + f_prNeighbour(); +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast( ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu(m_geoNwBroadcastPacket( + v_longPosVectorNodeB, + 0, +@@ -15217,7 +15243,7 @@ + f_getGeoBroadcastArea(c_area1) + ) + ) +- )); ++ ))); + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + + // Test Body +@@ -15262,7 +15288,7 @@ + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + + // Test Body +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast( ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu(m_geoNwBroadcastPacket( + v_longPosVectorNodeB, + 0, +@@ -15269,7 +15295,7 @@ + f_getGeoBroadcastArea(c_area1) + ) + ) +- )); ++ ))); + + t_toCbf.start; + tc_ac.start; +@@ -15397,15 +15423,15 @@ + v_nbrOfPackets := f_getLsPacketBufferSize() / v_packetSize + 1; + log("*** " & testcasename() & ": " & int2str(v_nbrOfPackets) & " ***"); + for (v_index:=1; v_index <= v_nbrOfPackets; v_index:=v_index+1) { +- if ( not f_utTriggerEvent(m_generateGeoUnicastMessageWithPayload(v_longPosVectorNodeA.gnAddr, char2oct("PAYLOAD_" & oct2str(int2oct(v_index, 2))))) ) { +- log("*** " & testcasename() & ": INCONC: Trigger failed ***"); +- f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); +- } ++ if ( not f_utTriggerEvent(m_generateGeoUnicastMessageWithPayload(v_longPosVectorNodeA.gnAddr, char2oct("PAYLOAD_" & oct2str(int2oct(v_index, 2))))) ) { ++ log("*** " & testcasename() & ": INCONC: Trigger failed ***"); ++ f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout); ++ } + } + + f_sleepIgnoreDef(0.5); + f_sendGeoNetMessage( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwLsReplyPacket( + v_longPosVectorNodeB, +@@ -15414,7 +15440,7 @@ + ) + ) + ) +- ); ++ )); + + // packet 1 shall be dropped + v_index := 2; +@@ -15613,7 +15639,7 @@ + p_geoNetworkingMsg.gnPacket.packet.extendedHeader.geoUnicastHeader.dstPosVector := f_longPosVector2ShortPosVector(v_longPosVectorNodeA); + for (i:=0; i < p_nbrOfPackets; i:=i+1) { + p_geoNetworkingMsg.gnPacket.packet.extendedHeader.geoUnicastHeader.seqNumber := vc_localSeqNumber; +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(p_geoNetworkingMsg)); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(p_geoNetworkingMsg))); + } + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + +@@ -15779,7 +15805,7 @@ + + for (i:=0; i < p_nbrOfPackets; i:=i+1) { + p_geoNetworkingMsg.gnPacket.packet.extendedHeader.geoBroadcastHeader.seqNumber := vc_localSeqNumber; +- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(p_geoNetworkingMsg)); ++ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(p_geoNetworkingMsg))); + } + f_selfOrClientSyncAndVerdict(c_prDone, e_success); + +Index: AtsIPv6OverGeoNetworking/ItsIpv6OverGeoNetworking_TestCases.ttcn +=================================================================== +--- AtsIPv6OverGeoNetworking/ItsIpv6OverGeoNetworking_TestCases.ttcn (revision 2630) ++++ AtsIPv6OverGeoNetworking/ItsIpv6OverGeoNetworking_TestCases.ttcn (working copy) +@@ -1084,7 +1084,7 @@ + + // Test Body + f_sendGeoNetMessageWithPayload( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeA, +@@ -1092,7 +1092,7 @@ + f_getGeoBroadcastArea(vc_gvlTable[c_gvl1].area) + ) + ) +- ), ++ )), + m_ipv6Payload(v_ipv6Packet) + ); + +@@ -1190,7 +1190,7 @@ + + // Test Body + f_sendGeoNetMessageWithPayload( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeA, +@@ -1198,7 +1198,7 @@ + f_getGeoBroadcastArea(vc_gvlTable[c_gvl2].area) + ) + ) +- ), ++ )), + m_ipv6Payload(v_ipv6Packet) + ); + +@@ -1289,7 +1289,7 @@ + + // Test Body + f_sendGeoNetMessageWithPayload( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwAnycastPacket( + v_longPosVectorNodeA, +@@ -1297,7 +1297,7 @@ + f_getGeoAnycastArea(vc_gvlTable[c_gvl1].area) + ) + ) +- ), ++ )), + m_ipv6Payload(v_ipv6Packet) + ); + +@@ -1394,7 +1394,7 @@ + + // Test Body + f_sendGeoNetMessageWithPayload( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeA, +@@ -1402,7 +1402,7 @@ + f_getGeoBroadcastArea(vc_gvlTable[c_gvl1].area) + ) + ) +- ), ++ )), + m_ipv6Payload(v_ipv6Packet) + ); + +@@ -1507,7 +1507,7 @@ + + // Test Body + f_sendGeoNetMessageWithPayload( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeA, +@@ -1515,7 +1515,7 @@ + f_getGeoBroadcastArea(vc_gvlTable[c_gvl3].area) + ) + ) +- ), ++ )), + m_ipv6Payload(v_ipv6Packet) + ); + +@@ -1614,7 +1614,7 @@ + + // Test Body + f_sendGeoNetMessageWithPayload( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwUnicastPacket( + v_longPosVectorNodeA, +@@ -1622,7 +1622,7 @@ + vc_localSeqNumber + ) + ) +- ), ++ )), + m_ipv6Payload(v_ipv6Packet) + ); + +@@ -1723,7 +1723,7 @@ + + // Test Body + f_sendGeoNetMessageWithPayload( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwUnicastPacket( + v_longPosVectorNodeB, +@@ -1731,7 +1731,7 @@ + vc_localSeqNumber + ) + ) +- ), ++ )), + m_ipv6Payload(v_ipv6Packet) + ); + +@@ -1830,7 +1830,7 @@ + + // Test Body + f_sendGeoNetMessageWithPayload( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwUnicastPacket( + v_longPosVectorNodeB, +@@ -1838,7 +1838,7 @@ + vc_localSeqNumber + ) + ) +- ), ++ )), + m_ipv6Payload(v_ipv6Packet) + ); + +@@ -1939,7 +1939,7 @@ + + // Test Body + f_sendGeoNetMessageWithPayload( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwUnicastPacket( + v_longPosVectorNodeB, +@@ -1947,7 +1947,7 @@ + vc_localSeqNumber + ) + ) +- ), ++ )), + m_ipv6Payload(v_ipv6Packet) + ); + +@@ -2049,7 +2049,7 @@ + + // Test Body + f_sendGeoNetMessageWithPayload( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwUnicastPacket( + v_longPosVectorNodeB, +@@ -2057,7 +2057,7 @@ + vc_localSeqNumber + ) + ) +- ), ++ )), + m_ipv6Payload(v_ipv6Packet) + ); + +@@ -2154,7 +2154,7 @@ + + // Test Body + f_sendGeoNetMessageWithPayload( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwTsbPacket( + vc_localSeqNumber, +@@ -2161,7 +2161,7 @@ + v_longPosVectorIut + ) + ) +- ), ++ )), + m_ipv6Payload(v_ipv6Packet) + ); + +@@ -2267,7 +2267,7 @@ + + // Test Body + f_sendGeoNetMessageWithPayload( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeA, +@@ -2275,7 +2275,7 @@ + f_getGeoBroadcastArea(vc_gvlTable[c_gvl3].area) + ) + ) +- ), ++ )), + m_ipv6Payload(v_ipv6Packet) + ); + +@@ -2362,7 +2362,7 @@ + ); + + f_sendGeoNetMessageWithPayload( +- m_geoNwReq_linkLayerBroadcast( ++ valueof(m_geoNwReq_linkLayerBroadcast( + m_geoNwPdu( + m_geoNwBroadcastPacket( + v_longPosVectorNodeA, +@@ -2370,7 +2370,7 @@ + f_getGeoBroadcastArea(vc_gvlTable[c_gvl3].area) + ) + ) +- ), ++ )), + m_ipv6Payload(v_ipv6Packet) + ); + Index: AtsIVIM/ItsIvim_TpFunctions.ttcn =================================================================== ---- AtsIVIM/ItsIvim_TpFunctions.ttcn (revision 2627) +--- AtsIVIM/ItsIvim_TpFunctions.ttcn (revision 2630) +++ AtsIVIM/ItsIvim_TpFunctions.ttcn (working copy) @@ -18,6 +18,7 @@ import from LibItsCommon_Pixits all; @@ -373,9 +2504,63 @@ Index: AtsIVIM/ItsIvim_TpFunctions.ttcn group iviMessageTransmission { +@@ -173,7 +175,7 @@ + // Preamble + f_prInitialState(); + for (i := 0; i < lengthof(v_utTriggers) - 1; i := i + 1) { +- f_utTriggerEvent(v_utTriggers[i]); ++ f_utTriggerEvent(valueof(v_utTriggers[i])); + f_awaitIviMessage(mw_ivimInd(mw_anyIvimPdu), v_ivimInd); + v_iviIdentificationNumbers[i] := v_ivimInd.msgIn.ivi.mandatory.iviIdentificationNumber; + } +@@ -180,7 +182,7 @@ + f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success); + + // Test Body +- f_utTriggerEvent(v_utTriggers[lengthof(v_utTriggers) - 1]); ++ f_utTriggerEvent(valueof(v_utTriggers[lengthof(v_utTriggers) - 1])); + f_awaitIviMessage(mw_ivimInd(mw_anyIvimPdu), v_ivimInd); + v_iviIdentificationNumbers[lengthof(v_iviIdentificationNumbers) - 1] := v_ivimInd.msgIn.ivi.mandatory.iviIdentificationNumber; + +@@ -235,7 +237,7 @@ + // Preamble + f_prInitialState(); + for (i := 0; i < lengthof(v_utTriggers) - 1; i := i + 1) { +- f_utTriggerEvent(v_utTriggers[i]); ++ f_utTriggerEvent(valueof(v_utTriggers[i])); + f_awaitIviMessage(mw_ivimInd(mw_anyIvimPdu), v_ivimInd); + f_poCancelEvent(e_iut, v_ivimInd.msgIn.ivi.mandatory.iviIdentificationNumber); + } +@@ -244,7 +246,7 @@ + f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success); + + // Test Body +- f_utTriggerEvent(v_utTriggers[lengthof(v_utTriggers) - 1]); ++ f_utTriggerEvent(valueof(v_utTriggers[lengthof(v_utTriggers) - 1])); + + tc_ac.start; + alt { +@@ -1561,13 +1563,13 @@ + v_ivimReq := valueof( + m_ivimReq( + m_ivimStructurePdu( +- m_ivimStructure( +- m_iviManagementContainer( ++ valueof(m_ivimStructure( ++ valueof(m_iviManagementContainer( + f_getProvider(), + 1, + IviStatus_new_ +- ) +- ) ++ )) ++ )) + ) + ) + ); Index: AtsMapemSpatem/ItsMapem_TpFunctions.ttcn =================================================================== ---- AtsMapemSpatem/ItsMapem_TpFunctions.ttcn (revision 2627) +--- AtsMapemSpatem/ItsMapem_TpFunctions.ttcn (revision 2630) +++ AtsMapemSpatem/ItsMapem_TpFunctions.ttcn (working copy) @@ -22,7 +22,7 @@ import from ITS_Container language "ASN.1:1997" all; @@ -388,7 +2573,7 @@ Index: AtsMapemSpatem/ItsMapem_TpFunctions.ttcn import from LibItsMapemSpatem_TestSystem all; Index: AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn =================================================================== ---- AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn (revision 2627) +--- AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn (revision 2630) +++ AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn (working copy) @@ -22,7 +22,7 @@ import from ITS_Container language "ASN.1:1997" all; @@ -403,7 +2588,7 @@ Index: AtsRSUsSimulator/ItsRSUSimulator_PicsInitConsts.ttcn =================================================================== --- AtsRSUsSimulator/ItsRSUSimulator_PicsInitConsts.ttcn (nonexistent) +++ AtsRSUsSimulator/ItsRSUSimulator_PicsInitConsts.ttcn (working copy) -@@ -0,0 +1,5637 @@ +@@ -0,0 +1,5636 @@ +module ItsRSUSimulator_PicsInitConsts { + + // LibCommon @@ -1314,8 +3499,7 @@ Index: AtsRSUsSimulator/ItsRSUSimulator_PicsInitConsts.ttcn + deltaAltitude := 0 + }, + trafficFlowRule := passToLeft, -+ referenceDenms := { -+ } ++ referenceDenms := omit + } + + } // End of c_PICS_Z1_D3 @@ -6044,7 +8228,7 @@ Index: AtsRSUsSimulator/ItsRSUSimulator_PicsInitConsts.ttcn \ No newline at end of file Index: AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn =================================================================== ---- AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn (revision 2627) +--- AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn (revision 2630) +++ AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn (working copy) @@ -17,7 +17,7 @@ import from EVCSN_PDU_Descriptions language "ASN.1:1997" all; @@ -6055,6 +8239,25 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn // LibItsCommon import from LibItsCommon_Functions all; +@@ -238,14 +238,14 @@ + v_ivim := + m_ivimParm( + PICS_RSU_PARAMS[p_rsu_id].stationID, +- m_ivimStructure( +- m_iviManagementContainer( ++ valueof(m_ivimStructure( ++ valueof(m_iviManagementContainer( + PICS_IVIM_PARMS_RSUs[p_rsu_id].provider, + PICS_IVIM_PARMS_RSUs[p_rsu_id].iviIdentificationNumber, + 0//IviStatus_new_ +- ), ++ )), + PICS_IVIM_PARMS_RSUs[p_rsu_id].iviContainers +- )); ++ ))); + // Update ivi status + v_ivim.ivi.mandatory.validFrom := f_getCurrentTime(); + v_ivim.ivi.mandatory.validTo := valueof(v_ivim.ivi.mandatory.validFrom) + 43200000; // 12hours @@ -266,7 +266,7 @@ ), m_itsEVCSNData( @@ -6064,9 +8267,54 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn ) )); // Update poi status +@@ -295,7 +295,7 @@ + m_denmPdu_rsu( + PICS_RSU_PARAMS[p_rsu_id].stationID, + m_denm( +- v_denmParmContainers.managementContainer, ++ valueof(v_denmParmContainers.managementContainer), + v_denmParmContainers.situationContainer, + v_denmParmContainers.locationContainer + ))); +@@ -380,7 +380,7 @@ + } + // Build the messages value list for this RSU + vc_rsuMessagesValueList[p_rsu_id] := +- m_rsuProfile( ++ valueof(m_rsuProfile( + v_beacon, + v_cam, + v_denms, +@@ -389,7 +389,7 @@ + v_ivim, + v_evcsn, + v_ssem +- ); ++ )); + if (PICS_RSU_PARAMS[p_rsu_id].geoShape == e_geoCircle) { + vc_geoArea := { + shape := e_geoCircle, +@@ -449,7 +449,7 @@ + + p_payload := valueof( + f_adaptPayload( +- vc_rsuMessagesValueList[vc_rsu_id].beacon, ++ valueof(vc_rsuMessagesValueList[vc_rsu_id].beacon), + 0, + -, + e_any +@@ -631,7 +631,7 @@ + ) runs on ItsRSUsSimulator { + + vc_rsuMessagesValueList[vc_rsu_id].evcsn.evcsn.poiHeader.timeStamp := f_getCurrentTime(); // Check if it is ITS or UTC time +- log("vc_rsuMessagesValueList[vc_rsu_id].evcsn", valueof(vc_rsuMessagesValueList[vc_rsu_id].evcsn)); ++ log("vc_rsuMessagesValueList[vc_rsu_id].evcsn", vc_rsuMessagesValueList[vc_rsu_id].evcsn); + p_payload := valueof( + f_adaptPayload( + bit2oct( Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn =================================================================== ---- AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn (revision 2627) +--- AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn (revision 2630) +++ AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn (working copy) @@ -14,9 +14,12 @@ import from EVCSN_PDU_Descriptions language "ASN.1:1997" all; @@ -6420,7 +8668,17 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn incidentIndication := omit, recommendedPath := omit, startingPointSpeedLimit := { -@@ -1000,8 +1004,8 @@ +@@ -971,8 +975,7 @@ + deltaAltitude := 0 + }, + trafficFlowRule := passToLeft, +- referenceDenms := { +- } ++ referenceDenms := omit + } + + } // End of PICS_Z1_D3 +@@ -1000,8 +1003,8 @@ modulepar ReferencePosition PICS_Z2_D1_EP := { latitude := 435512286, // Z2-D1-EP/latitude longitude := 102999675, // Z2-D1-EP/longitude @@ -6431,7 +8689,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn }; // End of PICS_Z2_D1_EP /** -@@ -1077,10 +1081,10 @@ +@@ -1077,10 +1080,10 @@ }; // End of PICS_Z2_D1_Tx modulepar DenmParm PICS_Z2_D1 := { @@ -6445,7 +8703,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn roadWorksContainerExtended := { lightBarSirenInUse := omit, closedLanes := { -@@ -1088,10 +1092,10 @@ +@@ -1088,10 +1091,10 @@ drivingLaneStatus := '0001'B }, restriction := omit, @@ -6458,7 +8716,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn trafficFlowRule := passToRight, referenceDenms := omit } -@@ -1107,8 +1111,8 @@ +@@ -1107,8 +1110,8 @@ modulepar ReferencePosition PICS_Z2_D2_EP := { latitude := 435513581, // Z2-D2-EP/latitude longitude := 103012798, // Z2-D2-EP/longitude @@ -6469,7 +8727,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn }; // End of PICS_Z2_D2_EP /** -@@ -1184,10 +1188,10 @@ +@@ -1184,10 +1187,10 @@ }; // End of PICS_Z2_D2_Tx modulepar DenmParm PICS_Z2_D2 := { @@ -6483,7 +8741,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn roadWorksContainerExtended := { lightBarSirenInUse := omit, closedLanes := { -@@ -1195,7 +1199,7 @@ +@@ -1195,7 +1198,7 @@ drivingLaneStatus := '0011'B }, restriction := omit, @@ -6492,7 +8750,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn incidentIndication := omit, recommendedPath := omit, startingPointSpeedLimit := omit, -@@ -1215,8 +1219,8 @@ +@@ -1215,8 +1218,8 @@ modulepar ReferencePosition PICS_Z2_D3_EP := { latitude := 435521014, // Z2-D3-EP/latitude longitude := 103020483, // Z2-D3-EP/longitude @@ -6503,7 +8761,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn }; // End of PICS_Z2_D3_EP /** -@@ -1284,10 +1288,10 @@ +@@ -1284,10 +1287,10 @@ }; // End of PICS_Z2_D3_Tx modulepar DenmParm PICS_Z2_D3 := { @@ -6517,7 +8775,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn roadWorksContainerExtended := { lightBarSirenInUse := omit, closedLanes := { -@@ -1295,7 +1299,7 @@ +@@ -1295,7 +1298,7 @@ drivingLaneStatus := '0100'B }, restriction := omit, @@ -6526,7 +8784,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn incidentIndication := omit, recommendedPath := omit, startingPointSpeedLimit := omit, -@@ -1327,8 +1331,8 @@ +@@ -1327,8 +1330,8 @@ modulepar ReferencePosition PICS_Z3_D1_EP := { latitude := 435537393, // Z3-D1-EP/latitude longitude := 103003415, // Z3-D1-EP/longitude @@ -6537,7 +8795,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn }; // End of PICS_Z3_D1_EP /** -@@ -1404,10 +1408,10 @@ +@@ -1404,10 +1407,10 @@ }; // End of PICS_Z3_D1_Tx modulepar DenmParm PICS_Z3_D1 := { @@ -6551,7 +8809,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn roadWorksContainerExtended := { lightBarSirenInUse := omit, closedLanes := { -@@ -1415,10 +1419,10 @@ +@@ -1415,10 +1418,10 @@ drivingLaneStatus := '0001'B }, restriction := omit, @@ -6564,7 +8822,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn trafficFlowRule := passToRight, referenceDenms := omit } -@@ -1434,8 +1438,8 @@ +@@ -1434,8 +1437,8 @@ modulepar ReferencePosition PICS_Z3_D2_EP := { latitude := 435543599, // Z3-D2-EP/latitude longitude := 103041247, // Z3-D2-EP/longitude @@ -6575,7 +8833,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn }; // End of PICS_Z3_D2_EP /** -@@ -1511,10 +1515,10 @@ +@@ -1511,10 +1514,10 @@ }; // End of PICS_Z3_D2_Tx modulepar DenmParm PICS_Z3_D2 := { @@ -6589,7 +8847,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn roadWorksContainerExtended := { lightBarSirenInUse := omit, closedLanes := { -@@ -1522,7 +1526,7 @@ +@@ -1522,7 +1525,7 @@ drivingLaneStatus := '0011'B }, restriction := omit, @@ -6598,7 +8856,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn incidentIndication := omit, recommendedPath := omit, startingPointSpeedLimit := omit, -@@ -1542,8 +1546,8 @@ +@@ -1542,8 +1545,8 @@ modulepar ReferencePosition PICS_Z3_D3_EP := { latitude := 435550184, // Z3-D3-EP/latitude longitude := 103037351, // Z3-D3-EP/longitude @@ -6609,7 +8867,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn }; // End of PICS_Z3_D3_EP /** -@@ -1611,10 +1615,10 @@ +@@ -1611,10 +1614,10 @@ }; // End of PICS_Z3_D3_Tx modulepar DenmParm PICS_Z3_D3 := { @@ -6623,7 +8881,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn roadWorksContainerExtended := { lightBarSirenInUse := omit, closedLanes := { -@@ -1622,7 +1626,7 @@ +@@ -1622,7 +1625,7 @@ drivingLaneStatus := '0100'B }, restriction := omit, @@ -6632,7 +8890,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn incidentIndication := omit, recommendedPath := omit, startingPointSpeedLimit := omit, -@@ -1654,8 +1658,8 @@ +@@ -1654,8 +1657,8 @@ modulepar ReferencePosition PICS_Z4_D1_EP := { latitude := 435562873, // Z4-D1-EP/latitude longitude := 103041679, // Z4-D1-EP/longitude @@ -6643,7 +8901,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn }; // End of PICS_Z4_D1_EP /** -@@ -1731,10 +1735,10 @@ +@@ -1731,10 +1734,10 @@ }; // End of PICS_Z4_D1_Tx modulepar DenmParm PICS_Z4_D1 := { @@ -6657,7 +8915,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn roadWorksContainerExtended := { lightBarSirenInUse := omit, closedLanes := { -@@ -1742,10 +1746,10 @@ +@@ -1742,10 +1745,10 @@ drivingLaneStatus := '0001'B }, restriction := omit, @@ -6670,7 +8928,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn trafficFlowRule := passToRight, referenceDenms := omit } -@@ -1761,8 +1765,8 @@ +@@ -1761,8 +1764,8 @@ modulepar ReferencePosition PICS_Z4_D2_EP := { latitude := 435567174, // Z4-D2-EP/latitude longitude := 103052073, // Z4-D2-EP/longitude @@ -6681,7 +8939,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn }; // End of PICS_Z4_D2_EP /** -@@ -1838,10 +1842,10 @@ +@@ -1838,10 +1841,10 @@ }; // End of PICS_Z4_D2_Tx modulepar DenmParm PICS_Z4_D2 := { @@ -6695,7 +8953,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn roadWorksContainerExtended := { lightBarSirenInUse := omit, closedLanes := { -@@ -1849,7 +1853,7 @@ +@@ -1849,7 +1852,7 @@ drivingLaneStatus := '0011'B }, restriction := omit, @@ -6704,7 +8962,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn incidentIndication := omit, recommendedPath := omit, startingPointSpeedLimit := omit, -@@ -1869,8 +1873,8 @@ +@@ -1869,8 +1872,8 @@ modulepar ReferencePosition PICS_Z4_D3_EP := { latitude := 435573552, // Z4-D3-EP/latitude longitude := 103060751, // Z4-D3-EP/longitude @@ -6715,7 +8973,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn }; // End of PICS_Z4_D3_EP /** -@@ -1938,10 +1942,10 @@ +@@ -1938,10 +1941,10 @@ }; // End of PICS_Z4_D3_Tx modulepar DenmParm PICS_Z4_D3 := { @@ -6729,7 +8987,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn roadWorksContainerExtended := { lightBarSirenInUse := omit, closedLanes := { -@@ -1949,7 +1953,7 @@ +@@ -1949,7 +1952,7 @@ drivingLaneStatus := '0100'B }, restriction := omit, @@ -6738,7 +8996,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn incidentIndication := omit, recommendedPath := omit, startingPointSpeedLimit := omit, -@@ -1981,8 +1985,8 @@ +@@ -1981,8 +1984,8 @@ modulepar ReferencePosition PICS_Z5_D1_EP := { latitude := 435574984, // Z5-D1-EP/latitude longitude := 103061238, // Z5-D1-EP/longitude @@ -6749,7 +9007,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn }; // End of PICS_Z5_D1_EP /** -@@ -2058,10 +2062,10 @@ +@@ -2058,10 +2061,10 @@ }; // End of PICS_Z5_D1_Tx modulepar DenmParm PICS_Z5_D1 := { @@ -6763,7 +9021,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn roadWorksContainerExtended := { lightBarSirenInUse := omit, closedLanes := { -@@ -2069,10 +2073,10 @@ +@@ -2069,10 +2072,10 @@ drivingLaneStatus := '0001'B }, restriction := omit, @@ -6776,7 +9034,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn trafficFlowRule := passToRight, referenceDenms := omit } -@@ -2088,8 +2092,8 @@ +@@ -2088,8 +2091,8 @@ modulepar ReferencePosition PICS_Z5_D2_EP := { latitude := 435568551, // Z5-D2-EP/latitude longitude := 103052438, // Z5-D2-EP/longitude @@ -6787,7 +9045,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn }; // End of PICS_Z5_D2_EP /** -@@ -2165,10 +2169,10 @@ +@@ -2165,10 +2168,10 @@ }; // End of PICS_Z5_D2_Tx modulepar DenmParm PICS_Z5_D2 := { @@ -6801,7 +9059,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn roadWorksContainerExtended := { lightBarSirenInUse := omit, closedLanes := { -@@ -2176,7 +2180,7 @@ +@@ -2176,7 +2179,7 @@ drivingLaneStatus := '0011'B }, restriction := omit, @@ -6810,7 +9068,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn incidentIndication := omit, recommendedPath := omit, startingPointSpeedLimit := omit, -@@ -2196,8 +2200,8 @@ +@@ -2196,8 +2199,8 @@ modulepar ReferencePosition PICS_Z5_D3_EP := { latitude := 435565175, // Z5-D3-EP/latitude longitude := 103041136, // Z5-D3-EP/longitude @@ -6821,7 +9079,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn }; // End of PICS_Z5_D3_EP /** -@@ -2265,10 +2269,10 @@ +@@ -2265,10 +2268,10 @@ }; // End of PICS_Z5_D3_Tx modulepar DenmParm PICS_Z5_D3 := { @@ -6835,7 +9093,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn roadWorksContainerExtended := { lightBarSirenInUse := omit, closedLanes := { -@@ -2276,7 +2280,7 @@ +@@ -2276,7 +2279,7 @@ drivingLaneStatus := '0100'B }, restriction := omit, @@ -6844,7 +9102,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn incidentIndication := omit, recommendedPath := omit, startingPointSpeedLimit := omit, -@@ -2308,8 +2312,8 @@ +@@ -2308,8 +2311,8 @@ modulepar ReferencePosition PICS_Z6_D1_EP := { latitude := 435549548, // Z6-D1-EP/latitude longitude := 103036609, // Z6-D1-EP/longitude @@ -6855,7 +9113,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn }; // End of PICS_Z6_D1_EP /** -@@ -2385,10 +2389,10 @@ +@@ -2385,10 +2388,10 @@ }; // End of PICS_Z6_D1_Tx modulepar DenmParm PICS_Z6_D1 := { @@ -6869,7 +9127,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn roadWorksContainerExtended := { lightBarSirenInUse := omit, closedLanes := { -@@ -2396,10 +2400,10 @@ +@@ -2396,10 +2399,10 @@ drivingLaneStatus := '0001'B }, restriction := omit, @@ -6882,7 +9140,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn trafficFlowRule := passToRight, referenceDenms := omit } -@@ -2415,8 +2419,8 @@ +@@ -2415,8 +2418,8 @@ modulepar ReferencePosition PICS_Z6_D2_EP := { latitude := 435542600, // Z6-D2-EP/latitude longitude := 103032647, // Z6-D2-EP/longitude @@ -6893,7 +9151,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn }; // End of PICS_Z6_D2_EP /** -@@ -2492,10 +2496,10 @@ +@@ -2492,10 +2495,10 @@ }; // End of PICS_Z6_D2_Tx modulepar DenmParm PICS_Z6_D2 := { @@ -6907,7 +9165,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn roadWorksContainerExtended := { lightBarSirenInUse := omit, closedLanes := { -@@ -2503,7 +2507,7 @@ +@@ -2503,7 +2506,7 @@ drivingLaneStatus := '0011'B }, restriction := omit, @@ -6916,7 +9174,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn incidentIndication := omit, recommendedPath := omit, startingPointSpeedLimit := omit, -@@ -2523,8 +2527,8 @@ +@@ -2523,8 +2526,8 @@ modulepar ReferencePosition PICS_Z6_D3_EP := { latitude := 435536760, // Z6-D3-EP/latitude longitude := 103024345, // Z6-D3-EP/longitude @@ -6927,7 +9185,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn } // End of PICS_Z6_D3_EP /** -@@ -2592,10 +2596,10 @@ +@@ -2592,10 +2595,10 @@ }; // End of PICS_Z6_D3_Tx modulepar DenmParm PICS_Z6_D3 := { @@ -6941,7 +9199,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn roadWorksContainerExtended := { lightBarSirenInUse := omit, closedLanes := { -@@ -2603,7 +2607,7 @@ +@@ -2603,7 +2606,7 @@ drivingLaneStatus := '0100'B }, restriction := omit, @@ -6950,7 +9208,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn incidentIndication := omit, recommendedPath := omit, startingPointSpeedLimit := omit, -@@ -2618,34 +2622,34 @@ +@@ -2618,34 +2621,34 @@ modulepar DenmEventsParmsUseCase PICS_DENM_PARMS_UC1_RWW := { { // Zone 1 @@ -7003,7 +9261,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn } } // End of PICS_DENM_PARMS_UC1_RWW -@@ -2652,9 +2656,9 @@ +@@ -2652,9 +2655,9 @@ } // End of group denmUseCase1 modulepar DenmEventsParmsUseCaseRsu PICS_DENM_EVENTS_RSU := { @@ -7016,7 +9274,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn } // End of PICS_DENM_EVENTS_RSU } // End of group denmEvents -@@ -2762,9 +2766,9 @@ +@@ -2762,9 +2765,9 @@ intersections := { { // Start of intersection #0 name := "PICS_Z1_M1_SL", @@ -7028,7 +9286,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn laneWidth := omit, speedLimits := omit, laneSet := { -@@ -2782,7 +2786,7 @@ +@@ -2782,7 +2785,7 @@ regional := omit }, maneuvers := omit, @@ -7037,7 +9295,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn connectsTo := { { connectingLane := { -@@ -2812,7 +2816,7 @@ +@@ -2812,7 +2815,7 @@ regional := omit }, maneuvers := omit, @@ -7046,7 +9304,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn connectsTo := omit, overlays := omit, regional := omit -@@ -2918,9 +2922,9 @@ +@@ -2918,9 +2921,9 @@ intersections := { { // Start of intersection #0 name := "PICS_Z2_M1_SL", @@ -7058,7 +9316,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn laneWidth := omit, speedLimits := omit, laneSet := { -@@ -2938,7 +2942,7 @@ +@@ -2938,7 +2941,7 @@ regional := omit }, maneuvers := omit, @@ -7067,7 +9325,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn connectsTo := { { connectingLane := { -@@ -2968,7 +2972,7 @@ +@@ -2968,7 +2971,7 @@ regional := omit }, maneuvers := omit, @@ -7076,7 +9334,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn connectsTo := omit, overlays := omit, regional := omit -@@ -3074,9 +3078,9 @@ +@@ -3074,9 +3077,9 @@ intersections := { { // Start of intersection #0 name := "PICS_Z3_M1_SL", @@ -7088,7 +9346,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn laneWidth := omit, speedLimits := omit, laneSet := { -@@ -3094,7 +3098,7 @@ +@@ -3094,7 +3097,7 @@ regional := omit }, maneuvers := omit, @@ -7097,7 +9355,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn connectsTo := { { connectingLane := { -@@ -3124,7 +3128,7 @@ +@@ -3124,7 +3127,7 @@ regional := omit }, maneuvers := omit, @@ -7106,7 +9364,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn connectsTo := omit, overlays := omit, regional := omit -@@ -3230,9 +3234,9 @@ +@@ -3230,9 +3233,9 @@ intersections := { { // Start of intersection #0 name := "PICS_Z4_M1_SL", @@ -7118,7 +9376,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn laneWidth := omit, speedLimits := omit, laneSet := { -@@ -3250,7 +3254,7 @@ +@@ -3250,7 +3253,7 @@ regional := omit }, maneuvers := omit, @@ -7127,7 +9385,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn connectsTo := { { connectingLane := { -@@ -3280,7 +3284,7 @@ +@@ -3280,7 +3283,7 @@ regional := omit }, maneuvers := omit, @@ -7136,7 +9394,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn connectsTo := omit, overlays := omit, regional := omit -@@ -3386,9 +3390,9 @@ +@@ -3386,9 +3389,9 @@ intersections := { { // Start of intersection #0 name := "PICS_Z5_M1_SL", @@ -7148,7 +9406,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn laneWidth := omit, speedLimits := omit, laneSet := { -@@ -3406,7 +3410,7 @@ +@@ -3406,7 +3409,7 @@ regional := omit }, maneuvers := omit, @@ -7157,7 +9415,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn connectsTo := { { connectingLane := { -@@ -3436,7 +3440,7 @@ +@@ -3436,7 +3439,7 @@ regional := omit }, maneuvers := omit, @@ -7166,7 +9424,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn connectsTo := omit, overlays := omit, regional := omit -@@ -3542,9 +3546,9 @@ +@@ -3542,9 +3545,9 @@ intersections := { { // Start of intersection #0 name := "PICS_Z6_M1_SL", @@ -7178,7 +9436,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn laneWidth := omit, speedLimits := omit, laneSet := { -@@ -3562,7 +3566,7 @@ +@@ -3562,7 +3565,7 @@ regional := omit }, maneuvers := omit, @@ -7187,7 +9445,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn connectsTo := { { connectingLane := { -@@ -3592,7 +3596,7 @@ +@@ -3592,7 +3595,7 @@ regional := omit }, maneuvers := omit, @@ -7196,7 +9454,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn connectsTo := omit, overlays := omit, regional := omit -@@ -3608,20 +3612,20 @@ +@@ -3608,20 +3611,20 @@ } // End of group mapemZone6 modulepar MapemParmListRsu PICS_MAPEM_PARMS_RSUs := { @@ -7224,7 +9482,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn } // End of PICS_MAPEM_PARMS_RSU } // End of group mapemEvents -@@ -3655,7 +3659,7 @@ +@@ -3655,7 +3658,7 @@ intersections := { { name := "PICS_SPATEM_PARMS_SG_50", @@ -7233,7 +9491,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn revision := 0, status := int2bit(0, 16), moy := 0, // To be updated in real-time -@@ -3733,7 +3737,7 @@ +@@ -3733,7 +3736,7 @@ } // End of type PICS_Z1_S1_SL modulepar SignalGroupParmList PICS_Z1_S1_SL_LIST := { @@ -7242,7 +9500,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn } // End of type PICS_Z1_S1_SL_LIST } // End of group spatemZone1 -@@ -3745,7 +3749,7 @@ +@@ -3745,7 +3748,7 @@ intersections := { { name := "PICS_SPATEM_PARMS_SG_50", @@ -7251,7 +9509,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn revision := 0, status := int2bit(0, 16), moy := 0, // To be updated in real-time -@@ -3823,7 +3827,7 @@ +@@ -3823,7 +3826,7 @@ } // End of type PICS_Z2_S1_SL modulepar SignalGroupParmList PICS_Z2_S1_SL_LIST := { @@ -7260,7 +9518,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn } // End of type PICS_Z2_S1_SL_LIST } // End of group spatemZone2 -@@ -3835,7 +3839,7 @@ +@@ -3835,7 +3838,7 @@ intersections := { { name := "PICS_SPATEM_PARMS_SG_50", @@ -7269,7 +9527,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn revision := 0, status := int2bit(0, 16), moy := 0, // To be updated in real-time -@@ -3913,7 +3917,7 @@ +@@ -3913,7 +3916,7 @@ } // End of type PICS_Z3_S1_SL modulepar SignalGroupParmList PICS_Z3_S1_SL_LIST := { @@ -7278,7 +9536,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn } // End of type PICS_Z3_S1_SL_LIST } // End of group spatemZone3 -@@ -3925,7 +3929,7 @@ +@@ -3925,7 +3928,7 @@ intersections := { { name := "PICS_SPATEM_PARMS_SG_50", @@ -7287,7 +9545,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn revision := 0, status := int2bit(0, 16), moy := 0, // To be updated in real-time -@@ -4003,7 +4007,7 @@ +@@ -4003,7 +4006,7 @@ } // End of type PICS_Z4_S1_SL modulepar SignalGroupParmList PICS_Z4_S1_SL_LIST := { @@ -7296,7 +9554,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn } // End of type PICS_Z4_S1_SL_LIST } // End of group spatemZone4 -@@ -4015,7 +4019,7 @@ +@@ -4015,7 +4018,7 @@ intersections := { { name := "PICS_SPATEM_PARMS_SG_50", @@ -7305,7 +9563,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn revision := 0, status := int2bit(0, 16), moy := 0, // To be updated in real-time -@@ -4093,7 +4097,7 @@ +@@ -4093,7 +4096,7 @@ } // End of type PICS_Z5_S1_SL modulepar SignalGroupParmList PICS_Z5_S1_SL_LIST := { @@ -7314,7 +9572,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn } // End of type PICS_Z5_S1_SL_LIST } // End of group spatemZone5 -@@ -4105,7 +4109,7 @@ +@@ -4105,7 +4108,7 @@ intersections := { { name := "PICS_SPATEM_PARMS_SG_50", @@ -7323,7 +9581,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn revision := 0, status := int2bit(0, 16), moy := 0, // To be updated in real-time -@@ -4183,19 +4187,19 @@ +@@ -4183,19 +4186,19 @@ } // End of type PICS_Z6_S1_SL modulepar SignalGroupParmList PICS_Z6_S1_SL_LIST := { @@ -7350,7 +9608,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn {} // RSU #8 } // End of PICS_SPATEM_PARMS_RSUs -@@ -4218,8 +4222,8 @@ +@@ -4218,8 +4221,8 @@ } // End of PICS_DENM_POSITION_CONFIDENCE_ELLIPSE modulepar Altitude PICS_IVIM_ALTITUDE := { @@ -7361,7 +9619,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn } // End of PICS_DENM_ALTITUDE } // End of group ivimCommonParams -@@ -4229,8 +4233,8 @@ +@@ -4229,8 +4232,8 @@ modulepar ReferencePosition PICS_Z1_I1_POS1_RP := { latitude := 435527493, longitude := 103006446, @@ -7372,7 +9630,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn } // End of PICS_Z1_I1_POS1_RP modulepar GlcPart PICS_Z1_I1_POS1_GP_1 := { -@@ -4314,13 +4318,13 @@ +@@ -4314,13 +4317,13 @@ iviContainers := { { glc := { @@ -7389,7 +9647,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn } } }, -@@ -4462,8 +4466,8 @@ +@@ -4462,8 +4465,8 @@ modulepar ReferencePosition PICS_Z2_I1_POS1_RP := { latitude := 435512756, longitude := 103002535, @@ -7400,7 +9658,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn } // End of PICS_Z2_I1_POS1_RP modulepar GlcPart PICS_Z2_I1_POS1_GP_1 := { -@@ -4547,13 +4551,13 @@ +@@ -4547,13 +4550,13 @@ iviContainers := { { glc := { @@ -7417,7 +9675,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn } } }, -@@ -4695,8 +4699,8 @@ +@@ -4695,8 +4698,8 @@ modulepar ReferencePosition PICS_Z3_I1_POS1_RP := { latitude := 435533069, longitude := 103024528, @@ -7428,7 +9686,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn } // End of PICS_Z3_I1_POS1_RP modulepar GlcPart PICS_Z3_I1_POS1_GP_1 := { -@@ -4780,13 +4784,13 @@ +@@ -4780,13 +4783,13 @@ iviContainers := { { glc := { @@ -7445,7 +9703,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn } } }, -@@ -4928,8 +4932,8 @@ +@@ -4928,8 +4931,8 @@ modulepar ReferencePosition PICS_Z4_I1_POS1_RP := { latitude := 435563484, longitude := 103042973, @@ -7456,7 +9714,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn } // End of PICS_Z4_I1_POS1_RP modulepar GlcPart PICS_Z4_I1_POS1_GP_1 := { -@@ -5013,13 +5017,13 @@ +@@ -5013,13 +5016,13 @@ iviContainers := { { glc := { @@ -7473,7 +9731,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn } } }, -@@ -5161,8 +5165,8 @@ +@@ -5161,8 +5164,8 @@ modulepar ReferencePosition PICS_Z5_I1_POS1_RP := { latitude := 435582342, longitude := 103065544, @@ -7484,7 +9742,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn } // End of PICS_Z5_I1_POS1_RP modulepar GlcPart PICS_Z5_I1_POS1_GP_1 := { -@@ -5246,13 +5250,13 @@ +@@ -5246,13 +5249,13 @@ iviContainers := { { glc := { @@ -7501,7 +9759,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn } } }, -@@ -5394,8 +5398,8 @@ +@@ -5394,8 +5397,8 @@ modulepar ReferencePosition PICS_Z6_I1_POS1_RP := { latitude := 435551186, longitude := 103033248, @@ -7512,7 +9770,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn } // End of PICS_Z6_I1_POS1_RP modulepar GlcPart PICS_Z6_I1_POS1_GP_1 := { -@@ -5479,13 +5483,13 @@ +@@ -5479,13 +5482,13 @@ iviContainers := { { glc := { @@ -7529,7 +9787,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn } } }, -@@ -5623,20 +5627,20 @@ +@@ -5623,20 +5626,20 @@ } // End of group ivimZone6 modulepar IvimParmListRsu PICS_IVIM_PARMS_RSUs := { @@ -7555,7 +9813,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn { provider := omit, iviIdentificationNumber := omit, -@@ -5656,50 +5660,10 @@ +@@ -5656,50 +5659,10 @@ modulepar UInt32 PICS_EVCSN_ITS_AID := 100; // FIXME Find the correct value @@ -7607,9 +9865,18 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn } } // End of group poimEvents +@@ -5747,7 +5710,7 @@ + /** + * @desc DENM frequency timer + */ +- modulepar float PICS_DENM_FREQUENCY := int2float(PICS_DENM_REPETITION_INTERVAL) / 1000.0; ++ modulepar float PICS_DENM_FREQUENCY := int2float(c_PICS_DENM_REPETITION_INTERVAL) / 1000.0; + + /** + * @desc MAPEM frequency timer Index: AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn =================================================================== ---- AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn (revision 2627) +--- AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn (revision 2630) +++ AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn (working copy) @@ -2,6 +2,7 @@ @@ -7665,29 +9932,47 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn } // End of group evcsnTemplates Index: AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn =================================================================== ---- AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn (revision 2627) +--- AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn (revision 2630) +++ AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn (working copy) +@@ -140,7 +140,7 @@ + [vc_spatem == true] tc_spatem.timeout { + 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_prepare_spatem(valueof(vc_rsuMessagesValueList[PX_RSU_ID - 1].spatems[v_counter]), v_payload); + f_send(v_payload, PICS_SPATEM_ITS_AID); + } + tc_spatem.start; @@ -180,7 +180,7 @@ */ testcase TC_RSUSIMU_BV_02() runs on ItsRSUsSimulator system ItsRSUsSimulatorSystem { // Local variables - const RectangularRegions c_detectionArea := { PICS_UC6_CAM_DETECTION_AREA_Z2 }; // PICS_UC6_CAM_DETECTION_AREA_Z1 -+ const RectangularRegions c_detectionArea := { valueof(PICS_UC6_CAM_DETECTION_AREA_Z2) }; // PICS_UC6_CAM_DETECTION_AREA_Z1 ++// const RectangularRegions c_detectionArea := { PICS_UC6_CAM_DETECTION_AREA_Z2 }; // PICS_UC6_CAM_DETECTION_AREA_Z1 var VehiclesSimulator v_vehicles := {}; var integer v_stationID; var boolean v_isInDetectionZone; +@@ -191,7 +191,7 @@ + var CfEvent v_cfEvent; + + // Test control +- if (f_isLocationInsideRectangularRegion(c_detectionArea, PICS_UC6_COLLISION_POINT_Z2) == false) { //PICS_UC6_COLLISION_POINT_Z1 ++ if (f_isLocationInsideRectangularRegion({ PICS_UC6_CAM_DETECTION_AREA_Z2 }/*c_detectionArea*/, PICS_UC6_COLLISION_POINT_Z2) == false) { //PICS_UC6_COLLISION_POINT_Z1 + log("Collision location is outside of the area"); + stop; + } @@ -339,7 +339,7 @@ ) runs on ItsRSUsSimulator { // Local variables - const RectangularRegions c_detectionArea := { PICS_UC6_CAM_DETECTION_AREA_Z2 }; // PICS_UC6_CAM_DETECTION_AREA_Z1 -+ const RectangularRegions c_detectionArea := { valueof(PICS_UC6_CAM_DETECTION_AREA_Z2) }; // PICS_UC6_CAM_DETECTION_AREA_Z1 ++// const RectangularRegions c_detectionArea := { valueof(PICS_UC6_CAM_DETECTION_AREA_Z2) }; // PICS_UC6_CAM_DETECTION_AREA_Z1 var GeoNetworkingInd v_gnInd; var template (value) CAM v_camSimu; var ThreeDLocation v_location; Index: AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn =================================================================== ---- AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn (revision 2627) +--- AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn (revision 2630) +++ AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn (working copy) @@ -2,7 +2,7 @@ @@ -7709,7 +9994,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn */ Index: AtsRSUsSimulator/ItsRSUsSimulator_TypesAndValues.ttcn =================================================================== ---- AtsRSUsSimulator/ItsRSUsSimulator_TypesAndValues.ttcn (revision 2627) +--- AtsRSUsSimulator/ItsRSUsSimulator_TypesAndValues.ttcn (revision 2630) +++ AtsRSUsSimulator/ItsRSUsSimulator_TypesAndValues.ttcn (working copy) @@ -13,7 +13,8 @@ import from IVI language "ASN.1:1997" all;