sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

canlogserver: add CAN XL support 

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
pull/504/head
Oliver Hartkopp 2024-02-29 08:44:27 +01:00
parent 29290505f7
commit 7761d8bcf8
1 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
canlogserver.c
View File

@ -186,9 +186,14 @@ int main(int argc, char **argv)
int opt, ret; int opt, ret;
int currmax = 1; /* we assume at least one can bus ;-) */ int currmax = 1; /* we assume at least one can bus ;-) */
struct sockaddr_can addr; struct sockaddr_can addr;
struct can_raw_vcid_options vcid_opts = {
.flags = CAN_RAW_XL_VCID_RX_FILTER,
.rx_vcid = 0,
.rx_vcid_mask = 0,
};
struct can_filter rfilter; struct can_filter rfilter;
struct canfd_frame frame; static cu_t cu; /* union for CAN CC/FD/XL frames */
const int canfd_on = 1; const int canfx_on = 1;
int nbytes, i, j; int nbytes, i, j;
struct ifreq ifr; struct ifreq ifr;
struct timeval tv; struct timeval tv;
@ -342,7 +347,13 @@ int main(int argc, char **argv)
&err_mask[i], sizeof(err_mask[i])); &err_mask[i], sizeof(err_mask[i]));
/* try to switch the socket into CAN FD mode */ /* try to switch the socket into CAN FD mode */
setsockopt(s[i], SOL_CAN_RAW, CAN_RAW_FD_FRAMES, &canfd_on, sizeof(canfd_on)); setsockopt(s[i], SOL_CAN_RAW, CAN_RAW_FD_FRAMES, &canfx_on, sizeof(canfx_on));
/* try to switch the socket into CAN XL mode */
setsockopt(s[i], SOL_CAN_RAW, CAN_RAW_XL_FRAMES, &canfx_on, sizeof(canfx_on));
/* try to enable the CAN XL VCID pass through mode */
setsockopt(s[i], SOL_CAN_RAW, CAN_RAW_XL_VCID_OPTS, &vcid_opts, sizeof(vcid_opts));
j = strlen(argv[optind+i]); j = strlen(argv[optind+i]);
@ -391,22 +402,35 @@ int main(int argc, char **argv)
socklen_t len = sizeof(addr); socklen_t len = sizeof(addr);
int idx; int idx;
if ((nbytes = recvfrom(s[i], &frame, CANFD_MTU, 0, if ((nbytes = recvfrom(s[i], &cu, sizeof(cu), 0,
(struct sockaddr*)&addr, &len)) < 0) { (struct sockaddr*)&addr, &len)) < 0) {
perror("read"); perror("read");
return 1; return 1;
} }
/* mark dual-use struct canfd_frame */ if (nbytes < CANXL_HDR_SIZE + CANXL_MIN_DLEN) {
if ((size_t)nbytes == CAN_MTU) fprintf(stderr, "read: no CAN frame\n");
frame.flags = 0;
else if ((size_t)nbytes == CANFD_MTU)
frame.flags |= CANFD_FDF;
else {
fprintf(stderr, "read: incomplete CAN frame\n");
return 1; return 1;
} }
if (cu.xl.flags & CANXL_XLF) {
if (nbytes != CANXL_HDR_SIZE + cu.xl.len) {
printf("nbytes = %d\n", nbytes);
fprintf(stderr, "read: no CAN XL frame\n");
return 1;
}
} else {
/* mark dual-use struct canfd_frame */
if (nbytes == CAN_MTU)
cu.fd.flags = 0;
else if (nbytes == CANFD_MTU)
cu.fd.flags |= CANFD_FDF;
else {
fprintf(stderr, "read: incomplete CAN CC/FD frame\n");
return 1;
}
}
if (ioctl(s[i], SIOCGSTAMP, &tv) < 0) if (ioctl(s[i], SIOCGSTAMP, &tv) < 0)
perror("SIOCGSTAMP"); perror("SIOCGSTAMP");
@ -415,7 +439,7 @@ int main(int argc, char **argv)
sprintf(afrbuf, "(%llu.%06llu) %*s ", sprintf(afrbuf, "(%llu.%06llu) %*s ",
(unsigned long long)tv.tv_sec, (unsigned long long)tv.tv_usec, max_devname_len, devname[idx]); (unsigned long long)tv.tv_sec, (unsigned long long)tv.tv_usec, max_devname_len, devname[idx]);
sprint_canframe(afrbuf+strlen(afrbuf), (cu_t *)&frame, 0); sprint_canframe(afrbuf+strlen(afrbuf), &cu, 0);
strcat(afrbuf, "\n"); strcat(afrbuf, "\n");
if (write(accsocket, afrbuf, strlen(afrbuf)) < 0) { if (write(accsocket, afrbuf, strlen(afrbuf)) < 0) {