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
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
- log_warning("Bridge '%s' failed: %s", bridge->name, strerror(-r));
+ log_warning("%s: bridge failed: %s", bridge->name, strerror(-r));
bridge_enter_failed(bridge);
return 1;
if (bridge->link)
bridge_enter_ready(bridge);
-
- bridge->state = BRIDGE_STATE_CREATED;
+ else
+ bridge->state = BRIDGE_STATE_CREATED;
return 1;
}
return r;
}
- log_info("Creating bridge '%s'", bridge->name);
+ log_debug("%s: creating bridge", bridge->name);
bridge->state = BRIDGE_STATE_CREATING;
_cleanup_fclose_ FILE *file = NULL;
int r;
+ assert(manager);
+ assert(filename);
+
file = fopen(filename, "re");
if (!file) {
if (errno == ENOENT)
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);
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;