Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support Configurable Network Namespace Path #51

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Support Configurable Network Namespace Path #51

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2d1444
support ns path
Apr 14, 2022
f5da6ea
remove duplicated code
Apr 14, 2022
93fbe2b
support delete by path
Apr 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 25 additions & 12 deletions netns_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,9 @@ import (
"golang.org/x/sys/unix"
)

// Deprecated: use syscall pkg instead (go >= 1.5 needed).
const (
CLONE_NEWUTS = 0x04000000 /* New utsname group? */
CLONE_NEWIPC = 0x08000000 /* New ipcs */
CLONE_NEWUSER = 0x10000000 /* New user namespace */
CLONE_NEWPID = 0x20000000 /* New pid namespace */
CLONE_NEWNET = 0x40000000 /* New network namespace */
CLONE_IO = 0x80000000 /* Get io context */
bindMountPath = "/run/netns" /* Bind mount path for named netns */
CLONE_NEWNET = syscall.CLONE_NEWNET /* New network namespace */
bindMountPath = "/run/netns" /* Bind mount path for named netns */
)

// Setns sets namespace using syscall. Note that this should be a method
Expand All @@ -50,8 +44,13 @@ func New() (ns NsHandle, err error) {

// NewNamed creates a new named network namespace and returns a handle to it
func NewNamed(name string) (NsHandle, error) {
if _, err := os.Stat(bindMountPath); os.IsNotExist(err) {
err = os.MkdirAll(bindMountPath, 0755)
return NewNamedWithDir(name, bindMountPath)
}

// NewNamed creates a new named network namespace and returns a handle to it
func NewNamedWithDir(name, dir string) (NsHandle, error) {
if _, err := os.Stat(dir); os.IsNotExist(err) {
err = os.MkdirAll(dir, 0755)
if err != nil {
return None(), err
}
Expand All @@ -62,7 +61,7 @@ func NewNamed(name string) (NsHandle, error) {
return None(), err
}

namedPath := path.Join(bindMountPath, name)
namedPath := path.Join(dir, name)

f, err := os.OpenFile(namedPath, os.O_CREATE|os.O_EXCL, 0444)
if err != nil {
Expand All @@ -81,7 +80,12 @@ func NewNamed(name string) (NsHandle, error) {

// DeleteNamed deletes a named network namespace
func DeleteNamed(name string) error {
namedPath := path.Join(bindMountPath, name)
return DeleteNamedWithDir(name, bindMountPath)
}

// DeleteNamed deletes a named network namespace
func DeleteNamedWithDir(name, dir string) error {
namedPath := path.Join(dir, name)

err := syscall.Unmount(namedPath, syscall.MNT_DETACH)
if err != nil {
Expand All @@ -91,6 +95,15 @@ func DeleteNamed(name string) error {
return os.Remove(namedPath)
}

func DeleteByPath(path string) error {
err := syscall.Unmount(path, syscall.MNT_DETACH)
if err != nil {
return err
}

return os.Remove(path)
}

// Get gets a handle to the current threads network namespace.
func Get() (NsHandle, error) {
return GetFromThread(os.Getpid(), unix.Gettid())
Expand Down