isotp: added support for separate extended address in rx path

[profile/ivi/can-utils.git] / isotprecv.c

diff --git a/isotprecv.c b/isotprecv.c
index 090164d..a0934ba 100644 (file)
--- a/isotprecv.c
+++ b/isotprecv.c
@@ -1,8 +1,4 @@
 /*
- *  $Id$
- */
-
-/*
  * isotprecv.c
  *
  * Copyright (c) 2008 Volkswagen Group Electronic Research
@@ -60,6 +56,7 @@
 #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)
 {
@@ -67,6 +64,7 @@ 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>    (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 SF/CF. (l)ength (c)ontent (a)ll)\n");
        fprintf(stderr, "         -b <bs>      (blocksize. 0 = off)\n");
@@ -91,12 +89,12 @@ int main(int argc, char **argv)
     __u32 force_rx_stmin = 0;
     int loop = 0;
 
-    unsigned char msg[4096];
+    unsigned char msg[BUFSIZE];
     int nbytes;
 
     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:b:m:w:f:l?")) != -1) {
+    while ((opt = getopt(argc, argv, "s:d:x:X:p:P:b:m:w:f:l?")) != -1) {
            switch (opt) {
            case 's':
                    addr.can_addr.tp.tx_id = strtoul(optarg, (char **)NULL, 16);
@@ -115,6 +113,11 @@ int main(int argc, char **argv)
                    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;
+                   break;
+
            case 'p':
                    opts.flags |= CAN_ISOTP_RX_PADDING;
                    opts.rxpad_content = strtoul(optarg, (char **)NULL, 16) & 0xFF;
@@ -126,7 +129,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]));
@@ -175,6 +178,11 @@ 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);
@@ -198,8 +206,8 @@ int main(int argc, char **argv)
     }
 
     do {
-           nbytes = read(s, msg, 4096);
-           if (nbytes > 0 && nbytes < 4096)
+           nbytes = read(s, msg, BUFSIZE);
+           if (nbytes > 0 && nbytes < BUFSIZE)
                    for (i=0; i < nbytes; i++)
                            printf("%02X ", msg[i]);
            printf("\n");