From d5ae74f86073c2f9847f4abbd9ed921cdb5ae094 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Wed, 17 Jun 2020 20:21:49 +0200 Subject: [PATCH] bugfix hk message size --- housekeeping/HousekeepingMessage.cpp | 4 ++-- housekeeping/HousekeepingMessage.h | 4 ++-- ipc/CommandMessage.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/housekeeping/HousekeepingMessage.cpp b/housekeeping/HousekeepingMessage.cpp index d47fb92a..d7efd703 100644 --- a/housekeeping/HousekeepingMessage.cpp +++ b/housekeeping/HousekeepingMessage.cpp @@ -4,8 +4,8 @@ HousekeepingMessage::HousekeepingMessage(MessageQueueMessageIF* message): CommandMessageBase(message) { if(message->getMaximumMessageSize() < HK_MESSAGE_SIZE) { - sif::error << "CommandMessage::ComandMessage: Passed message buffer" - " can not hold minimum "<< HK_MESSAGE_SIZE + sif::error << "HousekeepingMessage::HousekeepingMessage: Passed " + "message buffer can not hold minimum " << HK_MESSAGE_SIZE << " bytes!" << std::endl; return; } diff --git a/housekeeping/HousekeepingMessage.h b/housekeeping/HousekeepingMessage.h index c5e31fda..75afc8ea 100644 --- a/housekeeping/HousekeepingMessage.h +++ b/housekeeping/HousekeepingMessage.h @@ -36,8 +36,8 @@ union sid_t { class HousekeepingMessage : public CommandMessageBase { public: - static constexpr size_t HK_MESSAGE_SIZE = sizeof(MessageQueueId_t) - + sizeof(Command_t) + sizeof(sid_t) * sizeof(uint32_t); + static constexpr size_t HK_MESSAGE_SIZE = CommandMessageIF::HEADER_SIZE + + sizeof(sid_t) + sizeof(uint32_t); /** * The HK message is initialized with a pointer to a message which holds diff --git a/ipc/CommandMessage.cpp b/ipc/CommandMessage.cpp index 163a6a2d..9a8a82f2 100644 --- a/ipc/CommandMessage.cpp +++ b/ipc/CommandMessage.cpp @@ -12,7 +12,7 @@ CommandMessage::CommandMessage(MessageQueueMessageIF* receiverMessage): if(receiverMessage->getMaximumMessageSize() < getMinimumMessageSize()) { sif::error << "CommandMessage::ComandMessage: Passed message buffer" - " can not hold minimum "<< MINIMUM_COMMAND_MESSAGE_SIZE + " can not hold minimum "<< getMinimumMessageSize() << " bytes!" << std::endl; return; }