Skip to content

Fix command and status validation #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MarioIvancik merged 5 commits into from
Aug 12, 2024
Merged

Fix command and status validation #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
50b36e7
fix status and command string comparisons
MarioIvancik Jul 25, 2024
3d3906c
update version tag
MarioIvancik Jul 25, 2024
02308d4
dont use magic numbers
MarioIvancik Jul 25, 2024
2f9704a
create error_message buffer in aggregate_error
MarioIvancik Aug 7, 2024
bb1d713
fix validation conditions
MarioIvancik Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PROJECT(example_module CXX)

SET(CMAKE_CXX_STANDARD 20)

SET(EXAMPLE_MODULE_VERSION 1.1.0)
SET(EXAMPLE_MODULE_VERSION 1.1.1)

OPTION(BRINGAUTO_PACKAGE "Package creation" OFF)
OPTION(BRINGAUTO_INSTALL "Disable install" OFF)
Expand Down
15 changes: 13 additions & 2 deletions source/module_gateway/module_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ int aggregate_status(struct buffer *aggregated_status, const struct buffer curre

int aggregate_error(struct buffer *error_message, const struct buffer current_error_message, const struct buffer status,
unsigned int device_type) {
allocate(error_message, current_error_message.size_in_bytes);
std::memcpy(error_message->data, current_error_message.data,
current_error_message.size_in_bytes );
return OK;
}

Expand All @@ -71,9 +74,13 @@ int status_data_valid(const struct buffer status, unsigned int device_type) {
if(data == nullptr) {
return NOT_OK;
}
const std::string pressed_false = "{\"pressed\": false}";
const std::string pressed_true = "{\"pressed\": true}";

switch(device_type) {
case BUTTON_DEVICE_TYPE:
if(strncmp(data, "{\"pressed\": false}", status.size_in_bytes) == 0 || strncmp(data, "{\"pressed\": true}", status.size_in_bytes) == 0) {
if ((status.size_in_bytes == pressed_false.size() && strncmp(pressed_false.c_str(), data, status.size_in_bytes) == 0) ||
(status.size_in_bytes == pressed_true.size() && strncmp(pressed_true.c_str(), data, status.size_in_bytes) == 0)) {
return OK;
}
break;
Expand All @@ -89,9 +96,13 @@ int command_data_valid(const struct buffer command, unsigned int device_type) {
if(data == nullptr) {
return NOT_OK;
}
const std::string lit_up_false = "{\"lit_up\": false}";
const std::string lit_up_true = "{\"lit_up\": true}";

switch(device_type) {
case BUTTON_DEVICE_TYPE:
if(strncmp(data, "{\"lit_up\": false}", command.size_in_bytes) == 0 || strncmp(data, "{\"lit_up\": true}", command.size_in_bytes) == 0) {
if ((command.size_in_bytes == lit_up_false.size() && strncmp(lit_up_false.c_str(), data, command.size_in_bytes) == 0) ||
(command.size_in_bytes == lit_up_true.size() && strncmp(lit_up_true.c_str(), data, command.size_in_bytes) == 0)) {
return OK;
}
break;
Expand Down