chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2263bb9
)
sd-rtnl: recv_message - don't fail on interrupt
author
Tom Gundersen
<teg@jklm.no>
Mon, 29 Dec 2014 00:49:06 +0000
(
01:49
+0100)
committer
Tom Gundersen
<teg@jklm.no>
Mon, 29 Dec 2014 00:59:49 +0000
(
01:59
+0100)
We should just try again instead.
src/libsystemd/sd-rtnl/rtnl-message.c
patch
|
blob
|
history
diff --git
a/src/libsystemd/sd-rtnl/rtnl-message.c
b/src/libsystemd/sd-rtnl/rtnl-message.c
index cfb2af31420a37fae42df25c4c968bb25dc171bd..92f318267e009e7d351727ec04a8e589af8481e9 100644
(file)
--- a/
src/libsystemd/sd-rtnl/rtnl-message.c
+++ b/
src/libsystemd/sd-rtnl/rtnl-message.c
@@
-1348,8
+1348,10
@@
static int socket_recv_message(int fd, struct iovec *iov, uint32_t *_group, bool
/* no data */
if (errno == ENOBUFS)
log_debug("rtnl: kernel receive buffer overrun");
+ else if (errno == EAGAIN)
+ log_debug("rtnl: no data in socket");
- return (errno == EAGAIN) ? 0 : -errno;
+ return (errno == EAGAIN
|| errno == EINTR
) ? 0 : -errno;
} else if (r == 0)
/* connection was closed by the kernel */
return -ECONNRESET;