From 7939678070f33a64e1dd872d43b6a8185de5213f Mon Sep 17 00:00:00 2001 From: Oliver Hartkopp Date: Sat, 13 Dec 2025 10:38:15 +0100 Subject: [PATCH] can-utils: unify indention Signed-off-by: Oliver Hartkopp --- asc2log.c | 2 +- candump.c | 16 +- canlogserver.c | 4 +- cansniffer.c | 22 +-- isotpdump.c | 176 +++++++++++----------- isotpperf.c | 324 +++++++++++++++++++-------------------- isotprecv.c | 310 +++++++++++++++++++------------------- isotpsend.c | 400 ++++++++++++++++++++++++------------------------- j1939acd.c | 16 +- j1939cat.c | 36 ++--- j1939spy.c | 8 +- j1939sr.c | 6 +- lib.c | 39 ++--- testj1939.c | 10 +- 14 files changed, 685 insertions(+), 684 deletions(-) diff --git a/asc2log.c b/asc2log.c index 3d21f5f..99bd91a 100644 --- a/asc2log.c +++ b/asc2log.c @@ -584,7 +584,7 @@ static void eval_canxl_fd(char* buf, struct timeval *date_tvp, char timestamps, return; if (!(flags & ASC_F_FDF)) - return; + return; cf.flags = CANFD_FDF; diff --git a/candump.c b/candump.c index 8b9bf59..ec97dd6 100644 --- a/candump.c +++ b/candump.c @@ -715,12 +715,12 @@ int main(int argc, char **argv) localtime_r(&currtime, &now); snprintf(fname, sizeof(fname), "candump-%04d-%02d-%02d_%02d%02d%02d.log", - now.tm_year + 1900, - now.tm_mon + 1, - now.tm_mday, - now.tm_hour, - now.tm_min, - now.tm_sec); + now.tm_year + 1900, + now.tm_mon + 1, + now.tm_mday, + now.tm_hour, + now.tm_min, + now.tm_sec); logname = fname; } @@ -891,8 +891,8 @@ int main(int argc, char **argv) alen = sprintf(afrbuf, " %s", (color > 2) ? col_on[idx % MAXCOL] : ""); alen += sprint_timestamp(afrbuf + alen, timestamp, use_ns, &ts, &last_ts); alen += sprintf(afrbuf + alen, " %s%*s", - (color && (color < 3)) ? col_on[idx % MAXCOL] : "", - max_devname_len, devname[idx]); + (color && (color < 3)) ? col_on[idx % MAXCOL] : "", + max_devname_len, devname[idx]); if (extra_msg_info) { if (msg.msg_flags & MSG_DONTROUTE) diff --git a/canlogserver.c b/canlogserver.c index 2e8d288..b1b667d 100644 --- a/canlogserver.c +++ b/canlogserver.c @@ -317,8 +317,8 @@ int main(int argc, char **argv) for (i=0; icurrent.can_id; - unsigned long s = ((struct snif*)elem2)->current.can_id; + unsigned long f = ((struct snif*)elem1)->current.can_id; + unsigned long s = ((struct snif*)elem2)->current.can_id; - if (f > s) - return 1; - if (f < s) - return -1; + if (f > s) + return 1; + if (f < s) + return -1; - return 0; + return 0; } void print_usage(char *prg) @@ -741,10 +741,10 @@ int handle_timeo(long currcms) do_clr(i, UPDATE); } else if ((sniftab[i].hold) && (sniftab[i].hold < currcms)) { - memset(&sniftab[i].marker.data, 0, max_dlen); - print_snifline(i); - sniftab[i].hold = 0; /* disable update by hold */ - } + memset(&sniftab[i].marker.data, 0, max_dlen); + print_snifline(i); + sniftab[i].hold = 0; /* disable update by hold */ + } else printf("%s", CSR_DOWN); /* skip my line */ diff --git a/isotpdump.c b/isotpdump.c index 87a2d69..8a55354 100644 --- a/isotpdump.c +++ b/isotpdump.c @@ -426,112 +426,112 @@ int main(int argc, char **argv) } } - if (frame.can_id & CAN_EFF_FLAG) - printf(" %s %8X", argv[optind], frame.can_id & CAN_EFF_MASK); - else - printf(" %s %3X", argv[optind], frame.can_id & CAN_SFF_MASK); + if (frame.can_id & CAN_EFF_FLAG) + printf(" %s %8X", argv[optind], frame.can_id & CAN_EFF_MASK); + else + printf(" %s %3X", argv[optind], frame.can_id & CAN_SFF_MASK); - if (ext) - printf("{%02X}", frame.data[0]); + if (ext) + printf("{%02X}", frame.data[0]); - if (nbytes == CAN_MTU) - printf(" [%d] ", frame.len); - else - printf(" [%02d] ", frame.len); + if (nbytes == CAN_MTU) + printf(" [%d] ", frame.len); + else + printf(" [%02d] ", frame.len); - datidx = 0; - n_pci = frame.data[ext]; + datidx = 0; + n_pci = frame.data[ext]; - switch (n_pci & 0xF0) { - case 0x00: - is_ff = 1; - if (n_pci & 0xF) { - printf("[SF] ln: %-4d data:", n_pci & 0xF); - datidx = ext+1; - } else { - printf("[SF] ln: %-4d data:", frame.data[ext + 1]); - datidx = ext+2; - } - break; - - case 0x10: - is_ff = 1; - fflen = ((n_pci & 0x0F)<<8) + frame.data[ext+1]; - if (fflen) - datidx = ext+2; - else { - fflen = (frame.data[ext+2]<<24) + - (frame.data[ext+3]<<16) + - (frame.data[ext+4]<<8) + - frame.data[ext+5]; - datidx = ext+6; - } - printf("[FF] ln: %-4lu data:", fflen); - break; - - case 0x20: - printf("[CF] sn: %X data:", n_pci & 0x0F); + switch (n_pci & 0xF0) { + case 0x00: + is_ff = 1; + if (n_pci & 0xF) { + printf("[SF] ln: %-4d data:", n_pci & 0xF); datidx = ext+1; - break; + } else { + printf("[SF] ln: %-4d data:", frame.data[ext + 1]); + datidx = ext+2; + } + break; - case 0x30: - n_pci &= 0x0F; - printf("[FC] FC: %d ", n_pci); + case 0x10: + is_ff = 1; + fflen = ((n_pci & 0x0F)<<8) + frame.data[ext+1]; + if (fflen) + datidx = ext+2; + else { + fflen = (frame.data[ext+2]<<24) + + (frame.data[ext+3]<<16) + + (frame.data[ext+4]<<8) + + frame.data[ext+5]; + datidx = ext+6; + } + printf("[FF] ln: %-4lu data:", fflen); + break; - if (n_pci > 3) - n_pci = 3; + case 0x20: + printf("[CF] sn: %X data:", n_pci & 0x0F); + datidx = ext+1; + break; - printf("= %s # ", fc_info[n_pci]); + case 0x30: + n_pci &= 0x0F; + printf("[FC] FC: %d ", n_pci); - printf("BS: %d %s# ", frame.data[ext+1], - (frame.data[ext+1])? "":"= off "); + if (n_pci > 3) + n_pci = 3; - i = frame.data[ext+2]; - printf("STmin: 0x%02X = ", i); + printf("= %s # ", fc_info[n_pci]); - if (i < 0x80) - printf("%d ms", i); - else if (i > 0xF0 && i < 0xFA) - printf("%d us", (i & 0x0F) * 100); - else - printf("reserved"); - break; + printf("BS: %d %s# ", frame.data[ext+1], + (frame.data[ext+1])? "":"= off "); - default: - printf("[??]"); + i = frame.data[ext+2]; + printf("STmin: 0x%02X = ", i); + + if (i < 0x80) + printf("%d ms", i); + else if (i > 0xF0 && i < 0xFA) + printf("%d us", (i & 0x0F) * 100); + else + printf("reserved"); + break; + + default: + printf("[??]"); + } + + if (datidx && frame.len > datidx) { + printf(" "); + for (i = datidx; i < frame.len; i++) { + printf("%02X ", frame.data[i]); } - if (datidx && frame.len > datidx) { - printf(" "); + if (asc) { + printf("%*s", ((7-ext) - (frame.len-datidx))*3 + 5 , + "- '"); for (i = datidx; i < frame.len; i++) { - printf("%02X ", frame.data[i]); - } - - if (asc) { - printf("%*s", ((7-ext) - (frame.len-datidx))*3 + 5 , - "- '"); - for (i = datidx; i < frame.len; i++) { - printf("%c",((frame.data[i] > 0x1F) && - (frame.data[i] < 0x7F))? - frame.data[i] : '.'); - } - printf("'"); - } - if (uds_output && is_ff) { - int offset = 3; - if (asc) - offset = 1; - printf("%*s", ((7-ext) - (frame.len-datidx))*offset + 3, - " - "); - print_uds_message(frame.data[datidx], frame.data[datidx+2]); - is_ff = 0; + printf("%c",((frame.data[i] > 0x1F) && + (frame.data[i] < 0x7F))? + frame.data[i] : '.'); } + printf("'"); } + if (uds_output && is_ff) { + int offset = 3; + if (asc) + offset = 1; + printf("%*s", ((7-ext) - (frame.len-datidx))*offset + 3, + " - "); + print_uds_message(frame.data[datidx], frame.data[datidx+2]); + is_ff = 0; + } + } - if (color) - printf("%s", ATTRESET); - printf("\n"); - fflush(stdout); + if (color) + printf("%s", ATTRESET); + printf("\n"); + fflush(stdout); } close(s); diff --git a/isotpperf.c b/isotpperf.c index ad0dc2a..cadfa0d 100644 --- a/isotpperf.c +++ b/isotpperf.c @@ -243,177 +243,177 @@ int main(int argc, char **argv) continue; } + /* check extended address if provided */ + if (ext && extaddr != frame.data[0]) + continue; + + /* only get flow control information from dst CAN ID */ + if (frame.can_id == dst) { /* check extended address if provided */ - if (ext && extaddr != frame.data[0]) + if (rx_ext && frame.data[0] != rx_extaddr) continue; - /* only get flow control information from dst CAN ID */ - if (frame.can_id == dst) { - /* check extended address if provided */ - if (rx_ext && frame.data[0] != rx_extaddr) - continue; + n_pci = frame.data[rx_ext]; + /* check flow control PCI only */ + if ((n_pci & 0xF0) != 0x30) + continue; - n_pci = frame.data[rx_ext]; - /* check flow control PCI only */ - if ((n_pci & 0xF0) != 0x30) - continue; + bs = frame.data[rx_ext + 1]; + stmin = frame.data[rx_ext + 2]; + } - bs = frame.data[rx_ext + 1]; - stmin = frame.data[rx_ext + 2]; + /* data content starts and index datidx */ + datidx = 0; + + n_pci = frame.data[ext]; + switch (n_pci & 0xF0) { + + case 0x00: + /* SF */ + if (n_pci & 0xF) { + fflen = rcvlen = n_pci & 0xF; + datidx = ext+1; + } else { + fflen = rcvlen = frame.data[ext + 1]; + datidx = ext+2; } - /* data content starts and index datidx */ - datidx = 0; - - n_pci = frame.data[ext]; - switch (n_pci & 0xF0) { - - case 0x00: - /* SF */ - if (n_pci & 0xF) { - fflen = rcvlen = n_pci & 0xF; - datidx = ext+1; - } else { - fflen = rcvlen = frame.data[ext + 1]; - datidx = ext+2; - } - - /* ignore incorrect SF PDUs */ - if (frame.len < rcvlen + datidx) - fflen = rcvlen = 0; - - /* get number of digits for printing */ - fflen_digits = getdigits(fflen); - - /* get CAN FD bitrate & LL_DL setting information */ - brs = frame.flags & CANFD_BRS; - ll_dl = frame.len; - if (ll_dl < 8) - ll_dl = 8; - - ioctl(s, SIOCGSTAMP, &start_tv); - - /* determine CAN frame mode for this PDU */ - if (nbytes == CAN_MTU) - canfd_on = 0; - else - canfd_on = 1; - - break; - - case 0x10: - /* FF */ - fflen = ((n_pci & 0x0F)<<8) + frame.data[ext+1]; - if (fflen) - datidx = ext+2; - else { - fflen = (frame.data[ext+2]<<24) + - (frame.data[ext+3]<<16) + - (frame.data[ext+4]<<8) + - frame.data[ext+5]; - datidx = ext+6; - } - - /* to increase the time resolution we multiply fflen with 1000 later */ - if (fflen >= (UINT32_MAX / 1000)) { - printf("fflen %lu is more than ~4.2 MB - ignoring PDU\n", fflen); - fflush(stdout); - fflen = rcvlen = 0; - continue; - } - rcvlen = frame.len - datidx; - last_sn = 0; - - /* get number of digits for printing */ - fflen_digits = getdigits(fflen); - - /* get CAN FD bitrate & LL_DL setting information */ - brs = frame.flags & CANFD_BRS; - ll_dl = frame.len; - - ioctl(s, SIOCGSTAMP, &start_tv); - - /* determine CAN frame mode for this PDU */ - if (nbytes == CAN_MTU) - canfd_on = 0; - else - canfd_on = 1; - - break; - - case 0x20: - /* CF */ - if (rcvlen) { - sn = n_pci & 0x0F; - if (sn == ((last_sn + 1) & 0xF)) { - last_sn = sn; - datidx = ext+1; - rcvlen += frame.len - datidx; - } - } - break; - - default: - break; - } - - /* PDU reception in process */ - if (rcvlen) { - if (rcvlen > fflen) - rcvlen = fflen; - - percent = (rcvlen * 100 / fflen); - printf("\r %3lu%% ", percent); - - printf("|"); - - if (percent > 100) - percent = 100; - - for (i=0; i < NUMBAR; i++){ - if (i < (int)(percent/PERCENTRES)) - printf("X"); - else - printf("."); - } - printf("| %*lu/%lu ", fflen_digits, rcvlen, fflen); - } - - /* PDU complete */ - if (rcvlen && rcvlen >= fflen) { - - printf("\r%s %02d%c (BS:%2hhu # ", canfd_on?"CAN-FD":"CAN2.0", ll_dl, brs?'*':' ', bs); - if (stmin < 0x80) - printf("STmin:%3hhu msec)", stmin); - else if (stmin > 0xF0 && stmin < 0xFA) - printf("STmin:%3u usec)", (stmin & 0xF) * 100); - else - printf("STmin: invalid )"); - - printf(" : %lu byte in ", fflen); - - /* calculate time */ - ioctl(s, SIOCGSTAMP, &end_tv); - diff_tv.tv_sec = end_tv.tv_sec - start_tv.tv_sec; - diff_tv.tv_usec = end_tv.tv_usec - start_tv.tv_usec; - if (diff_tv.tv_usec < 0) - diff_tv.tv_sec--, diff_tv.tv_usec += 1000000; - if (diff_tv.tv_sec < 0) - diff_tv.tv_sec = diff_tv.tv_usec = 0; - - /* check devisor to be not zero */ - if (diff_tv.tv_sec * 1000 + diff_tv.tv_usec / 1000){ - printf("%llu.%06llus ", (unsigned long long)diff_tv.tv_sec, (unsigned long long)diff_tv.tv_usec); - printf("=> %lu byte/s", (fflen * 1000) / - (unsigned long)(diff_tv.tv_sec * 1000 + diff_tv.tv_usec / 1000)); - } else - printf("(no time available) "); - - printf("\n"); - /* wait for next PDU */ + /* ignore incorrect SF PDUs */ + if (frame.len < rcvlen + datidx) fflen = rcvlen = 0; + + /* get number of digits for printing */ + fflen_digits = getdigits(fflen); + + /* get CAN FD bitrate & LL_DL setting information */ + brs = frame.flags & CANFD_BRS; + ll_dl = frame.len; + if (ll_dl < 8) + ll_dl = 8; + + ioctl(s, SIOCGSTAMP, &start_tv); + + /* determine CAN frame mode for this PDU */ + if (nbytes == CAN_MTU) + canfd_on = 0; + else + canfd_on = 1; + + break; + + case 0x10: + /* FF */ + fflen = ((n_pci & 0x0F)<<8) + frame.data[ext+1]; + if (fflen) + datidx = ext+2; + else { + fflen = (frame.data[ext+2]<<24) + + (frame.data[ext+3]<<16) + + (frame.data[ext+4]<<8) + + frame.data[ext+5]; + datidx = ext+6; } - fflush(stdout); + + /* to increase the time resolution we multiply fflen with 1000 later */ + if (fflen >= (UINT32_MAX / 1000)) { + printf("fflen %lu is more than ~4.2 MB - ignoring PDU\n", fflen); + fflush(stdout); + fflen = rcvlen = 0; + continue; + } + rcvlen = frame.len - datidx; + last_sn = 0; + + /* get number of digits for printing */ + fflen_digits = getdigits(fflen); + + /* get CAN FD bitrate & LL_DL setting information */ + brs = frame.flags & CANFD_BRS; + ll_dl = frame.len; + + ioctl(s, SIOCGSTAMP, &start_tv); + + /* determine CAN frame mode for this PDU */ + if (nbytes == CAN_MTU) + canfd_on = 0; + else + canfd_on = 1; + + break; + + case 0x20: + /* CF */ + if (rcvlen) { + sn = n_pci & 0x0F; + if (sn == ((last_sn + 1) & 0xF)) { + last_sn = sn; + datidx = ext+1; + rcvlen += frame.len - datidx; + } + } + break; + + default: + break; + } + + /* PDU reception in process */ + if (rcvlen) { + if (rcvlen > fflen) + rcvlen = fflen; + + percent = (rcvlen * 100 / fflen); + printf("\r %3lu%% ", percent); + + printf("|"); + + if (percent > 100) + percent = 100; + + for (i=0; i < NUMBAR; i++){ + if (i < (int)(percent/PERCENTRES)) + printf("X"); + else + printf("."); + } + printf("| %*lu/%lu ", fflen_digits, rcvlen, fflen); + } + + /* PDU complete */ + if (rcvlen && rcvlen >= fflen) { + + printf("\r%s %02d%c (BS:%2hhu # ", canfd_on?"CAN-FD":"CAN2.0", ll_dl, brs?'*':' ', bs); + if (stmin < 0x80) + printf("STmin:%3hhu msec)", stmin); + else if (stmin > 0xF0 && stmin < 0xFA) + printf("STmin:%3u usec)", (stmin & 0xF) * 100); + else + printf("STmin: invalid )"); + + printf(" : %lu byte in ", fflen); + + /* calculate time */ + ioctl(s, SIOCGSTAMP, &end_tv); + diff_tv.tv_sec = end_tv.tv_sec - start_tv.tv_sec; + diff_tv.tv_usec = end_tv.tv_usec - start_tv.tv_usec; + if (diff_tv.tv_usec < 0) + diff_tv.tv_sec--, diff_tv.tv_usec += 1000000; + if (diff_tv.tv_sec < 0) + diff_tv.tv_sec = diff_tv.tv_usec = 0; + + /* check devisor to be not zero */ + if (diff_tv.tv_sec * 1000 + diff_tv.tv_usec / 1000){ + printf("%llu.%06llus ", (unsigned long long)diff_tv.tv_sec, (unsigned long long)diff_tv.tv_usec); + printf("=> %lu byte/s", (fflen * 1000) / + (unsigned long)(diff_tv.tv_sec * 1000 + diff_tv.tv_usec / 1000)); + } else + printf("(no time available) "); + + printf("\n"); + /* wait for next PDU */ + fflen = rcvlen = 0; + } + fflush(stdout); } close(s); diff --git a/isotprecv.c b/isotprecv.c index 35ba4d8..9dbb032 100644 --- a/isotprecv.c +++ b/isotprecv.c @@ -82,183 +82,183 @@ void print_usage(char *prg) int main(int argc, char **argv) { - int s; - struct sockaddr_can addr; - static struct can_isotp_options opts; - static struct can_isotp_fc_options fcopts; - static struct can_isotp_ll_options llopts; - int opt, i; - extern int optind, opterr, optopt; - __u32 force_rx_stmin = 0; - int loop = 0; + int s; + struct sockaddr_can addr; + static struct can_isotp_options opts; + static struct can_isotp_fc_options fcopts; + static struct can_isotp_ll_options llopts; + int opt, i; + extern int optind, opterr, optopt; + __u32 force_rx_stmin = 0; + int loop = 0; - unsigned char msg[BUFSIZE]; - int nbytes; + unsigned char msg[BUFSIZE]; + int nbytes; - addr.can_addr.tp.tx_id = addr.can_addr.tp.rx_id = NO_CAN_ID; + 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:lFL:?")) != -1) { - switch (opt) { - case 's': - addr.can_addr.tp.tx_id = strtoul(optarg, NULL, 16); - if (strlen(optarg) > 7) - addr.can_addr.tp.tx_id |= CAN_EFF_FLAG; - break; + while ((opt = getopt(argc, argv, "s:d:x:p:P:b:m:w:f:lFL:?")) != -1) { + switch (opt) { + case 's': + addr.can_addr.tp.tx_id = strtoul(optarg, NULL, 16); + if (strlen(optarg) > 7) + addr.can_addr.tp.tx_id |= CAN_EFF_FLAG; + break; - case 'd': - addr.can_addr.tp.rx_id = strtoul(optarg, NULL, 16); - if (strlen(optarg) > 7) - addr.can_addr.tp.rx_id |= CAN_EFF_FLAG; - break; + case 'd': + addr.can_addr.tp.rx_id = strtoul(optarg, NULL, 16); + if (strlen(optarg) > 7) + addr.can_addr.tp.rx_id |= CAN_EFF_FLAG; + break; - case 'x': - { - int elements = sscanf(optarg, "%hhx:%hhx", - &opts.ext_address, - &opts.rx_ext_address); + case 'x': + { + 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; - } + 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': - { - int elements = sscanf(optarg, "%hhx:%hhx", - &opts.txpad_content, - &opts.rxpad_content); + case 'p': + { + 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; - } + 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') - opts.flags |= CAN_ISOTP_CHK_PAD_LEN; - else if (optarg[0] == 'c') - opts.flags |= CAN_ISOTP_CHK_PAD_DATA; - else if (optarg[0] == 'a') - 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])); - exit(0); - } - break; + case 'P': + if (optarg[0] == 'l') + opts.flags |= CAN_ISOTP_CHK_PAD_LEN; + else if (optarg[0] == 'c') + opts.flags |= CAN_ISOTP_CHK_PAD_DATA; + else if (optarg[0] == 'a') + 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])); + exit(0); + } + break; - case 'b': - fcopts.bs = strtoul(optarg, NULL, 16) & 0xFF; - break; + case 'b': + fcopts.bs = strtoul(optarg, NULL, 16) & 0xFF; + break; - case 'm': - fcopts.stmin = strtoul(optarg, NULL, 16) & 0xFF; - break; + case 'm': + fcopts.stmin = strtoul(optarg, NULL, 16) & 0xFF; + break; - case 'w': - fcopts.wftmax = strtoul(optarg, NULL, 16) & 0xFF; - break; + case 'w': + fcopts.wftmax = strtoul(optarg, NULL, 16) & 0xFF; + break; - case 'f': - opts.flags |= CAN_ISOTP_FORCE_RXSTMIN; - force_rx_stmin = strtoul(optarg, NULL, 10); - break; + case 'f': + opts.flags |= CAN_ISOTP_FORCE_RXSTMIN; + force_rx_stmin = strtoul(optarg, NULL, 10); + break; - case 'l': - loop = 1; - break; + case 'l': + loop = 1; + break; - case 'F': - opts.flags |= CAN_ISOTP_DYN_FC_PARMS; - break; + case 'F': + opts.flags |= CAN_ISOTP_DYN_FC_PARMS; + 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 '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); - break; + case '?': + print_usage(basename(argv[0])); + exit(0); + break; - default: - fprintf(stderr, "Unknown option %c\n", opt); - print_usage(basename(argv[0])); - exit(1); - break; - } - } - - if ((argc - optind != 1) || - (addr.can_addr.tp.tx_id == NO_CAN_ID) || - (addr.can_addr.tp.rx_id == NO_CAN_ID)) { - 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_OPTS, &opts, sizeof(opts)); - setsockopt(s, SOL_CAN_ISOTP, CAN_ISOTP_RECV_FC, &fcopts, sizeof(fcopts)); - - if (llopts.tx_dl) { - if (setsockopt(s, SOL_CAN_ISOTP, CAN_ISOTP_LL_OPTS, &llopts, sizeof(llopts)) < 0) { - perror("link layer sockopt"); - exit(1); + default: + fprintf(stderr, "Unknown option %c\n", opt); + print_usage(basename(argv[0])); + exit(1); + break; + } } - } - if (opts.flags & CAN_ISOTP_FORCE_RXSTMIN) - setsockopt(s, SOL_CAN_ISOTP, CAN_ISOTP_RX_STMIN, &force_rx_stmin, sizeof(force_rx_stmin)); + if ((argc - optind != 1) || + (addr.can_addr.tp.tx_id == NO_CAN_ID) || + (addr.can_addr.tp.rx_id == NO_CAN_ID)) { + print_usage(basename(argv[0])); + exit(1); + } + + if ((s = socket(PF_CAN, SOCK_DGRAM, CAN_ISOTP)) < 0) { + perror("socket"); + exit(1); + } - addr.can_family = AF_CAN; - addr.can_ifindex = if_nametoindex(argv[optind]); - if (!addr.can_ifindex) { - perror("if_nametoindex"); - exit(1); - } + setsockopt(s, SOL_CAN_ISOTP, CAN_ISOTP_OPTS, &opts, sizeof(opts)); + setsockopt(s, SOL_CAN_ISOTP, CAN_ISOTP_RECV_FC, &fcopts, sizeof(fcopts)); + + 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_RXSTMIN) + setsockopt(s, SOL_CAN_ISOTP, CAN_ISOTP_RX_STMIN, &force_rx_stmin, sizeof(force_rx_stmin)); + + addr.can_family = AF_CAN; + addr.can_ifindex = if_nametoindex(argv[optind]); + if (!addr.can_ifindex) { + perror("if_nametoindex"); + exit(1); + } + + if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) { + perror("bind"); + close(s); + exit(1); + } + + do { + nbytes = read(s, msg, BUFSIZE); + if (nbytes > 0 && nbytes < BUFSIZE) + for (i=0; i < nbytes; i++) + printf("%02X ", msg[i]); + printf("\n"); + } while (loop); - if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - perror("bind"); close(s); - exit(1); - } - do { - nbytes = read(s, msg, BUFSIZE); - if (nbytes > 0 && nbytes < BUFSIZE) - for (i=0; i < nbytes; i++) - printf("%02X ", msg[i]); - printf("\n"); - } while (loop); - - close(s); - - return 0; + return 0; } diff --git a/isotpsend.c b/isotpsend.c index deac601..80f7d84 100644 --- a/isotpsend.c +++ b/isotpsend.c @@ -86,238 +86,238 @@ void print_usage(char *prg) int main(int argc, char **argv) { - int s; - struct sockaddr_can addr; - static struct can_isotp_options opts; - static struct can_isotp_ll_options llopts; - int opt; - extern int optind, opterr, optopt; - unsigned int loops = 1; /* one (== no) loop by default */ - useconds_t usecs = 0; /* wait before sending the PDU */ - __u32 force_tx_stmin = 0; - unsigned char buf[BUFSIZE]; - int buflen = 0; - int datalen = 0; - int retval = 0; + int s; + struct sockaddr_can addr; + static struct can_isotp_options opts; + static struct can_isotp_ll_options llopts; + int opt; + extern int optind, opterr, optopt; + unsigned int loops = 1; /* one (== no) loop by default */ + useconds_t usecs = 0; /* wait before sending the PDU */ + __u32 force_tx_stmin = 0; + 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; + 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:D:l:g:bSCL:?")) != -1) { - switch (opt) { - case 's': - addr.can_addr.tp.tx_id = strtoul(optarg, NULL, 16); - if (strlen(optarg) > 7) - addr.can_addr.tp.tx_id |= CAN_EFF_FLAG; - break; + while ((opt = getopt(argc, argv, "s:d:x:p:P:t:f:D:l:g:bSCL:?")) != -1) { + switch (opt) { + case 's': + addr.can_addr.tp.tx_id = strtoul(optarg, NULL, 16); + if (strlen(optarg) > 7) + addr.can_addr.tp.tx_id |= CAN_EFF_FLAG; + break; - case 'd': - addr.can_addr.tp.rx_id = strtoul(optarg, NULL, 16); - if (strlen(optarg) > 7) - addr.can_addr.tp.rx_id |= CAN_EFF_FLAG; - break; + case 'd': + addr.can_addr.tp.rx_id = strtoul(optarg, NULL, 16); + if (strlen(optarg) > 7) + addr.can_addr.tp.rx_id |= CAN_EFF_FLAG; + break; - case 'x': - { - int elements = sscanf(optarg, "%hhx:%hhx", - &opts.ext_address, - &opts.rx_ext_address); + case 'x': + { + 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; - } + 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': - { - int elements = sscanf(optarg, "%hhx:%hhx", - &opts.txpad_content, - &opts.rxpad_content); + case 'p': + { + 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; - } + 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') - opts.flags |= CAN_ISOTP_CHK_PAD_LEN; - else if (optarg[0] == 'c') - opts.flags |= CAN_ISOTP_CHK_PAD_DATA; - else if (optarg[0] == 'a') - 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])); - exit(0); - } - break; + case 'P': + if (optarg[0] == 'l') + opts.flags |= CAN_ISOTP_CHK_PAD_LEN; + else if (optarg[0] == 'c') + opts.flags |= CAN_ISOTP_CHK_PAD_DATA; + else if (optarg[0] == 'a') + 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])); + exit(0); + } + break; - case 't': - if (!strncmp(optarg, ZERO_STRING, strlen(ZERO_STRING))) - opts.frame_txtime = CAN_ISOTP_FRAME_TXTIME_ZERO; - else - opts.frame_txtime = strtoul(optarg, NULL, 10); - break; + case 't': + if (!strncmp(optarg, ZERO_STRING, strlen(ZERO_STRING))) + opts.frame_txtime = CAN_ISOTP_FRAME_TXTIME_ZERO; + else + opts.frame_txtime = strtoul(optarg, NULL, 10); + break; - case 'f': - opts.flags |= CAN_ISOTP_FORCE_TXSTMIN; - force_tx_stmin = strtoul(optarg, NULL, 10); - break; + case 'f': + opts.flags |= CAN_ISOTP_FORCE_TXSTMIN; + force_tx_stmin = strtoul(optarg, NULL, 10); + break; - case 'D': - datalen = strtoul(optarg, NULL, 10); - if (!datalen || datalen >= BUFSIZE) { - print_usage(basename(argv[0])); - exit(0); - } - break; + case 'D': + datalen = strtoul(optarg, NULL, 10); + if (!datalen || datalen >= BUFSIZE) { + print_usage(basename(argv[0])); + exit(0); + } + break; - case 'l': - if (optarg[0] == 'i') { - loops = 0; /* infinite loop */ - } else { - loops = strtoul(optarg, NULL, 10); - if (!loops) { - fprintf(stderr, "Invalid argument for option -l!\n"); - return 1; - } - } - break; + case 'l': + if (optarg[0] == 'i') { + loops = 0; /* infinite loop */ + } else { + loops = strtoul(optarg, NULL, 10); + if (!loops) { + fprintf(stderr, "Invalid argument for option -l!\n"); + return 1; + } + } + break; - case 'g': - usecs = strtoul(optarg, NULL, 10); - break; + case 'g': + usecs = strtoul(optarg, NULL, 10); + break; - case 'b': - opts.flags |= CAN_ISOTP_WAIT_TX_DONE; - break; + case 'b': + opts.flags |= CAN_ISOTP_WAIT_TX_DONE; + break; - case 'S': - opts.flags |= CAN_ISOTP_SF_BROADCAST; - break; + case 'S': + opts.flags |= CAN_ISOTP_SF_BROADCAST; + break; - case 'C': - opts.flags |= CAN_ISOTP_CF_BROADCAST; - break; + case 'C': + opts.flags |= CAN_ISOTP_CF_BROADCAST; + 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 '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); - break; + case '?': + print_usage(basename(argv[0])); + exit(0); + break; - default: - fprintf(stderr, "Unknown option %c\n", opt); - print_usage(basename(argv[0])); - exit(1); - break; - } - } + default: + fprintf(stderr, "Unknown option %c\n", opt); + print_usage(basename(argv[0])); + exit(1); + break; + } + } #define BC_FLAGS (CAN_ISOTP_SF_BROADCAST | CAN_ISOTP_CF_BROADCAST) - if ((argc - optind != 1) || - (addr.can_addr.tp.tx_id == NO_CAN_ID) || - ((opts.flags & BC_FLAGS) == BC_FLAGS) || - ((addr.can_addr.tp.rx_id == NO_CAN_ID) && - (!(opts.flags & BC_FLAGS)))) { - print_usage(basename(argv[0])); - exit(1); - } - - if ((s = socket(PF_CAN, SOCK_DGRAM, CAN_ISOTP)) < 0) { - perror("socket"); - exit(1); - } - - if (setsockopt(s, SOL_CAN_ISOTP, CAN_ISOTP_OPTS, &opts, sizeof(opts)) < 0) { - perror("sockopt"); - exit(1); - } - - - 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 ((argc - optind != 1) || + (addr.can_addr.tp.tx_id == NO_CAN_ID) || + ((opts.flags & BC_FLAGS) == BC_FLAGS) || + ((addr.can_addr.tp.rx_id == NO_CAN_ID) && + (!(opts.flags & BC_FLAGS)))) { + print_usage(basename(argv[0])); + 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)); + if ((s = socket(PF_CAN, SOCK_DGRAM, CAN_ISOTP)) < 0) { + perror("socket"); + exit(1); + } - addr.can_family = AF_CAN; - addr.can_ifindex = if_nametoindex(argv[optind]); - if (!addr.can_ifindex) { - perror("if_nametoindex"); - exit(1); - } + if (setsockopt(s, SOL_CAN_ISOTP, CAN_ISOTP_OPTS, &opts, sizeof(opts)) < 0) { + perror("sockopt"); + exit(1); + } - if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - perror("bind"); - close(s); - exit(1); - } - if (!datalen) { - while (buflen < BUFSIZE && scanf("%hhx", &buf[buflen]) == 1) - buflen++; - } else { - for (buflen = 0; buflen < datalen; buflen++) - buf[buflen] = ((buflen % 0xFF) + 1) & 0xFF; - } + 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; + addr.can_ifindex = if_nametoindex(argv[optind]); + if (!addr.can_ifindex) { + perror("if_nametoindex"); + exit(1); + } + + if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) { + perror("bind"); + close(s); + exit(1); + } + + if (!datalen) { + while (buflen < BUFSIZE && scanf("%hhx", &buf[buflen]) == 1) + buflen++; + } else { + for (buflen = 0; buflen < datalen; buflen++) + buf[buflen] = ((buflen % 0xFF) + 1) & 0xFF; + } loop: - if (usecs) - usleep(usecs); + if (usecs) + usleep(usecs); - retval = write(s, buf, buflen); - if (retval < 0) { - perror("write"); - return retval; - } + retval = write(s, buf, buflen); + if (retval < 0) { + perror("write"); + return retval; + } - if (retval != buflen) - fprintf(stderr, "wrote only %d from %d byte\n", retval, buflen); + if (retval != buflen) + fprintf(stderr, "wrote only %d from %d byte\n", retval, buflen); - if (loops) { - if (--loops) - goto loop; - } else { - goto loop; - } + if (loops) { + if (--loops) + goto loop; + } else { + goto loop; + } - /* - * due to a Kernel internal wait queue the PDU is sent completely - * before close() returns. - */ - close(s); + /* + * due to a Kernel internal wait queue the PDU is sent completely + * before close() returns. + */ + close(s); - return 0; + return 0; } diff --git a/j1939acd.c b/j1939acd.c index ae4e58a..a3f4ad1 100644 --- a/j1939acd.c +++ b/j1939acd.c @@ -112,10 +112,10 @@ static struct { int sig_alrm; int sig_usr1; int state; - #define STATE_INITIAL 0 - #define STATE_REQ_SENT 1 - #define STATE_REQ_PENDING 2 /* wait 1250 msec for first claim */ - #define STATE_OPERATIONAL 3 +#define STATE_INITIAL 0 +#define STATE_REQ_SENT 1 +#define STATE_REQ_PENDING 2 /* wait 1250 msec for first claim */ +#define STATE_OPERATIONAL 3 } s = { .intf = default_intf, .ranges = default_range, @@ -126,8 +126,8 @@ static struct { struct { uint64_t name; int flags; - #define F_USE 0x01 - #define F_SEEN 0x02 +#define F_USE 0x01 +#define F_SEEN 0x02 } addr[J1939_IDLE_ADDR /* =254 */]; /* lookup by name */ @@ -209,7 +209,7 @@ static int open_socket(const char *device, uint64_t name) if (s.verbose) fprintf(stderr, "- setsockopt(, SOL_CAN_J1939, SO_J1939_FILTER, , %zd);\n", sizeof(filt)); ret = setsockopt(sock, SOL_CAN_J1939, SO_J1939_FILTER, - &filt, sizeof(filt)); + &filt, sizeof(filt)); if (ret < 0) err(1, "setsockopt filter"); @@ -217,7 +217,7 @@ static int open_socket(const char *device, uint64_t name) if (s.verbose) fprintf(stderr, "- setsockopt(, SOL_SOCKET, SO_BROADCAST, %d, %zd);\n", value, sizeof(value)); ret = setsockopt(sock, SOL_SOCKET, SO_BROADCAST, - &value, sizeof(value)); + &value, sizeof(value)); if (ret < 0) err(1, "setsockopt set broadcast"); diff --git a/j1939cat.c b/j1939cat.c index 23715ea..ef9346e 100644 --- a/j1939cat.c +++ b/j1939cat.c @@ -31,11 +31,11 @@ * strict type-checking.. See the * "unnecessary" pointer comparison. */ -#define min(x, y) ({ \ - typeof(x) _min1 = (x); \ - typeof(y) _min2 = (y); \ - (void) (&_min1 == &_min2); \ - _min1 < _min2 ? _min1 : _min2; }) +#define min(x, y) ({ \ + typeof(x) _min1 = (x); \ + typeof(y) _min2 = (y); \ + (void) (&_min1 == &_min2); \ + _min1 < _min2 ? _min1 : _min2; }) struct j1939cat_stats { @@ -98,7 +98,7 @@ static const char help_msg[] = static const char optstring[] = "?hi:vs:rp:P:R:B"; static ssize_t j1939cat_send_one(struct j1939cat_priv *priv, int out_fd, - const void *buf, size_t buf_size) + const void *buf, size_t buf_size) { ssize_t num_sent; int flags = 0; @@ -132,7 +132,7 @@ static ssize_t j1939cat_send_one(struct j1939cat_priv *priv, int out_fd, } static void j1939cat_print_timestamp(struct j1939cat_priv *priv, const char *name, - struct timespec *cur) + struct timespec *cur) { struct j1939cat_stats *stats = &priv->stats; @@ -140,8 +140,8 @@ static void j1939cat_print_timestamp(struct j1939cat_priv *priv, const char *nam return; fprintf(stderr, " %s: %llu s %llu us (seq=%03u, send=%07u)", - name, (unsigned long long)cur->tv_sec, (unsigned long long)cur->tv_nsec / 1000, - stats->tskey, stats->send); + name, (unsigned long long)cur->tv_sec, (unsigned long long)cur->tv_nsec / 1000, + stats->tskey, stats->send); fprintf(stderr, "\n"); } @@ -226,7 +226,7 @@ static int j1939cat_extract_serr(struct j1939cat_priv *priv) stats->tskey = serr->ee_data; j1939cat_print_timestamp(priv, j1939cat_tstype_to_str(serr->ee_info), - &tss->ts[0]); + &tss->ts[0]); if (serr->ee_info == SCM_TSTAMP_SCHED) return -EINTR; @@ -338,7 +338,7 @@ static int j1939cat_recv_err(struct j1939cat_priv *priv) } static int j1939cat_send_loop(struct j1939cat_priv *priv, int out_fd, char *buf, - size_t buf_size) + size_t buf_size) { struct j1939cat_stats *stats = &priv->stats; ssize_t count; @@ -411,7 +411,7 @@ static int j1939cat_send_loop(struct j1939cat_priv *priv, int out_fd, char *buf, } static int j1939cat_sendfile(struct j1939cat_priv *priv, int out_fd, int in_fd, - off_t *offset, size_t count) + off_t *offset, size_t count) { int ret = EXIT_SUCCESS; off_t orig = 0; @@ -617,7 +617,7 @@ static int j1939cat_sock_prepare(struct j1939cat_priv *priv) if (priv->todo_prio >= 0) { ret = setsockopt(priv->sock, SOL_CAN_J1939, SO_J1939_SEND_PRIO, - &priv->todo_prio, sizeof(priv->todo_prio)); + &priv->todo_prio, sizeof(priv->todo_prio)); if (ret < 0) { warn("set priority %i", priv->todo_prio); return EXIT_FAILURE; @@ -633,11 +633,11 @@ static int j1939cat_sock_prepare(struct j1939cat_priv *priv) } sock_opt = SOF_TIMESTAMPING_SOFTWARE | - SOF_TIMESTAMPING_OPT_CMSG | - SOF_TIMESTAMPING_TX_ACK | - SOF_TIMESTAMPING_TX_SCHED | - SOF_TIMESTAMPING_OPT_STATS | SOF_TIMESTAMPING_OPT_TSONLY | - SOF_TIMESTAMPING_OPT_ID | SOF_TIMESTAMPING_RX_SOFTWARE; + SOF_TIMESTAMPING_OPT_CMSG | + SOF_TIMESTAMPING_TX_ACK | + SOF_TIMESTAMPING_TX_SCHED | + SOF_TIMESTAMPING_OPT_STATS | SOF_TIMESTAMPING_OPT_TSONLY | + SOF_TIMESTAMPING_OPT_ID | SOF_TIMESTAMPING_RX_SOFTWARE; if (setsockopt(priv->sock, SOL_SOCKET, SO_TIMESTAMPING, (char *) &sock_opt, sizeof(sock_opt))) diff --git a/j1939spy.c b/j1939spy.c index dc260da..464478d 100644 --- a/j1939spy.c +++ b/j1939spy.c @@ -76,7 +76,7 @@ static struct { static const int ival_1 = 1; static char ctrlmsg[ - CMSG_SPACE(sizeof(struct timeval)) + CMSG_SPACE(sizeof(struct timeval)) + CMSG_SPACE(sizeof(uint8_t)) /* dest addr */ + CMSG_SPACE(sizeof(uint64_t)) /* dest name */ + CMSG_SPACE(sizeof(uint8_t)) /* priority */ @@ -264,9 +264,9 @@ abs_time: struct tm tm; tm = *localtime(&tdut.tv_sec); printf("(%04u%02u%02uT%02u%02u%02u.%04llu)", - tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, - tm.tm_hour, tm.tm_min, tm.tm_sec, - (unsigned long long)tdut.tv_usec/100); + tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, + tm.tm_hour, tm.tm_min, tm.tm_sec, + (unsigned long long)tdut.tv_usec/100); } } printf(" %s ", libj1939_addr2str(&src)); diff --git a/j1939sr.c b/j1939sr.c index fafed3a..363be38 100644 --- a/j1939sr.c +++ b/j1939sr.c @@ -68,9 +68,9 @@ static struct { int pkt_len; int priority; int defined; - #define DEF_SRC 1 - #define DEF_DST 2 - #define DEF_PRIO 4 +#define DEF_SRC 1 +#define DEF_DST 2 +#define DEF_PRIO 4 struct sockaddr_can src, dst; } s = { .priority = 6, diff --git a/lib.c b/lib.c index fcf00d5..3c94749 100644 --- a/lib.c +++ b/lib.c @@ -83,8 +83,8 @@ static inline void _put_id(char *buf, int end_offset, canid_t id) /* CAN DLC to real data length conversion helpers */ -static const unsigned char dlc2len[] = {0, 1, 2, 3, 4, 5, 6, 7, - 8, 12, 16, 20, 24, 32, 48, 64}; +static const unsigned char dlc2len[] = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 12, 16, 20, 24, 32, 48, 64}; /* get data length from raw data length code (DLC) */ unsigned char can_fd_dlc2len(unsigned char dlc) @@ -92,16 +92,17 @@ unsigned char can_fd_dlc2len(unsigned char dlc) return dlc2len[dlc & 0x0F]; } -static const unsigned char len2dlc[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, /* 0 - 8 */ - 9, 9, 9, 9, /* 9 - 12 */ - 10, 10, 10, 10, /* 13 - 16 */ - 11, 11, 11, 11, /* 17 - 20 */ - 12, 12, 12, 12, /* 21 - 24 */ - 13, 13, 13, 13, 13, 13, 13, 13, /* 25 - 32 */ - 14, 14, 14, 14, 14, 14, 14, 14, /* 33 - 40 */ - 14, 14, 14, 14, 14, 14, 14, 14, /* 41 - 48 */ - 15, 15, 15, 15, 15, 15, 15, 15, /* 49 - 56 */ - 15, 15, 15, 15, 15, 15, 15, 15}; /* 57 - 64 */ +static const unsigned char len2dlc[] = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, /* 0 - 8 */ + 9, 9, 9, 9, /* 9 - 12 */ + 10, 10, 10, 10, /* 13 - 16 */ + 11, 11, 11, 11, /* 17 - 20 */ + 12, 12, 12, 12, /* 21 - 24 */ + 13, 13, 13, 13, 13, 13, 13, 13, /* 25 - 32 */ + 14, 14, 14, 14, 14, 14, 14, 14, /* 33 - 40 */ + 14, 14, 14, 14, 14, 14, 14, 14, /* 41 - 48 */ + 15, 15, 15, 15, 15, 15, 15, 15, /* 49 - 56 */ + 15, 15, 15, 15, 15, 15, 15, 15}; /* 57 - 64 */ /* map the sanitized data length to an appropriate data length code */ unsigned char can_fd_len2dlc(unsigned char len) @@ -777,8 +778,8 @@ static int snprintf_error_ctrl(char *buf, size_t len, const struct canfd_frame * n += snprintf(buf + n, len - n, "{"); n += snprintf_error_data(buf + n, len - n, cf->data[1], - controller_problems, - ARRAY_SIZE(controller_problems)); + controller_problems, + ARRAY_SIZE(controller_problems)); n += snprintf(buf + n, len - n, "}"); return n; @@ -793,8 +794,8 @@ static int snprintf_error_prot(char *buf, size_t len, const struct canfd_frame * n += snprintf(buf + n, len - n, "{{"); n += snprintf_error_data(buf + n, len - n, cf->data[2], - protocol_violation_types, - ARRAY_SIZE(protocol_violation_types)); + protocol_violation_types, + ARRAY_SIZE(protocol_violation_types)); n += snprintf(buf + n, len - n, "}{"); if (cf->data[3] > 0 && cf->data[3] < ARRAY_SIZE(protocol_violation_locations)) @@ -819,7 +820,7 @@ static int snprintf_error_cnt(char *buf, size_t len, const struct canfd_frame *c } int snprintf_can_error_frame(char *buf, size_t len, const struct canfd_frame *cf, - const char* sep) + const char* sep) { canid_t class, mask; int i, n = 0, classes = 0; @@ -858,7 +859,7 @@ int snprintf_can_error_frame(char *buf, size_t len, const struct canfd_frame *cf n += tmp_n; if (mask == CAN_ERR_LOSTARB) n += snprintf_error_lostarb(buf + n, len - n, - cf); + cf); if (mask == CAN_ERR_CRTL) n += snprintf_error_ctrl(buf + n, len - n, cf); if (mask == CAN_ERR_PROT) @@ -878,7 +879,7 @@ int snprintf_can_error_frame(char *buf, size_t len, const struct canfd_frame *cf } int64_t timespec_diff_ms(struct timespec *ts1, - struct timespec *ts2) + struct timespec *ts2) { int64_t diff = (ts1->tv_sec - ts2->tv_sec) * 1000; diff --git a/testj1939.c b/testj1939.c index 08797cb..2236176 100644 --- a/testj1939.c +++ b/testj1939.c @@ -197,7 +197,7 @@ int main(int argc, char *argv[]) if (verbose) fprintf(stderr, "- setsockopt(, SOL_CAN_J1939, SO_J1939_SEND_PRIO, &%i);\n", todo_prio); ret = setsockopt(sock, SOL_CAN_J1939, SO_J1939_SEND_PRIO, - &todo_prio, sizeof(todo_prio)); + &todo_prio, sizeof(todo_prio)); if (ret < 0) err(1, "set priority %i", todo_prio); } @@ -246,7 +246,7 @@ int main(int argc, char *argv[]) if (verbose) fprintf(stderr, "- sendto(, , %i, 0, %s, %zi);\n", todo_send, libj1939_addr2str(&peername), sizeof(peername)); ret = sendto(sock, dat, todo_send, 0, - (void *)&peername, sizeof(peername)); + (void *)&peername, sizeof(peername)); } else { /* * we may do sendto(sock, dat, todo_send, 0, NULL, 0) @@ -273,7 +273,7 @@ int main(int argc, char *argv[]) fprintf(stderr, "- recvfrom(, , %zi, 0, &, %zi);\n", sizeof(peername), sizeof(peername)); peernamelen = sizeof(peername); ret = recvfrom(sock, dat, sizeof(dat), 0, - (void *)&peername, &peernamelen); + (void *)&peername, &peernamelen); if (ret < 0) { if (EINTR == errno) { if (verbose) @@ -287,7 +287,7 @@ int main(int argc, char *argv[]) if (verbose) fprintf(stderr, "- sendto(, , %i, 0, %s, %i);\n", ret, libj1939_addr2str(&peername), peernamelen); ret = sendto(sock, dat, ret, 0, - (void *)&peername, peernamelen); + (void *)&peername, peernamelen); if (ret < 0) err(1, "sendto"); } @@ -297,7 +297,7 @@ int main(int argc, char *argv[]) if (todo_names && peername.can_addr.j1939.name) printf("%016llx ", peername.can_addr.j1939.name); printf("%02x %05x:", peername.can_addr.j1939.addr, - peername.can_addr.j1939.pgn); + peername.can_addr.j1939.pgn); for (i = 0, j = 0; i < ret; ++i, j++) { if (j == 8) { printf("\n%05x ", i);