Merge pull request #397 from axn/master

Fix instantiation of multiple vlan interfaces with same id

Merge pull request #397 from axn/master
6b1aa947 · hallyn · 4662c6de · 82f58d03 · 6b1aa947
Commit 6b1aa947 authored Jan 21, 2015 by hallyn
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

conf.c src/lxc/conf.c +2 -1

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -2735,13 +2735,14 @@ static int instantiate_vlan(struct lxc_handler *handler, struct lxc_netdev *netd
 {
 	char peer[IFNAMSIZ];
 	int err;
+	static uint16_t vlan_cntr = 0;

 	if (!netdev->link) {
 		ERROR("no link specified for vlan netdev");
 		return -1;
 	}

-	err = snprintf(peer, sizeof(peer), "vlan%d", netdev->priv.vlan_attr.vid);
+	err = snprintf(peer, sizeof(peer), "vlan%d-%d", netdev->priv.vlan_attr.vid, vlan_cntr++);
 	if (err >= sizeof(peer)) {
 		ERROR("peer name too long");
 		return -1;