isotp[server|tun]: update padding and CAN FD features

[can-utils.git] / isotpsend.c

diff --git a/isotpsend.c b/isotpsend.c
index 2585bec94b2bdaa6fb6c1309d709742cb4e8f200..e0256cb9083ecd025ed53a84b31d5d68cb52c70d 100644 (file)
--- a/isotpsend.c
+++ b/isotpsend.c
@@ -63,10 +63,9 @@ 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, "         -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, "         -x <addr>[:<rxaddr>] (extended addressing / opt. separate rxaddr)\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");
@@ -93,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:L:?")) != -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);
@@ -108,19 +107,42 @@ 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;
-                   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')
@@ -184,11 +206,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);