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

asc2log: fix handling for RTR frames in Classic CAN mode 

Fix reading of the RTR representation without and with DLC (v8.5+ tools).

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
pull/203/head
Oliver Hartkopp 2020-05-10 15:09:55 +02:00
parent 9cde2ebe8f
commit 3bb659d18d
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
asc2log.c
View File

@ -135,7 +135,7 @@ void eval_can(char* buf, struct timeval *date_tvp, char timestamps, char base, i
int dlc = 0; int dlc = 0;
int data[8]; int data[8];
char tmp1[BUFLEN]; char tmp1[BUFLEN];
int i, found; int i, items, found;
/* 0.002367 1 390x Rx d 8 17 00 14 00 C0 00 08 00 */ /* 0.002367 1 390x Rx d 8 17 00 14 00 C0 00 08 00 */
@ -143,26 +143,30 @@ void eval_can(char* buf, struct timeval *date_tvp, char timestamps, char base, i
if (base == 'h') { /* check for CAN frames with hexadecimal values */ if (base == 'h') { /* check for CAN frames with hexadecimal values */
if (sscanf(buf, "%ld.%ld %d %s %*s %c %d %x %x %x %x %x %x %x %x", items = sscanf(buf, "%ld.%ld %d %s %*s %c %d %x %x %x %x %x %x %x %x",
&read_tv.tv_sec, &read_tv.tv_usec, &interface, &read_tv.tv_sec, &read_tv.tv_usec, &interface,
tmp1, &rtr, &dlc, tmp1, &rtr, &dlc,
&data[0], &data[1], &data[2], &data[3], &data[0], &data[1], &data[2], &data[3],
&data[4], &data[5], &data[6], &data[7] &data[4], &data[5], &data[6], &data[7]);
) == dlc + 6 ) {
if ((items == dlc + 6 ) || /* data frame */
((items == 5) && (rtr == 'r')) || /* RTR without DLC */
((items == 6) && (rtr == 'r'))) { /* RTR with DLC */
found = 1; found = 1;
get_can_id(&cf, tmp1, 16); get_can_id(&cf, tmp1, 16);
} }
} else { /* check for CAN frames with decimal values */ } else { /* check for CAN frames with decimal values */
if (sscanf(buf, "%ld.%ld %d %s %*s %c %d %d %d %d %d %d %d %d %d", items = sscanf(buf, "%ld.%ld %d %s %*s %c %d %d %d %d %d %d %d %d %d",
&read_tv.tv_sec, &read_tv.tv_usec, &interface, &read_tv.tv_sec, &read_tv.tv_usec, &interface,
tmp1, &rtr, &dlc, tmp1, &rtr, &dlc,
&data[0], &data[1], &data[2], &data[3], &data[0], &data[1], &data[2], &data[3],
&data[4], &data[5], &data[6], &data[7] &data[4], &data[5], &data[6], &data[7]);
) == dlc + 6 ) {
if ((items == dlc + 6 ) || /* data frame */
((items == 5) && (rtr == 'r')) || /* RTR without DLC */
((items == 6) && (rtr == 'r'))) { /* RTR with DLC */
found = 1; found = 1;
get_can_id(&cf, tmp1, 10); get_can_id(&cf, tmp1, 10);
} }