Skip to content
Snippets Groups Projects
Commit 71cc6b2b authored by kpetridis's avatar kpetridis
Browse files

Removed comments

parent d42cd828
No related branches found
No related tags found
No related merge requests found
...@@ -76,7 +76,7 @@ private: ...@@ -76,7 +76,7 @@ private:
/** /**
* Checks if the specified application process is controlled by the Service and returns true if it does. * Checks if the specified application process is controlled by the Service and returns true if it does.
*/ */
bool appIsControlled(Message& request, uint8_t applicationId); bool isAppControlled(Message& request, uint8_t applicationId);
/** /**
* Checks if all service types are allowed already, i.e. if the application process contains no service type * Checks if all service types are allowed already, i.e. if the application process contains no service type
......
...@@ -31,7 +31,7 @@ uint8_t RealTimeForwardingControlService::countReportsOfService(uint8_t applicat ...@@ -31,7 +31,7 @@ uint8_t RealTimeForwardingControlService::countReportsOfService(uint8_t applicat
return applicationProcessConfiguration.definitions[std::make_pair(applicationID, serviceType)].size(); return applicationProcessConfiguration.definitions[std::make_pair(applicationID, serviceType)].size();
} }
bool RealTimeForwardingControlService::appIsControlled(Message& request, uint8_t applicationId) { bool RealTimeForwardingControlService::isAppControlled(Message& request, uint8_t applicationId) {
if (std::find(controlledApplications.begin(), controlledApplications.end(), applicationId) == if (std::find(controlledApplications.begin(), controlledApplications.end(), applicationId) ==
controlledApplications.end()) { controlledApplications.end()) {
ErrorHandler::reportError(request, ErrorHandler::ExecutionStartErrorType::NotControlledApplication); ErrorHandler::reportError(request, ErrorHandler::ExecutionStartErrorType::NotControlledApplication);
...@@ -42,7 +42,7 @@ bool RealTimeForwardingControlService::appIsControlled(Message& request, uint8_t ...@@ -42,7 +42,7 @@ bool RealTimeForwardingControlService::appIsControlled(Message& request, uint8_t
bool RealTimeForwardingControlService::checkApplicationOfAppProcessConfig(Message& request, uint8_t applicationID, bool RealTimeForwardingControlService::checkApplicationOfAppProcessConfig(Message& request, uint8_t applicationID,
uint8_t numOfServices) { uint8_t numOfServices) {
if (not appIsControlled(request, applicationID) or allServiceTypesAllowed(request, applicationID)) { if (not isAppControlled(request, applicationID) or allServiceTypesAllowed(request, applicationID)) {
for (uint8_t l = 0; l < numOfServices; l++) { for (uint8_t l = 0; l < numOfServices; l++) {
request.skipBytes(1); request.skipBytes(1);
uint8_t numOfMessages = request.readUint8(); uint8_t numOfMessages = request.readUint8();
...@@ -63,7 +63,6 @@ bool RealTimeForwardingControlService::allServiceTypesAllowed(Message& request, ...@@ -63,7 +63,6 @@ bool RealTimeForwardingControlService::allServiceTypesAllowed(Message& request,
bool RealTimeForwardingControlService::maxServiceTypesReached(Message& request, uint8_t applicationID) { bool RealTimeForwardingControlService::maxServiceTypesReached(Message& request, uint8_t applicationID) {
if (countServicesOfApplication(applicationID) >= ECSSMaxServiceTypeDefinitions) { if (countServicesOfApplication(applicationID) >= ECSSMaxServiceTypeDefinitions) {
// std::cout<<"err22\n";
ErrorHandler::reportError(request, ErrorHandler::ExecutionStartErrorType::MaxServiceTypesReached); ErrorHandler::reportError(request, ErrorHandler::ExecutionStartErrorType::MaxServiceTypesReached);
return true; return true;
} }
...@@ -81,9 +80,7 @@ bool RealTimeForwardingControlService::checkService(Message& request, uint8_t ap ...@@ -81,9 +80,7 @@ bool RealTimeForwardingControlService::checkService(Message& request, uint8_t ap
bool RealTimeForwardingControlService::allReportTypesAllowed(Message& request, uint8_t applicationID, bool RealTimeForwardingControlService::allReportTypesAllowed(Message& request, uint8_t applicationID,
uint8_t serviceType) { uint8_t serviceType) {
// std::cout<<"num mess= "<<static_cast<int>(countReportsOfService(applicationID, serviceType))<<"\n";
if (countReportsOfService(applicationID, serviceType) >= AllMessageTypes::messagesOfService[serviceType].size()) { if (countReportsOfService(applicationID, serviceType) >= AllMessageTypes::messagesOfService[serviceType].size()) {
// std::cout<<"err23\n";
ErrorHandler::reportError(request, ErrorHandler::ExecutionStartErrorType::AllReportTypesAlreadyAllowed); ErrorHandler::reportError(request, ErrorHandler::ExecutionStartErrorType::AllReportTypesAlreadyAllowed);
return true; return true;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment