#include "conf-parser.h"
#include "list.h"
-void bridge_free(Bridge *bridge) {
- bridge_join_callback *callback;
+static const char* const netdev_kind_table[] = {
+ [NETDEV_KIND_BRIDGE] = "bridge",
+ [NETDEV_KIND_BOND] = "bond"
+};
- if (!bridge)
+DEFINE_STRING_TABLE_LOOKUP(netdev_kind, NetdevKind);
+DEFINE_CONFIG_PARSE_ENUM(config_parse_netdev_kind, netdev_kind, NetdevKind, "Failed to parse netdev kind");
+
+void netdev_free(Netdev *netdev) {
+ netdev_enslave_callback *callback;
+
+ if (!netdev)
return;
- while ((callback = bridge->callbacks)) {
- LIST_REMOVE(callbacks, bridge->callbacks, callback);
+ while ((callback = netdev->callbacks)) {
+ LIST_REMOVE(callbacks, netdev->callbacks, callback);
free(callback);
}
- if (bridge->name)
- hashmap_remove(bridge->manager->bridges, bridge->name);
+ if (netdev->name)
+ hashmap_remove(netdev->manager->netdevs, netdev->name);
- free(bridge->filename);
+ free(netdev->filename);
- free(bridge->description);
- free(bridge->name);
+ free(netdev->description);
+ free(netdev->name);
- free(bridge);
+ free(netdev);
}
-int bridge_get(Manager *manager, const char *name, Bridge **ret) {
- Bridge *bridge;
+int netdev_get(Manager *manager, const char *name, Netdev **ret) {
+ Netdev *netdev;
assert(manager);
assert(name);
assert(ret);
- bridge = hashmap_get(manager->bridges, name);
- if (!bridge) {
+ netdev = hashmap_get(manager->netdevs, name);
+ if (!netdev) {
*ret = NULL;
return -ENOENT;
}
- *ret = bridge;
+ *ret = netdev;
return 0;
}
-static int bridge_enter_failed(Bridge *bridge) {
- bridge->state = BRIDGE_STATE_FAILED;
+static int netdev_enter_failed(Netdev *netdev) {
+ netdev->state = NETDEV_STATE_FAILED;
return 0;
}
-static int bridge_join_ready(Bridge *bridge, Link* link, sd_rtnl_message_handler_t callback) {
+static int netdev_enslave_ready(Netdev *netdev, Link* link, sd_rtnl_message_handler_t callback) {
_cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL;
int r;
- assert(bridge);
- assert(bridge->state == BRIDGE_STATE_READY);
+ assert(netdev);
+ assert(netdev->state == NETDEV_STATE_READY);
assert(link);
assert(callback);
r = sd_rtnl_message_link_new(RTM_SETLINK, link->ifindex, &req);
if (r < 0) {
- log_error_bridge(bridge,
+ log_error_netdev(netdev,
"Could not allocate RTM_SETLINK message: %s",
strerror(-r));
return r;
}
- r = sd_rtnl_message_append_u32(req, IFLA_MASTER, bridge->link->ifindex);
+ r = sd_rtnl_message_append_u32(req, IFLA_MASTER, netdev->link->ifindex);
if (r < 0) {
- log_error_bridge(bridge,
+ log_error_netdev(netdev,
"Could not append IFLA_MASTER attribute: %s",
strerror(-r));
return r;
}
- r = sd_rtnl_call_async(bridge->manager->rtnl, req, callback, link, 0, NULL);
+ r = sd_rtnl_call_async(netdev->manager->rtnl, req, callback, link, 0, NULL);
if (r < 0) {
- log_error_bridge(bridge,
+ log_error_netdev(netdev,
"Could not send rtnetlink message: %s",
strerror(-r));
return r;
}
- log_debug_bridge(bridge, "joining link %s to bridge", link->ifname);
+ log_debug_netdev(netdev, "enslaving link '%s'", link->ifname);
return 0;
}
-static int bridge_enter_ready(Bridge *bridge) {
- bridge_join_callback *callback;
+static int netdev_enter_ready(Netdev *netdev) {
+ netdev_enslave_callback *callback;
- assert(bridge);
- assert(bridge->name);
+ assert(netdev);
+ assert(netdev->name);
- bridge->state = BRIDGE_STATE_READY;
+ netdev->state = NETDEV_STATE_READY;
- log_info_bridge(bridge, "bridge ready");
+ log_info_netdev(netdev, "netdev ready");
- LIST_FOREACH(callbacks, callback, bridge->callbacks) {
- /* join the links that were attempted to be joined befor the
+ LIST_FOREACH(callbacks, callback, netdev->callbacks) {
+ /* enslave the links that were attempted to be enslaved befor the
* link was ready */
- bridge_join_ready(bridge, callback->link, callback->callback);
+ netdev_enslave_ready(netdev, callback->link, callback->callback);
}
return 0;
}
-static int bridge_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
- Bridge *bridge = userdata;
+static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+ Netdev *netdev = userdata;
int r;
- assert(bridge->state != _BRIDGE_STATE_INVALID);
+ assert(netdev->state != _NETDEV_STATE_INVALID);
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
- log_warning_bridge(bridge, "bridge failed: %s", strerror(-r));
- bridge_enter_failed(bridge);
+ log_warning_netdev(netdev, "netdev failed: %s", strerror(-r));
+ netdev_enter_failed(netdev);
return 1;
}
return 1;
}
-static int bridge_create(Bridge *bridge) {
+static int netdev_create(Netdev *netdev) {
_cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL;
+ const char *kind;
int r;
- assert(bridge);
- assert(bridge->state == _BRIDGE_STATE_INVALID);
- assert(bridge->name);
- assert(bridge->manager);
- assert(bridge->manager->rtnl);
+ assert(netdev);
+ assert(netdev->state == _NETDEV_STATE_INVALID);
+ assert(netdev->name);
+ assert(netdev->manager);
+ assert(netdev->manager->rtnl);
r = sd_rtnl_message_link_new(RTM_NEWLINK, 0, &req);
if (r < 0) {
- log_error_bridge(bridge,
+ log_error_netdev(netdev,
"Could not allocate RTM_NEWLINK message: %s",
strerror(-r));
return r;
}
- r = sd_rtnl_message_append_string(req, IFLA_IFNAME, bridge->name);
+ r = sd_rtnl_message_append_string(req, IFLA_IFNAME, netdev->name);
if (r < 0) {
- log_error_bridge(bridge,
+ log_error_netdev(netdev,
"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_bridge(bridge,
+ log_error_netdev(netdev,
"Could not open IFLA_LINKINFO container: %s",
strerror(-r));
return r;
}
- r = sd_rtnl_message_append_string(req, IFLA_INFO_KIND, "bridge");
+ kind = netdev_kind_to_string(netdev->kind);
+ if (!kind) {
+ log_error_netdev(netdev, "Invalid kind");
+ return -EINVAL;
+ }
+
+ r = sd_rtnl_message_append_string(req, IFLA_INFO_KIND, kind);
if (r < 0) {
- log_error_bridge(bridge,
+ log_error_netdev(netdev,
"Could not append IFLA_INFO_KIND attribute: %s",
strerror(-r));
return r;
r = sd_rtnl_message_close_container(req);
if (r < 0) {
- log_error_bridge(bridge,
+ log_error_netdev(netdev,
"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);
+ r = sd_rtnl_call_async(netdev->manager->rtnl, req, &netdev_create_handler, netdev, 0, NULL);
if (r < 0) {
- log_error_bridge(bridge,
+ log_error_netdev(netdev,
"Could not send rtnetlink message: %s", strerror(-r));
return r;
}
- log_debug_bridge(bridge, "creating bridge");
+ log_debug_netdev(netdev, "creating netdev");
- bridge->state = BRIDGE_STATE_CREATING;
+ netdev->state = NETDEV_STATE_CREATING;
return 0;
}
-int bridge_join(Bridge *bridge, Link *link, sd_rtnl_message_handler_t callback) {
- if (bridge->state == BRIDGE_STATE_READY) {
- bridge_join_ready(bridge, link, callback);
+int netdev_enslave(Netdev *netdev, Link *link, sd_rtnl_message_handler_t callback) {
+ if (netdev->state == NETDEV_STATE_READY) {
+ netdev_enslave_ready(netdev, link, callback);
} else {
- /* the bridge is not yet read, save this request for when it is*/
- bridge_join_callback *cb;
+ /* the netdev is not yet read, save this request for when it is*/
+ netdev_enslave_callback *cb;
- cb = new0(bridge_join_callback, 1);
+ cb = new0(netdev_enslave_callback, 1);
if (!cb)
return log_oom();
cb->callback = callback;
cb->link = link;
- LIST_PREPEND(callbacks, bridge->callbacks, cb);
+ LIST_PREPEND(callbacks, netdev->callbacks, cb);
}
return 0;
}
-int bridge_set_link(Manager *m, Link *link) {
- Bridge *bridge;
+int netdev_set_link(Manager *m, NetdevKind kind, Link *link) {
+ Netdev *netdev;
int r;
- r = bridge_get(m, link->ifname, &bridge);
+ r = netdev_get(m, link->ifname, &netdev);
if (r < 0)
return r;
- if (bridge->link && bridge->link != link)
+ if (netdev->link && netdev->link != link)
return -EEXIST;
- bridge->link = link;
+ if (netdev->kind != kind)
+ return -EINVAL;
- bridge_enter_ready(bridge);
+ netdev->link = link;
+
+ netdev_enter_ready(netdev);
return 0;
}
-static int bridge_load_one(Manager *manager, const char *filename) {
- _cleanup_bridge_free_ Bridge *bridge = NULL;
+static int netdev_load_one(Manager *manager, const char *filename) {
+ _cleanup_netdev_free_ Netdev *netdev = NULL;
_cleanup_fclose_ FILE *file = NULL;
int r;
return errno;
}
- bridge = new0(Bridge, 1);
- if (!bridge)
+ netdev = new0(Netdev, 1);
+ if (!netdev)
return log_oom();
- bridge->manager = manager;
- bridge->state = _BRIDGE_STATE_INVALID;
+ netdev->manager = manager;
+ netdev->state = _NETDEV_STATE_INVALID;
+ netdev->kind = _NETDEV_KIND_INVALID;
- r = config_parse(NULL, filename, file, "Bridge\0", config_item_perf_lookup,
- (void*) network_gperf_lookup, false, false, bridge);
+ r = config_parse(NULL, filename, file, "Netdev\0", config_item_perf_lookup,
+ (void*) network_gperf_lookup, false, false, netdev);
if (r < 0) {
log_warning("Could not parse config file %s: %s", filename, strerror(-r));
return r;
}
- if (!bridge->name) {
- log_warning("Bridge without Name configured in %s. Ignoring", filename);
+ if (netdev->kind == _NETDEV_KIND_INVALID) {
+ log_warning("Netdev without Kind configured in %s. Ignoring", filename);
+ return 0;
+ }
+
+ if (!netdev->name) {
+ log_warning("Netdev without Name configured in %s. Ignoring", filename);
return 0;
}
- bridge->filename = strdup(filename);
- if (!bridge->filename)
+ netdev->filename = strdup(filename);
+ if (!netdev->filename)
return log_oom();
- r = hashmap_put(bridge->manager->bridges, bridge->name, bridge);
+ r = hashmap_put(netdev->manager->netdevs, netdev->name, netdev);
if (r < 0)
return r;
- LIST_HEAD_INIT(bridge->callbacks);
+ LIST_HEAD_INIT(netdev->callbacks);
- r = bridge_create(bridge);
+ r = netdev_create(netdev);
if (r < 0)
return r;
- bridge = NULL;
+ netdev = NULL;
return 0;
}
-int bridge_load(Manager *manager) {
- Bridge *bridge;
+int netdev_load(Manager *manager) {
+ Netdev *netdev;
char **files, **f;
int r;
assert(manager);
- while ((bridge = hashmap_first(manager->bridges)))
- bridge_free(bridge);
+ while ((netdev = hashmap_first(manager->netdevs)))
+ netdev_free(netdev);
r = conf_files_list_strv(&files, ".netdev", NULL, network_dirs);
if (r < 0) {
}
STRV_FOREACH_BACKWARDS(f, files) {
- r = bridge_load_one(manager, *f);
+ r = netdev_load_one(manager, *f);
if (r < 0)
return r;
}
~ianmdlvl / elogind.git / blobdiff