networkd: refuse to use .network files with missing Address/Gateway key

[elogind.git] / src / network / networkd-bridge.c

diff --git a/src/network/networkd-bridge.c b/src/network/networkd-bridge.c
index e9dceab894dfca725cde2106a66bc014eb01763b..ac71cf39d89a2039cf9999b024981d2def4ec724 100644 (file)
--- a/src/network/networkd-bridge.c
+++ b/src/network/networkd-bridge.c
@@ -84,14 +84,14 @@ static int bridge_join_ready(Bridge *bridge, Link* link, sd_rtnl_message_handler
         assert(link);
         assert(callback);
 
-        r = sd_rtnl_message_link_new(RTM_SETLINK, link->ifindex, 0, 0, &req);
+        r = sd_rtnl_message_link_new(RTM_SETLINK, link->ifindex, &req);
         if (r < 0) {
                 log_error("Could not allocate RTM_SETLINK message: %s",
                           strerror(-r));
                 return r;
         }
 
-        r = sd_rtnl_message_append(req, IFLA_MASTER, &bridge->link->ifindex);
+        r = sd_rtnl_message_append_u32(req, IFLA_MASTER, bridge->link->ifindex);
         if (r < 0) {
                 log_error("Could not append IFLA_MASTER attribute: %s",
                           strerror(-r));
@@ -112,7 +112,7 @@ static int bridge_enter_ready(Bridge *bridge) {
 
         bridge->state = BRIDGE_STATE_READY;
 
-        log_info("Bridge '%s' ready", bridge->name);
+        log_info("%s: bridge ready", bridge->name);
 
         LIST_FOREACH(callbacks, callback, bridge->callbacks) {
                 /* join the links that were attempted to be joined befor the
@@ -131,16 +131,18 @@ static int bridge_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userda
 
         r = sd_rtnl_message_get_errno(m);
         if (r < 0) {
-                log_warning("Bridge '%s' failed: %s", bridge->name, strerror(-r));
-                return bridge_enter_failed(bridge);
+                log_warning("%s: bridge failed: %s", bridge->name, strerror(-r));
+                bridge_enter_failed(bridge);
+
+                return 1;
         }
 
         if (bridge->link)
-                return bridge_enter_ready(bridge);
-
-        bridge->state = BRIDGE_STATE_CREATED;
+                bridge_enter_ready(bridge);
+        else
+                bridge->state = BRIDGE_STATE_CREATED;
 
-        return 0;
+        return 1;
 }
 
 static int bridge_create(Bridge *bridge) {
@@ -153,14 +155,14 @@ static int bridge_create(Bridge *bridge) {
         assert(bridge->manager);
         assert(bridge->manager->rtnl);
 
-        r = sd_rtnl_message_link_new(RTM_NEWLINK, 0, 0, 0, &req);
+        r = sd_rtnl_message_link_new(RTM_NEWLINK, 0, &req);
         if (r < 0) {
                 log_error("Could not allocate RTM_NEWLINK message: %s",
                           strerror(-r));
                 return r;
         }
 
-        r = sd_rtnl_message_append(req, IFLA_IFNAME, bridge->name);
+        r = sd_rtnl_message_append_string(req, IFLA_IFNAME, bridge->name);
         if (r < 0) {
                 log_error("Could not append IFLA_IFNAME attribute: %s",
                           strerror(-r));
@@ -174,7 +176,7 @@ static int bridge_create(Bridge *bridge) {
                 return r;
         }
 
-        r = sd_rtnl_message_append(req, IFLA_INFO_KIND, "bridge");
+        r = sd_rtnl_message_append_string(req, IFLA_INFO_KIND, "bridge");
         if (r < 0) {
                 log_error("Could not append IFLA_INFO_KIND attribute: %s",
                           strerror(-r));
@@ -194,7 +196,7 @@ static int bridge_create(Bridge *bridge) {
                 return r;
         }
 
-        log_info("Creating bridge '%s'", bridge->name);
+        log_debug("%s: creating bridge", bridge->name);
 
         bridge->state = BRIDGE_STATE_CREATING;
 
@@ -244,6 +246,9 @@ static int bridge_load_one(Manager *manager, const char *filename) {
         _cleanup_fclose_ FILE *file = NULL;
         int r;
 
+        assert(manager);
+        assert(filename);
+
         file = fopen(filename, "re");
         if (!file) {
                 if (errno == ENOENT)
@@ -264,8 +269,7 @@ static int bridge_load_one(Manager *manager, const char *filename) {
         if (r < 0) {
                 log_warning("Could not parse config file %s: %s", filename, strerror(-r));
                 return r;
-        } else
-                log_debug("Parsed configuration file %s", filename);
+        }
 
         if (!bridge->name) {
                 log_warning("Bridge without Name configured in %s. Ignoring", filename);