#include "conf-parser.h"
#include "list.h"
+#define VLANID_MAX 4094
+
static const char* const netdev_kind_table[] = {
[NETDEV_KIND_BRIDGE] = "bridge",
- [NETDEV_KIND_BOND] = "bond"
+ [NETDEV_KIND_BOND] = "bond",
+ [NETDEV_KIND_VLAN] = "vlan",
};
-DEFINE_STRING_TABLE_LOOKUP(netdev_kind, NetdevKind);
-DEFINE_CONFIG_PARSE_ENUM(config_parse_netdev_kind, netdev_kind, NetdevKind, "Failed to parse netdev kind");
+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) {
+void netdev_free(NetDev *netdev) {
netdev_enslave_callback *callback;
if (!netdev)
free(netdev);
}
-int netdev_get(Manager *manager, const char *name, Netdev **ret) {
- Netdev *netdev;
+int netdev_get(Manager *manager, const char *name, NetDev **ret) {
+ NetDev *netdev;
assert(manager);
assert(name);
return 0;
}
-static int netdev_enter_failed(Netdev *netdev) {
+static int netdev_enter_failed(NetDev *netdev) {
netdev->state = NETDEV_STATE_FAILED;
return 0;
}
-static int netdev_enslave_ready(Netdev *netdev, 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;
return r;
}
- r = sd_rtnl_message_append_u32(req, IFLA_MASTER, netdev->link->ifindex);
+ r = sd_rtnl_message_append_u32(req, IFLA_MASTER, netdev->ifindex);
if (r < 0) {
log_error_netdev(netdev,
"Could not append IFLA_MASTER attribute: %s",
return 0;
}
-static int netdev_enter_ready(Netdev *netdev) {
+static int netdev_enter_ready(NetDev *netdev) {
netdev_enslave_callback *callback;
assert(netdev);
}
static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
- Netdev *netdev = userdata;
+ NetDev *netdev = userdata;
int r;
assert(netdev->state != _NETDEV_STATE_INVALID);
return 1;
}
-static int netdev_create(Netdev *netdev) {
+static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback) {
_cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL;
const char *kind;
int r;
assert(netdev);
- assert(netdev->state == _NETDEV_STATE_INVALID);
+ assert(!(netdev->kind == NETDEV_KIND_VLAN) || (link && callback && netdev->vlanid <= VLANID_MAX));
assert(netdev->name);
assert(netdev->manager);
assert(netdev->manager->rtnl);
return r;
}
+ if (link) {
+ r = sd_rtnl_message_append_u32(req, IFLA_LINK, link->ifindex);
+ if (r < 0) {
+ log_error_netdev(netdev,
+ "Could not append IFLA_LINK attribute: %s",
+ strerror(-r));
+ return r;
+ }
+ }
+
r = sd_rtnl_message_append_string(req, IFLA_IFNAME, netdev->name);
if (r < 0) {
log_error_netdev(netdev,
return r;
}
+ if (netdev->vlanid <= VLANID_MAX) {
+ r = sd_rtnl_message_open_container(req, IFLA_INFO_DATA);
+ if (r < 0) {
+ log_error_netdev(netdev,
+ "Could not open IFLA_INFO_DATA container: %s",
+ strerror(-r));
+ return r;
+ }
+
+ r = sd_rtnl_message_append_u16(req, IFLA_VLAN_ID, netdev->vlanid);
+ if (r < 0) {
+ log_error_netdev(netdev,
+ "Could not append IFLA_VLAN_ID attribute: %s",
+ strerror(-r));
+ return r;
+ }
+
+ r = sd_rtnl_message_close_container(req);
+ if (r < 0) {
+ log_error_netdev(netdev,
+ "Could not close IFLA_INFO_DATA container %s",
+ strerror(-r));
+ return r;
+ }
+ }
+
r = sd_rtnl_message_close_container(req);
if (r < 0) {
log_error_netdev(netdev,
return r;
}
- r = sd_rtnl_call_async(netdev->manager->rtnl, req, &netdev_create_handler, netdev, 0, NULL);
+ if (link)
+ r = sd_rtnl_call_async(netdev->manager->rtnl, req, callback, link, 0, NULL);
+ else
+ r = sd_rtnl_call_async(netdev->manager->rtnl, req, &netdev_create_handler, netdev, 0, NULL);
if (r < 0) {
log_error_netdev(netdev,
"Could not send rtnetlink message: %s", strerror(-r));
return 0;
}
-int netdev_enslave(Netdev *netdev, Link *link, sd_rtnl_message_handler_t callback) {
+int netdev_enslave(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback) {
+ if (netdev->kind == NETDEV_KIND_VLAN)
+ return netdev_create(netdev, link, callback);
+
if (netdev->state == NETDEV_STATE_READY) {
netdev_enslave_ready(netdev, link, callback);
} else {
return 0;
}
-int netdev_set_link(Manager *m, NetdevKind kind, Link *link) {
- Netdev *netdev;
- int r;
-
- r = netdev_get(m, link->ifname, &netdev);
- if (r < 0)
- return r;
-
- if (netdev->link && netdev->link != link)
- return -EEXIST;
+int netdev_set_ifindex(NetDev *netdev, int ifindex) {
+ assert(netdev);
+ assert(ifindex > 0);
- if (netdev->kind != kind)
- return -EINVAL;
+ if (netdev->ifindex > 0) {
+ if (netdev->ifindex == ifindex)
+ return 0;
+ else
+ return -EEXIST;
+ }
- netdev->link = link;
+ netdev->ifindex = ifindex;
netdev_enter_ready(netdev);
}
static int netdev_load_one(Manager *manager, const char *filename) {
- _cleanup_netdev_free_ Netdev *netdev = NULL;
+ _cleanup_netdev_free_ NetDev *netdev = NULL;
_cleanup_fclose_ FILE *file = NULL;
int r;
return errno;
}
- netdev = new0(Netdev, 1);
+ netdev = new0(NetDev, 1);
if (!netdev)
return log_oom();
netdev->manager = manager;
netdev->state = _NETDEV_STATE_INVALID;
netdev->kind = _NETDEV_KIND_INVALID;
+ netdev->vlanid = VLANID_MAX + 1;
- r = config_parse(NULL, filename, file, "Netdev\0", config_item_perf_lookup,
+ r = config_parse(NULL, filename, file, "NetDev\0VLAN\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));
}
if (netdev->kind == _NETDEV_KIND_INVALID) {
- log_warning("Netdev without Kind configured in %s. Ignoring", filename);
+ 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);
+ log_warning("NetDev without Name configured in %s. Ignoring", filename);
+ return 0;
+ }
+
+ if (netdev->kind == NETDEV_KIND_VLAN && netdev->vlanid > VLANID_MAX) {
+ log_warning("VLAN without valid Id configured in %s. Ignoring", filename);
return 0;
}
LIST_HEAD_INIT(netdev->callbacks);
- r = netdev_create(netdev);
- if (r < 0)
- return r;
+ if (netdev->kind != NETDEV_KIND_VLAN) {
+ r = netdev_create(netdev, NULL, NULL);
+ if (r < 0)
+ return r;
+ }
netdev = NULL;
}
int netdev_load(Manager *manager) {
- Netdev *netdev;
+ NetDev *netdev;
char **files, **f;
int r;