picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #148 from teg/sd-network-race

Browse source 
sd-network: allow the state dir to be created after the monitor
This commit is contained in:
Lennart Poettering 2015-06-10 20:43:38 +02:00
parent ad091530b3 870395a4d8
commit d112701190
1 changed files with 56 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/libsystemd/sd-network/sd-network.c
View file

@ -297,8 +297,31 @@ static inline sd_network_monitor* FD_TO_MONITOR(int fd) {
return (sd_network_monitor*) (unsigned long) (fd + 1);
}
static int monitor_add_inotify_watch(int fd) {
int k;
k = inotify_add_watch(fd, "/run/systemd/netif/links/", IN_MOVED_TO|IN_DELETE);
if (k >= 0)
return 0;
else if (errno != ENOENT)
return -errno;
k = inotify_add_watch(fd, "/run/systemd/netif/", IN_CREATE|IN_ISDIR);
if (k >= 0)
return 0;
else if (errno != ENOENT)
return -errno;
k = inotify_add_watch(fd, "/run/systemd/", IN_CREATE|IN_ISDIR);
if (k < 0)
return -errno;
return 0;
}
_public_ int sd_network_monitor_new(sd_network_monitor **m, const char *category) {
int fd, k;
_cleanup_close_ int fd = -1;
int k;
bool good = false;
assert_return(m, -EINVAL);
@ -308,11 +331,9 @@ _public_ int sd_network_monitor_new(sd_network_monitor **m, const char *category
return -errno;
if (!category || streq(category, "links")) {
k = inotify_add_watch(fd, "/run/systemd/netif/links/", IN_MOVED_TO|IN_DELETE);
if (k < 0) {
safe_close(fd);
return -errno;
}
k = monitor_add_inotify_watch(fd);
if (k < 0)
return k;
good = true;
}
@ -323,6 +344,8 @@ _public_ int sd_network_monitor_new(sd_network_monitor **m, const char *category
}
*m = FD_TO_MONITOR(fd);
fd = -1;
return 0;
}
@ -338,10 +361,36 @@ _public_ sd_network_monitor* sd_network_monitor_unref(sd_network_monitor *m) {
}
_public_ int sd_network_monitor_flush(sd_network_monitor *m) {
union inotify_event_buffer buffer;
struct inotify_event *e;
ssize_t l;
int fd, k;
assert_return(m, -EINVAL);
return flush_fd(MONITOR_TO_FD(m));
fd = MONITOR_TO_FD(m);
l = read(fd, &buffer, sizeof(buffer));
if (l < 0) {
if (errno == EAGAIN || errno == EINTR)
return 0;
return -errno;
}
FOREACH_INOTIFY_EVENT(e, buffer, l) {
if (e->mask & IN_ISDIR) {
k = monitor_add_inotify_watch(fd);
if (k < 0)
return k;
k = inotify_rm_watch(fd, e->wd);
if (k < 0)
return -errno;
}
}
return 0;
}
_public_ int sd_network_monitor_get_fd(sd_network_monitor *m) {