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

Make nl_getifdata() use a netlink sequence number generated from the

Browse Source 
tv_nsec field from clock_gettime(CLOCK_REALTIME), and actually check
that the sequence number matches that of the netlink replies.
This commit is contained in:
Nicholas J. Kain 2014-03-17 06:15:59 -04:00
parent 6460346bb6
commit 268e88dc24
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ndhc/netlink.c
View File

@ -150,7 +150,7 @@ static void do_handle_getifdata(const struct nlmsghdr *nlh, void *data)
} }
} }
static int handle_getifdata(int fd) static int handle_getifdata(int fd, uint32_t seq)
{ {
char nlbuf[8192]; char nlbuf[8192];
ssize_t ret; ssize_t ret;
@ -159,7 +159,7 @@ static int handle_getifdata(int fd)
ret = nl_recv_buf(fd, nlbuf, sizeof nlbuf); ret = nl_recv_buf(fd, nlbuf, sizeof nlbuf);
if (ret == -1) if (ret == -1)
return -1; return -1;
if (nl_foreach_nlmsg(nlbuf, ret, 0, 0, if (nl_foreach_nlmsg(nlbuf, ret, seq, 0,
do_handle_getifdata, &got_ifdata) == -1) do_handle_getifdata, &got_ifdata) == -1)
return -1; return -1;
} while (ret > 0); } while (ret > 0);
@ -176,7 +176,14 @@ int nl_getifdata(void)
goto fail; goto fail;
} }
if (nl_sendgetlinks(fd, time(NULL))) { struct timespec ts;
if (clock_gettime(CLOCK_REALTIME, &ts) < 0) {
log_line("%s: (%s) clock_gettime failed",
client_config.interface, __func__);
goto fail_fd;
}
uint32_t seq = ts.tv_nsec;
if (nl_sendgetlinks(fd, seq)) {
log_line("%s: (%s) nl_sendgetlinks failed", log_line("%s: (%s) nl_sendgetlinks failed",
client_config.interface, __func__); client_config.interface, __func__);
goto fail_fd; goto fail_fd;
@ -185,7 +192,7 @@ int nl_getifdata(void)
for (int pr = 0; !pr;) { for (int pr = 0; !pr;) {
pr = poll(&((struct pollfd){.fd=fd,.events=POLLIN}), 1, -1); pr = poll(&((struct pollfd){.fd=fd,.events=POLLIN}), 1, -1);
if (pr == 1) if (pr == 1)
ret = handle_getifdata(fd); ret = handle_getifdata(fd, seq);
else if (pr == -1 && errno != EINTR) else if (pr == -1 && errno != EINTR)
goto fail_fd; goto fail_fd;
} }