From 392951ad39ec47c3aaaa93ea438845feb1ceb8a4 Mon Sep 17 00:00:00 2001
From: kpetridis <petridkon@gmail.com>
Date: Sat, 7 May 2022 20:02:44 +0300
Subject: [PATCH] Introduced new variable
---
inc/ECSS_Definitions.hpp | 7 +++++++
inc/Helpers/ForwardControlConfiguration.hpp | 4 +---
src/Services/RealTimeForwardingControlService.cpp | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/inc/ECSS_Definitions.hpp b/inc/ECSS_Definitions.hpp
index 5c8ee8af..af4e33b2 100644
--- a/inc/ECSS_Definitions.hpp
+++ b/inc/ECSS_Definitions.hpp
@@ -186,6 +186,13 @@ inline const uint8_t ECSSMaxReportTypeDefinitions = 20;
*/
inline const uint8_t ECSSMaxServiceTypeDefinitions = 10;
+/**
+ * The number of possible combinations between application processes and service types, i.e. the number of all
+ * possible (applicationID, serviceType) pairs.
+ */
+inline const uint8_t ECSSMaxApplicationsServicesCombinations = ECSSMaxControlledApplicationProcesses *
+ ECSSMaxServiceTypeDefinitions;
+
/**
* The max number of event definition IDs per event report blocking type definition in the event report blocking
* configuration
diff --git a/inc/Helpers/ForwardControlConfiguration.hpp b/inc/Helpers/ForwardControlConfiguration.hpp
index dfd0e58b..da573dd1 100644
--- a/inc/Helpers/ForwardControlConfiguration.hpp
+++ b/inc/Helpers/ForwardControlConfiguration.hpp
@@ -39,9 +39,7 @@ public:
* already exist in the map, and the requested report type is located in the vector of report types, which corresponds
* to the appID and service type.
*/
- etl::map<AppServiceKey, ReportTypeDefinitions,
- ECSSMaxControlledApplicationProcesses * ECSSMaxServiceTypeDefinitions>
- definitions;
+ etl::map<AppServiceKey, ReportTypeDefinitions, ECSSMaxApplicationsServicesCombinations> definitions;
ApplicationProcessConfiguration() = default;
};
diff --git a/src/Services/RealTimeForwardingControlService.cpp b/src/Services/RealTimeForwardingControlService.cpp
index d7ff81d7..72303f2b 100644
--- a/src/Services/RealTimeForwardingControlService.cpp
+++ b/src/Services/RealTimeForwardingControlService.cpp
@@ -43,7 +43,7 @@ bool RealTimeForwardingControlService::isAppControlled(Message& request, uint8_t
bool RealTimeForwardingControlService::checkApplicationOfAppProcessConfig(Message& request, uint8_t applicationID,
uint8_t numOfServices) {
if (not isAppControlled(request, applicationID) or allServiceTypesAllowed(request, applicationID)) {
- for (uint8_t l = 0; l < numOfServices; l++) {
+ for (uint8_t i = 0; i < numOfServices; i++) {
request.skipBytes(1);
uint8_t numOfMessages = request.readUint8();
request.skipBytes(numOfMessages);
--
GitLab