Commit fb3d342e authored by garciay's avatar garciay
Browse files

Add PICS_IS_IUT_SECURED for CAM, DENM & GN to pass SSP & its_aid from TA to ATS

update port & templates for CAM, DENM & GN to pass SSP & its_aid from TA to ATS
parent e4782aac
......@@ -99,6 +99,12 @@ module LibItsCam_Pics {
* @desc Is the IUT RSU?
*/
modulepar boolean PICS_RSU := false;
/**
* @desc Is the IUT running in secured mode?
*/
modulepar boolean PICS_IS_IUT_SECURED := false;
} // end camPics
} // end LibItsCam_Pics
......@@ -32,14 +32,16 @@ module LibItsCam_Templates {
template CamInd mw_camInd (
in template (present) CAM p_camMsg
) := {
msgIn := p_camMsg,
gnNextHeader := *,
gnHeaderType := *,
gnHeaderSubtype := *,
gnLifetime := *,
gnTrafficClass := *,
btpDestinationPort := *,
btpInfo := *
msgIn := p_camMsg,
gnNextHeader := *,
gnHeaderType := *,
gnHeaderSubtype := *,
gnLifetime := *,
gnTrafficClass := *,
btpDestinationPort := *,
btpInfo := *,
ssp := *,
its_aid := *
};
/**
......
......@@ -117,14 +117,16 @@ module LibItsCam_TestSystem {
* @desc FA1 CAM Indication Primitive
*/
type record CamInd {
CAM msgIn,
UInt8 gnNextHeader optional,
UInt8 gnHeaderType optional,
UInt8 gnHeaderSubtype optional,
UInt32 gnLifetime optional,
UInt8 gnTrafficClass optional,
UInt16 btpDestinationPort optional,
UInt16 btpInfo optional
CAM msgIn,
UInt8 gnNextHeader optional,
UInt8 gnHeaderType optional,
UInt8 gnHeaderSubtype optional,
UInt32 gnLifetime optional,
UInt8 gnTrafficClass optional,
UInt16 btpDestinationPort optional,
UInt16 btpInfo optional,
octetstring ssp optional,
octetstring its_aid optional
}
with {
encode (msgIn) "LibItsCam_asn1"
......
......@@ -62,7 +62,12 @@ module LibItsDenm_Pics {
* @see ETSI TS 102 869-2 Table 3
*/
modulepar boolean PICS_IMPACT_REDUCTION := true;
/**
* @desc Is the IUT running in secured mode?
*/
modulepar boolean PICS_IS_IUT_SECURED := false;
} // end denmPics
}
\ No newline at end of file
......@@ -57,14 +57,16 @@ module LibItsDenm_Templates {
template (present) DenmInd mw_denmInd(
template (present) DENM p_denMsg
) := {
msgIn := p_denMsg,
gnNextHeader := *,
gnHeaderType := *,
gnHeaderSubtype := *,
gnLifetime := *,
gnTrafficClass := *,
btpDestinationPort := *,
btpInfo := *
msgIn := p_denMsg,
gnNextHeader := *,
gnHeaderType := *,
gnHeaderSubtype := *,
gnLifetime := *,
gnTrafficClass := *,
btpDestinationPort := *,
btpInfo := *,
ssp := *,
its_aid := *
}
/**
......
......@@ -122,14 +122,16 @@ module LibItsDenm_TestSystem {
* @member denmMsg
*/
type record DenmInd {
DENM msgIn,
UInt8 gnNextHeader optional,
UInt8 gnHeaderType optional,
UInt8 gnHeaderSubtype optional,
UInt32 gnLifetime optional,
UInt8 gnTrafficClass optional,
UInt16 btpDestinationPort optional,
UInt16 btpInfo optional
DENM msgIn,
UInt8 gnNextHeader optional,
UInt8 gnHeaderType optional,
UInt8 gnHeaderSubtype optional,
UInt32 gnLifetime optional,
UInt8 gnTrafficClass optional,
UInt16 btpDestinationPort optional,
UInt16 btpInfo optional,
octetstring ssp optional,
octetstring its_aid optional
}
with {
encode (msgIn) "LibItsDenm_asn1"
......
......@@ -1195,7 +1195,8 @@ module LibItsGeoNetworking_Functions {
altstep a_neighbourDefault() runs on ItsGeoNetworking {
[] a_receiveLsRequestAndReply(
?, f_getPosition(vc_componentName).gnAddr.mid,
?,
f_getPosition(vc_componentName).gnAddr.mid,
f_getPosition(vc_componentName),
f_getPosition(vc_componentName)
) {
......
......@@ -350,7 +350,12 @@ module LibItsGeoNetworking_Pics {
* @desc IUT's Mac address
*/
modulepar MacAddress PICS_IUT_MAC_ADDRESS := 'FFFFFFFFFFFF'O;
/**
* @desc Is the IUT running in secured mode?
*/
modulepar boolean PICS_IS_IUT_SECURED := false;
} // end geoNwPics
} // end LibItsGeoNetworking_Pics
\ No newline at end of file
......@@ -40,8 +40,11 @@ module LibItsGeoNetworking_Templates {
template (value) GeoNetworkingReq m_geoNwReq_linkLayerBroadcast(
template (value) GeoNetworkingPdu p_geoNwMsg
) := {
msgOut := p_geoNwMsg,
macDestinationAddress := c_llBroadcast
msgOut := p_geoNwMsg,
macDestinationAddress := c_llBroadcast,
ssp := omit,
its_aid := omit
}
/**
......@@ -63,8 +66,10 @@ module LibItsGeoNetworking_Templates {
template GeoNetworkingInd mw_geoNwInd(
template (present) GeoNetworkingPdu p_geoNwMsg
) := {
msgIn := p_geoNwMsg,
macDestinationAddress := ?
msgIn := p_geoNwMsg,
macDestinationAddress := ?,
ssp := *,
its_aid := *
}
/**
......
......@@ -141,7 +141,9 @@ module LibItsGeoNetworking_TestSystem {
*/
type record GeoNetworkingInd {
GeoNetworkingPdu msgIn,
MacAddress macDestinationAddress
MacAddress macDestinationAddress,
octetstring ssp optional,
octetstring its_aid optional
}
/**
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment