Fix initialization order of storage

Author: richardapeters

services/util/EchoInstantiation.hpp

@@ -41,21 +41,25 @@ namespace main_
         services::SesameCobs cobs;
         services::SesameWindowed windowed{ cobs };
         services::EchoOnSesame echo;
+
+        template<std::size_t MessageSize>
+        struct CobsStorage
+        {
+            static constexpr std::size_t encodedMessageSize = services::SesameWindowed::bufferSizeForMessage<MessageSize, services::SesameCobs::EncodedMessageSize>;
+
+            infra::BoundedVector<uint8_t>::WithMaxSize<services::SesameCobs::sendBufferSize<MessageSize>> cobsSendStorage;
+            infra::BoundedDeque<uint8_t>::WithMaxSize<services::SesameCobs::receiveBufferSize<encodedMessageSize>> cobsReceivedMessage;
+        };
     };
 
     template<std::size_t MessageSize>
     struct EchoOnSesame::WithMessageSize
-        : EchoOnSesame
+        : private EchoOnSesame::CobsStorage<MessageSize>
+        , EchoOnSesame
     {
         WithMessageSize(hal::BufferedSerialCommunication& serialCommunication, services::MethodSerializerFactory& serializerFactory)
-            : EchoOnSesame(cobsSendStorage, cobsReceivedMessage, serialCommunication, serializerFactory)
+            : EchoOnSesame(this->cobsSendStorage, this->cobsReceivedMessage, serialCommunication, serializerFactory)
         {}
-
-    private:
-        static constexpr std::size_t encodedMessageSize = services::SesameWindowed::bufferSizeForMessage<MessageSize, services::SesameCobs::EncodedMessageSize>;
-
-        infra::BoundedVector<uint8_t>::WithMaxSize<services::SesameCobs::sendBufferSize<MessageSize>> cobsSendStorage;
-        infra::BoundedDeque<uint8_t>::WithMaxSize<services::SesameCobs::receiveBufferSize<encodedMessageSize>> cobsReceivedMessage;
     };
 
 #ifdef EMIL_HAL_GENERIC

services/util/EchoInstantiationSecured.hpp

@@ -1,12 +1,10 @@
 #ifndef SERVICES_UTIL_ECHO_INSTANTIATION_SECURED_HPP
 #define SERVICES_UTIL_ECHO_INSTANTIATION_SECURED_HPP
 
-#include "hal/interfaces/SerialCommunication.hpp"
+#include "services/util/EchoInstantiation.hpp"
 #include "services/util/EchoPolicyDiffieHellman.hpp"
 #include "services/util/EchoPolicySymmetricKey.hpp"
-#include "services/util/SesameCobs.hpp"
 #include "services/util/SesameSecured.hpp"
-#include "services/util/SesameWindowed.hpp"
 
 namespace main_
 {
@@ -22,6 +20,13 @@ namespace main_
         services::SesameWindowed windowed{ cobs };
         services::SesameSecured::WithCryptoMbedTls secured;
         services::EchoOnSesame echo;
+
+        template<std::size_t MessageSize>
+        struct SecuredStorage
+        {
+            infra::BoundedVector<uint8_t>::WithMaxSize<services::SesameSecured::encodedMessageSize<MessageSize>> securedSendBuffer;
+            infra::BoundedVector<uint8_t>::WithMaxSize<services::SesameSecured::encodedMessageSize<MessageSize>> securedReceiveBuffer;    
+        };
     };
 
     struct EchoOnSesameSecuredSymmetricKey
@@ -38,19 +43,13 @@ namespace main_
 
     template<std::size_t MessageSize>
     struct EchoOnSesameSecuredSymmetricKey::WithMessageSize
