chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: manager - enumerate addresses globally, rather than per-link
[elogind.git]
/
src
/
network
/
networkd.c
diff --git
a/src/network/networkd.c
b/src/network/networkd.c
index d6075359c880411e7bd8d83650736994dd533814..0b386d4069261ef1145e8303783c10b987b81886 100644
(file)
--- a/
src/network/networkd.c
+++ b/
src/network/networkd.c
@@
-46,7
+46,7
@@
int main(int argc, char *argv[]) {
r = get_user_creds(&user, &uid, &gid, NULL, NULL);
if (r < 0) {
r = get_user_creds(&user, &uid, &gid, NULL, NULL);
if (r < 0) {
- log_error
("Cannot resolve user name %s: %s", user, strerror(-r)
);
+ log_error
_errno(r, "Cannot resolve user name %s: %m", user
);
goto out;
}
goto out;
}
@@
-54,18
+54,15
@@
int main(int argc, char *argv[]) {
* watches in. */
r = mkdir_safe_label("/run/systemd/netif", 0755, uid, gid);
if (r < 0)
* watches in. */
r = mkdir_safe_label("/run/systemd/netif", 0755, uid, gid);
if (r < 0)
- log_error("Could not create runtime directory: %s",
- strerror(-r));
+ log_error_errno(r, "Could not create runtime directory: %m");
r = mkdir_safe_label("/run/systemd/netif/links", 0755, uid, gid);
if (r < 0)
r = mkdir_safe_label("/run/systemd/netif/links", 0755, uid, gid);
if (r < 0)
- log_error("Could not create runtime directory 'links': %s",
- strerror(-r));
+ log_error_errno(r, "Could not create runtime directory 'links': %m");
r = mkdir_safe_label("/run/systemd/netif/leases", 0755, uid, gid);
if (r < 0)
r = mkdir_safe_label("/run/systemd/netif/leases", 0755, uid, gid);
if (r < 0)
- log_error("Could not create runtime directory 'leases': %s",
- strerror(-r));
+ log_error_errno(r, "Could not create runtime directory 'leases': %m");
r = drop_privileges(uid, gid,
(1ULL << CAP_NET_ADMIN) |
r = drop_privileges(uid, gid,
(1ULL << CAP_NET_ADMIN) |
@@
-75,39
+72,47
@@
int main(int argc, char *argv[]) {
if (r < 0)
goto out;
if (r < 0)
goto out;
+ assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0);
+
r = manager_new(&m);
if (r < 0) {
r = manager_new(&m);
if (r < 0) {
- log_error
("Could not create manager: %s", strerror(-r)
);
+ log_error
_errno(r, "Could not create manager: %m"
);
goto out;
}
r = manager_udev_listen(m);
if (r < 0) {
goto out;
}
r = manager_udev_listen(m);
if (r < 0) {
- log_error
("Could not connect to udev: %s", strerror(-r)
);
+ log_error
_errno(r, "Could not connect to udev: %m"
);
goto out;
}
r = manager_rtnl_listen(m);
if (r < 0) {
goto out;
}
r = manager_rtnl_listen(m);
if (r < 0) {
- log_error
("Could not connect to rtnl: %s", strerror(-r)
);
+ log_error
_errno(r, "Could not connect to rtnl: %m"
);
goto out;
}
r = manager_bus_listen(m);
if (r < 0) {
goto out;
}
r = manager_bus_listen(m);
if (r < 0) {
- log_error
("Could not connect to system bus: %s", strerror(-r)
);
+ log_error
_errno(r, "Could not connect to system bus: %m"
);
goto out;
}
r = manager_load_config(m);
if (r < 0) {
goto out;
}
r = manager_load_config(m);
if (r < 0) {
- log_error
("Could not load configuration files: %s", strerror(-r)
);
+ log_error
_errno(r, "Could not load configuration files: %m"
);
goto out;
}
r = manager_rtnl_enumerate_links(m);
if (r < 0) {
goto out;
}
r = manager_rtnl_enumerate_links(m);
if (r < 0) {
- log_error("Could not enumerate links: %s", strerror(-r));
+ log_error_errno(r, "Could not enumerate links: %m");
+ goto out;
+ }
+
+ r = manager_rtnl_enumerate_addresses(m);
+ if (r < 0) {
+ log_error_errno(r, "Could not enumerate links: %m");
goto out;
}
goto out;
}
@@
-117,12
+122,13
@@
int main(int argc, char *argv[]) {
r = sd_event_loop(m->event);
if (r < 0) {
r = sd_event_loop(m->event);
if (r < 0) {
- log_error
("Event loop failed: %s", strerror(-r)
);
+ log_error
_errno(r, "Event loop failed: %m"
);
goto out;
}
out:
sd_notify(false,
goto out;
}
out:
sd_notify(false,
+ "STOPPING=1\n"
"STATUS=Shutting down...");
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
"STATUS=Shutting down...");
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;