emo/ndhc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle sendto() returning EINTR in nl_sendgetlink(), and print if an

Browse Source 
error is encountered while performing sendto().
This commit is contained in:
Nicholas J. Kain
2014-03-12 15:14:40 -04:00
parent b7b353acdc
commit 1222f4f22a
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ndhc/netlink.c
View File

@ -142,6 +142,7 @@ static int nl_sendgetlink(struct client_state_t *cs)
{ {
char nlbuf[8192]; char nlbuf[8192];
struct nlmsghdr *nlh = (struct nlmsghdr *)nlbuf; struct nlmsghdr *nlh = (struct nlmsghdr *)nlbuf;
ssize_t r;
memset(nlbuf, 0, sizeof nlbuf); memset(nlbuf, 0, sizeof nlbuf);
nlh->nlmsg_len = NLMSG_LENGTH(sizeof (struct rtattr)); nlh->nlmsg_len = NLMSG_LENGTH(sizeof (struct rtattr));
@ -152,9 +153,18 @@ static int nl_sendgetlink(struct client_state_t *cs)
struct sockaddr_nl addr = { struct sockaddr_nl addr = {
.nl_family = AF_NETLINK, .nl_family = AF_NETLINK,
}; };
if (sendto(cs->nlFd, nlbuf, nlh->nlmsg_len, 0, (struct sockaddr *)&addr, retry_sendto:
sizeof addr) == -1) r = sendto(cs->nlFd, nlbuf, nlh->nlmsg_len, 0,
return -1; (struct sockaddr *)&addr, sizeof addr);
if (r < 0) {
if (errno == EINTR)
goto retry_sendto;
else {
log_warning("%s: (%s) netlink sendto socket failed: %s",
client_config.interface, __func__, strerror(errno));
return -1;
}
}
return 0; return 0;
} }