]> rtime.felk.cvut.cz Git - sojka/can-utils.git/blobdiff - candump.c
Allow to specify the name of the IP tunnel netdevice via commandline option '-n ...
[sojka/can-utils.git] / candump.c
index cc31a392ed4773291fd7e763ab92c6ab691d0ce3..ae203747fd126d024dcceb11cc6b865ec462eb85 100644 (file)
--- a/candump.c
+++ b/candump.c
@@ -5,7 +5,7 @@
 /*
  * candump.c
  *
- * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
+ * Copyright (c) 2002-2009 Volkswagen Group Electronic Research
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -68,7 +68,6 @@
 #include "lib.h"
 
 #define MAXSOCK 16    /* max. number of CAN interfaces given on the cmdline */
-#define MAXFILTER 30  /* max. number of possible filters for each socket */
 #define MAXIFNAMES 30 /* size of receive name index to omit ioctls */
 #define MAXCOL 6      /* number of different colors for colorized output */
 #define ANYDEV "any"  /* name of interface to receive from any CAN interface */
@@ -109,15 +108,18 @@ void print_usage(char *prg)
        fprintf(stderr, "         -c          (increment color mode level)\n");
        fprintf(stderr, "         -i          (binary output - may exceed 80 chars/line)\n");
        fprintf(stderr, "         -a          (enable additional ASCII output)\n");
+       fprintf(stderr, "         -S          (swap byte order in printed CAN data[] - marked with '%c' )\n", SWAP_DELIMITER);
        fprintf(stderr, "         -s <level>  (silent mode - %d: off (default) %d: animation %d: silent)\n", SILENT_OFF, SILENT_ANI, SILENT_ON);
        fprintf(stderr, "         -b <can>    (bridge mode - send received frames to <can>)\n");
        fprintf(stderr, "         -B <can>    (bridge mode - like '-b' with disabled loopback)\n");
        fprintf(stderr, "         -l          (log CAN-frames into file. Sets '-s %d' by default)\n", SILENT_ON);
        fprintf(stderr, "         -L          (use log file format on stdout)\n");
+       fprintf(stderr, "         -n <count>  (terminate after receiption of <count> CAN frames)\n");
+       fprintf(stderr, "         -r <size>   (set socket receive buffer to <size>)\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");
-       fprintf(stderr, "\nUp to %d comma separated filters can be specified for each given CAN interface:\n", MAXFILTER);
+       fprintf(stderr, "\nComma separated filters can be specified for each given CAN interface:\n");
        fprintf(stderr, " <can_id>:<can_mask> (matches when <received_can_id> & mask == can_id & mask)\n");
        fprintf(stderr, " <can_id>~<can_mask> (matches when <received_can_id> & mask != can_id & mask)\n");
        fprintf(stderr, " #<error_mask>       (set error frame filter, see include/linux/can/error.h)\n");
@@ -129,8 +131,9 @@ void print_usage(char *prg)
        fprintf(stderr, "%s -c -c -ta can0,123:7FF,400:700,#000000FF can2,400~7F0 can3 can8\n", prg);
        fprintf(stderr, "%s -l any,0~0,#FFFFFFFF    (log only error frames but no(!) data frames)\n", prg);
        fprintf(stderr, "%s -l any,0:0,#FFFFFFFF    (log error frames and also all data frames)\n", prg);
-       fprintf(stderr, "%s vcan2,92345678:9FFFFFFF (match only for extended CAN ID 12345678)\n", prg);
-       fprintf(stderr, "%s vcan2,12345678:1FFFFFFF (analog to above due to 8 digit value length)\n", prg);
+       fprintf(stderr, "%s vcan2,92345678:DFFFFFFF (match only for extended CAN ID 12345678)\n", prg);
+       fprintf(stderr, "%s vcan2,123:7FF (matches CAN ID 123 - including EFF and RTR frames)\n", prg);
+       fprintf(stderr, "%s vcan2,123:C00007FF (matches CAN ID 123 - only SFF and non-RTR frames)\n", prg);
        fprintf(stderr, "\n");
 }
 
