networking: fix SecurityEntity setup and add smoke test

Change-Id: I05b8ff255e883baa3512917571715878b4031d45
riebl · Nov 22, 2018 · 699a9a5 · 699a9a5
1 parent d0a3ccb
commit 699a9a5
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 2 deletions.
diff --git a/scenarios/artery/CMakeLists.txt b/scenarios/artery/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_opp_run(example CONFIG omnetpp.ini)
 add_opp_test(example SUFFIX inet CONFIG inet SIMTIME_LIMIT 20s)
+add_opp_test(example SUFFIX security CONFIG inet_security SIMTIME_LIMIT 20s)
 add_opp_test(example SUFFIX inet-mixed-vehicles CONFIG inet_multiple_vehicle_types SIMTIME_LIMIT 20s)
 add_opp_test(example SUFFIX inet-rsu CONFIG inet_rsu SIMTIME_LIMIT 20s)
 add_opp_test(example SUFFIX veins CONFIG veins SIMTIME_LIMIT 20s)

diff --git a/scenarios/artery/omnetpp.ini b/scenarios/artery/omnetpp.ini
@@ -60,6 +60,12 @@ network = artery.inet.World
 *.node[*].middleware.services = xmldoc("services.xml")
 
 
+[Config inet_security]
+extends = inet
+
+*.node[*].vanetza.security.typename = "SecurityEntity"
+
+
 [Config inet_multiple_vehicle_types]
 extends = inet
 # see above for configuration of mapper's random number generator (rng)

diff --git a/src/artery/networking/Router.cc b/src/artery/networking/Router.cc
@@ -43,6 +43,11 @@ void Router::initialize(int stage)
         mRouter.reset(new vanetza::geonet::Router(*runtime, mMIB));
         mRouter->set_address(generateAddress()); // VehicleMiddleware determines station type at first stage
 
+        // register security entity if available
+        if (mSecurityEntity) {
+            mRouter->set_security_entity(mSecurityEntity);
+        }
+
         // pass BTP-B messages to middleware which will dispatch them to its services
         using vanetza::geonet::UpperProtocol;
         mRouter->set_transport_handler(UpperProtocol::BTP_B, &mMiddleware->getTransportInterface());

diff --git a/src/artery/networking/SecurityEntity.cc b/src/artery/networking/SecurityEntity.cc
@@ -16,12 +16,17 @@ namespace artery
 
 Define_Module(SecurityEntity)
 
+int SecurityEntity::numInitStages() const
+{
+    return 2;
+}
+
 void SecurityEntity::initialize(int stage)
 {
     if (stage == 0) {
         mRuntime = inet::findModuleFromPar<Runtime>(par("runtimeModule"), this);
         mPositionProvider = inet::findModuleFromPar<vanetza::PositionProvider>(par("positionModule"), this);
-
+    } else if (stage == 1){
         mBackend = createBackend(par("CryptoBackend"));
         mCertificateProvider = createCertificateProvider(par("CertificateProvider"));
         mCertificateValidator = createCertificateValidator(par("CertificateValidator"));

diff --git a/src/artery/networking/SecurityEntity.h b/src/artery/networking/SecurityEntity.h
@@ -25,6 +25,7 @@ class SecurityEntity : public omnetpp::cSimpleModule, public vanetza::security::
 {
     public:
         // cSimpleModule
+        int numInitStages() const override;
         void initialize(int stage) override;
         void finish() override;
 

diff --git a/src/artery/networking/SecurityEntity.ned b/src/artery/networking/SecurityEntity.ned
@@ -1,6 +1,6 @@
 package artery.networking;
 
-simple SecurityEntity
+simple SecurityEntity like ISecurityEntity
 {
     parameters:
         @class(SecurityEntity);