can-calc-bit-timing: import current can_calc_bittiming() from kernel

[can-utils.git] / isotpsend.c

diff --git a/isotpsend.c b/isotpsend.c
index eb8de69ee0a9a1703ba2add6c11838b7e5ecf6ff..b6a56708fb4d8c71afa34c6396ef079fe261fa8e 100644 (file)
--- a/isotpsend.c
+++ b/isotpsend.c
@@ -64,8 +64,8 @@ void print_usage(char *prg)
        fprintf(stderr, "Options: -s <can_id>  (source can_id. Use 8 digits for extended IDs)\n");
        fprintf(stderr, "         -d <can_id>  (destination can_id. Use 8 digits for extended IDs)\n");
        fprintf(stderr, "         -x <addr>[:<rxaddr>] (extended addressing / opt. separate rxaddr)\n");
-       fprintf(stderr, "         -p <byte>    (set and enable padding byte)\n");
-       fprintf(stderr, "         -P <mode>    (check padding in FC. (l)ength (c)ontent (a)ll)\n");
+       fprintf(stderr, "         -p [tx]:[rx] (set and enable tx/rx padding bytes)\n");
+       fprintf(stderr, "         -P <mode>    (check rx padding for (l)ength (c)ontent (a)ll)\n");
        fprintf(stderr, "         -t <time ns> (frame transmit time (N_As) in nanosecs)\n");
        fprintf(stderr, "         -f <time ns> (ignore FC and force local tx stmin value in nanosecs)\n");
        fprintf(stderr, "         -D <len>     (send a fixed PDU with len bytes - no STDIN data)\n");
@@ -79,7 +79,6 @@ int main(int argc, char **argv)
 {
     int s;
     struct sockaddr_can addr;
-    struct ifreq ifr;
     static struct can_isotp_options opts;
     static struct can_isotp_ll_options llopts;
     int opt;
@@ -125,9 +124,24 @@ int main(int argc, char **argv)
            }
 
            case 'p':
-                   opts.flags |= CAN_ISOTP_TX_PADDING;
-                   opts.txpad_content = strtoul(optarg, (char **)NULL, 16) & 0xFF;
+           {
+                   int elements = sscanf(optarg, "%hhx:%hhx",
+                                         &opts.txpad_content,
+                                         &opts.rxpad_content);
+
+                   if (elements == 1)
+                           opts.flags |= CAN_ISOTP_TX_PADDING;
+                   else if (elements == 2)
+                           opts.flags |= (CAN_ISOTP_TX_PADDING | CAN_ISOTP_RX_PADDING);
+                   else if (sscanf(optarg, ":%hhx", &opts.rxpad_content) == 1)
+                           opts.flags |= CAN_ISOTP_RX_PADDING;
+                   else {
+                           printf("incorrect padding values '%s'.\n", optarg);
+                           print_usage(basename(argv[0]));
+                           exit(0);
+                   }
                    break;
+           }
 
            case 'P':
                    if (optarg[0] == 'l')
@@ -209,9 +223,7 @@ int main(int argc, char **argv)
            setsockopt(s, SOL_CAN_ISOTP, CAN_ISOTP_TX_STMIN, &force_tx_stmin, sizeof(force_tx_stmin));
 
     addr.can_family = AF_CAN;
-    strcpy(ifr.ifr_name, argv[optind]);
-    ioctl(s, SIOCGIFINDEX, &ifr);
-    addr.can_ifindex = ifr.ifr_ifindex;
+    addr.can_ifindex = if_nametoindex(argv[optind]);
 
     if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
        perror("bind");