DHCP DUID, IAID configuration options

[thirdparty/systemd.git] / src / network / networkd.c

diff --git a/src/network/networkd.c b/src/network/networkd.c
index 430d615f90753066b61a260e25457860abd0903c..c8f81a2ca60c2686fe37282ecd9886b55a6567af 100644 (file)
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
@@ -19,11 +17,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "capability.h"
-#include "sd-event.h"
 #include "sd-daemon.h"
 
+#include "capability-util.h"
 #include "networkd.h"
+#include "networkd-conf.h"
+#include "signal-util.h"
+#include "user-util.h"
 
 int main(int argc, char *argv[]) {
         _cleanup_manager_free_ Manager *m = NULL;
@@ -54,15 +54,19 @@ int main(int argc, char *argv[]) {
          * watches in. */
         r = mkdir_safe_label("/run/systemd/netif", 0755, uid, gid);
         if (r < 0)
-                log_error_errno(r, "Could not create runtime directory: %m");
+                log_warning_errno(r, "Could not create runtime directory: %m");
 
         r = mkdir_safe_label("/run/systemd/netif/links", 0755, uid, gid);
         if (r < 0)
-                log_error_errno(r, "Could not create runtime directory 'links': %m");
+                log_warning_errno(r, "Could not create runtime directory 'links': %m");
 
         r = mkdir_safe_label("/run/systemd/netif/leases", 0755, uid, gid);
         if (r < 0)
-                log_error_errno(r, "Could not create runtime directory 'leases': %m");
+                log_warning_errno(r, "Could not create runtime directory 'leases': %m");
+
+        r = mkdir_safe_label("/run/systemd/netif/lldp", 0755, uid, gid);
+        if (r < 0)
+                log_warning_errno(r, "Could not create runtime directory 'lldp': %m");
 
         r = drop_privileges(uid, gid,
                             (1ULL << CAP_NET_ADMIN) |
@@ -72,7 +76,7 @@ int main(int argc, char *argv[]) {
         if (r < 0)
                 goto out;
 
-        assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0);
+        assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT, -1) >= 0);
 
         r = manager_new(&m);
         if (r < 0) {
@@ -80,41 +84,47 @@ int main(int argc, char *argv[]) {
                 goto out;
         }
 
-        r = manager_udev_listen(m);
+        r = manager_connect_bus(m);
         if (r < 0) {
-                log_error_errno(r, "Could not connect to udev: %m");
+                log_error_errno(r, "Could not connect to bus: %m");
                 goto out;
         }
 
-        r = manager_rtnl_listen(m);
+        r = manager_parse_config_file(m);
+        if (r < 0)
+                log_warning_errno(r, "Failed to parse configuration file: %m");
+
+        r = manager_load_config(m);
         if (r < 0) {
-                log_error_errno(r, "Could not connect to rtnl: %m");
+                log_error_errno(r, "Could not load configuration files: %m");
                 goto out;
         }
 
-        r = manager_bus_listen(m);
+        r = manager_rtnl_enumerate_links(m);
         if (r < 0) {
-                log_error_errno(r, "Could not connect to system bus: %m");
+                log_error_errno(r, "Could not enumerate links: %m");
                 goto out;
         }
 
-        r = manager_load_config(m);
+        r = manager_rtnl_enumerate_addresses(m);
         if (r < 0) {
-                log_error_errno(r, "Could not load configuration files: %m");
+                log_error_errno(r, "Could not enumerate addresses: %m");
                 goto out;
         }
 
-        r = manager_rtnl_enumerate_links(m);
+        r = manager_rtnl_enumerate_routes(m);
         if (r < 0) {
-                log_error_errno(r, "Could not enumerate links: %m");
+                log_error_errno(r, "Could not enumerate routes: %m");
                 goto out;
         }
 
+        log_info("Enumeration completed");
+
         sd_notify(false,
                   "READY=1\n"
                   "STATUS=Processing requests...");
 
-        r = sd_event_loop(m->event);
+        r = manager_run(m);
         if (r < 0) {
                 log_error_errno(r, "Event loop failed: %m");
                 goto out;