@@ -165,7 +168,7 @@ int idx2dindex(int ifidx, int socket) {
                        break;
 
        if (i == MAXIFNAMES) {
-               printf("Interface index cache only supports %d interfaces.\n",
+               fprintf(stderr, "Interface index cache only supports %d interfaces.\n",
                       MAXIFNAMES);
                exit(1);
        }
@@ -188,21 +191,6 @@ int idx2dindex(int ifidx, int socket) {
        return i;
 }
 
-canid_t checkeff(char *ptr, char *nptr)
-{
-       int len;
-
-       if (nptr)
-               len = nptr - ptr;
-       else
-               len = strlen(ptr);
-
-       if (len == 17 && (ptr[8] == ':' || ptr[8] == '~'))
-               return CAN_EFF_FLAG;
-       else
-               return 0;
-}
-
 int main(int argc, char **argv)
 {
        fd_set rdfs;
@@ -215,12 +203,13 @@ int main(int argc, char **argv)
        unsigned char view = 0;
        unsigned char log = 0;
        unsigned char logfrmt = 0;
+       int count = 0;
+       int rcvbuf_size = 0;
        int opt, ret;
        int currmax, numfilter;
        char *ptr, *nptr;
-       canid_t eff;
        struct sockaddr_can addr;
-       struct can_filter rfilter[MAXFILTER];
+       struct can_filter *rfilter;
        can_err_mask_t err_mask;
        struct can_frame frame;
        int nbytes, i;
@@ -235,13 +224,13 @@ int main(int argc, char **argv)
        last_tv.tv_sec  = 0;
        last_tv.tv_usec = 0;
 
-       while ((opt = getopt(argc, argv, "t:cias:b:B:lLh?")) != -1) {
+       while ((opt = getopt(argc, argv, "t:ciaSs:b:B:lLn:r:h?")) != -1) {
                switch (opt) {
                case 't':
                        timestamp = optarg[0];
                        if ((timestamp != 'a') && (timestamp != 'A') &&
                            (timestamp != 'd') && (timestamp != 'z')) {
-                               printf("%s: unknown timestamp mode '%c' - ignored\n",
+                               fprintf(stderr, "%s: unknown timestamp mode '%c' - ignored\n",
                                       basename(argv[0]), optarg[0]);
                                timestamp = 0;
                        }
@@ -259,6 +248,10 @@ int main(int argc, char **argv)
                        view |= CANLIB_VIEW_ASCII;
                        break;
 
+               case 'S':
+                       view |= CANLIB_VIEW_SWAP;
+                       break;
+
                case 's':
                        silent = atoi(optarg);
                        if (silent > SILENT_ON) {
@@ -270,7 +263,7 @@ int main(int argc, char **argv)
                case 'b':
                case 'B':
                        if (strlen(optarg) >= IFNAMSIZ) {
-                               printf("Name of CAN device '%s' is too long!\n\n", optarg);
+                               fprintf(stderr, "Name of CAN device '%s' is too long!\n\n", optarg);
                                return 1;
                        } else {
                                bridge = socket(PF_CAN, SOCK_RAW, CAN_RAW);
@@ -289,6 +282,9 @@ int main(int argc, char **argv)
                                        return 1;
                                }
 
+                               /* disable default receive filter on this write-only RAW socket */
+                               setsockopt(bridge, SOL_CAN_RAW, CAN_RAW_FILTER, NULL, 0);
+
                                if (opt == 'B') {
                                        int loopback = 0;
 
@@ -311,6 +307,22 @@ int main(int argc, char **argv)
                        logfrmt = 1;
                        break;
 
+               case 'n':
+                       count = atoi(optarg);
+                       if (count < 1) {
+                               print_usage(basename(argv[0]));
+                               exit(1);
+                       }
+                       break;
+
+               case 'r':
+                       rcvbuf_size = atoi(optarg);
+                       if (rcvbuf_size < 1) {
+                               print_usage(basename(argv[0]));
+                               exit(1);
+                       }
+                       break;
+
                default:
                        print_usage(basename(argv[0]));
                        exit(1);
@@ -323,9 +335,14 @@ int main(int argc, char **argv)
                exit(0);
        }
        
+       if (logfrmt && view) {
+               fprintf(stderr, "Log file format selected: Please disable ASCII/BINARY/SWAP options!\n");
+               exit(0);
+       }
+
        if (silent == SILENT_INI) {
                if (log) {
-                       printf("\nDisabled standard output while logging.");
+                       fprintf(stderr, "\nDisabled standard output while logging.");
                        silent = SILENT_ON; /* disable output on stdout */
                } else
                        silent = SILENT_OFF; /* default output */
@@ -334,7 +351,7 @@ int main(int argc, char **argv)
        currmax = argc - optind; /* find real number of CAN devices */
 
        if (currmax > MAXSOCK) {
-               printf("More than %d CAN devices given on commandline!\n", MAXSOCK);
+               fprintf(stderr, "More than %d CAN devices given on commandline!\n", MAXSOCK);
                return 1;
        }
 
@@ -359,7 +376,7 @@ int main(int argc, char **argv)
                        nbytes = strlen(ptr); /* no ',' found => no filter definitions */
 
                if (nbytes >= IFNAMSIZ) {
-                       printf("name of CAN device '%s' is too long!\n", ptr);
+                       fprintf(stderr, "name of CAN device '%s' is too long!\n", ptr);
                        return 1;
                }
 
@@ -388,6 +405,21 @@ int main(int argc, char **argv)
 
                        /* found a ',' after the interface name => check for filters */
 
+                       /* determine number of filters to alloc the filter space */
+                       numfilter = 0;
+                       ptr = nptr;
+                       while (ptr) {
+                               numfilter++;
+                               ptr++; /* hop behind the ',' */
+                               ptr = strchr(ptr, ','); /* exit condition */
+                       }
+
+                       rfilter = malloc(sizeof(struct can_filter) * numfilter);
+                       if (!rfilter) {
+                               fprintf(stderr, "Failed to create filter space!\n");
+                               return 1;
+                       }
+
                        numfilter = 0;
                        err_mask = 0;
 
@@ -401,9 +433,6 @@ int main(int argc, char **argv)
                                           &rfilter[numfilter].can_id, 
                                           (long unsigned int *)
                                           &rfilter[numfilter].can_mask) == 2) {
-                                       eff = checkeff(ptr, nptr);
-                                       rfilter[numfilter].can_id |= eff;
-                                       rfilter[numfilter].can_mask |= eff;
                                        rfilter[numfilter].can_mask &= ~CAN_ERR_FLAG;
                                        numfilter++;
                                } else if (sscanf(ptr, "%lx~%lx",
@@ -412,20 +441,11 @@ int main(int argc, char **argv)
                                                  (long unsigned int *)
                                                  &rfilter[numfilter].can_mask) == 2) {
                                        rfilter[numfilter].can_id |= CAN_INV_FILTER;
-                                       eff = checkeff(ptr, nptr);
-                                       rfilter[numfilter].can_id |= eff;
-                                       rfilter[numfilter].can_mask |= eff;
                                        rfilter[numfilter].can_mask &= ~CAN_ERR_FLAG;
                                        numfilter++;
                                } else if (sscanf(ptr, "#%lx",
                                                  (long unsigned int *)&err_mask) != 1) { 
-                                       printf("Error in filter option parsing: '%s'\n", ptr);
-                                       exit(1);
-                               }
-
-                               if (numfilter > MAXFILTER) {
-                                       printf("Too many filters specified for '%s'.\n",
-                                              ifr.ifr_name);
+                                       fprintf(stderr, "Error in filter option parsing: '%s'\n", ptr);
                                        exit(1);
                                }
                        }
@@ -436,9 +456,36 @@ int main(int argc, char **argv)
 
                        if (numfilter)
                                setsockopt(s[i], SOL_CAN_RAW, CAN_RAW_FILTER,
-                                          &rfilter, numfilter * sizeof(struct can_filter));
+                                          rfilter, numfilter * sizeof(struct can_filter));
+
+                       free(rfilter);
+
                } /* if (nptr) */
 
+               if (rcvbuf_size) {
+
+                       int curr_rcvbuf_size;
+                       socklen_t curr_rcvbuf_size_len = sizeof(curr_rcvbuf_size);
+
+                       if (setsockopt(s[i], SOL_SOCKET, SO_RCVBUF,
+                                      &rcvbuf_size, sizeof(rcvbuf_size)) < 0) {
+                               perror("setsockopt SO_RCVBUF");
+                               exit(1);
+                       }
+
+                       if (getsockopt(s[i], SOL_SOCKET, SO_RCVBUF,
+                                      &curr_rcvbuf_size, &curr_rcvbuf_size_len) < 0) {
+                               perror("getsockopt SO_RCVBUF");
+                               exit(1);
+                       }
+
+                       /* Only print a warning the first time we detect the adjustment */
+                       /* n.b.: The wanted size is doubled in Linux in net/sore/sock.c */
+                       if (!i && curr_rcvbuf_size < rcvbuf_size*2)
+                               fprintf(stderr, "The socket receive buffer size was "
+                                       "adjusted due to /proc/sys/net/core/rmem_max.\n");
+               }
+
                if (bind(s[i], (struct sockaddr *)&addr, sizeof(addr)) < 0) {
                        perror("bind");
                        return 1;
@@ -468,7 +515,7 @@ int main(int argc, char **argv)
                if (silent != SILENT_ON)
                        printf("\nWarning: console output active while logging!");
 
-               printf("\nEnabling Logfile '%s'\n\n", fname);
+               fprintf(stderr, "\nEnabling Logfile '%s'\n\n", fname);
 
                logfile = fopen(fname, "w");
                if (!logfile) {
@@ -508,6 +555,9 @@ int main(int argc, char **argv)
                                        return 1;
                                }
 
+                               if (count && (--count == 0))
+                                       running = 0;
+
                                if (bridge) {
                                        nbytes = write(bridge, &frame, sizeof(struct can_frame));
                                        if (nbytes < 0) {