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

Added CAN message direction (Tx or Rx) for logging in candump and log2asc

pull/211/head
Pallavi Revanna 2020-05-28 14:38:15 -07:00
parent 43610bd621
commit 38d240fbb8
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
candump.c
View File

@ -706,9 +706,9 @@ int main(int argc, char **argv)
/* log CAN frame with absolute timestamp & device */ /* log CAN frame with absolute timestamp & device */
sprint_canframe(buf, &frame, 0, maxdlen); sprint_canframe(buf, &frame, 0, maxdlen);
fprintf(logfile, "(%010ld.%06ld) %*s %s\n", fprintf(logfile, "(%010ld.%06ld) %*s %s %s\n",
tv.tv_sec, tv.tv_usec, tv.tv_sec, tv.tv_usec,
max_devname_len, devname[idx], buf); max_devname_len, devname[idx], (msg.msg_flags & MSG_DONTROUTE)?"Tx":"Rx", buf);
} }
if ((logfrmt) && (silent == SILENT_OFF)){ if ((logfrmt) && (silent == SILENT_OFF)){

18
log2asc.c
View File

@ -71,7 +71,7 @@ void print_usage(char *prg)
fprintf(stderr, " -r (supress dlc for RTR frames - pre v8.5 tools)\n"); fprintf(stderr, " -r (supress dlc for RTR frames - pre v8.5 tools)\n");
} }
void can_asc(struct canfd_frame *cf, int devno, int nortrdlc, FILE *outfile) void can_asc(struct canfd_frame *cf, int devno, int nortrdlc, FILE *outfile, char *msgdir)
{ {
int i; int i;
char id[10]; char id[10];
@ -83,7 +83,9 @@ void can_asc(struct canfd_frame *cf, int devno, int nortrdlc, FILE *outfile)
else { else {
sprintf(id, "%X%c", cf->can_id & CAN_EFF_MASK, sprintf(id, "%X%c", cf->can_id & CAN_EFF_MASK,
(cf->can_id & CAN_EFF_FLAG)?'x':' '); (cf->can_id & CAN_EFF_FLAG)?'x':' ');
fprintf(outfile, "%-15s Rx ", id);
fprintf(outfile, "%-15s ", id);
fprintf(outfile, "%s ", msgdir); /* message direction (Tx or Rx) */
if (cf->can_id & CAN_RTR_FLAG) { if (cf->can_id & CAN_RTR_FLAG) {
if (nortrdlc) if (nortrdlc)
@ -100,7 +102,7 @@ void can_asc(struct canfd_frame *cf, int devno, int nortrdlc, FILE *outfile)
} }
} }
void canfd_asc(struct canfd_frame *cf, int devno, int mtu, FILE *outfile) void canfd_asc(struct canfd_frame *cf, int devno, int mtu, FILE *outfile, char *msgdir)
{ {
int i; int i;
char id[10]; char id[10];
@ -114,6 +116,7 @@ void canfd_asc(struct canfd_frame *cf, int devno, int mtu, FILE *outfile)
#define ASC_F_ESI 0x00004000 #define ASC_F_ESI 0x00004000
fprintf(outfile, "CANFD %3d Rx ", devno); /* 3 column channel number right aligned */ fprintf(outfile, "CANFD %3d Rx ", devno); /* 3 column channel number right aligned */
fprintf(outfile, "%s ", msgdir); /* message direction (Tx or Rx) */
sprintf(id, "%X%c", cf->can_id & CAN_EFF_MASK, sprintf(id, "%X%c", cf->can_id & CAN_EFF_MASK,
(cf->can_id & CAN_EFF_FLAG)?'x':' '); (cf->can_id & CAN_EFF_FLAG)?'x':' ');
@ -148,6 +151,7 @@ void canfd_asc(struct canfd_frame *cf, int devno, int mtu, FILE *outfile)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
static char buf[BUFSZ], device[BUFSZ], ascframe[BUFSZ]; static char buf[BUFSZ], device[BUFSZ], ascframe[BUFSZ];
static char msgdir[2];
struct canfd_frame cf; struct canfd_frame cf;
static struct timeval tv, start_tv; static struct timeval tv, start_tv;
@ -223,8 +227,8 @@ int main(int argc, char **argv)
if (buf[0] != '(') if (buf[0] != '(')
continue; continue;
if (sscanf(buf, "(%ld.%ld) %s %s", &tv.tv_sec, &tv.tv_usec, if (sscanf(buf, "(%ld.%ld) %s %s %s", &tv.tv_sec, &tv.tv_usec,
device, ascframe) != 4) { device, msgdir, ascframe) != 5) {
fprintf(stderr, "incorrect line format in logfile\n"); fprintf(stderr, "incorrect line format in logfile\n");
return 1; return 1;
} }
@ -267,9 +271,9 @@ int main(int argc, char **argv)
fprintf(outfile, "%4ld.%06ld ", tv.tv_sec, tv.tv_usec); fprintf(outfile, "%4ld.%06ld ", tv.tv_sec, tv.tv_usec);
if ((mtu == CAN_MTU) && (fdfmt == 0)) if ((mtu == CAN_MTU) && (fdfmt == 0))
can_asc(&cf, devno, nortrdlc, outfile); can_asc(&cf, devno, nortrdlc, outfile, msgdir);
else else
canfd_asc(&cf, devno, mtu, outfile); canfd_asc(&cf, devno, mtu, outfile, msgdir);
if (crlf) if (crlf)
fprintf(outfile, "\r"); fprintf(outfile, "\r");