X-Git-Url: https://rtime.felk.cvut.cz/gitweb/can-utils.git/blobdiff_plain/836d3cc0122ce31a1b732d369cbd27b690c3110f..HEAD:/isotpsend.c

diff --git a/isotpsend.c b/isotpsend.c
index 3bb8282..b6a5670 100644
--- a/isotpsend.c
+++ b/isotpsend.c
@@ -56,17 +56,20 @@
 #include <linux/can/isotp.h>
 
 #define NO_CAN_ID 0xFFFFFFFFU
+#define BUFSIZE 5000 /* size > 4095 to check socket API internal checks */
 
 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. Use 'any' for all addresses)\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");
+	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");
@@ -76,17 +79,19 @@ 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;
     extern int optind, opterr, optopt;
     __u32 force_tx_stmin = 0;
-    unsigned char buf[4096];
+    unsigned char buf[BUFSIZE];
     int buflen = 0;
+    int datalen = 0;
+    int retval = 0;
 
     addr.can_addr.tp.tx_id = addr.can_addr.tp.rx_id = NO_CAN_ID;
 
-    while ((opt = getopt(argc, argv, "s:d:x:p:P:t:f:?")) != -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);
@@ -101,14 +106,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;
+	    {
+		    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')
@@ -116,7 +149,7 @@ int main(int argc, char **argv)
 		    else if (optarg[0] == 'c')
 			    opts.flags |= CAN_ISOTP_CHK_PAD_DATA;
 		    else if (optarg[0] == 'a')
-			    opts.flags |= (CAN_ISOTP_CHK_PAD_DATA | CAN_ISOTP_CHK_PAD_DATA);
+			    opts.flags |= (CAN_ISOTP_CHK_PAD_LEN | CAN_ISOTP_CHK_PAD_DATA);
 		    else {
 			    printf("unknown padding check option '%c'.\n", optarg[0]);
 			    print_usage(basename(argv[0]));
@@ -133,6 +166,25 @@ int main(int argc, char **argv)
 		    force_tx_stmin = strtoul(optarg, (char **)NULL, 10);
 		    break;
 
+	    case 'D':
+		    datalen = strtoul(optarg, (char **)NULL, 10);
+		    if (!datalen || datalen >= BUFSIZE) {
+			    print_usage(basename(argv[0]));
+			    exit(0);
+		    }
+		    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);
@@ -160,13 +212,18 @@ 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));
 
     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");
@@ -174,10 +231,23 @@ int main(int argc, char **argv)
 	exit(1);
     }
 
-    while (buflen < 4096 && scanf("%hhx", &buf[buflen]) == 1)
-	    buflen++;
+    if (!datalen) {
+	    while (buflen < BUFSIZE && scanf("%hhx", &buf[buflen]) == 1)
+		    buflen++;
+    } else {
+	    for (buflen = 0; buflen < datalen; buflen++)
+		    buf[buflen] = ((buflen % 0xFF) + 1) & 0xFF;
+    }
+
+
+    retval = write(s, buf, buflen);
+    if (retval < 0) {
+	    perror("write");
+	    return retval;
+    }
 
-    write(s, buf, buflen);
+    if (retval != buflen)
+	    fprintf(stderr, "wrote only %d from %d byte\n", retval, buflen);
 
     /* 
      * due to a Kernel internal wait queue the PDU is sent completely