sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lib: snprintf_can_error_frame(): don't bail out if CAN_ERR_CNT is set 

If CAN_ERR_CNT is set, the snprintf_can_error_frame() bails out, as it
cannot decode CAN_ERR_CNT.

Fixes: 21fb43532e ("lib: snprintf_can_error_frame: print counter errors if CAN_ERR_CNT is set")
pull/462/head
Marc Kleine-Budde 2023-09-27 16:15:52 +02:00
parent 0a43e84bcd
commit 7d59157d4d
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib.c
View File

@ -499,6 +499,7 @@ static const char *error_classes[] = {
"bus-off", "bus-off",
"bus-error", "bus-error",
"restarted-after-bus-off", "restarted-after-bus-off",
"error-counter-tx-rx",
}; };
static const char *controller_problems[] = { static const char *controller_problems[] = {
@ -636,6 +637,19 @@ static int snprintf_error_prot(char *buf, size_t len, const struct canfd_frame *
return n; return n;
} }
static int snprintf_error_cnt(char *buf, size_t len, const struct canfd_frame *cf)
{
int n = 0;
if (len <= 0)
return 0;
n += snprintf(buf + n, len - n, "{{%d}{%d}}",
cf->data[6], cf->data[7]);
return n;
}
void snprintf_can_error_frame(char *buf, size_t len, const struct canfd_frame *cf, void snprintf_can_error_frame(char *buf, size_t len, const struct canfd_frame *cf,
const char* sep) const char* sep)
{ {
@ -679,13 +693,14 @@ void snprintf_can_error_frame(char *buf, size_t len, const struct canfd_frame *c
n += snprintf_error_ctrl(buf + n, len - n, cf); n += snprintf_error_ctrl(buf + n, len - n, cf);
if (mask == CAN_ERR_PROT) if (mask == CAN_ERR_PROT)
n += snprintf_error_prot(buf + n, len - n, cf); n += snprintf_error_prot(buf + n, len - n, cf);
if (mask == CAN_ERR_CNT)
n += snprintf_error_cnt(buf + n, len - n, cf);
classes++; classes++;
} }
} }
if (cf->can_id & CAN_ERR_CNT || cf->data[6] || cf->data[7]) { if (!(cf->can_id & CAN_ERR_CNT) && (cf->data[6] || cf->data[7])) {
n += snprintf(buf + n, len - n, "%s", sep); n += snprintf(buf + n, len - n, "%serror-counter-tx-rx", sep);
n += snprintf(buf + n, len - n, "error-counter-tx-rx{{%d}{%d}}", n += snprintf_error_cnt(buf + n, len - n, cf);
cf->data[6], cf->data[7]);
} }
} }