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");
{
int s;
struct sockaddr_can addr;
- struct ifreq ifr;
static struct can_isotp_options opts;
static struct can_isotp_ll_options llopts;
int opt;
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);
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')
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);
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");