chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rtnl: add Makefile symlink
[elogind.git]
/
src
/
libsystemd-rtnl
/
sd-rtnl.c
diff --git
a/src/libsystemd-rtnl/sd-rtnl.c
b/src/libsystemd-rtnl/sd-rtnl.c
index b11a813dfe3cea502657b3b194dded9999eb563e..8ea11df808d2981dda7c59cedd141e3ed542b035 100644
(file)
--- a/
src/libsystemd-rtnl/sd-rtnl.c
+++ b/
src/libsystemd-rtnl/sd-rtnl.c
@@
-27,6
+27,7
@@
#include "sd-rtnl.h"
#include "rtnl-internal.h"
#include "sd-rtnl.h"
#include "rtnl-internal.h"
+#include "rtnl-util.h"
static int sd_rtnl_new(sd_rtnl **ret) {
sd_rtnl *rtnl;
static int sd_rtnl_new(sd_rtnl **ret) {
sd_rtnl *rtnl;
@@
-43,12
+44,24
@@
static int sd_rtnl_new(sd_rtnl **ret) {
rtnl->sockaddr.nl.nl_family = AF_NETLINK;
rtnl->sockaddr.nl.nl_family = AF_NETLINK;
+ rtnl->original_pid = getpid();
+
*ret = rtnl;
return 0;
}
*ret = rtnl;
return 0;
}
+static bool rtnl_pid_changed(sd_rtnl *rtnl) {
+ assert(rtnl);
+
+ /* We don't support people creating an rtnl connection and
+ * keeping it around over a fork(). Let's complain. */
+
+ return rtnl->original_pid != getpid();
+}
+
int sd_rtnl_open(uint32_t groups, sd_rtnl **ret) {
_cleanup_sd_rtnl_unref_ sd_rtnl *rtnl = NULL;
int sd_rtnl_open(uint32_t groups, sd_rtnl **ret) {
_cleanup_sd_rtnl_unref_ sd_rtnl *rtnl = NULL;
+ socklen_t addrlen;
int r;
r = sd_rtnl_new(&rtnl);
int r;
r = sd_rtnl_new(&rtnl);
@@
-61,10
+74,16
@@
int sd_rtnl_open(uint32_t groups, sd_rtnl **ret) {
rtnl->sockaddr.nl.nl_groups = groups;
rtnl->sockaddr.nl.nl_groups = groups;
- r = bind(rtnl->fd, &rtnl->sockaddr.sa, sizeof(rtnl->sockaddr));
+ addrlen = sizeof(rtnl->sockaddr);
+
+ r = bind(rtnl->fd, &rtnl->sockaddr.sa, addrlen);
if (r < 0)
return -errno;
if (r < 0)
return -errno;
+ r = getsockname(rtnl->fd, &rtnl->sockaddr.sa, &addrlen);
+ if (r < 0)
+ return r;
+
*ret = rtnl;
rtnl = NULL;
*ret = rtnl;
rtnl = NULL;
@@
-98,6
+117,7
@@
int sd_rtnl_send_with_reply_and_block(sd_rtnl *nl,
int r, serial;
assert_return(nl, -EINVAL);
int r, serial;
assert_return(nl, -EINVAL);
+ assert_return(!rtnl_pid_changed(nl), -ECHILD);
assert_return(message, -EINVAL);
r = message_seal(nl, message);
assert_return(message, -EINVAL);
r = message_seal(nl, message);