c0d34c692f
Add a namespace object interface for somewhat cleaner code when creating and switching between network namespaces. All created namespaces are now mounted in /var/run/netns to ensure they have persistent inodes and paths that can be passed around between plugin components without relying on the current namespace being correct. Also remove the thread-locking arguments from the ns package per https://github.com/appc/cni/issues/183 by doing all the namespace changes in a separate goroutine that locks/unlocks itself, instead of the caller having to track OS thread locking.
72 lines
1.7 KiB
Go
72 lines
1.7 KiB
Go
// Copyright 2016 CNI authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package main
|
|
|
|
import (
|
|
"github.com/containernetworking/cni/pkg/ns"
|
|
"github.com/containernetworking/cni/pkg/skel"
|
|
"github.com/containernetworking/cni/pkg/types"
|
|
"github.com/vishvananda/netlink"
|
|
)
|
|
|
|
func cmdAdd(args *skel.CmdArgs) error {
|
|
args.IfName = "lo" // ignore config, this only works for loopback
|
|
err := ns.WithNetNSPath(args.Netns, func(_ ns.NetNS) error {
|
|
link, err := netlink.LinkByName(args.IfName)
|
|
if err != nil {
|
|
return err // not tested
|
|
}
|
|
|
|
err = netlink.LinkSetUp(link)
|
|
if err != nil {
|
|
return err // not tested
|
|
}
|
|
|
|
return nil
|
|
})
|
|
if err != nil {
|
|
return err // not tested
|
|
}
|
|
|
|
result := types.Result{}
|
|
return result.Print()
|
|
}
|
|
|
|
func cmdDel(args *skel.CmdArgs) error {
|
|
args.IfName = "lo" // ignore config, this only works for loopback
|
|
err := ns.WithNetNSPath(args.Netns, func(ns.NetNS) error {
|
|
link, err := netlink.LinkByName(args.IfName)
|
|
if err != nil {
|
|
return err // not tested
|
|
}
|
|
|
|
err = netlink.LinkSetDown(link)
|
|
if err != nil {
|
|
return err // not tested
|
|
}
|
|
|
|
return nil
|
|
})
|
|
if err != nil {
|
|
return err // not tested
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func main() {
|
|
skel.PluginMain(cmdAdd, cmdDel)
|
|
}
|