Skip to content

bugfix: setRxFilters() in CO_driver.c now sets a pass-all filter if the filter list is oversized. #21

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

Open
maservant wants to merge 3 commits into
base: master
Choose a base branch
from
Open

bugfix: setRxFilters() in CO_driver.c now sets a pass-all filter if the filter list is oversized. #21

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9a64fb
bugfix: setRxFilters() now sets a pass-all filter if the filter list …
maservant Apr 30, 2024
ca63e10
Fix indent
maservant Apr 30, 2024
de3a91d
Merge branch 'CANopenNode:master' into master
maservant Jul 5, 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
39 changes: 27 additions & 12 deletions CO_driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,18 +149,33 @@ static CO_ReturnError_t setRxFilters(CO_CANmodule_t *CANmodule)
if (count == 0) {
/* No filter is set, disable RX */
return disableRx(CANmodule);
}

retval = CO_ERROR_NO;
for (i = 0; i < CANmodule->CANinterfaceCount; i ++) {
int ret = setsockopt(CANmodule->CANinterfaces[i].fd, SOL_CAN_RAW, CAN_RAW_FILTER,
rxFiltersCpy, sizeof(struct can_filter) * count);
if(ret < 0){
log_printf(LOG_ERR, CAN_FILTER_FAILED,
CANmodule->CANinterfaces[i].ifName);
log_printf(LOG_DEBUG, DBG_ERRNO, "setsockopt()");
retval = CO_ERROR_SYSCALL;
}
} else if (count > CAN_RAW_FILTER_MAX) {
/* Too many filters for the hardware to handle, filtering will be done in software. */
struct can_filter passAllFilter = { .can_id = 0, .can_mask = 0 };

retval = CO_ERROR_NO;
for (i = 0; i < CANmodule->CANinterfaceCount; i ++) {
int ret = setsockopt(CANmodule->CANinterfaces[i].fd, SOL_CAN_RAW, CAN_RAW_FILTER,
&passAllFilter, sizeof(struct can_filter));
if(ret < 0){
log_printf(LOG_ERR, CAN_FILTER_FAILED,
CANmodule->CANinterfaces[i].ifName);
log_printf(LOG_DEBUG, DBG_ERRNO, "setsockopt()");
retval = CO_ERROR_SYSCALL;
}
}
} else {
retval = CO_ERROR_NO;
for (i = 0; i < CANmodule->CANinterfaceCount; i ++) {
int ret = setsockopt(CANmodule->CANinterfaces[i].fd, SOL_CAN_RAW, CAN_RAW_FILTER,
rxFiltersCpy, sizeof(struct can_filter) * count);
if(ret < 0){
log_printf(LOG_ERR, CAN_FILTER_FAILED,
CANmodule->CANinterfaces[i].ifName);
log_printf(LOG_DEBUG, DBG_ERRNO, "setsockopt()");
retval = CO_ERROR_SYSCALL;
}
}
}

return retval;
Expand Down