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

isotpperf: print link layer data length of measured PDU 

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
pull/1/head
Oliver Hartkopp 2015-02-23 10:37:13 +01:00
parent 7e1b18f756
commit e71816295b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
isotpperf.c
View File

@ -104,6 +104,7 @@ int main(int argc, char **argv)
unsigned char bs = 0; unsigned char bs = 0;
unsigned char stmin = 0; unsigned char stmin = 0;
unsigned char brs = 0; unsigned char brs = 0;
unsigned char ll_dl = 0;
unsigned long fflen = 0; unsigned long fflen = 0;
unsigned fflen_digits = 0; unsigned fflen_digits = 0;
unsigned long rcvlen = 0; unsigned long rcvlen = 0;
@ -274,8 +275,11 @@ int main(int argc, char **argv)
/* get number of digits for printing */ /* get number of digits for printing */
fflen_digits = getdigits(fflen); fflen_digits = getdigits(fflen);
/* get CAN FD bitrate setting information */ /* get CAN FD bitrate & LL_DL setting information */
brs = frame.flags & CANFD_BRS; brs = frame.flags & CANFD_BRS;
ll_dl = frame.len;
if (ll_dl < 8)
ll_dl = 8;
ioctl(s, SIOCGSTAMP, &start_tv); ioctl(s, SIOCGSTAMP, &start_tv);
@ -313,8 +317,9 @@ int main(int argc, char **argv)
/* get number of digits for printing */ /* get number of digits for printing */
fflen_digits = getdigits(fflen); fflen_digits = getdigits(fflen);
/* get CAN FD bitrate setting information */ /* get CAN FD bitrate & LL_DL setting information */
brs = frame.flags & CANFD_BRS; brs = frame.flags & CANFD_BRS;
ll_dl = frame.len;
ioctl(s, SIOCGSTAMP, &start_tv); ioctl(s, SIOCGSTAMP, &start_tv);
@ -367,7 +372,7 @@ int main(int argc, char **argv)
/* PDU complete */ /* PDU complete */
if (rcvlen && rcvlen >= fflen) { 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) if (stmin < 0x80)
printf("STmin:%3hhu msec)", stmin); printf("STmin:%3hhu msec)", stmin);
else if (stmin > 0xF0 && stmin < 0xFA) else if (stmin > 0xF0 && stmin < 0xFA)