Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ require (
golang.org/x/crypto v0.45.0
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394
golang.org/x/net v0.47.0
golang.org/x/sys v0.38.0
golang.org/x/sys v0.41.0
golang.org/x/term v0.37.0
golang.org/x/text v0.31.0
golang.org/x/tools v0.38.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -470,8 +470,8 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
Expand Down
4 changes: 2 additions & 2 deletions pkg/brctl/brctl.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func Addbr(name string) error {
return fmt.Errorf("open unix socket: %w", err)
}

if _, err := executeIoctlStr(brctlSocket, unix.SIOCBRADDBR, name); err != nil {
if err := unix.IoctlSetString(brctlSocket, unix.SIOCBRADDBR, name); err != nil {
return fmt.Errorf("can't add bridge %q: %w", name, err)
}

Expand All @@ -53,7 +53,7 @@ func Delbr(name string) error {
return fmt.Errorf("open unix socket: %w", err)
}

if _, err := executeIoctlStr(brctlSocket, unix.SIOCBRDELBR, name); err != nil {
if err := unix.IoctlSetString(brctlSocket, unix.SIOCBRDELBR, name); err != nil {
return fmt.Errorf("can't delete bridge %q: %w", name, err)
}

Expand Down
10 changes: 0 additions & 10 deletions pkg/brctl/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
"strings"
"syscall"
"time"
"unsafe"

"github.com/tklauser/go-sysconf"
"golang.org/x/sys/unix"
Expand Down Expand Up @@ -279,15 +278,6 @@ func sysconfhz() (int, error) {
return int(clktck), nil
}

func executeIoctlStr(fd int, req uint, raw string) (int, error) {
localBytes := append([]byte(raw), 0)
_, _, errno := syscall.Syscall(unix.SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(unsafe.Pointer(&localBytes[0])))
if errno != 0 {
return 0, errno
}
return 0, nil
}

func getIndexFromInterfaceName(ifname string) (int, error) {
ifreq, err := unix.NewIfreq(ifname)
if err != nil {
Expand Down
3 changes: 0 additions & 3 deletions vendor/golang.org/x/sys/cpu/cpu.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 3 additions & 19 deletions vendor/golang.org/x/sys/cpu/cpu_arm64.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions vendor/golang.org/x/sys/cpu/cpu_arm64.s

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/sys/cpu/cpu_gc_arm64.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/sys/cpu/cpu_gccgo_arm64.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/golang.org/x/sys/cpu/cpu_netbsd_arm64.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/golang.org/x/sys/cpu/cpu_openbsd_arm64.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/golang.org/x/sys/cpu/cpu_other_arm64.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 42 additions & 0 deletions vendor/golang.org/x/sys/cpu/cpu_windows_arm64.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading