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

canbusload: use recvmsg() instead of recvfrom() 

To access msg_flags for RX/TX direction detection.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
pull/556/head
Oliver Hartkopp 2024-08-07 21:29:49 +02:00
parent 7665e1e236
commit 724e6f7c11
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
canbusload.c
View File

@ -251,6 +251,8 @@ int main(int argc, char **argv)
char *ptr, *nptr; char *ptr, *nptr;
struct sockaddr_can addr; struct sockaddr_can addr;
struct canfd_frame frame; struct canfd_frame frame;
struct iovec iov;
struct msghdr msg;
int nbytes, i; int nbytes, i;
int have_anydev = 0; int have_anydev = 0;
@ -405,10 +407,14 @@ int main(int argc, char **argv)
if (redraw) if (redraw)
printf("%s", CLR_SCREEN); printf("%s", CLR_SCREEN);
while (running) { /* these settings are static and can be held out of the hot path */
socklen_t len = sizeof(addr); iov.iov_base = &frame;
int flags = 0; msg.msg_name = &addr;
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
msg.msg_control = NULL;
while (running) {
FD_ZERO(&rdfs); FD_ZERO(&rdfs);
FD_SET(s, &rdfs); FD_SET(s, &rdfs);
@ -417,8 +423,13 @@ int main(int argc, char **argv)
continue; continue;
} }
nbytes = recvfrom(s, &frame, sizeof(struct canfd_frame), /* these settings may be modified by recvmsg() */
flags, (struct sockaddr*)&addr, &len); iov.iov_len = sizeof(frame);
msg.msg_namelen = sizeof(addr);
msg.msg_controllen = 0;
msg.msg_flags = 0;
nbytes = recvmsg(s, &msg, 0);
if (nbytes < 0) { if (nbytes < 0) {
perror("read"); perror("read");