Android.mk: remove executable bit

[can-utils.git] / candump.c

diff --git a/candump.c b/candump.c
index d6c7c0172595684c331dfd15108931c51c948857..c865bd76f9dd78f41b99bbdae31b1067ab411809 100644 (file)
--- a/candump.c
+++ b/candump.c
@@ -1,7 +1,3 @@
-/*
- *  $Id$
- */
-
 /*
  * candump.c
  *
@@ -53,6 +49,7 @@
 #include <ctype.h>
 #include <libgen.h>
 #include <time.h>
+#include <errno.h>
 
 #include <sys/time.h>
 #include <sys/types.h>
@@ -99,6 +96,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 +121,8 @@ 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, "         -T <msecs>  (terminate after <msecs> without any reception)\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 +206,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;
@@ -228,6 +229,7 @@ int main(int argc, char **argv)
        int nbytes, i, maxdlen;
        struct ifreq ifr;
        struct timeval tv, last_tv;
+       struct timeval timeout, timeout_config = { 0, 0 }, *timeout_current = NULL;
        FILE *logfile = NULL;
 
        signal(SIGTERM, sigterm);
@@ -237,7 +239,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:heT:?")) != -1) {
                switch (opt) {
                case 't':
                        timestamp = optarg[0];
@@ -328,6 +330,10 @@ int main(int argc, char **argv)
                        dropmonitor = 1;
                        break;
 
+               case 'x':
+                       extra_msg_info = 1;
+                       break;
+
                case 'L':
                        logfrmt = 1;
                        break;
@@ -348,6 +354,17 @@ int main(int argc, char **argv)
                        }
                        break;
 
+               case 'T':
+                       errno = 0;
+                       timeout_config.tv_usec = strtol(optarg, NULL, 0);
+                       if (errno != 0) {
+                               print_usage(basename(argv[0]));
+                               exit(1);
+                       }
+                       timeout_config.tv_sec = timeout_config.tv_usec / 1000;
+                       timeout_config.tv_usec = (timeout_config.tv_usec % 1000) * 1000;
+                       timeout_current = &timeout;
+                       break;
                default:
                        print_usage(basename(argv[0]));
                        exit(1);
@@ -591,7 +608,10 @@ int main(int argc, char **argv)
                for (i=0; i<currmax; i++)
                        FD_SET(s[i], &rdfs);
 
-               if ((ret = select(s[currmax-1]+1, &rdfs, NULL, NULL, NULL)) < 0) {
+               if (timeout_current)
+                       *timeout_current = timeout_config;
+
+               if ((ret = select(s[currmax-1]+1, &rdfs, NULL, NULL, timeout_current)) <= 0) {
                        //perror("select");
                        running = 0;
                        continue;
@@ -679,15 +699,15 @@ int main(int argc, char **argv)
 
                                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 */
+                                       /* without separator as logfile use-case is parsing */
                                        fprint_canframe(logfile, &frame, "\n", 0, maxdlen);
                                }
 
                                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 */
@@ -706,7 +726,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 */
@@ -746,6 +766,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);