Remove obsolete 'vcan' tool.

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

diff --git a/candump.c b/candump.c
index cbe821e1fc7ccac90dce24573aa5cd852d71bdae..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 */
@@ -115,10 +114,12 @@ void print_usage(char *prg)
        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");
@@ -202,11 +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;
        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;
@@ -221,7 +224,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:lLh?")) != -1) {
+       while ((opt = getopt(argc, argv, "t:ciaSs:b:B:lLn:r:h?")) != -1) {
                switch (opt) {
                case 't':
                        timestamp = optarg[0];
@@ -304,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);
@@ -386,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;
 
@@ -414,12 +448,6 @@ int main(int argc, char **argv)
                                        fprintf(stderr, "Error in filter option parsing: '%s'\n", ptr);
                                        exit(1);
                                }
-
-                               if (numfilter > MAXFILTER) {
-                                       fprintf(stderr, "Too many filters specified for '%s'.\n",
-                                              ifr.ifr_name);
-                                       exit(1);
-                               }
                        }
 
                        if (err_mask)
@@ -428,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;
@@ -500,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) {