Skip to content
GitLab
Commits (1)
Hide whitespace changes
Inline Side-by-side
ttcn/Common/LibItsCommon_Templates.ttcn
View file @ 9ee2927d
...@@ -18,8 +18,6 @@ module LibItsCommon_Templates { ...@@ -18,8 +18,6 @@ module LibItsCommon_Templates {
group taPrimitives { group taPrimitives {
//FIXME RGY the simple boolean result has been changed to a union
// template (value) AcSecResponse m_acSecResponseSuccess := true;
template (value) AdapterControlResults m_acSecResponseSuccess := {acSecResponse:=true}; template (value) AdapterControlResults m_acSecResponseSuccess := {acSecResponse:=true};
/** /**
...@@ -44,18 +42,16 @@ module LibItsCommon_Templates { ...@@ -44,18 +42,16 @@ module LibItsCommon_Templates {
} }
} // End of template m_acDisableSecurity } // End of template m_acDisableSecurity
//FIXME RGY As discussed, port in type is changed to a top-level union type
// template AcGnssResponse m_acGnssResponseSuccess := true;
template AdapterControlResults m_acGnssResponseSuccess := {acGnssResponse:=true}; template AdapterControlResults m_acGnssResponseSuccess := {acGnssResponse:=true};
//FIXME RGY As discussed, port in type is changed to a top-level union type template (value) AdapterControlResults m_acGnssDistanceCovered := {
// template AcGnssDistanceCovered m_acGnssDistanceCovered := true; acGnssDistanceCovered:=true
template AdapterControlResults m_acGnssDistanceCovered := {acGnssDistanceCovered:=true}; };
/** /**
* @desc Testsystem will load GNSS scenario * @desc Testsystem will load GNSS scenario
*/ */
template AcGnssPrimitive m_loadScenario(Scenario p_scenario) := { template (value) AcGnssPrimitive m_loadScenario(Scenario p_scenario) := {
loadScenario := { loadScenario := {
scenario := p_scenario scenario := p_scenario
} }
...@@ -64,7 +60,7 @@ module LibItsCommon_Templates { ...@@ -64,7 +60,7 @@ module LibItsCommon_Templates {
/** /**
* @desc Testsystem will start GNSS scenario * @desc Testsystem will start GNSS scenario
*/ */
template AcGnssPrimitive m_startScenario := { template (value) AcGnssPrimitive m_startScenario := {
startScenario := { startScenario := {
} }
} }
...@@ -72,7 +68,7 @@ module LibItsCommon_Templates { ...@@ -72,7 +68,7 @@ module LibItsCommon_Templates {
/** /**
* @desc Testsystem will stop GNSS scenario * @desc Testsystem will stop GNSS scenario
*/ */
template AcGnssPrimitive m_stopScenario := { template (value) AcGnssPrimitive m_stopScenario := {
stopScenario := { stopScenario := {
} }
} }
...@@ -80,7 +76,7 @@ module LibItsCommon_Templates { ...@@ -80,7 +76,7 @@ module LibItsCommon_Templates {
/** /**
* @desc Testsystem will request indication if distance was covered * @desc Testsystem will request indication if distance was covered
*/ */
template AcGnssPrimitive m_distanceToCover(float p_distance) := { template (value) AcGnssPrimitive m_distanceToCover(float p_distance) := {
distanceToCover := { distanceToCover := {
distance := p_distance distance := p_distance
} }
...@@ -89,7 +85,7 @@ module LibItsCommon_Templates { ...@@ -89,7 +85,7 @@ module LibItsCommon_Templates {
/** /**
* @desc Testsystem will change the speed (delta value) * @desc Testsystem will change the speed (delta value)
*/ */
template AcGnssPrimitive m_changeScenarioSpeed(SpeedValue p_deltaSpeedValue) := { template (value) AcGnssPrimitive m_changeScenarioSpeed(SpeedValue p_deltaSpeedValue) := {
changeSpeed := { changeSpeed := {
deltaSpeed := p_deltaSpeedValue deltaSpeed := p_deltaSpeedValue
} }
...@@ -98,7 +94,7 @@ module LibItsCommon_Templates { ...@@ -98,7 +94,7 @@ module LibItsCommon_Templates {
/** /**
* @desc Testsystem will change the heading (delta value) * @desc Testsystem will change the heading (delta value)
*/ */
template AcGnssPrimitive m_changeScenarioHeading(HeadingValue p_deltaHeadingValue) := { template (value) AcGnssPrimitive m_changeScenarioHeading(HeadingValue p_deltaHeadingValue) := {
changeHeading := { changeHeading := {
deltaHeading := p_deltaHeadingValue deltaHeading := p_deltaHeadingValue
} }
......
ttcn/DENM/LibItsDenm_Templates.ttcn
View file @ 9ee2927d
...@@ -314,7 +314,7 @@ module LibItsDenm_Templates { ...@@ -314,7 +314,7 @@ module LibItsDenm_Templates {
* @param p_protocolVersion The expected protocol version (Default: current DEN protocol version) * @param p_protocolVersion The expected protocol version (Default: current DEN protocol version)
* @param p_messageID The expected message id (Default: DEN message id) * @param p_messageID The expected message id (Default: DEN message id)
*/ */
template ItsPduHeader mw_itsPduHeader( template (present) ItsPduHeader mw_itsPduHeader(
template (present) StationID p_stationID := ?, template (present) StationID p_stationID := ?,
template (present) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_, template (present) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_,
template (present) ItsPduHeader.messageID p_messageID := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageID_denm_ template (present) ItsPduHeader.messageID p_messageID := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageID_denm_
...@@ -431,7 +431,7 @@ module LibItsDenm_Templates { ...@@ -431,7 +431,7 @@ module LibItsDenm_Templates {
* @param p_location The expected location Container (Default: any or omit) * @param p_location The expected location Container (Default: any or omit)
* @param p_alacarte The expected Alacarte Container (Default: any or omit) * @param p_alacarte The expected Alacarte Container (Default: any or omit)
*/ */
template (present) DecentralizedEnvironmentalNotificationMessage mw_denm( template DecentralizedEnvironmentalNotificationMessage mw_denm(
template (present) ManagementContainer p_management := ?, template (present) ManagementContainer p_management := ?,
template SituationContainer p_situation := *, template SituationContainer p_situation := *,
template LocationContainer p_location := *, template LocationContainer p_location := *,
...@@ -500,7 +500,7 @@ module LibItsDenm_Templates { ...@@ -500,7 +500,7 @@ module LibItsDenm_Templates {
* @param p_detectionTime The detection time (Default: current time) * @param p_detectionTime The detection time (Default: current time)
* @param p_referenceTime The reference time (Default: current time) * @param p_referenceTime The reference time (Default: current time)
*/ */
template (value) ManagementContainer m_denmMgmtConTermination ( template (omit) ManagementContainer m_denmMgmtConTermination (
template (value) ActionID p_actionID, template (value) ActionID p_actionID,
template (value) StationType p_stationType := f_getTsStationType(), template (value) StationType p_stationType := f_getTsStationType(),
template (value) ValidityDuration p_validityDuration := defaultValidity, template (value) ValidityDuration p_validityDuration := defaultValidity,
...@@ -522,7 +522,7 @@ module LibItsDenm_Templates { ...@@ -522,7 +522,7 @@ module LibItsDenm_Templates {
* @param p_detectionTime The detection time (Default: current time) * @param p_detectionTime The detection time (Default: current time)
* @param p_referenceTime The reference time (Default: current time) * @param p_referenceTime The reference time (Default: current time)
*/ */
template (present) ManagementContainer mw_denmMgmtConTermination ( template ManagementContainer mw_denmMgmtConTermination (
template (present) ActionID p_actionID, template (present) ActionID p_actionID,
template (present) StationType p_stationType := f_getIutStationType(), template (present) StationType p_stationType := f_getIutStationType(),
template (present) TimestampIts p_referenceTime := ?, template (present) TimestampIts p_referenceTime := ?,
...@@ -541,7 +541,7 @@ module LibItsDenm_Templates { ...@@ -541,7 +541,7 @@ module LibItsDenm_Templates {
* @param p_validityDuration The expected validity duration (Default: any or omit) * @param p_validityDuration The expected validity duration (Default: any or omit)
* @param p_transmissionInterval The expected transmission interval (Default: any or omit) * @param p_transmissionInterval The expected transmission interval (Default: any or omit)
*/ */
template (present) ManagementContainer mw_denmMgmtCon( template ManagementContainer mw_denmMgmtCon(
template (present) ActionID p_actionID, template (present) ActionID p_actionID,
template (present) StationType p_stationType := f_getIutStationType(), template (present) StationType p_stationType := f_getIutStationType(),
template (present) TimestampIts p_referenceTime := ?, template (present) TimestampIts p_referenceTime := ?,
......
ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn
View file @ 9ee2927d
...@@ -161,7 +161,7 @@ module LibItsGeoNetworking_Functions { ...@@ -161,7 +161,7 @@ module LibItsGeoNetworking_Functions {
* NodeB being close to the area center * NodeB being close to the area center
*/ */
//FIXME RGY Titan doesn't support mtc and system clauses yet //FIXME RGY Titan doesn't support mtc and system clauses yet
function f_cf01Up(Scenario p_scenario := e_staticPosition) runs on ItsGeoNetworking /* TITAN TODO: system ItsGeoNetworkingSystem */ { function f_cf01Up(Scenario p_scenario := e_staticPosition) runs on ItsGeoNetworking system ItsGeoNetworkingSystem {
// Variables // Variables
var PositionTable v_positionTable := {}; var PositionTable v_positionTable := {};
...@@ -190,7 +190,7 @@ module LibItsGeoNetworking_Functions { ...@@ -190,7 +190,7 @@ module LibItsGeoNetworking_Functions {
} // end f_cf01Up } // end f_cf01Up
//FIXME RGY Titan doesn't support mtc and system clauses yet //FIXME RGY Titan doesn't support mtc and system clauses yet
function f_cf01Down() runs on ItsGeoNetworking /* TITAN TODO: system ItsGeoNetworkingSystem */ { function f_cf01Down() runs on ItsGeoNetworking system ItsGeoNetworkingSystem {
f_uninitialiseSecuredMode(); f_uninitialiseSecuredMode();
...@@ -217,7 +217,7 @@ module LibItsGeoNetworking_Functions { ...@@ -217,7 +217,7 @@ module LibItsGeoNetworking_Functions {
*/ */
//FIXME RGY Titan doesn't support mtc and system clauses yet //FIXME RGY Titan doesn't support mtc and system clauses yet
function f_cf02Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ { function f_cf02Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
// Variables // Variables
var LongPosVector v_longPosVectorIut := valueof(m_dummyLongPosVector); var LongPosVector v_longPosVectorIut := valueof(m_dummyLongPosVector);
...@@ -286,7 +286,7 @@ module LibItsGeoNetworking_Functions { ...@@ -286,7 +286,7 @@ module LibItsGeoNetworking_Functions {
*/ */
//FIXME RGY Titan doesn't support mtc and system clauses yet //FIXME RGY Titan doesn't support mtc and system clauses yet
function f_cf02Down() runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ { function f_cf02Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
// Local variables // Local variables
var integer i; var integer i;
...@@ -318,7 +318,7 @@ module LibItsGeoNetworking_Functions { ...@@ -318,7 +318,7 @@ module LibItsGeoNetworking_Functions {
* @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages * @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages
*/ */
//FIXME RGY Titan doesn't support mtc and system clauses yet //FIXME RGY Titan doesn't support mtc and system clauses yet
function f_cf03Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ { function f_cf03Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
// Variables // Variables
var LongPosVector v_longPosVectorIut := valueof(m_dummyLongPosVector); var LongPosVector v_longPosVectorIut := valueof(m_dummyLongPosVector);
...@@ -386,7 +386,7 @@ module LibItsGeoNetworking_Functions { ...@@ -386,7 +386,7 @@ module LibItsGeoNetworking_Functions {
*/ */
//FIXME RGY Titan doesn't support mtc and system clauses yet //FIXME RGY Titan doesn't support mtc and system clauses yet
function f_cf03Down() runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ { function f_cf03Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
// Local variables // Local variables
var integer i; var integer i;
...@@ -421,7 +421,7 @@ module LibItsGeoNetworking_Functions { ...@@ -421,7 +421,7 @@ module LibItsGeoNetworking_Functions {
*/ */
//FIXME RGY Titan doesn't support mtc and system clauses yet //FIXME RGY Titan doesn't support mtc and system clauses yet
function f_cf04Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ { function f_cf04Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
// Variables // Variables
var LongPosVector v_longPosVectorIut := valueof(m_dummyLongPosVector); var LongPosVector v_longPosVectorIut := valueof(m_dummyLongPosVector);
...@@ -489,7 +489,7 @@ module LibItsGeoNetworking_Functions { ...@@ -489,7 +489,7 @@ module LibItsGeoNetworking_Functions {
*/ */
//FIXME RGY Titan doesn't support mtc and system clauses yet //FIXME RGY Titan doesn't support mtc and system clauses yet
function f_cf04Down() runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */{ function f_cf04Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
// Local variables // Local variables
var integer i; var integer i;
...@@ -520,7 +520,7 @@ module LibItsGeoNetworking_Functions { ...@@ -520,7 +520,7 @@ module LibItsGeoNetworking_Functions {
*/ */
//FIXME RGY Titan doesn't support mtc and system clauses yet //FIXME RGY Titan doesn't support mtc and system clauses yet
function f_cf05Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ { function f_cf05Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
// Variables // Variables
var LongPosVector v_longPosVectorIut := valueof(m_dummyLongPosVector); var LongPosVector v_longPosVectorIut := valueof(m_dummyLongPosVector);
...@@ -587,7 +587,7 @@ module LibItsGeoNetworking_Functions { ...@@ -587,7 +587,7 @@ module LibItsGeoNetworking_Functions {
*/ */
//FIXME RGY Titan doesn't support mtc and system clauses yet //FIXME RGY Titan doesn't support mtc and system clauses yet
function f_cf05Down() runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ { function f_cf05Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
// Local variables // Local variables
var integer i; var integer i;
...@@ -618,7 +618,7 @@ module LibItsGeoNetworking_Functions { ...@@ -618,7 +618,7 @@ module LibItsGeoNetworking_Functions {
* @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages * @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages
*/ */
//FIXME RGY Titan doesn't support mtc and system clauses yet //FIXME RGY Titan doesn't support mtc and system clauses yet
function f_cf06Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ { function f_cf06Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
// Variables // Variables
var LongPosVector v_longPosVectorIut := valueof(m_dummyLongPosVector); var LongPosVector v_longPosVectorIut := valueof(m_dummyLongPosVector);
...@@ -685,7 +685,7 @@ module LibItsGeoNetworking_Functions { ...@@ -685,7 +685,7 @@ module LibItsGeoNetworking_Functions {
*/ */
//FIXME RGY Titan doesn't support mtc and system clauses yet //FIXME RGY Titan doesn't support mtc and system clauses yet
function f_cf06Down() runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ { function f_cf06Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
// Local variables // Local variables
var integer i; var integer i;
...@@ -716,7 +716,7 @@ module LibItsGeoNetworking_Functions { ...@@ -716,7 +716,7 @@ module LibItsGeoNetworking_Functions {
*/ */
//FIXME RGY Titan doesn't support mtc and system clauses yet //FIXME RGY Titan doesn't support mtc and system clauses yet
function f_cf07Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /* TITAN TODO mtc ItsMtc system ItsGeoNetworkingSystem */{ function f_cf07Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
// Variables // Variables
var LongPosVector v_longPosVectorIut := valueof(m_dummyLongPosVector); var LongPosVector v_longPosVectorIut := valueof(m_dummyLongPosVector);
...@@ -782,7 +782,7 @@ module LibItsGeoNetworking_Functions { ...@@ -782,7 +782,7 @@ module LibItsGeoNetworking_Functions {
* @desc Deletes configuration cf06 * @desc Deletes configuration cf06
*/ */
//FIXME RGY Titan doesn't support mtc and system clauses yet //FIXME RGY Titan doesn't support mtc and system clauses yet
function f_cf07Down() runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ { function f_cf07Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
// Local variables // Local variables
var integer i; var integer i;
...@@ -978,9 +978,8 @@ module LibItsGeoNetworking_Functions { ...@@ -978,9 +978,8 @@ module LibItsGeoNetworking_Functions {
position := p_positionValue position := p_positionValue
}; };
} }
//FIXME RGY Titan doesn't support @deterministic yet
// function @deterministic f_fillTimestamp(inout LongPosVector v_vector) function @deterministic f_fillTimestamp(in LongPosVector v_vector)
function f_fillTimestamp(inout LongPosVector v_vector)
return LongPosVector { return LongPosVector {
if (v_vector.timestamp_ == 0) { if (v_vector.timestamp_ == 0) {
v_vector.timestamp_ := f_computeGnTimestamp(); v_vector.timestamp_ := f_computeGnTimestamp();
...@@ -1339,7 +1338,7 @@ module LibItsGeoNetworking_Functions { ...@@ -1339,7 +1338,7 @@ module LibItsGeoNetworking_Functions {
/** /**
* @desc Default handling cf01 de-initialisation. * @desc Default handling cf01 de-initialisation.
*/ */
altstep a_cf01Down() runs on ItsGeoNetworking { altstep a_cf01Down() runs on ItsGeoNetworking system ItsGeoNetworkingSystem {
[] a_shutdown() { [] a_shutdown() {
f_poDefault(); f_poDefault();
f_cf01Down(); f_cf01Down();
...@@ -1351,7 +1350,7 @@ module LibItsGeoNetworking_Functions { ...@@ -1351,7 +1350,7 @@ module LibItsGeoNetworking_Functions {
/** /**
* @desc Default handling cf02 de-initialisation. * @desc Default handling cf02 de-initialisation.
*/ */
altstep a_cf02Down() runs on ItsMtc { altstep a_cf02Down() runs on ItsMtc system ItsGeoNetworkingSystem {
[] a_shutdown() { [] a_shutdown() {
f_cf02Down(); f_cf02Down();
log("*** a_cf02Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***"); log("*** a_cf02Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");
...@@ -1362,7 +1361,7 @@ module LibItsGeoNetworking_Functions { ...@@ -1362,7 +1361,7 @@ module LibItsGeoNetworking_Functions {
/** /**
* @desc Default handling cf03 de-initialisation. * @desc Default handling cf03 de-initialisation.
*/ */
altstep a_cf03Down() runs on ItsMtc { altstep a_cf03Down() runs on ItsMtc system ItsGeoNetworkingSystem {
[] a_shutdown() { [] a_shutdown() {
f_cf03Down(); f_cf03Down();
log("*** a_cf03Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***"); log("*** a_cf03Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");
...@@ -1373,7 +1372,7 @@ module LibItsGeoNetworking_Functions { ...@@ -1373,7 +1372,7 @@ module LibItsGeoNetworking_Functions {
/** /**
* @desc Default handling cf04 de-initialisation. * @desc Default handling cf04 de-initialisation.
*/ */
altstep a_cf04Down() runs on ItsMtc { altstep a_cf04Down() runs on ItsMtc system ItsGeoNetworkingSystem {
[] a_shutdown() { [] a_shutdown() {
f_cf04Down(); f_cf04Down();
log("*** a_cf04Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***"); log("*** a_cf04Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");
...@@ -1384,7 +1383,7 @@ module LibItsGeoNetworking_Functions { ...@@ -1384,7 +1383,7 @@ module LibItsGeoNetworking_Functions {
/** /**
* @desc Default handling cf05 de-initialisation. * @desc Default handling cf05 de-initialisation.
*/ */
altstep a_cf05Down() runs on ItsMtc { altstep a_cf05Down() runs on ItsMtc system ItsGeoNetworkingSystem {
[] a_shutdown() { [] a_shutdown() {
f_cf05Down(); f_cf05Down();
log("*** a_cf05Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***"); log("*** a_cf05Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");
...@@ -1395,7 +1394,7 @@ module LibItsGeoNetworking_Functions { ...@@ -1395,7 +1394,7 @@ module LibItsGeoNetworking_Functions {
/** /**
* @desc Default handling cf06 de-initialisation. * @desc Default handling cf06 de-initialisation.
*/ */
altstep a_cf06Down() runs on ItsMtc { altstep a_cf06Down() runs on ItsMtc system ItsGeoNetworkingSystem {
[] a_shutdown() { [] a_shutdown() {
f_cf06Down(); f_cf06Down();
log("*** a_cf06Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***"); log("*** a_cf06Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");
...@@ -1406,7 +1405,7 @@ module LibItsGeoNetworking_Functions { ...@@ -1406,7 +1405,7 @@ module LibItsGeoNetworking_Functions {
/** /**
* @desc Default handling cf07 de-initialisation. * @desc Default handling cf07 de-initialisation.
*/ */
altstep a_cf07Down() runs on ItsMtc { altstep a_cf07Down() runs on ItsMtc system ItsGeoNetworkingSystem {
[] a_shutdown() { [] a_shutdown() {
f_cf07Down(); f_cf07Down();
log("*** a_cf07Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***"); log("*** a_cf07Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");
......
ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn
View file @ 9ee2927d
...@@ -74,8 +74,8 @@ module LibItsGeoNetworking_Templates { ...@@ -74,8 +74,8 @@ module LibItsGeoNetworking_Templates {
* @desc Receive template for GeoNetworking packet (GeonetworkingPort Primitive) * @desc Receive template for GeoNetworking packet (GeonetworkingPort Primitive)
* @param p_geoNwMsg GeoNetworking packet to be received * @param p_geoNwMsg GeoNetworking packet to be received
*/ */
template GeoNetworkingInd mw_geoNwInd( template(present) GeoNetworkingInd mw_geoNwInd(
template (present) GeoNetworkingPdu p_geoNwMsg template (present) GeoNetworkingPdu p_geoNwMsg := ?
) := { ) := {
msgIn := p_geoNwMsg, msgIn := p_geoNwMsg,
macDestinationAddress := ?, macDestinationAddress := ?,
...@@ -88,9 +88,9 @@ module LibItsGeoNetworking_Templates { ...@@ -88,9 +88,9 @@ module LibItsGeoNetworking_Templates {
* @param p_geoNwMsg GeoNetworking packet to be received * @param p_geoNwMsg GeoNetworking packet to be received
* @param p_llDestinationAdress Link-layer destination address * @param p_llDestinationAdress Link-layer destination address
*/ */
template GeoNetworkingInd mw_geoNwInd_withLinkLayerDestination( template (present) GeoNetworkingInd mw_geoNwInd_withLinkLayerDestination(
template (present) GeoNetworkingPdu p_geoNwMsg, template (present) GeoNetworkingPdu p_geoNwMsg := ?,
template (present) MacAddress p_llDestinationAdress template (present) MacAddress p_llDestinationAdress := ?
) modifies mw_geoNwInd := { ) modifies mw_geoNwInd := {
macDestinationAddress := p_llDestinationAdress macDestinationAddress := p_llDestinationAdress
} }
...@@ -396,8 +396,8 @@ module LibItsGeoNetworking_Templates { ...@@ -396,8 +396,8 @@ module LibItsGeoNetworking_Templates {
* @desc Testsystem will pass received to the TTCN-3 * @desc Testsystem will pass received to the TTCN-3
* @param p_beaconHeader The neighbor information * @param p_beaconHeader The neighbor information
*/ */
template AcGnPrimitive m_startPassBeaconing( template (value) AcGnPrimitive m_startPassBeaconing(
template (value) BeaconHeader p_beaconHeader in template (value) BeaconHeader p_beaconHeader
) := { ) := {
startPassBeaconing := { startPassBeaconing := {
beaconHeader := p_beaconHeader beaconHeader := p_beaconHeader
...@@ -407,7 +407,7 @@ module LibItsGeoNetworking_Templates { ...@@ -407,7 +407,7 @@ module LibItsGeoNetworking_Templates {
/** /**
* @desc Testsystem will stop passing beacon information to the TTCN-3 * @desc Testsystem will stop passing beacon information to the TTCN-3
*/ */
template AcGnPrimitive m_stopPassBeaconing := { template (value) AcGnPrimitive m_stopPassBeaconing := {
stopPassBeaconing := { stopPassBeaconing := {
} }
} }
...@@ -431,7 +431,7 @@ module LibItsGeoNetworking_Templates { ...@@ -431,7 +431,7 @@ module LibItsGeoNetworking_Templates {
* @desc Testsystem will stop beaconing for multiple neighbors * @desc Testsystem will stop beaconing for multiple neighbors
* @param p_compName The neighbor * @param p_compName The neighbor
*/ */
template AcGnPrimitive m_stopBeaconingMultipleNeighbour := { template (value) AcGnPrimitive m_stopBeaconingMultipleNeighbour := {
stopBeaconingMultipleNeighbour:= { stopBeaconingMultipleNeighbour:= {
} }
} }
...@@ -441,7 +441,7 @@ module LibItsGeoNetworking_Templates { ...@@ -441,7 +441,7 @@ module LibItsGeoNetworking_Templates {
* found in received beacon information to the TTCN-3 * found in received beacon information to the TTCN-3
* @param p_gnAddress The GN address included in the LongPosVector * @param p_gnAddress The GN address included in the LongPosVector
*/ */
template AcGnPrimitive m_getLongPosVector(GN_Address p_gnAddress) := { template (value) AcGnPrimitive m_getLongPosVector(GN_Address p_gnAddress) := {
getLongPosVector := { getLongPosVector := {
gnAddress := p_gnAddress gnAddress := p_gnAddress
} }
...@@ -678,7 +678,7 @@ module LibItsGeoNetworking_Templates { ...@@ -678,7 +678,7 @@ module LibItsGeoNetworking_Templates {
* @param payload Expected GN payload * @param payload Expected GN payload
*/ */
template (present) GnNonSecuredPacket mw_geoNwAnyPacket_withPayload( template (present) GnNonSecuredPacket mw_geoNwAnyPacket_withPayload(
template (present) GnRawPayload p_payload template (present) GnRawPayload p_payload := ?
) := { ) := {
commonHeader := mw_commonHeader( commonHeader := mw_commonHeader(
?, ?,
...@@ -868,8 +868,8 @@ module LibItsGeoNetworking_Templates { ...@@ -868,8 +868,8 @@ module LibItsGeoNetworking_Templates {
* @param p_seqNumber Sequence number of GeoAnycast packet * @param p_seqNumber Sequence number of GeoAnycast packet
*/ */
template (present) GnNonSecuredPacket mw_geoNwAnycastPacket( template (present) GnNonSecuredPacket mw_geoNwAnycastPacket(
in template (present) LongPosVector p_sourceLongPosVec, template (present) LongPosVector p_sourceLongPosVec := ?,
in template (present) UInt16 p_seqNumber template (present) UInt16 p_seqNumber := ?
) := { ) := {
commonHeader := mw_commonHeader( commonHeader := mw_commonHeader(
PX_GN_UPPER_LAYER, PX_GN_UPPER_LAYER,
...@@ -889,9 +889,9 @@ module LibItsGeoNetworking_Templates { ...@@ -889,9 +889,9 @@ module LibItsGeoNetworking_Templates {
* @param p_anycastArea Destination GeoArea * @param p_anycastArea Destination GeoArea
*/ */
template (present) GnNonSecuredPacket mw_geoNwAnycastPacketWithArea( template (present) GnNonSecuredPacket mw_geoNwAnycastPacketWithArea(
in template (present) LongPosVector p_sourceLongPosVec, template (present) LongPosVector p_sourceLongPosVec := ?,
in template (present) UInt16 p_seqNumber, template (present) UInt16 p_seqNumber := ?,
in template (present) GeoAnycastArea p_anycastArea template (present) GeoAnycastArea p_anycastArea := ?
) := { ) := {
commonHeader := mw_commonHeader( commonHeader := mw_commonHeader(
PX_GN_UPPER_LAYER, PX_GN_UPPER_LAYER,
...@@ -1142,8 +1142,8 @@ module LibItsGeoNetworking_Templates { ...@@ -1142,8 +1142,8 @@ module LibItsGeoNetworking_Templates {
* @param p_mid Searched GN_Address MID * @param p_mid Searched GN_Address MID
*/ */
template (present) GnNonSecuredPacket mw_geoNwLsRequestPacket( template (present) GnNonSecuredPacket mw_geoNwLsRequestPacket(
in template (present) UInt16 p_seqNumber, template (present) UInt16 p_seqNumber := ?,
in template (present) GN_Address.mid p_mid template (present) GN_Address.mid p_mid := ?
) := { ) := {
commonHeader := mw_commonHeader( commonHeader := mw_commonHeader(
e_any, e_any,
...@@ -1185,8 +1185,8 @@ module LibItsGeoNetworking_Templates { ...@@ -1185,8 +1185,8 @@ module LibItsGeoNetworking_Templates {
* @param p_destinationLongPosVec Short position vector of destination * @param p_destinationLongPosVec Short position vector of destination
*/ */
template (present) GnNonSecuredPacket mw_geoNwLsReplyPacket( template (present) GnNonSecuredPacket mw_geoNwLsReplyPacket(
in template (present) LongPosVector p_sourceLongPosVec, template (present) LongPosVector p_sourceLongPosVec := ?,
in template (present) ShortPosVector p_destinationLongPosVec template (present) ShortPosVector p_destinationLongPosVec := ?
) := { ) := {
commonHeader := mw_commonHeader( commonHeader := mw_commonHeader(
e_any, e_any,
...@@ -1578,9 +1578,9 @@ module LibItsGeoNetworking_Templates { ...@@ -1578,9 +1578,9 @@ module LibItsGeoNetworking_Templates {
* @param p_nextHeader Id of next header * @param p_nextHeader Id of next header
* @param p_headerTypeSubType Header's type and sub-type * @param p_headerTypeSubType Header's type and sub-type
*/ */
template CommonHeader mw_commonHeader ( template (present) CommonHeader mw_commonHeader (
in template (present) NextHeader p_nextHeader, template (present) NextHeader p_nextHeader := ?,
in template (present) HeaderTST p_headerTypeSubType template (present) HeaderTST p_headerTypeSubType := ?
) := { ) := {
nextHeader := p_nextHeader, nextHeader := p_nextHeader,
reserved := ?, reserved := ?,
...@@ -1597,9 +1597,9 @@ module LibItsGeoNetworking_Templates { ...@@ -1597,9 +1597,9 @@ module LibItsGeoNetworking_Templates {
* @param p_nextHeader Id of next header * @param p_nextHeader Id of next header
* @param p_headerTypeSubType Header's type and sub-type * @param p_headerTypeSubType Header's type and sub-type
*/ */
template CommonHeader mw_commonHeader_noPayload ( template (present) CommonHeader mw_commonHeader_noPayload (
in template (present) NextHeader p_nextHeader, in template (present) NextHeader p_nextHeader := ?,
in template (present) HeaderTST p_headerTypeSubType in template (present) HeaderTST p_headerTypeSubType := ?
) modifies mw_commonHeader := { ) modifies mw_commonHeader := {
plLength := 0 plLength := 0
} }
...@@ -1611,10 +1611,10 @@ module LibItsGeoNetworking_Templates { ...@@ -1611,10 +1611,10 @@ module LibItsGeoNetworking_Templates {
* @param p_hopLimit Maximum number of hops * @param p_hopLimit Maximum number of hops
* @see mw_commonHeader * @see mw_commonHeader
*/ */
template CommonHeader mw_commonHeaderWithHopLimit ( template (present) CommonHeader mw_commonHeaderWithHopLimit (
in template (present) NextHeader p_nextHeader, in template (present) NextHeader p_nextHeader := ?,
in template (present) HeaderTST p_headerTypeSubType, in template (present) HeaderTST p_headerTypeSubType := ?,
in template (present) UInt8 p_hopLimit in template (present) UInt8 p_hopLimit := ?
) modifies mw_commonHeader := { ) modifies mw_commonHeader := {
maxHopLimit := p_hopLimit maxHopLimit := p_hopLimit
} }
...@@ -1628,11 +1628,11 @@ module LibItsGeoNetworking_Templates { ...@@ -1628,11 +1628,11 @@ module LibItsGeoNetworking_Templates {
* @param p_flags Flags in the common header * @param p_flags Flags in the common header
* @see mw_commonHeaderWithHopLimit * @see mw_commonHeaderWithHopLimit
*/ */
template CommonHeader mw_commonHeaderWithHopLimitAndFlags ( template (present) CommonHeader mw_commonHeaderWithHopLimitAndFlags (
in template (present) NextHeader p_nextHeader, in template (present) NextHeader p_nextHeader := ?,
in template (present) HeaderTST p_headerTypeSubType, in template (present) HeaderTST p_headerTypeSubType := ?,
in template (present) UInt8 p_hopLimit, in template (present) UInt8 p_hopLimit := ?,
in template (present) Bit8 p_flags in template (present) Bit8 p_flags := ?
) modifies mw_commonHeaderWithHopLimit := { ) modifies mw_commonHeaderWithHopLimit := {
flags := p_flags flags := p_flags
} }
...@@ -1644,10 +1644,10 @@ module LibItsGeoNetworking_Templates { ...@@ -1644,10 +1644,10 @@ module LibItsGeoNetworking_Templates {
* @param p_headerTypeSubType Header's type and sub-type * @param p_headerTypeSubType Header's type and sub-type
* @param p_trafficClass Packet's traffic class * @param p_trafficClass Packet's traffic class
*/ */
template CommonHeader mw_commonHeaderWithTrafficClass ( template (present) CommonHeader mw_commonHeaderWithTrafficClass (
in template (present) NextHeader p_nextHeader, in template (present) NextHeader p_nextHeader := ?,
in template (present) HeaderTST p_headerTypeSubType, in template (present) HeaderTST p_headerTypeSubType := ?,
in template (present) TrafficClass p_trafficClass in template (present) TrafficClass p_trafficClass := ?
) modifies mw_commonHeader := { ) modifies mw_commonHeader := {
trafficClass := p_trafficClass trafficClass := p_trafficClass
} }
...@@ -1699,8 +1699,8 @@ module LibItsGeoNetworking_Templates { ...@@ -1699,8 +1699,8 @@ module LibItsGeoNetworking_Templates {
* @desc Receive template for long position vector with specific GN_Address * @desc Receive template for long position vector with specific GN_Address
* @param p_gnAddress GN_Address to be contained in the long position vector * @param p_gnAddress GN_Address to be contained in the long position vector
*/ */
template LongPosVector mw_longPosVectorAny( template (present) LongPosVector mw_longPosVectorAny(
in template (present) GN_Address p_gnAddress in template (present) GN_Address p_gnAddress := ?
) := { ) := {
gnAddr := p_gnAddress, gnAddr := p_gnAddress,
timestamp_ := ?, timestamp_ := ?,
...@@ -1715,8 +1715,8 @@ module LibItsGeoNetworking_Templates { ...@@ -1715,8 +1715,8 @@ module LibItsGeoNetworking_Templates {
* @desc Receive template for long position vector with strict position check * @desc Receive template for long position vector with strict position check
* @param p_longPosVector The base long position vector * @param p_longPosVector The base long position vector
*/ */
template LongPosVector mw_longPosVectorPosition( template (present) LongPosVector mw_longPosVectorPosition(
in template (value) LongPosVector p_longPosVector template (present) LongPosVector p_longPosVector := ?
) := { ) := {
gnAddr := p_longPosVector.gnAddr, gnAddr := p_longPosVector.gnAddr,
timestamp_ := ?, timestamp_ := ?,
...@@ -1732,8 +1732,8 @@ module LibItsGeoNetworking_Templates { ...@@ -1732,8 +1732,8 @@ module LibItsGeoNetworking_Templates {
* @desc Receive template for short position vector with strict position check * @desc Receive template for short position vector with strict position check
* @param p_shortPosVector The base short position vector * @param p_shortPosVector The base short position vector
*/ */
template ShortPosVector mw_shortPosVectorPosition( template (present) ShortPosVector mw_shortPosVectorPosition(
in template (value) ShortPosVector p_shortPosVector template (present) ShortPosVector p_shortPosVector := ?
) := { ) := {
gnAddr := p_shortPosVector.gnAddr, gnAddr := p_shortPosVector.gnAddr,
timestamp_ := ?, timestamp_ := ?,
...@@ -1745,8 +1745,8 @@ module LibItsGeoNetworking_Templates { ...@@ -1745,8 +1745,8 @@ module LibItsGeoNetworking_Templates {
* @desc Receive template for short position vector without position check * @desc Receive template for short position vector without position check
* @param p_shortPosVector The base short position vector * @param p_shortPosVector The base short position vector
*/ */
template ShortPosVector mw_shortPosVectorPosition_anyPos( template (present) ShortPosVector mw_shortPosVectorPosition_anyPos(
in template (value) ShortPosVector p_shortPosVector template (present) ShortPosVector p_shortPosVector := ?
) modifies mw_shortPosVectorPosition := { ) modifies mw_shortPosVectorPosition := {
latitude := ?, latitude := ?,
longitude := ? longitude := ?
...@@ -1803,9 +1803,9 @@ module LibItsGeoNetworking_Templates { ...@@ -1803,9 +1803,9 @@ module LibItsGeoNetworking_Templates {
* @param p_destinationShortPosVec Long position vector of destination * @param p_destinationShortPosVec Long position vector of destination
* @param p_seqNumber Sequence number of GeoUnicast packet * @param p_seqNumber Sequence number of GeoUnicast packet
*/ */
template ExtendedHeader mw_geoUnicastHeader( template (present) ExtendedHeader mw_geoUnicastHeader(
in template (present) ShortPosVector p_destinationShortPosVec, template (present) ShortPosVector p_destinationShortPosVec := ?,
in template (present) UInt16 p_seqNumber template (present) UInt16 p_seqNumber := ?
) := { ) := {
geoUnicastHeader := { geoUnicastHeader := {
seqNumber := p_seqNumber, seqNumber := p_seqNumber,
...@@ -1822,10 +1822,10 @@ module LibItsGeoNetworking_Templates { ...@@ -1822,10 +1822,10 @@ module LibItsGeoNetworking_Templates {
* @param p_srcLongPosVec Long position vector of source * @param p_srcLongPosVec Long position vector of source
* @see mw_geoUnicastHeader * @see mw_geoUnicastHeader
*/ */
template ExtendedHeader mw_geoUnicastHeaderWithSourcePv( template (present) ExtendedHeader mw_geoUnicastHeaderWithSourcePv(
in template (present) ShortPosVector p_destinationShortPosVec, template (present) ShortPosVector p_destinationShortPosVec := ?,
in template (present) UInt16 p_seqNumber, template (present) UInt16 p_seqNumber := ?,
in template (present) LongPosVector p_srcLongPosVec template (present) LongPosVector p_srcLongPosVec := ?
) modifies mw_geoUnicastHeader := { ) modifies mw_geoUnicastHeader := {
geoUnicastHeader := { geoUnicastHeader := {
srcPosVector := p_srcLongPosVec srcPosVector := p_srcLongPosVec
...@@ -1886,9 +1886,9 @@ module LibItsGeoNetworking_Templates { ...@@ -1886,9 +1886,9 @@ module LibItsGeoNetworking_Templates {
* @param p_senderLongPosVec Long position vector of sender * @param p_senderLongPosVec Long position vector of sender
* @param p_seqNumber Sequence number of GeoBroadcast packet * @param p_seqNumber Sequence number of GeoBroadcast packet
*/ */
template ExtendedHeader mw_geoBroadcastHeader( template (present) ExtendedHeader mw_geoBroadcastHeader(
in template (present) LongPosVector p_sourceLongPosVec, template (present) LongPosVector p_sourceLongPosVec := ?,
in template (present) UInt16 p_seqNumber template (present) UInt16 p_seqNumber := ?
) := { ) := {
geoBroadcastHeader := { geoBroadcastHeader := {
seqNumber := p_seqNumber, seqNumber := p_seqNumber,
...@@ -1911,10 +1911,10 @@ module LibItsGeoNetworking_Templates { ...@@ -1911,10 +1911,10 @@ module LibItsGeoNetworking_Templates {
* @param p_broadcastArea Destination GeoArea * @param p_broadcastArea Destination GeoArea
* @see mw_geoBroadcastHeader * @see mw_geoBroadcastHeader
*/ */
template ExtendedHeader mw_geoBroadcastHeaderWithArea ( template (present) ExtendedHeader mw_geoBroadcastHeaderWithArea (
in template (present) LongPosVector p_sourceLongPosVec, template (present) LongPosVector p_sourceLongPosVec := ?,
in template (present) UInt16 p_seqNumber, template (present) UInt16 p_seqNumber := ?,
in template (present) GeoBroadcastArea p_broadcastArea template (present) GeoBroadcastArea p_broadcastArea := ?
) modifies mw_geoBroadcastHeader := { ) modifies mw_geoBroadcastHeader := {
geoBroadcastHeader := { geoBroadcastHeader := {
geoAreaPosLatitude := p_broadcastArea.geoBroadcastArea.geoAreaPosLatitude, geoAreaPosLatitude := p_broadcastArea.geoBroadcastArea.geoAreaPosLatitude,
...@@ -1941,7 +1941,7 @@ module LibItsGeoNetworking_Templates { ...@@ -1941,7 +1941,7 @@ module LibItsGeoNetworking_Templates {
/** /**
* @desc Receive template for GeoBroadcast header type * @desc Receive template for GeoBroadcast header type
*/ */
template HeaderTST mw_geoBroadcastHeaderType := { template (present) HeaderTST mw_geoBroadcastHeaderType := {
geoBroadcastHdr := { geoBroadcastHdr := {
headerType := e_geoBroadcast, headerType := e_geoBroadcast,
headerSubType := ? headerSubType := ?
...@@ -1953,8 +1953,8 @@ module LibItsGeoNetworking_Templates { ...@@ -1953,8 +1953,8 @@ module LibItsGeoNetworking_Templates {
* @param p_headerSubType Packet's subtype * @param p_headerSubType Packet's subtype
* @see mw_geoBroadcastHeaderType * @see mw_geoBroadcastHeaderType
*/ */
template HeaderTST mw_geoBroadcastHeaderTypeWithSubType( template (present) HeaderTST mw_geoBroadcastHeaderTypeWithSubType(
in template (present) HeaderSubTypeGeoBroadcast p_headerSubType template (present) HeaderSubTypeGeoBroadcast p_headerSubType := ?
) modifies mw_geoBroadcastHeaderType := { ) modifies mw_geoBroadcastHeaderType := {
geoBroadcastHdr := { geoBroadcastHdr := {
headerSubType := p_headerSubType headerSubType := p_headerSubType
...@@ -1995,9 +1995,9 @@ module LibItsGeoNetworking_Templates { ...@@ -1995,9 +1995,9 @@ module LibItsGeoNetworking_Templates {
* @param p_senderLongPosVec Long position vector of sender * @param p_senderLongPosVec Long position vector of sender
* @param p_seqNumber Sequence number of GeoAnycast packet * @param p_seqNumber Sequence number of GeoAnycast packet
*/ */
template ExtendedHeader mw_geoAnycastHeader( template (present) ExtendedHeader mw_geoAnycastHeader(
in template (present) LongPosVector p_sourceLongPosVec, template (present) LongPosVector p_sourceLongPosVec := ?,
in template (present) UInt16 p_seqNumber template (present) UInt16 p_seqNumber := ?
) := { ) := {
geoAnycastHeader := { geoAnycastHeader := {
seqNumber := p_seqNumber, seqNumber := p_seqNumber,
...@@ -2020,10 +2020,10 @@ module LibItsGeoNetworking_Templates { ...@@ -2020,10 +2020,10 @@ module LibItsGeoNetworking_Templates {
* @param p_anycastArea Destination GeoArea * @param p_anycastArea Destination GeoArea
* @see mw_geoAnycastHeader * @see mw_geoAnycastHeader
*/ */
template ExtendedHeader mw_geoAnycastHeaderWithArea ( template (present) ExtendedHeader mw_geoAnycastHeaderWithArea (
in template (present) LongPosVector p_sourceLongPosVec, template (present) LongPosVector p_sourceLongPosVec := ?,
in template (present) UInt16 p_seqNumber, template (present) UInt16 p_seqNumber := ?,
in template (present) GeoAnycastArea p_anycastArea template (present) GeoAnycastArea p_anycastArea := ?
) modifies mw_geoAnycastHeader := { ) modifies mw_geoAnycastHeader := {
geoAnycastHeader := { geoAnycastHeader := {
geoAreaPosLatitude := p_anycastArea.geoAnycastArea.geoAreaPosLatitude, geoAreaPosLatitude := p_anycastArea.geoAnycastArea.geoAreaPosLatitude,
...@@ -2050,7 +2050,7 @@ module LibItsGeoNetworking_Templates { ...@@ -2050,7 +2050,7 @@ module LibItsGeoNetworking_Templates {
/** /**
* @desc Receive template for GeoAnycast header type with any sub-type * @desc Receive template for GeoAnycast header type with any sub-type
*/ */
template HeaderTST mw_geoAnycastHeaderType := { template (present)HeaderTST mw_geoAnycastHeaderType := {
geoAnycastHdr := { geoAnycastHdr := {
headerType := e_geoAnycast, headerType := e_geoAnycast,
headerSubType := ? headerSubType := ?
...@@ -2062,8 +2062,8 @@ module LibItsGeoNetworking_Templates { ...@@ -2062,8 +2062,8 @@ module LibItsGeoNetworking_Templates {
* @param p_headerSubType Packet's subtype * @param p_headerSubType Packet's subtype
* @see mw_geoAnycastHeaderType * @see mw_geoAnycastHeaderType
*/ */
template HeaderTST mw_geoAnycastHeaderTypeWithSubType( template (present) HeaderTST mw_geoAnycastHeaderTypeWithSubType(
in template (present) HeaderSubTypeGeoAnycast p_headerSubType template (present) HeaderSubTypeGeoAnycast p_headerSubType := ?
) modifies mw_geoAnycastHeaderType := { ) modifies mw_geoAnycastHeaderType := {
geoAnycastHdr := { geoAnycastHdr := {
headerSubType := p_headerSubType headerSubType := p_headerSubType
...@@ -2098,9 +2098,9 @@ module LibItsGeoNetworking_Templates { ...@@ -2098,9 +2098,9 @@ module LibItsGeoNetworking_Templates {
* @param p_seqNumber Sequence number of LS Request packet * @param p_seqNumber Sequence number of LS Request packet
* @param p_mid Searched GN_Address MID * @param p_mid Searched GN_Address MID
*/ */
template ExtendedHeader mw_lsRequestHeader( template (present) ExtendedHeader mw_lsRequestHeader(
in template (present) UInt16 p_seqNumber, in template (present) UInt16 p_seqNumber := ?,
in template (present) GN_Address.mid p_mid in template (present) GN_Address.mid p_mid := ?
) := { ) := {
lsRequestHeader := { lsRequestHeader := {
seqNumber := p_seqNumber, seqNumber := p_seqNumber,
...@@ -2156,7 +2156,7 @@ module LibItsGeoNetworking_Templates { ...@@ -2156,7 +2156,7 @@ module LibItsGeoNetworking_Templates {
/** /**
* @desc Receive template for any LS Reply header * @desc Receive template for any LS Reply header
*/ */
template ExtendedHeader mw_lsReplyHeaderAny := { template (present) ExtendedHeader mw_lsReplyHeaderAny := {
lsReplyHeader := { lsReplyHeader := {
seqNumber := ?, seqNumber := ?,
reserved := ?, reserved := ?,
...@@ -2171,10 +2171,10 @@ module LibItsGeoNetworking_Templates { ...@@ -2171,10 +2171,10 @@ module LibItsGeoNetworking_Templates {
* @param p_destinationLongPosVec Short position vector of destination * @param p_destinationLongPosVec Short position vector of destination
* @see mw_lsReplyHeaderAny * @see mw_lsReplyHeaderAny
*/ */
template ExtendedHeader mw_lsReplyHeader( template (present) ExtendedHeader mw_lsReplyHeader(
in template (present) LongPosVector p_sourceLongPosVec, template (present) LongPosVector p_sourceLongPosVec := ?,
in template (present) ShortPosVector p_destinationLongPosVec) template (present) ShortPosVector p_destinationLongPosVec := ?
modifies mw_lsReplyHeaderAny := { ) modifies mw_lsReplyHeaderAny := {
lsReplyHeader := { lsReplyHeader := {
srcPosVector := p_sourceLongPosVec, srcPosVector := p_sourceLongPosVec,
dstPosVector := p_destinationLongPosVec dstPosVector := p_destinationLongPosVec
...@@ -2212,8 +2212,8 @@ module LibItsGeoNetworking_Templates { ...@@ -2212,8 +2212,8 @@ module LibItsGeoNetworking_Templates {
* @desc Receive template for Beacon header * @desc Receive template for Beacon header
* @param p_sourceLongPosVec Long position vector of source * @param p_sourceLongPosVec Long position vector of source
*/ */
template ExtendedHeader mw_beaconHeader( template (present) ExtendedHeader mw_beaconHeader(
in template (present) LongPosVector p_sourceLongPosVec template (present) LongPosVector p_sourceLongPosVec := ?
) := { ) := {
beaconHeader := { beaconHeader := {
srcPosVector := p_sourceLongPosVec srcPosVector := p_sourceLongPosVec
...@@ -2422,7 +2422,9 @@ module LibItsGeoNetworking_Templates { ...@@ -2422,7 +2422,9 @@ module LibItsGeoNetworking_Templates {
* @desc Receive template for GN_Address. Only M_ID field is discriminent * @desc Receive template for GN_Address. Only M_ID field is discriminent
* @param p_mid Expected GN Address MID * @param p_mid Expected GN Address MID
*/ */
template GN_Address mw_gnAddressMid(in template (present) GN_Address.mid p_mid) := { template (present) GN_Address mw_gnAddressMid(
template (present) GN_Address.mid p_mid := ?
) := {
typeOfAddress := ?, typeOfAddress := ?,
stationType := ?, stationType := ?,
stationCountryCode := ?, stationCountryCode := ?,
......
ttcn/Http/LibItsHttp_TestSystem.ttcn
View file @ 9ee2927d
...@@ -25,9 +25,10 @@ module LibItsHttp_TestSystem { ...@@ -25,9 +25,10 @@ module LibItsHttp_TestSystem {
type component HttpComponent extends SelfSyncComp { // FIXME To be rename into HttpTest type component HttpComponent extends SelfSyncComp { // FIXME To be rename into HttpTest
port HttpPort httpPort; port HttpPort httpPort;
port HttpPort httpPort_notif; port HttpPort httpPort_notif;
// timers
timer tc_wait := PX_TWAIT;
timer tc_ac := PX_TAC; timer tc_ac := PX_TAC;
timer tc_noac := PX_TNOAC; timer tc_noac := PX_TNOAC;
timer tc_wait := PX_TWAIT;
} // End of component HttpComponent } // End of component HttpComponent
......
ttcn/IVIM/LibItsIvim_Templates.ttcn
View file @ 9ee2927d
...@@ -54,7 +54,7 @@ module LibItsIvim_Templates { ...@@ -54,7 +54,7 @@ module LibItsIvim_Templates {
* @param p_iviMsg The expected IVI Message * @param p_iviMsg The expected IVI Message
*/ */
template (present) IvimInd mw_ivimInd( template (present) IvimInd mw_ivimInd(
template (present) IVIM p_iviMsg template (present) IVIM p_iviMsg := ?
) := { ) := {
msgIn := p_iviMsg, msgIn := p_iviMsg,
gnNextHeader := *, gnNextHeader := *,
...@@ -77,10 +77,8 @@ module LibItsIvim_Templates { ...@@ -77,10 +77,8 @@ module LibItsIvim_Templates {
* @param p_gnLifetime GN packet lifetime value (ms) * @param p_gnLifetime GN packet lifetime value (ms)
* @param p_gnTrafficClass GN traffic class value * @param p_gnTrafficClass GN traffic class value
*/ */
//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base template IvimInd mw_ivimIndWithGnParameters(
// template IvimInd mw_ivimIndWithGnParameters ( template (present) IVIM p_iviMsg := ?,
template(present) IvimInd mw_ivimIndWithGnParameters (
template (present) IVIM p_iviMsg,
in template UInt8 p_gnNextHeader := *, in template UInt8 p_gnNextHeader := *,
in template UInt8 p_gnHeaderType := *, in template UInt8 p_gnHeaderType := *,
in template UInt8 p_gnHeaderSubtype := *, in template UInt8 p_gnHeaderSubtype := *,
...@@ -100,10 +98,8 @@ module LibItsIvim_Templates { ...@@ -100,10 +98,8 @@ module LibItsIvim_Templates {
* @param p_btpDestinationPort BTP destination port value * @param p_btpDestinationPort BTP destination port value
* @param p_btpInfo BTP destination port info value (if BTP-B) or BTP source port value (if BTP-A) * @param p_btpInfo BTP destination port info value (if BTP-B) or BTP source port value (if BTP-A)
*/ */
//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base template IvimInd mw_ivimIndWithBtpParameters(
// template IvimInd mw_ivimIndWithBtpParameters ( template (present) IVIM p_iviMsg := ?,
template(present) IvimInd mw_ivimIndWithBtpParameters (
template (present) IVIM p_iviMsg,
template UInt16 p_btpDestinationPort := *, template UInt16 p_btpDestinationPort := *,
template UInt16 p_btpInfo := * template UInt16 p_btpInfo := *
) modifies mw_ivimInd := { ) modifies mw_ivimInd := {
...@@ -117,9 +113,8 @@ module LibItsIvim_Templates { ...@@ -117,9 +113,8 @@ module LibItsIvim_Templates {
* @param p_ssp SSP security parameter * @param p_ssp SSP security parameter
* @param p_its_aid ITS-AID value * @param p_its_aid ITS-AID value
*/ */
//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base template IvimInd mw_ivimIndWithSecurityParameters(
template(present) IvimInd mw_ivimIndWithSecurityParameters ( template (present) IVIM p_iviMsg := ?,
template (present) IVIM p_iviMsg,
template Bit256 p_ssp := *, template Bit256 p_ssp := *,
template UInt32 p_its_aid := * template UInt32 p_its_aid := *
) modifies mw_ivimInd := { ) modifies mw_ivimInd := {
...@@ -167,7 +162,7 @@ module LibItsIvim_Templates { ...@@ -167,7 +162,7 @@ module LibItsIvim_Templates {
* @param p_connectedIviStructures List of ConnectedIviStructure (Default: omit) * @param p_connectedIviStructures List of ConnectedIviStructure (Default: omit)
* @param p_optional_ Optional field (Default: omit) * @param p_optional_ Optional field (Default: omit)
*/ */
template (value) UtIvimUpdate m_utIvimUpdateEvent( template (omit) UtIvimUpdate m_utIvimUpdateEvent(
template (value) IviIdentificationNumber p_iviIdentificationNumber, template (value) IviIdentificationNumber p_iviIdentificationNumber,
template (omit) TimestampIts p_timeStamp := c_duration_2sec, template (omit) TimestampIts p_timeStamp := c_duration_2sec,
template (omit) TimestampIts p_validFrom := omit, template (omit) TimestampIts p_validFrom := omit,
...@@ -221,7 +216,7 @@ module LibItsIvim_Templates { ...@@ -221,7 +216,7 @@ module LibItsIvim_Templates {
* @param p_protocolVersion The expected protocol version (Default: current IVI protocol version) * @param p_protocolVersion The expected protocol version (Default: current IVI protocol version)
* @param p_messageID The expected message id (Default: IVI message id) * @param p_messageID The expected message id (Default: IVI message id)
*/ */
template ItsPduHeader mw_itsPduHeader( template (present) ItsPduHeader mw_itsPduHeader(
template (present) StationID p_stationID := ?, template (present) StationID p_stationID := ?,
template (present) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_, template (present) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_,
template (present) ItsPduHeader.messageID p_messageID := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageID_ivim_ template (present) ItsPduHeader.messageID p_messageID := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageID_ivim_
...@@ -269,7 +264,7 @@ module LibItsIvim_Templates { ...@@ -269,7 +264,7 @@ module LibItsIvim_Templates {
* @param p_messageID The expected message id (Default: IVI message id) * @param p_messageID The expected message id (Default: IVI message id)
*/ */
template (present) IVIM mw_ivimPdu( template (present) IVIM mw_ivimPdu(
template (present) IviStructure p_ivim, template (present) IviStructure p_ivim := ?,
template (present) StationID p_stationID := ?, template (present) StationID p_stationID := ?,
template (present) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_, template (present) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_,
template (present) ItsPduHeader.messageID p_messageID := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageID_ivim_ template (present) ItsPduHeader.messageID p_messageID := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageID_ivim_
...@@ -300,7 +295,7 @@ module LibItsIvim_Templates { ...@@ -300,7 +295,7 @@ module LibItsIvim_Templates {
* @param p_mandatory The Management Container * @param p_mandatory The Management Container
* @param p_optional_ A list of IVI Container (Default: omit) * @param p_optional_ A list of IVI Container (Default: omit)
*/ */
template (present) IviStructure mw_ivimStructure( template IviStructure mw_ivimStructure(
template (present) IVIManagementContainer p_mandatory := ?, template (present) IVIManagementContainer p_mandatory := ?,
template IviStructure.optional_ p_optional_ := * template IviStructure.optional_ p_optional_ := *
) := { ) := {
...@@ -315,7 +310,7 @@ module LibItsIvim_Templates { ...@@ -315,7 +310,7 @@ module LibItsIvim_Templates {
template (value) IviStructure m_ivimStructureCancellation( template (value) IviStructure m_ivimStructureCancellation(
in template (value) IviIdentificationNumber p_iviIdentificationNumber in template (value) IviIdentificationNumber p_iviIdentificationNumber
) := { ) := {
mandatory := valueof(m_iviManagementContainer(f_getProvider(), valueof(p_iviIdentificationNumber), LibItsIvim_ASN1_IVInamedNumbers.IviStatus_cancellation_)), mandatory := valueof(m_iviManagementContainer(f_getProvider(), valueof(p_iviIdentificationNumber), IviStatus_cancellation_)),
optional_ := omit optional_ := omit
} // End of template m_ivimStructureCancellation } // End of template m_ivimStructureCancellation
...@@ -509,7 +504,7 @@ module LibItsIvim_Templates { ...@@ -509,7 +504,7 @@ module LibItsIvim_Templates {
zone := p_zone zone := p_zone
} // End of template m_glcPart } // End of template m_glcPart
template (present) GlcPart mw_glcPart( template GlcPart mw_glcPart(
template (present) Zid p_zoneId := ?, template (present) Zid p_zoneId := ?,
template LanePosition p_laneNumber := *, template LanePosition p_laneNumber := *,
template GlcPart.zoneExtension p_zoneExtension := *, template GlcPart.zoneExtension p_zoneExtension := *,
......
ttcn/MapemSpatem/LibItsMapemSpatem_Templates.ttcn
View file @ 9ee2927d
...@@ -313,7 +313,7 @@ module LibItsMapemSpatem_Templates { ...@@ -313,7 +313,7 @@ module LibItsMapemSpatem_Templates {
* @param p_protocolVersion The expected protocol version (Default: current MAPEM SPATEM protocol version) * @param p_protocolVersion The expected protocol version (Default: current MAPEM SPATEM protocol version)
* @param p_messageID The expected message id (Default: MAPEM id) * @param p_messageID The expected message id (Default: MAPEM id)
*/ */
template ItsPduHeader mw_itsPduHeaderMapem( template (present) ItsPduHeader mw_itsPduHeaderMapem(
template (present) StationID p_stationID := ?, template (present) StationID p_stationID := ?,
template (present) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_, template (present) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_,
template (present) ItsPduHeader.messageID p_messageID := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageID_mapem_ template (present) ItsPduHeader.messageID p_messageID := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageID_mapem_
...@@ -329,7 +329,7 @@ module LibItsMapemSpatem_Templates { ...@@ -329,7 +329,7 @@ module LibItsMapemSpatem_Templates {
* @param p_protocolVersion The expected protocol version (Default: current MAPEM SPATEM protocol version) * @param p_protocolVersion The expected protocol version (Default: current MAPEM SPATEM protocol version)
* @param p_messageID The expected message id (Default: SPATEM id) * @param p_messageID The expected message id (Default: SPATEM id)
*/ */
template ItsPduHeader mw_itsPduHeaderSpatem( template (present) ItsPduHeader mw_itsPduHeaderSpatem(
template (present) StationID p_stationID := ?, template (present) StationID p_stationID := ?,
template (present) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_, template (present) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_,
template (present) ItsPduHeader.messageID p_messageID := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageID_spatem_ template (present) ItsPduHeader.messageID p_messageID := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageID_spatem_
...@@ -571,9 +571,7 @@ module LibItsMapemSpatem_Templates { ...@@ -571,9 +571,7 @@ module LibItsMapemSpatem_Templates {
/** /**
* @desc Send template for SPAT Message * @desc Send template for SPAT Message
*/ */
//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base template (omit) SPAT m_spatem(
// template (omit) SPAT m_spatem(
template (value) SPAT m_spatem(
in template (value) IntersectionStateList p_intersections, in template (value) IntersectionStateList p_intersections,
in template (omit) DescriptiveName p_name := omit in template (omit) DescriptiveName p_name := omit
) modifies m_defaultSpatem:= { ) modifies m_defaultSpatem:= {
...@@ -585,12 +583,12 @@ module LibItsMapemSpatem_Templates { ...@@ -585,12 +583,12 @@ module LibItsMapemSpatem_Templates {
template (value) IntersectionStateList m_intersections := { m_intersection }; template (value) IntersectionStateList m_intersections := { m_intersection };
template (value) IntersectionState m_intersection := { template (omit) IntersectionState m_intersection := {
name := omit, // Human readable name for intersection to be used only in debug mode name := omit, // Human readable name for intersection to be used only in debug mode
id := m_intersectionReferenceID, // A globally unique value set, consisting of a regionID and id := m_intersectionReferenceID, // A globally unique value set, consisting of a regionID and
// intersection ID assignment provides a unique mapping to the intersection MAP in question which provides complete location and approach/move/lane data // intersection ID assignment provides a unique mapping to the intersection MAP in question which provides complete location and approach/move/lane data
revision := PX_INTERSECTIONSTATE_REVISION, revision := PX_INTERSECTIONSTATE_REVISION,
status := LibItsCommon_ASN1_ISDSRC_NamedNumbers.IntersectionStatusObject_manualControlIsEnabled_, status := IntersectionStatusObject_manualControlIsEnabled_,
// General status of the controller(s) // General status of the controller(s)
moy := omit, // Minute of current UTC year used only with messages to be archived moy := omit, // Minute of current UTC year used only with messages to be archived
timeStamp := omit, // The mSec point in the current UTC minute that this message was constructed timeStamp := omit, // The mSec point in the current UTC minute that this message was constructed
...@@ -602,7 +600,7 @@ module LibItsMapemSpatem_Templates { ...@@ -602,7 +600,7 @@ module LibItsMapemSpatem_Templates {
template (value) MovementList m_movements := { m_movement }; template (value) MovementList m_movements := { m_movement };
template (value) MovementState m_movement := { template (omit) MovementState m_movement := {
movementName := omit, movementName := omit,
signalGroup := PX_SIGNAL_GROUP_ID, signalGroup := PX_SIGNAL_GROUP_ID,
state_time_speed := m_movementEventList, state_time_speed := m_movementEventList,
......
ttcn/Security/LibItsSecurity_Functions.ttcn
View file @ 9ee2927d
...@@ -1211,7 +1211,7 @@ module LibItsSecurity_Functions { ...@@ -1211,7 +1211,7 @@ module LibItsSecurity_Functions {
// Local variables // Local variables
var EtsiTs103097Certificate v_aaCertificate, v_atCertificate; var EtsiTs103097Certificate v_aaCertificate, v_atCertificate;
var HeaderInfo v_mandatoryHeaders; var HeaderInfo v_mandatoryHeaders := valueof(m_ieee1609Dot2_headerInfo(0));
var HeaderInfo v_signerInfo; var HeaderInfo v_signerInfo;
// Load certificates if required // Load certificates if required
...@@ -1286,7 +1286,7 @@ module LibItsSecurity_Functions { ...@@ -1286,7 +1286,7 @@ module LibItsSecurity_Functions {
// Local variables // Local variables
var EtsiTs103097Certificate v_aaCertificate, v_atCertificate; var EtsiTs103097Certificate v_aaCertificate, v_atCertificate;
var HeaderInfo v_mandatoryHeaders; var HeaderInfo v_mandatoryHeaders := valueof(m_ieee1609Dot2_headerInfo(0));
var HeaderInfo v_signerInfo; var HeaderInfo v_signerInfo;
// Load certificates if required // Load certificates if required
...@@ -1363,7 +1363,7 @@ module LibItsSecurity_Functions { ...@@ -1363,7 +1363,7 @@ module LibItsSecurity_Functions {
// Local variables // Local variables
var EtsiTs103097Certificate v_aaCertificate, v_atCertificate; var EtsiTs103097Certificate v_aaCertificate, v_atCertificate;
var HeaderInfo v_mandatoryHeaders; var HeaderInfo v_mandatoryHeaders := valueof(m_ieee1609Dot2_headerInfo(0));
var HeaderInfo v_signerInfo; var HeaderInfo v_signerInfo;
// Load certificates if required // Load certificates if required
...@@ -1433,7 +1433,7 @@ module LibItsSecurity_Functions { ...@@ -1433,7 +1433,7 @@ module LibItsSecurity_Functions {
// Local variables // Local variables
var EtsiTs103097Certificate v_aaCertificate, v_atCertificate; var EtsiTs103097Certificate v_aaCertificate, v_atCertificate;
var HeaderInfo v_mandatoryHeaders; var HeaderInfo v_mandatoryHeaders := valueof(m_ieee1609Dot2_headerInfo(0));
var HeaderInfo v_signerInfo; var HeaderInfo v_signerInfo;
// Load certificates if required // Load certificates if required
...@@ -1508,7 +1508,7 @@ module LibItsSecurity_Functions { ...@@ -1508,7 +1508,7 @@ module LibItsSecurity_Functions {
// Local variables // Local variables
var EtsiTs103097Certificate v_aaCertificate, v_atCertificate; var EtsiTs103097Certificate v_aaCertificate, v_atCertificate;
var HeaderInfo v_mandatoryHeaders; var HeaderInfo v_mandatoryHeaders := valueof(m_ieee1609Dot2_headerInfo(0));
var HeaderInfo v_signerInfo; var HeaderInfo v_signerInfo;
// Load certificates if required // Load certificates if required
...@@ -1570,8 +1570,6 @@ module LibItsSecurity_Functions { ...@@ -1570,8 +1570,6 @@ module LibItsSecurity_Functions {
in charstring p_certificateName in charstring p_certificateName
) runs on ItsSecurityBaseComponent return HashedId8 { ) runs on ItsSecurityBaseComponent return HashedId8 {
// Local variables // Local variables
// FIXME (DF) UNUSED
// var EtsiTs103097Certificate v_atCertificate;
var HashedId8 v_hashedId8 := '0000000000000000'O; var HashedId8 v_hashedId8 := '0000000000000000'O;
// Sanity check // Sanity check
......
ttcn/Security/LibItsSecurity_Templates.ttcn
View file @ 9ee2927d
...@@ -51,8 +51,6 @@ module LibItsSecurity_Templates { ...@@ -51,8 +51,6 @@ module LibItsSecurity_Templates {
* @desc Its AID for Other * @desc Its AID for Other
* @see Draft ETSI TS 103 097 V1.3.1 Clause 7.3 Security profile for DENMs * @see Draft ETSI TS 103 097 V1.3.1 Clause 7.3 Security profile for DENMs
*/ */
//FIXME RGY definition type is changed to modulepar, as Titan doesn't support dynamic constants
// const IntX c_its_aid_Other := PX_OTHER_ITS_AID;
template Psid c_its_aid_Other := PX_OTHER_ITS_AID; template Psid c_its_aid_Other := PX_OTHER_ITS_AID;
/** /**
...@@ -1015,12 +1013,16 @@ module LibItsSecurity_Templates { ...@@ -1015,12 +1013,16 @@ module LibItsSecurity_Templates {
template (omit) HeaderInfo m_headerInfo_inner_pki_request( template (omit) HeaderInfo m_headerInfo_inner_pki_request(
in template (value) Psid p_psid := c_its_aid_SCR, in template (value) Psid p_psid := c_its_aid_SCR,
in template (value) Time64 p_generationTime in template (value) Time64 p_generationTime
) modifies m_headerInfo_gn := {}; ) modifies m_ieee1609Dot2_headerInfo := {
generationTime := p_generationTime
};
template (omit) HeaderInfo m_headerInfo_inner_pki_response( template (omit) HeaderInfo m_headerInfo_inner_pki_response(
in template (value) Psid p_psid := c_its_aid_SCR, in template (value) Psid p_psid := c_its_aid_SCR,
in template (value) Time64 p_generationTime in template (value) Time64 p_generationTime
) modifies m_headerInfo_gn := {}; ) modifies m_ieee1609Dot2_headerInfo := {
generationTime := p_generationTime
};
template (present) HeaderInfo mw_headerInfo_inner_pki_request( template (present) HeaderInfo mw_headerInfo_inner_pki_request(
template (present) Psid p_psid := c_its_aid_SCR, template (present) Psid p_psid := c_its_aid_SCR,
...@@ -1711,7 +1713,7 @@ module LibItsSecurity_Templates { ...@@ -1711,7 +1713,7 @@ module LibItsSecurity_Templates {
ssp := p_ssp ssp := p_ssp
} // End of template m_appPermissions } // End of template m_appPermissions
template (present) PsidSsp mw_appPermissions( template PsidSsp mw_appPermissions(
template (present) Psid p_psid := ?, template (present) Psid p_psid := ?,
template ServiceSpecificPermissions p_ssp := * template ServiceSpecificPermissions p_ssp := *
) := { ) := {
...@@ -2074,7 +2076,7 @@ module LibItsSecurity_Templates { ...@@ -2074,7 +2076,7 @@ module LibItsSecurity_Templates {
group utPrimitives { group utPrimitives {
template UtGnInitialize m_secGnInitialize( template (value) UtGnInitialize m_secGnInitialize(
in Oct8 p_hashedId8 in Oct8 p_hashedId8
) := { ) := {
hashedId8 := p_hashedId8 hashedId8 := p_hashedId8
......