isotp[send|recv]: change command line option for extended addressing

[can-utils.git] / isotpsend.c

diff --git a/isotpsend.c b/isotpsend.c
index 7b48ec266045a2d6d06dd6591d08b84ab3cc94f8..eb8de69ee0a9a1703ba2add6c11838b7e5ecf6ff 100644 (file)
--- a/isotpsend.c
+++ b/isotpsend.c
@@ -63,13 +63,13 @@ void print_usage(char *prg)
        fprintf(stderr, "\nUsage: %s [options] <CAN interface>\n", 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>    (extended addressing mode)\n");
-       fprintf(stderr, "         -X <addr>    (extended addressing mode - rx addr)\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, "         -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");
+       fprintf(stderr, "         -L <mtu>:<tx_dl>:<tx_flags> (link layer options for CAN FD)\n");
        fprintf(stderr, "\nCAN IDs and addresses are given and expected in hexadecimal values.\n");
        fprintf(stderr, "The pdu data is expected on STDIN in space separated ASCII hex values.\n");
        fprintf(stderr, "\n");
@@ -81,6 +81,7 @@ int main(int argc, char **argv)
     struct sockaddr_can addr;
     struct ifreq ifr;
     static struct can_isotp_options opts;
+    static struct can_isotp_ll_options llopts;
     int opt;
     extern int optind, opterr, optopt;
     __u32 force_tx_stmin = 0;
@@ -91,7 +92,7 @@ int main(int argc, char **argv)
 
     addr.can_addr.tp.tx_id = addr.can_addr.tp.rx_id = NO_CAN_ID;
 
-    while ((opt = getopt(argc, argv, "s:d:x:X:p:P:t:f:D:?")) != -1) {
+    while ((opt = getopt(argc, argv, "s:d:x:p:P:t:f:D:L:?")) != -1) {
            switch (opt) {
            case 's':
                    addr.can_addr.tp.tx_id = strtoul(optarg, (char **)NULL, 16);
@@ -106,14 +107,22 @@ int main(int argc, char **argv)
                    break;
 
            case 'x':
-                   opts.flags |= CAN_ISOTP_EXTEND_ADDR;
-                   opts.ext_address = strtoul(optarg, (char **)NULL, 16) & 0xFF;
-                   break;
-
-           case 'X':
-                   opts.flags |= CAN_ISOTP_RX_EXT_ADDR;
-                   opts.rx_ext_address = strtoul(optarg, (char **)NULL, 16) & 0xFF;
+           {
+                   int elements = sscanf(optarg, "%hhx:%hhx",
+                                         &opts.ext_address,
+                                         &opts.rx_ext_address);
+
+                   if (elements == 1)
+                           opts.flags |= CAN_ISOTP_EXTEND_ADDR;
+                   else if (elements == 2)
+                           opts.flags |= (CAN_ISOTP_EXTEND_ADDR | CAN_ISOTP_RX_EXT_ADDR);
+                   else {
+                           printf("incorrect extended addr values '%s'.\n", optarg);
+                           print_usage(basename(argv[0]));
+                           exit(0);
+                   }
                    break;
+           }
 
            case 'p':
                    opts.flags |= CAN_ISOTP_TX_PADDING;
@@ -151,6 +160,17 @@ int main(int argc, char **argv)
                    }
                    break;
 
+           case 'L':
+                   if (sscanf(optarg, "%hhu:%hhu:%hhu",
+                              &llopts.mtu,
+                              &llopts.tx_dl,
+                              &llopts.tx_flags) != 3) {
+                           printf("unknown link layer options '%s'.\n", optarg);
+                           print_usage(basename(argv[0]));
+                           exit(0);
+                   }
+                   break;
+
            case '?':
                    print_usage(basename(argv[0]));
                    exit(0);
@@ -171,11 +191,6 @@ int main(int argc, char **argv)
            exit(1);
     }
   
-    if ((opts.flags & CAN_ISOTP_RX_EXT_ADDR) && (!(opts.flags & CAN_ISOTP_EXTEND_ADDR))) {
-           print_usage(basename(argv[0]));
-           exit(1);
-    }
-
     if ((s = socket(PF_CAN, SOCK_DGRAM, CAN_ISOTP)) < 0) {
        perror("socket");
        exit(1);
@@ -183,6 +198,13 @@ int main(int argc, char **argv)
 
     setsockopt(s, SOL_CAN_ISOTP, CAN_ISOTP_OPTS, &opts, sizeof(opts));
 
+    if (llopts.tx_dl) {
+       if (setsockopt(s, SOL_CAN_ISOTP, CAN_ISOTP_LL_OPTS, &llopts, sizeof(llopts)) < 0) {
+           perror("link layer sockopt");
+           exit(1);
+       }
+    }
+
     if (opts.flags & CAN_ISOTP_FORCE_TXSTMIN)
            setsockopt(s, SOL_CAN_ISOTP, CAN_ISOTP_TX_STMIN, &force_tx_stmin, sizeof(force_tx_stmin));