-        : EchoOnSesameSecuredSymmetricKey
+        : private EchoOnSesame::CobsStorage<MessageSize>
+        , private EchoOnSesameSecured::SecuredStorage<MessageSize>
+        , EchoOnSesameSecuredSymmetricKey
     {
         WithMessageSize(hal::BufferedSerialCommunication& serialCommunication, services::MethodSerializerFactory& serializerFactory, const services::SesameSecured::KeyMaterial& keyMaterial, hal::SynchronousRandomDataGenerator& randomDataGenerator)
-            : EchoOnSesameSecuredSymmetricKey(cobsSendStorage, cobsReceivedMessage, securedSendBuffer, securedReceiveBuffer, serialCommunication, serializerFactory, keyMaterial, randomDataGenerator)
+            : EchoOnSesameSecuredSymmetricKey(this->cobsSendStorage, this->cobsReceivedMessage, this->securedSendBuffer, this->securedReceiveBuffer, serialCommunication, serializerFactory, keyMaterial, randomDataGenerator)
         {}
-
-    private:
-        static constexpr std::size_t encodedMessageSize = services::SesameWindowed::bufferSizeForMessage<MessageSize, services::SesameCobs::EncodedMessageSize>;
-
-        infra::BoundedVector<uint8_t>::WithMaxSize<services::SesameCobs::sendBufferSize<MessageSize>> cobsSendStorage;
-        infra::BoundedDeque<uint8_t>::WithMaxSize<services::SesameCobs::receiveBufferSize<encodedMessageSize>> cobsReceivedMessage;
-        infra::BoundedVector<uint8_t>::WithMaxSize<services::SesameSecured::encodedMessageSize<MessageSize>> securedSendBuffer;
-        infra::BoundedVector<uint8_t>::WithMaxSize<services::SesameSecured::encodedMessageSize<MessageSize>> securedReceiveBuffer;
     };
 
     struct EchoOnSesameSecuredDiffieHellman
@@ -71,19 +70,13 @@ namespace main_
 
     template<std::size_t MessageSize>
     struct EchoOnSesameSecuredDiffieHellman::WithMessageSize
-        : EchoOnSesameSecuredDiffieHellman
+        : private EchoOnSesame::CobsStorage<MessageSize>
+        , private EchoOnSesameSecured::SecuredStorage<MessageSize>
+        , EchoOnSesameSecuredDiffieHellman
     {
         WithMessageSize(hal::BufferedSerialCommunication& serialCommunication, services::MethodSerializerFactory& serializerFactory, infra::ConstByteRange dsaCertificate, infra::ConstByteRange dsaCertificatePrivateKey, infra::ConstByteRange rootCaCertificate, hal::SynchronousRandomDataGenerator& randomDataGenerator)
-            : EchoOnSesameSecuredDiffieHellman(cobsSendStorage, cobsReceivedMessage, securedSendBuffer, securedReceiveBuffer, serialCommunication, serializerFactory, dsaCertificatePrivateKey, dsaCertificate, rootCaCertificate, randomDataGenerator)
+            : EchoOnSesameSecuredDiffieHellman(this->cobsSendStorage, this->cobsReceivedMessage, this->securedSendBuffer, this->securedReceiveBuffer, serialCommunication, serializerFactory, dsaCertificatePrivateKey, dsaCertificate, rootCaCertificate, randomDataGenerator)
         {}
-
-    private:
-        static constexpr std::size_t encodedMessageSize = services::SesameWindowed::bufferSizeForMessage<MessageSize, services::SesameCobs::EncodedMessageSize>;
-
-        infra::BoundedVector<uint8_t>::WithMaxSize<services::SesameCobs::sendBufferSize<MessageSize>> cobsSendStorage;
-        infra::BoundedDeque<uint8_t>::WithMaxSize<services::SesameCobs::receiveBufferSize<encodedMessageSize>> cobsReceivedMessage;
-        infra::BoundedVector<uint8_t>::WithMaxSize<services::SesameSecured::encodedMessageSize<MessageSize>> securedSendBuffer;
-        infra::BoundedVector<uint8_t>::WithMaxSize<services::SesameSecured::encodedMessageSize<MessageSize>> securedReceiveBuffer;
     };
 }