Add VLAN support in config

[mirror_lxc.git] / src / lxc / conf.c

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 81bc470f6555c7bab5c4b3caea63f20d7c7553ce..3550f386639ee7f31febbf7a2dd2b67ea4303d37 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -75,12 +75,14 @@ struct mount_opt {
 
 static int instanciate_veth(struct lxc_netdev *);
 static int instanciate_macvlan(struct lxc_netdev *);
+static int instanciate_vlan(struct lxc_netdev *);
 static int instanciate_phys(struct lxc_netdev *);
 static int instanciate_empty(struct lxc_netdev *);
 
 static  instanciate_cb netdev_conf[MAXCONFTYPE + 1] = {
        [VETH]    = instanciate_veth,
        [MACVLAN] = instanciate_macvlan,
+       [VLAN]    = instanciate_vlan,
        [PHYS]    = instanciate_phys,
        [EMPTY]   = instanciate_empty,
 };
@@ -927,6 +929,35 @@ static int instanciate_macvlan(struct lxc_netdev *netdev)
        return 0;
 }
 
+/* XXX: merge with instanciate_macvlan */
+static int instanciate_vlan(struct lxc_netdev *netdev)
+{
+       char peer[IFNAMSIZ];
+
+       if (!netdev->link) {
+               ERROR("no link specified for vlan netdev");
+               return -1;
+       }
+
+       snprintf(peer, sizeof(peer), "vlan%d",netdev->vlan_attr.vid);
+
+       if (lxc_vlan_create(netdev->link, peer, netdev->vlan_attr.vid)) {
+               ERROR("failed to create vlan interface '%s' on '%s'",
+                     peer, netdev->link);
+               return -1;
+       }
+
+       netdev->ifindex = if_nametoindex(peer);
+       if (!netdev->ifindex) {
+               ERROR("failed to retrieve the ifindex for %s", peer);
+               lxc_device_delete(peer);
+               return -1;
+       }
+
+       DEBUG("instanciated vlan '%s', ifindex is '%d'", "vlan1000", netdev->ifindex);
+       return 0;
+}
+
 static int instanciate_phys(struct lxc_netdev *netdev)
 {
        netdev->ifindex = if_nametoindex(netdev->link);