From e71816295bb399c7daf518379718e5b07d44a072 Mon Sep 17 00:00:00 2001 From: Oliver Hartkopp Date: Mon, 23 Feb 2015 10:37:13 +0100 Subject: [PATCH 1/1] isotpperf: print link layer data length of measured PDU Signed-off-by: Oliver Hartkopp --- isotpperf.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/isotpperf.c b/isotpperf.c index c8c60c8..eaa8857 100644 --- a/isotpperf.c +++ b/isotpperf.c @@ -104,6 +104,7 @@ int main(int argc, char **argv) unsigned char bs = 0; unsigned char stmin = 0; unsigned char brs = 0; + unsigned char ll_dl = 0; unsigned long fflen = 0; unsigned fflen_digits = 0; unsigned long rcvlen = 0; @@ -274,8 +275,11 @@ int main(int argc, char **argv) /* get number of digits for printing */ fflen_digits = getdigits(fflen); - /* get CAN FD bitrate setting information */ + /* get CAN FD bitrate & LL_DL setting information */ brs = frame.flags & CANFD_BRS; + ll_dl = frame.len; + if (ll_dl < 8) + ll_dl = 8; ioctl(s, SIOCGSTAMP, &start_tv); @@ -313,8 +317,9 @@ int main(int argc, char **argv) /* get number of digits for printing */ fflen_digits = getdigits(fflen); - /* get CAN FD bitrate setting information */ + /* get CAN FD bitrate & LL_DL setting information */ brs = frame.flags & CANFD_BRS; + ll_dl = frame.len; ioctl(s, SIOCGSTAMP, &start_tv); @@ -367,7 +372,7 @@ int main(int argc, char **argv) /* PDU complete */ if (rcvlen && rcvlen >= fflen) { - printf("\r%s%c (BS:%2hhu # ", canfd_on?"CAN-FD":"CAN2.0", brs?'*':' ', bs); + printf("\r%s %02d%c (BS:%2hhu # ", canfd_on?"CAN-FD":"CAN2.0", ll_dl, brs?'*':' ', bs); if (stmin < 0x80) printf("STmin:%3hhu msec)", stmin); else if (stmin > 0xF0 && stmin < 0xFA) -- 2.39.2