diff --git a/data/gencerts.cfg b/data/gencerts.cfg
index 1840453243d896eb05b026d93eaca48ae0fba921..6a94750e0a4a480253d84d7ca7ac62fa73dc9363 100644
--- a/data/gencerts.cfg
+++ b/data/gencerts.cfg
@@ -5,12 +5,17 @@ reuse=yes
format=hex
# Reference time point. The begining of the current year is used by default
-#reftime=2015-01-01
+#reftime=2016-01-01
# location of the IUT position
-reflocation=51.4744200:5.6240500
+reflocation= 43.552545:10.300891
# custom AID to be used to test GenericMessageProfile
macro=CAM:36
macro=DENM:37
-macro=GENERIC:39
+macro=GENERIC:38
+
+# local region: Italy
+macro=RGN_LOCAL:380
+# Other region: France
+macro=RGN_OTHER:250
diff --git a/data/profiles/CERT_IUT_E_AT.xml b/data/profiles/CERT_IUT_E_AT.xml
index f7be1b55a86d918ff28f92dd8569606225c62ce4..e9755cc9fa1348af871263957f9cd9f3ab390b0f 100644
--- a/data/profiles/CERT_IUT_E_AT.xml
+++ b/data/profiles/CERT_IUT_E_AT.xml
@@ -22,7 +22,7 @@
-
+
diff --git a/data/profiles/CERT_TS_09_01_BV_AT.xml b/data/profiles/CERT_TS_09_01_BV_AT.xml
index 19b38841accc1e1d14b8ac045574862a7158b66b..0899040f4e013072f74b5270ef26634556dc29d6 100644
--- a/data/profiles/CERT_TS_09_01_BV_AT.xml
+++ b/data/profiles/CERT_TS_09_01_BV_AT.xml
@@ -25,7 +25,7 @@
-
+
diff --git a/data/profiles/CERT_TS_09_02_BV_AT.xml b/data/profiles/CERT_TS_09_02_BV_AT.xml
index 4e6d6e0ba7617c93261552fdba34d432673ea329..c2f6a16c29d56428d4b0ca18a88141b314879579 100644
--- a/data/profiles/CERT_TS_09_02_BV_AT.xml
+++ b/data/profiles/CERT_TS_09_02_BV_AT.xml
@@ -25,7 +25,7 @@
-
+
diff --git a/data/profiles/CERT_TS_09_03_BV_AT.xml b/data/profiles/CERT_TS_09_03_BV_AT.xml
index 3bef414987bf2f93742a8d67c61923f041e89663..d675d0f7ce323deea5e92820445c56042e886b30 100644
--- a/data/profiles/CERT_TS_09_03_BV_AT.xml
+++ b/data/profiles/CERT_TS_09_03_BV_AT.xml
@@ -23,7 +23,7 @@
-
+
diff --git a/data/profiles/CERT_TS_09_04_BV_AT.xml b/data/profiles/CERT_TS_09_04_BV_AT.xml
index c90445687e8bbb78db6a1e11ef68c531bea2305b..9ba21e57f75d84debb81978442fb8998a4c5e06b 100644
--- a/data/profiles/CERT_TS_09_04_BV_AT.xml
+++ b/data/profiles/CERT_TS_09_04_BV_AT.xml
@@ -22,7 +22,7 @@
-
+
diff --git a/data/profiles/CERT_TS_09_05_BV_AT.xml b/data/profiles/CERT_TS_09_05_BV_AT.xml
index b61d66d96261888aba05153336e37300fb4acc96..4895e477085b24c01a3af2cf9d7bc20c8f13d76f 100644
--- a/data/profiles/CERT_TS_09_05_BV_AT.xml
+++ b/data/profiles/CERT_TS_09_05_BV_AT.xml
@@ -22,7 +22,7 @@
-
+
diff --git a/data/profiles/CERT_TS_09_06_BV_AT.xml b/data/profiles/CERT_TS_09_06_BV_AT.xml
index 10d0b1b77f34e6eaa03a58adbbfe28cca095ff12..fd3c2cdd9a08102616c538d956832fca3979261e 100644
--- a/data/profiles/CERT_TS_09_06_BV_AT.xml
+++ b/data/profiles/CERT_TS_09_06_BV_AT.xml
@@ -26,7 +26,7 @@
-
+
diff --git a/data/profiles/CERT_TS_09_08_BO_AA.xml b/data/profiles/CERT_TS_09_08_BO_AA.xml
index dc49d31a70b436937ffa1ef4248b2f9cbf4896cd..ba562bbd0b547ad25539db36b3d0822066c00500 100644
--- a/data/profiles/CERT_TS_09_08_BO_AA.xml
+++ b/data/profiles/CERT_TS_09_08_BO_AA.xml
@@ -23,7 +23,7 @@
-
+
diff --git a/data/profiles/CERT_TS_09_08_BO_AT.xml b/data/profiles/CERT_TS_09_08_BO_AT.xml
index 9e425ba184a62f61b1c8e7c336f4d8a7dec37434..92e74119c362864d752193ec2d38792280614255 100644
--- a/data/profiles/CERT_TS_09_08_BO_AT.xml
+++ b/data/profiles/CERT_TS_09_08_BO_AT.xml
@@ -23,7 +23,7 @@
-
+
diff --git a/data/profiles/CERT_TS_09_09_BO_AA.xml b/data/profiles/CERT_TS_09_09_BO_AA.xml
index 736eacfe7b7ee66b5ce37c9f577444a7a78c2180..c2ccd68a14db4f24e023e65b1f0fd1b13759d8d7 100644
--- a/data/profiles/CERT_TS_09_09_BO_AA.xml
+++ b/data/profiles/CERT_TS_09_09_BO_AA.xml
@@ -23,7 +23,7 @@
-
+
diff --git a/data/profiles/CERT_TS_09_09_BO_AT.xml b/data/profiles/CERT_TS_09_09_BO_AT.xml
index 277ab9094a3cef9d4ed6a5a56d6f7cb679ce5adf..16c8555c09a2c69f88f6ca7a8700334713a003a8 100644
--- a/data/profiles/CERT_TS_09_09_BO_AT.xml
+++ b/data/profiles/CERT_TS_09_09_BO_AT.xml
@@ -23,7 +23,7 @@
-
+
diff --git a/data/profiles/CERT_TS_E1_AA.xml b/data/profiles/CERT_TS_E1_AA.xml
index 19cf4ef4f263f97527a14d19796314ee3f4b98f2..61a3f6c2e9079b2a287036b9ba51affd6e3ab49e 100644
--- a/data/profiles/CERT_TS_E1_AA.xml
+++ b/data/profiles/CERT_TS_E1_AA.xml
@@ -27,7 +27,7 @@
-
+
diff --git a/data/profiles/CERT_TS_E_AA.xml b/data/profiles/CERT_TS_E_AA.xml
index 739e6966d08ac0a26736d9cd39fe253dd1edcfb5..ac711eb8b290ef710e41c9042f2a25c43e2c58d0 100644
--- a/data/profiles/CERT_TS_E_AA.xml
+++ b/data/profiles/CERT_TS_E_AA.xml
@@ -27,7 +27,7 @@
-
+
diff --git a/data/profiles/CERT_TS_E_AT.xml b/data/profiles/CERT_TS_E_AT.xml
index 44665bd0960732baf7430433f48d4007d0366504..b488b73352bb2175cc3f823e77b3136b7fd61736 100644
--- a/data/profiles/CERT_TS_E_AT.xml
+++ b/data/profiles/CERT_TS_E_AT.xml
@@ -27,7 +27,7 @@
-
+
diff --git a/data/profiles/CERT_TS_MSG_13_06_BO_AT.xml b/data/profiles/CERT_TS_MSG_13_06_BO_AT.xml
index fb6f7dadaf375a7b3160506f7b89c5476a9af7af..4fc76fba547100c6dd46c988f9064eb649d900d7 100644
--- a/data/profiles/CERT_TS_MSG_13_06_BO_AT.xml
+++ b/data/profiles/CERT_TS_MSG_13_06_BO_AT.xml
@@ -1,6 +1,4 @@
-
2
@@ -26,7 +24,7 @@
-
+
diff --git a/data/profiles/Makefile b/data/profiles/Makefile
index b7a6b751fa6b97adefa2c08bf0188ac95a91a692..a8306f744329974385809703ad45df1c5d93a39a 100644
--- a/data/profiles/Makefile
+++ b/data/profiles/Makefile
@@ -1,4 +1,5 @@
outdir=../certificates
+config=../gencerts.cfg
installdir=C:\Users\filatov\Documents\Dropbox\Yann\certificates\PLU
distzip=$(outdir)/plu_ts_certificates.zip
@@ -8,9 +9,9 @@ distzip=$(outdir)/plu_ts_certificates.zip
depdir=.deps
keydir=$(outdir)
-GENOPTS := -C config.cfg
+GENOPTS := -C "$(config)"
+itscertgen="../../itscertgen.exe"
-itscertgen="../itscertgen.exe"
profiles := $(wildcard CERT_*.xml)
profiles_iut_at := $(wildcard CERT_IUT_*AT.xml)
profiles_other := $(filter-out $(profiles_iut_at), $(profiles))
diff --git a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn
index b925a2dd29418a0305a05b517aba74d5106eeed6..07f72d080347e45e3b1b514c0d231ea361c1ad45 100644
--- a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn
+++ b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn
@@ -416,7 +416,6 @@ module ItsRSUsSimulator_Functions {
if (ispresent(p_geoNetworkingPdu.gnPacket.packet.payload.decodedPayload.btpPacket.payload.decodedPayload)) {
if (ischosen(p_geoNetworkingPdu.gnPacket.packet.payload.decodedPayload.btpPacket.payload.decodedPayload.sremPacket)) {
var SignalRequestMessage v_signalRequestMessage := p_geoNetworkingPdu.gnPacket.packet.payload.decodedPayload.btpPacket.payload.decodedPayload.sremPacket.srm;
- var template (value) SSEM v_ssem := vc_rsuMessagesValueList[PX_RSU_ID - 1].ssem;
var template (value) Payload v_payload;
log(v_signalRequestMessage);
@@ -427,8 +426,9 @@ module ItsRSUsSimulator_Functions {
bit2oct(
encvalue(
valueof(
- v_ssem
- ))),
+ m_ssem(
+ v_signalRequestMessage
+ )))),
PICS_SSEM_BTP_DESTINATION_PORT,
PICS_SSEM_BTP_SOURCE_PORT
)
diff --git a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn
index 5167929ea5c776779bf763fde9dff19130ac2b57..b4d37036e10722001c1f86d355f922882ae9483f 100644
--- a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn
+++ b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn
@@ -95,6 +95,28 @@ module ItsRSUsSimulator_Templates {
}
}
+ /**
+ * @desc Receive template for GeoNetworking Unicast Packet
+ * @param p_destinationShortPosVec Short position vector of destination
+ * @param p_seqNumber Sequence number of GeoUnicast packet
+ * @param p_nextHeader Id of next header
+ */
+ template (present) GnNonSecuredPacket mw_geoNwTsbPacketWithNextHeader_srem(
+ in template (present) UInt16 p_seqNumber := ?,
+ in template (present) LongPosVector p_sourceLongPosVec := ?,
+ in template (value) NextHeader p_nextHeader
+ ) modifies mw_geoNwTsbPacketWithNextHeader := {
+ payload := {
+ decodedPayload := {
+ btpPacket := mw_btpB(
+ PICS_SREM_BTP_DESTINATION_PORT,
+ PICS_SREM_BTP_SOURCE_PORT,
+ ?
+ )
+ },
+ rawPayload := ?
+ }
+ }
} // End of group geoNetworkingTemplates
diff --git a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn
index 275cf47975c7093744e37395db99eda6d0514dda..df871e3d98ff789f9563c58e766128281005d54b 100644
--- a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn
+++ b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn
@@ -54,18 +54,13 @@ module ItsRSUsSimulator_TestCases {
if (ispresent(vc_rsuMessagesValueList[PX_RSU_ID - 1].ivim)) {
tc_ivim.start;
}
- log("Expected SREM:", mw_geoNwInd(
- mw_geoNwPdu(
- mw_geoNwBroadcastPacketWithNextHeader_srem(
- ?,
- ?,
- e_btpB
- ))));
+
alt {
[] geoNetworkingPort.receive(
mw_geoNwInd(
mw_geoNwPdu(
- mw_geoNwBroadcastPacketWithNextHeader_srem(
+ // FIXM Geobroadcast or TSB? mw_geoNwBroadcastPacketWithNextHeader_srem
+ mw_geoNwTsbPacketWithNextHeader_srem(
?,
?,
e_btpB