#include <net/if.h>
-#include "networkd.h"
+#include "networkd-netdev-vlan.h"
#include "network-internal.h"
#include "list.h"
-int netdev_create_vlan(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback) {
- _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;
- const char *kind;
+static int netdev_vlan_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_message *req) {
int r;
assert(netdev);
+ assert(netdev->ifname);
assert(netdev->kind == NETDEV_KIND_VLAN);
assert(link);
- assert(callback);
- assert(netdev->ifname);
- assert(netdev->manager);
- assert(netdev->manager->rtnl);
+ assert(req);
- r = sd_rtnl_message_new_link(netdev->manager->rtnl, &req, RTM_NEWLINK, 0);
+ r = sd_rtnl_message_append_u32(req, IFLA_LINK, link->ifindex);
if (r < 0) {
log_error_netdev(netdev,
- "Could not allocate RTM_NEWLINK message: %s",
+ "Could not append IFLA_LINK attribute: %s",
strerror(-r));
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->ifname);
if (r < 0) {
log_error_netdev(netdev,
return r;
}
- kind = netdev_kind_to_string(netdev->kind);
- if (!kind) {
- log_error_netdev(netdev, "Invalid kind");
- return -EINVAL;
- }
-
- r = sd_rtnl_message_open_container_union(req, IFLA_INFO_DATA, kind);
+ r = sd_rtnl_message_open_container_union(req, IFLA_INFO_DATA, "vlan");
if (r < 0) {
log_error_netdev(netdev,
"Could not open IFLA_INFO_DATA container: %s",
return r;
}
- r = sd_rtnl_call_async(netdev->manager->rtnl, req, callback, link, 0, NULL);
- if (r < 0) {
- log_error_netdev(netdev,
- "Could not send rtnetlink message: %s", strerror(-r));
- return r;
- }
-
- link_ref(link);
+ return 0;
+}
- log_debug_netdev(netdev, "creating netdev");
+static int netdev_vlan_verify(NetDev *netdev, const char *filename) {
+ assert(netdev);
+ assert(filename);
- netdev->state = NETDEV_STATE_CREATING;
+ if (netdev->vlanid > VLANID_MAX) {
+ log_warning("VLAN without valid Id configured in %s. Ignoring", filename);
+ return -EINVAL;
+ }
return 0;
}
+
+const NetDevVTable vlan_vtable = {
+ .fill_message_create_on_link = netdev_vlan_fill_message_create,
+ .config_verify = netdev_vlan_verify,
+};