X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-bridge.c;h=ce48878991be24f5a336fd5efaad76a26e11ecb4;hb=5972fe953ec56c77936a1e612ca87d8a0e6c0c64;hp=e9dceab894dfca725cde2106a66bc014eb01763b;hpb=df41aaf9a2b195c9a8bb6fca6672cbf25bc147fb;p=elogind.git diff --git a/src/network/networkd-bridge.c b/src/network/networkd-bridge.c index e9dceab89..ce4887899 100644 --- a/src/network/networkd-bridge.c +++ b/src/network/networkd-bridge.c @@ -55,9 +55,6 @@ int bridge_get(Manager *manager, const char *name, Bridge **ret) { assert(name); assert(ret); - if (manager_should_reload(manager)) - manager_load_config(manager); - bridge = hashmap_get(manager->bridges, name); if (!bridge) { *ret = NULL; @@ -84,35 +81,44 @@ 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)); + log_error_bridge(bridge, + "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)); + log_error_bridge(bridge, + "Could not append IFLA_MASTER attribute: %s", + strerror(-r)); return r; } r = sd_rtnl_call_async(bridge->manager->rtnl, req, callback, link, 0, NULL); if (r < 0) { - log_error("Could not send rtnetlink message: %s", strerror(-r)); + log_error_bridge(bridge, + "Could not send rtnetlink message: %s", + strerror(-r)); return r; } + log_debug_bridge(bridge, "joining link %s to bridge", link->ifname); + return 0; } static int bridge_enter_ready(Bridge *bridge) { bridge_join_callback *callback; + assert(bridge); + assert(bridge->name); + bridge->state = BRIDGE_STATE_READY; - log_info("Bridge '%s' ready", bridge->name); + log_info_bridge(bridge, "bridge ready"); LIST_FOREACH(callbacks, callback, bridge->callbacks) { /* join the links that were attempted to be joined befor the @@ -127,20 +133,17 @@ static int bridge_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userda Bridge *bridge = userdata; int r; - assert(bridge->state == BRIDGE_STATE_CREATING); + assert(bridge->state != _BRIDGE_STATE_INVALID); 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); - } - - if (bridge->link) - return bridge_enter_ready(bridge); + log_warning_bridge(bridge, "bridge failed: %s", strerror(-r)); + bridge_enter_failed(bridge); - bridge->state = BRIDGE_STATE_CREATED; + return 1; + } - return 0; + return 1; } static int bridge_create(Bridge *bridge) { @@ -153,48 +156,54 @@ 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)); + log_error_bridge(bridge, + "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)); + log_error_bridge(bridge, + "Could not append IFLA_IFNAME attribute: %s", + strerror(-r)); return r; } r = sd_rtnl_message_open_container(req, IFLA_LINKINFO); if (r < 0) { - log_error("Colud not open IFLA_LINKINFO container: %s", - strerror(-r)); + log_error_bridge(bridge, + "Could not open IFLA_LINKINFO container: %s", + strerror(-r)); 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)); + log_error_bridge(bridge, + "Could not append IFLA_INFO_KIND attribute: %s", + strerror(-r)); return r; } r = sd_rtnl_message_close_container(req); if (r < 0) { - log_error("Could not close IFLA_LINKINFO container %s", - strerror(-r)); + log_error_bridge(bridge, + "Could not close IFLA_LINKINFO container %s", + strerror(-r)); return r; } r = sd_rtnl_call_async(bridge->manager->rtnl, req, &bridge_create_handler, bridge, 0, NULL); if (r < 0) { - log_error("Could not send rtnetlink message: %s", strerror(-r)); + log_error_bridge(bridge, + "Could not send rtnetlink message: %s", strerror(-r)); return r; } - log_info("Creating bridge '%s'", bridge->name); + log_debug_bridge(bridge, "creating bridge"); bridge->state = BRIDGE_STATE_CREATING; @@ -223,18 +232,18 @@ int bridge_join(Bridge *bridge, Link *link, sd_rtnl_message_handler_t callback) int bridge_set_link(Manager *m, Link *link) { Bridge *bridge; + int r; - bridge = hashmap_get(m->bridges, link->ifname); - if (!bridge) - return -ENOENT; + r = bridge_get(m, link->ifname, &bridge); + if (r < 0) + return r; if (bridge->link && bridge->link != link) return -EEXIST; bridge->link = link; - if (bridge->state == BRIDGE_STATE_CREATED) - bridge_enter_ready(bridge); + bridge_enter_ready(bridge); return 0; } @@ -244,6 +253,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 +276,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); @@ -301,7 +312,7 @@ int bridge_load(Manager *manager) { while ((bridge = hashmap_first(manager->bridges))) bridge_free(bridge); - r = conf_files_list_strv(&files, ".netdev", NULL, (const char **)manager->network_dirs); + r = conf_files_list_strv(&files, ".netdev", NULL, network_dirs); if (r < 0) { log_error("Failed to enumerate netdev files: %s", strerror(-r)); return r;