shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-30 06:25:37 +03:00
Code

sd-network: Keep inotify watch if watch descriptor didn't change

Browse Source 
In sd_network_monitor_flush(), we shouldn't remove the inotify
watch for the current directory if the directory the network
monitor is waiting for wasn't created yet.

inotify_add_watch() returns the same unique watch descriptor if a
path is already being watched. Let's return the watch descriptor
from monitor_add_inotify_watch() so we can check if it's the same
as the watch descriptor of the inotify event. If they are equal,
we're still watching the same path and we don't need to remove the
inotify watch just yet.
This commit is contained in:
Daan De Meyer 2022-05-03 13:54:49 +02:00 committed by Yu Watanabe
parent d31b8a66d1
commit 206c0897a2
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/libsystemd/sd-network/sd-network.c
View File

@ -413,25 +413,25 @@ static sd_network_monitor* FD_TO_MONITOR(int fd) {
}
static int monitor_add_inotify_watch(int fd) {
int k;
int wd;
k = inotify_add_watch(fd, "/run/systemd/netif/links/", IN_MOVED_TO|IN_DELETE);
if (k >= 0)
return 0;
wd = inotify_add_watch(fd, "/run/systemd/netif/links/", IN_MOVED_TO|IN_DELETE);
if (wd >= 0)
return wd;
else if (errno != ENOENT)
return -errno;
k = inotify_add_watch(fd, "/run/systemd/netif/", IN_CREATE|IN_ISDIR);
if (k >= 0)
return 0;
wd = inotify_add_watch(fd, "/run/systemd/netif/", IN_CREATE|IN_ISDIR);
if (wd >= 0)
return wd;
else if (errno != ENOENT)
return -errno;
k = inotify_add_watch(fd, "/run/systemd/", IN_CREATE|IN_ISDIR);
if (k < 0)
wd = inotify_add_watch(fd, "/run/systemd/", IN_CREATE|IN_ISDIR);
if (wd < 0)
return -errno;
return 0;
return wd;
}
int sd_network_monitor_new(sd_network_monitor **m, const char *category) {
@ -470,7 +470,7 @@ sd_network_monitor* sd_network_monitor_unref(sd_network_monitor *m) {
int sd_network_monitor_flush(sd_network_monitor *m) {
union inotify_event_buffer buffer;
ssize_t l;
int fd, k;
int fd;
assert_return(m, -EINVAL);
@ -486,13 +486,16 @@ int sd_network_monitor_flush(sd_network_monitor *m) {
FOREACH_INOTIFY_EVENT(e, buffer, l) {
if (e->mask & IN_ISDIR) {
k = monitor_add_inotify_watch(fd);
if (k < 0)
return k;
int wd;
k = inotify_rm_watch(fd, e->wd);
if (k < 0)
return -errno;
wd = monitor_add_inotify_watch(fd);
if (wd < 0)
return wd;
if (wd != e->wd) {
if (inotify_rm_watch(fd, e->wd) < 0)
return -errno;
}
}
}