diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-02-15 22:50:01 +0100 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-25 11:56:39 -0400 |
| commit | 2eb25bc571d6b5babe50ab116c2619e17de39ec9 (patch) | |
| tree | 3df98494a97998a379936551a08456ea86241e2e /src/libsystemd-network/sd-dhcp-server.c | |
| parent | 95adafc428b5b4be0ddd4d43a7b96658390388bc (diff) | |
networkd: FIONREAD is not reliable on some sockets
Fixes: #2457
Diffstat (limited to 'src/libsystemd-network/sd-dhcp-server.c')
| -rw-r--r-- | src/libsystemd-network/sd-dhcp-server.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c index ad3a37b722..54ff1a3f28 100644 --- a/src/libsystemd-network/sd-dhcp-server.c +++ b/src/libsystemd-network/sd-dhcp-server.c @@ -955,14 +955,13 @@ static int server_receive_message(sd_event_source *s, int fd, .msg_controllen = sizeof(cmsgbuf), }; struct cmsghdr *cmsg; - int buflen = 0, len; + ssize_t buflen, len; assert(server); - if (ioctl(fd, FIONREAD, &buflen) < 0) - return -errno; - else if (buflen < 0) - return -EIO; + buflen = next_datagram_size_fd(fd); + if (buflen < 0) + return buflen; message = malloc(buflen); if (!message) |