#include "conf-parser.h"
#include "list.h"
-static const char* const netdev_kind_table[] = {
+#define VLANID_MAX 4094
+
+static const char* const netdev_kind_table[_NETDEV_KIND_MAX] = {
[NETDEV_KIND_BRIDGE] = "bridge",
[NETDEV_KIND_BOND] = "bond",
[NETDEV_KIND_VLAN] = "vlan",
+ [NETDEV_KIND_MACVLAN] = "macvlan",
+};
+
+DEFINE_STRING_TABLE_LOOKUP(netdev_kind, NetDevKind);
+DEFINE_CONFIG_PARSE_ENUM(config_parse_netdev_kind, netdev_kind, NetDevKind, "Failed to parse netdev kind");
+
+static const char* const macvlan_mode_table[_NETDEV_MACVLAN_MODE_MAX] = {
+ [NETDEV_MACVLAN_MODE_PRIVATE] = "private",
+ [NETDEV_MACVLAN_MODE_VEPA] = "vepa",
+ [NETDEV_MACVLAN_MODE_BRIDGE] = "bridge",
+ [NETDEV_MACVLAN_MODE_PASSTHRU] = "passthru",
};
-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(macvlan_mode, MacVlanMode);
+DEFINE_CONFIG_PARSE_ENUM(config_parse_macvlan_mode, macvlan_mode, MacVlanMode, "Failed to parse macvlan mode");
-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) {
- _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL;
+static int netdev_enslave_ready(NetDev *netdev, Link* link, sd_rtnl_message_handler_t callback) {
+ _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;
int r;
assert(netdev);
assert(netdev->state == NETDEV_STATE_READY);
+ assert(netdev->manager);
+ assert(netdev->manager->rtnl);
assert(link);
assert(callback);
- r = sd_rtnl_message_link_new(RTM_SETLINK, link->ifindex, &req);
+ r = sd_rtnl_message_new_link(netdev->manager->rtnl, &req,
+ RTM_SETLINK, link->ifindex);
if (r < 0) {
log_error_netdev(netdev,
"Could not allocate RTM_SETLINK message: %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;
- int r, ifindex;
+ NetDev *netdev = userdata;
+ int r;
assert(netdev->state != _NETDEV_STATE_INVALID);
return 1;
}
- r = sd_rtnl_message_link_get_ifindex(m, &ifindex);
- if (r < 0)
- log_warning_netdev(netdev, "created netdev with unknown ifindex: %s", strerror(-r));
- else {
- log_info_netdev(netdev, "created netdev with ifindex %d", ifindex);
- netdev_set_ifindex(netdev, ifindex);
- }
-
return 1;
}
-static int netdev_create(Netdev *netdev, Link *link, sd_rtnl_message_handler_t callback) {
- _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL;
+static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback) {
+ _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;
const char *kind;
int r;
assert(netdev);
- assert(!(netdev->kind == NETDEV_KIND_VLAN) || (link && callback && netdev->vlanid >= 0));
+ assert(!(netdev->kind == NETDEV_KIND_VLAN || netdev->kind == NETDEV_KIND_MACVLAN) ||
+ (link && callback));
assert(netdev->name);
assert(netdev->manager);
assert(netdev->manager->rtnl);
- r = sd_rtnl_message_link_new(RTM_NEWLINK, 0, &req);
+ r = sd_rtnl_message_new_link(netdev->manager->rtnl, &req, RTM_NEWLINK, 0);
if (r < 0) {
log_error_netdev(netdev,
"Could not allocate RTM_NEWLINK message: %s",
return r;
}
- if (netdev->vlanid >= 0) {
+ if (netdev->vlanid <= VLANID_MAX || netdev->macvlan_mode != _NETDEV_MACVLAN_MODE_INVALID) {
r = sd_rtnl_message_open_container(req, IFLA_INFO_DATA);
if (r < 0) {
log_error_netdev(netdev,
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;
+ if (netdev->vlanid <= VLANID_MAX) {
+ 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;
+ }
+ }
+
+ if (netdev->macvlan_mode != _NETDEV_MACVLAN_MODE_INVALID) {
+ r = sd_rtnl_message_append_u32(req, IFLA_MACVLAN_MODE, netdev->macvlan_mode);
+ if (r < 0) {
+ log_error_netdev(netdev,
+ "Could not append IFLA_MACVLAN_MODE attribute: %s",
+ strerror(-r));
+ return r;
+ }
}
r = sd_rtnl_message_close_container(req);
return 0;
}
-int netdev_enslave(Netdev *netdev, Link *link, sd_rtnl_message_handler_t callback) {
- if (netdev->kind == NETDEV_KIND_VLAN)
+int netdev_enslave(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback) {
+ if (netdev->kind == NETDEV_KIND_VLAN || netdev->kind == NETDEV_KIND_MACVLAN)
return netdev_create(netdev, link, callback);
if (netdev->state == NETDEV_STATE_READY) {
return 0;
}
-int netdev_set_ifindex(Netdev *netdev, int ifindex) {
+int netdev_set_ifindex(NetDev *netdev, int ifindex) {
assert(netdev);
assert(ifindex > 0);
}
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 = -1;
+ netdev->macvlan_mode = _NETDEV_MACVLAN_MODE_INVALID;
+ netdev->vlanid = VLANID_MAX + 1;
- r = config_parse(NULL, filename, file, "Netdev\0VLAN\0", config_item_perf_lookup,
- (void*) network_gperf_lookup, false, false, netdev);
+ r = config_parse(NULL, filename, file, "Match\0NetDev\0VLAN\0MACVLAN\0",
+ config_item_perf_lookup, (void*) network_netdev_gperf_lookup,
+ false, false, netdev);
if (r < 0) {
log_warning("Could not parse config file %s: %s", filename, strerror(-r));
return 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;
+ }
+
+ if (netdev->kind != NETDEV_KIND_VLAN && netdev->vlanid <= VLANID_MAX) {
+ log_warning("VLAN Id configured for a %s in %s. Ignoring",
+ netdev_kind_to_string(netdev->kind), filename);
return 0;
}
- if (netdev->kind == NETDEV_KIND_VLAN && netdev->vlanid < 0) {
- log_warning("VLAN without Id configured in %s. Ignoring", filename);
+ if (netdev->kind != NETDEV_KIND_MACVLAN &&
+ netdev->macvlan_mode != _NETDEV_MACVLAN_MODE_INVALID) {
+ log_warning("MACVLAN Mode configured for a %s in %s. Ignoring",
+ netdev_kind_to_string(netdev->kind), filename);
return 0;
}
if (!netdev->filename)
return log_oom();
+ if (net_match_config(NULL, NULL, NULL, NULL, NULL,
+ netdev->match_host, netdev->match_virt,
+ netdev->match_kernel, netdev->match_arch,
+ NULL, NULL, NULL, NULL, NULL, NULL) <= 0)
+ return 0;
+
r = hashmap_put(netdev->manager->netdevs, netdev->name, netdev);
if (r < 0)
return r;
LIST_HEAD_INIT(netdev->callbacks);
- if (netdev->kind != NETDEV_KIND_VLAN) {
+ if (netdev->kind != NETDEV_KIND_VLAN &&
+ netdev->kind != NETDEV_KIND_MACVLAN) {
r = netdev_create(netdev, NULL, NULL);
if (r < 0)
return r;
}
int netdev_load(Manager *manager) {
- Netdev *netdev;
+ NetDev *netdev;
char **files, **f;
int r;