ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Revert "plugins/ptp: allow host veth to be UP"

Browse Source 
This reverts commit 231d2d5a27.
This commit is contained in:
Stefan Junker
2015-09-24 18:28:14 +02:00
parent 39ea97f99d
commit f1c9c632e1
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/ip/link.go
View File

@ -77,9 +77,8 @@ func RandomVethName() (string, error) {
return fmt.Sprintf("veth%x", entropy), nil
}
// SetupVeth creates the virtual ethernet pair and sets up the container's end in the container netns.
// Setting up the host end up has to be done in the host netns outside of this function.
// This is because moving the host veth end will cause it to be brought down automatically when it is moved to the host netns.
// SetupVeth sets up a virtual ethernet link.
// Should be in container netns.
func SetupVeth(contVethName string, mtu int, hostNS *os.File) (hostVeth, contVeth netlink.Link, err error) {
var hostVethName string
hostVethName, contVeth, err = makeVeth(contVethName, mtu)
@ -98,6 +97,11 @@ func SetupVeth(contVethName string, mtu int, hostNS *os.File) (hostVeth, contVet
return
}
if err = netlink.LinkSetUp(hostVeth); err != nil {
err = fmt.Errorf("failed to set %q up: %v", contVethName, err)
return
}
if err = netlink.LinkSetNsFd(hostVeth, int(hostNS.Fd())); err != nil {
err = fmt.Errorf("failed to move veth to host netns: %v", err)
return