slcanpty: fix wrong usage of nbytes variable

[sojka/can-utils.git] / candump.c

diff --git a/candump.c b/candump.c
index 11be0aeef1f3084357ec73996e568161a3055bea..bf3e8bb5d18614a322f43d3e6f9dfdf6ee6a0b30 100644 (file)
--- a/candump.c
+++ b/candump.c
@@ -1,7 +1,3 @@
-/*
- *  $Id$
- */
-
 /*
  * candump.c
  *
@@ -99,6 +95,7 @@ const int canfd_on = 1;
 
 #define MAXANI 4
 const char anichar[MAXANI] = {'|', '/', '-', '\\'};
+const char extra_m_info[4][4] = {"- -", "B -", "- E", "B E"};
 
 extern int optind, opterr, optopt;
 
@@ -123,6 +120,7 @@ void print_usage(char *prg)
        fprintf(stderr, "         -r <size>   (set socket receive buffer to <size>)\n");
        fprintf(stderr, "         -d          (monitor dropped CAN frames)\n");
        fprintf(stderr, "         -e          (dump CAN error frames in human-readable format)\n");
+       fprintf(stderr, "         -x          (print extra message infos, rx/tx brs esi)\n");
        fprintf(stderr, "\n");
        fprintf(stderr, "Up to %d CAN interfaces with optional filter sets can be specified\n", MAXSOCK);
        fprintf(stderr, "on the commandline in the form: <ifname>[,filter]*\n");
@@ -206,6 +204,7 @@ int main(int argc, char **argv)
        useconds_t bridge_delay = 0;
        unsigned char timestamp = 0;
        unsigned char dropmonitor = 0;
+       unsigned char extra_msg_info = 0;
        unsigned char silent = SILENT_INI;
        unsigned char silentani = 0;
        unsigned char color = 0;
@@ -237,7 +236,7 @@ int main(int argc, char **argv)
        last_tv.tv_sec  = 0;
        last_tv.tv_usec = 0;
 
-       while ((opt = getopt(argc, argv, "t:ciaSs:b:B:u:ldLn:r:he?")) != -1) {
+       while ((opt = getopt(argc, argv, "t:ciaSs:b:B:u:ldxLn:r:he?")) != -1) {
                switch (opt) {
                case 't':
                        timestamp = optarg[0];
@@ -328,6 +327,10 @@ int main(int argc, char **argv)
                        dropmonitor = 1;
                        break;
 
+               case 'x':
+                       extra_msg_info = 1;
+                       break;
+
                case 'L':
                        logfrmt = 1;
                        break;
@@ -673,9 +676,13 @@ int main(int argc, char **argv)
 
                                idx = idx2dindex(addr.can_ifindex, s[i]);
 
+                               /* once we detected a EFF frame indent SFF frames accordingly */
+                               if (frame.can_id & CAN_EFF_FLAG)
+                                       view |= CANLIB_VIEW_INDENT_SFF;
+
                                if (log) {
                                        /* log CAN frame with absolute timestamp & device */
-                                       fprintf(logfile, "(%ld.%06ld) ", tv.tv_sec, tv.tv_usec);
+                                       fprintf(logfile, "(%010ld.%06ld) ", tv.tv_sec, tv.tv_usec);
                                        fprintf(logfile, "%*s ", max_devname_len, devname[idx]);
                                        /* without seperator as logfile use-case is parsing */
                                        fprint_canframe(logfile, &frame, "\n", 0, maxdlen);
@@ -683,7 +690,7 @@ int main(int argc, char **argv)
 
                                if (logfrmt) {
                                        /* print CAN frame in log file style to stdout */
-                                       printf("(%ld.%06ld) ", tv.tv_sec, tv.tv_usec);
+                                       printf("(%010ld.%06ld) ", tv.tv_sec, tv.tv_usec);
                                        printf("%*s ", max_devname_len, devname[idx]);
                                        fprint_canframe(stdout, &frame, "\n", 0, maxdlen);
                                        goto out_fflush; /* no other output to stdout */
@@ -702,7 +709,7 @@ int main(int argc, char **argv)
                                switch (timestamp) {
 
                                case 'a': /* absolute with timestamp */
-                                       printf("(%ld.%06ld) ", tv.tv_sec, tv.tv_usec);
+                                       printf("(%010ld.%06ld) ", tv.tv_sec, tv.tv_usec);
                                        break;
 
                                case 'A': /* absolute with date */
@@ -742,6 +749,15 @@ int main(int argc, char **argv)
 
                                printf(" %s", (color && (color<3))?col_on[idx%MAXCOL]:"");
                                printf("%*s", max_devname_len, devname[idx]);
+
+                               if (extra_msg_info) {
+
+                                       if (msg.msg_flags & MSG_DONTROUTE)
+                                               printf ("  TX %s", extra_m_info[frame.flags & 3]);
+                                       else
+                                               printf ("  RX %s", extra_m_info[frame.flags & 3]);
+                               }
+
                                printf("%s  ", (color==1)?col_off:"");
 
                                fprint_long_canframe(stdout, &frame, NULL, view, maxdlen);