Revert "more ifnames"

This reverts commit 6cc767c.

net/veth.go

@@ -99,9 +99,8 @@ func contains(addrs []netlink.Addr, addr *net.IPNet) bool {
 }
 
 const (
-	VethName = "ethwe" // name inside container namespace
-	//vethPrefix = "v" + VethName // starts with "veth" to suppress UI notifications
-	vethPrefix = "v"
+	VethName   = "ethwe"        // name inside container namespace
+	vethPrefix = "v" + VethName // starts with "veth" to suppress UI notifications
 )
 
 func interfaceExistsInNamespace(netNSPath string, ifName string) bool {
@@ -120,13 +119,11 @@ func AttachContainer(netNSPath, id, ifName, bridgeName string, mtu int, withMult
 	defer ns.Close()
 
 	if !interfaceExistsInNamespace(netNSPath, ifName) {
-		//maxIDLen := IFNAMSIZ - 1 - len(vethPrefix+"pl")
-		maxIDLen := IFNAMSIZ - 1 - len(vethPrefix+"l")
+		maxIDLen := IFNAMSIZ - 1 - len(vethPrefix+"pl")
 		if len(id) > maxIDLen {
 			id = id[:maxIDLen] // trim passed ID if too long
 		}
-		//name, peerName := vethPrefix+"pl"+id, vethPrefix+"pg"+id
-		name, peerName := vethPrefix+"l"+id, vethPrefix+"g"+id
+		name, peerName := vethPrefix+"pl"+id, vethPrefix+"pg"+id
 		veth, err := CreateAndAttachVeth(name, peerName, bridgeName, mtu, keepTXOn, true, func(veth netlink.Link) error {
 			if err := netlink.LinkSetNsFd(veth, int(ns)); err != nil {
 				return fmt.Errorf("failed to move veth to container netns: %s", err)