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

j1939: drop SO_J1939_RECV_OWN support 

SO_J1939_RECV_OWN is no longer supported by the kernel. So, sync the
headers and rework jacd.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
pull/151/head
Oleksij Rempel 2019-08-02 07:48:23 +02:00
parent d5ba0e2d23
commit 7337cb12de
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jacd.c
View File

@ -221,14 +221,6 @@ static int open_socket(const char *device, uint64_t name)
if (ret < 0)
error(1, errno, "setsockopt filter");
value = 1;
if (s.verbose)
fprintf(stderr, "- setsockopt(, SOL_CAN_J1939, SO_J1939_RECV_OWN, %d, %zd);\n", value, sizeof(value));
ret = setsockopt(sock, SOL_CAN_J1939, SO_J1939_RECV_OWN,
&value, sizeof(value));
if (ret < 0)
error(1, errno, "setsockopt receive own msgs");
value = 1;
if (s.verbose)
fprintf(stderr, "- setsockopt(, SOL_SOCKET, SO_BROADCAST, %d, %zd);\n", value, sizeof(value));
@ -475,7 +467,7 @@ static void restore_cache(void)
/* main */
int main(int argc, char *argv[])
{
int ret, sock, pgn, sa, opt;
int ret, sock, sock_rx, pgn, sa, opt;
socklen_t slen;
uint8_t dat[9];
struct sockaddr_can saddr;
@ -536,6 +528,7 @@ int main(int argc, char *argv[])
if (!s.intf || !s.name)
error(1, 0, "bad arguments");
ret = sock = open_socket(s.intf, s.name);
sock_rx = open_socket(s.intf, s.name);
install_signal(SIGTERM);
install_signal(SIGINT);
@ -579,7 +572,7 @@ int main(int argc, char *argv[])
}
slen = sizeof(saddr);
ret = recvfrom(sock, dat, sizeof(dat), 0, (void *)&saddr, &slen);
ret = recvfrom(sock_rx, dat, sizeof(dat), 0, (void *)&saddr, &slen);
if (ret < 0) {
if (EINTR == errno)
continue;