From 0d0dc2334edec33c22e48cea8033b6d71a4473ca Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Thu, 5 May 2022 13:07:33 +0200
Subject: [PATCH] replace syscall package by x/sys/unix

Signed-off-by: Steffen Vogel <post@steffenvogel.de>
---
 internal/common.go       | 4 ++--
 internal/util/util.go    | 7 ++++---
 pkg/daemon.go            | 4 ++--
 pkg/intf/kernel_linux.go | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/internal/common.go b/internal/common.go
index 061f3fee..e19166ad 100644
--- a/internal/common.go
+++ b/internal/common.go
@@ -8,13 +8,13 @@ import (
 	"path/filepath"
 	"runtime/pprof"
 	"strings"
-	"syscall"
 	"time"
 
 	"github.com/go-logr/zapr"
 	glog "github.com/ipfs/go-log/v2"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
+	"golang.org/x/sys/unix"
 	"google.golang.org/grpc/grpclog"
 	"k8s.io/klog/v2"
 	"riasc.eu/wice/internal/log"
@@ -64,7 +64,7 @@ func SetupRand() {
 
 func SetupSignals() chan os.Signal {
 	ch := make(chan os.Signal, 1)
-	signal.Notify(ch, syscall.SIGINT, syscall.SIGTERM)
+	signal.Notify(ch, unix.SIGINT, unix.SIGTERM)
 
 	return ch
 }
diff --git a/internal/util/util.go b/internal/util/util.go
index ebf3b719..4ce9c444 100644
--- a/internal/util/util.go
+++ b/internal/util/util.go
@@ -6,8 +6,9 @@ import (
 	"math/rand"
 	"net"
 	"os"
-	"syscall"
 	"unsafe"
+
+	"golang.org/x/sys/unix"
 )
 
 type Less func(i, j int) bool
@@ -56,8 +57,8 @@ func GenerateRandomString(s int) (string, error) {
 	return base64.URLEncoding.EncodeToString(b), err
 }
 
-func SetsockoptBytes(fd int, level int, opt int, b []byte) syscall.Errno {
-	_, _, errno := syscall.Syscall6(syscall.SYS_SETSOCKOPT,
+func SetsockoptBytes(fd int, level int, opt int, b []byte) unix.Errno {
+	_, _, errno := unix.Syscall6(unix.SYS_SETSOCKOPT,
 		uintptr(fd), uintptr(level), uintptr(opt),
 		uintptr(unsafe.Pointer(&b[0])), uintptr(len(b)), 0)
 
diff --git a/pkg/daemon.go b/pkg/daemon.go
index 0fcf0af5..7af01018 100644
--- a/pkg/daemon.go
+++ b/pkg/daemon.go
@@ -3,11 +3,11 @@ package pkg
 import (
 	"fmt"
 	"sync"
-	"syscall"
 	"time"
 
 	"github.com/cilium/ebpf/rlimit"
 	"go.uber.org/zap"
+	"golang.org/x/sys/unix"
 	"golang.zx2c4.com/wireguard/wgctrl"
 	"riasc.eu/wice/internal"
 	"riasc.eu/wice/internal/config"
@@ -149,7 +149,7 @@ out:
 		case sig := <-signals:
 			d.logger.Debug("Received signal", zap.String("signal", sig.String()))
 			switch sig {
-			case syscall.SIGUSR1:
+			case unix.SIGUSR1:
 				d.SyncAllInterfaces()
 			default:
 				break out
diff --git a/pkg/intf/kernel_linux.go b/pkg/intf/kernel_linux.go
index 135c3259..b3dee835 100644
--- a/pkg/intf/kernel_linux.go
+++ b/pkg/intf/kernel_linux.go
@@ -4,10 +4,10 @@ import (
 	"errors"
 	"fmt"
 	"math"
-	"syscall"
 
 	"github.com/vishvananda/netlink"
 	"go.uber.org/zap"
+	"golang.org/x/sys/unix"
 	"golang.zx2c4.com/wireguard/wgctrl"
 	"riasc.eu/wice/internal/config"
 	nl "riasc.eu/wice/pkg/netlink"
@@ -128,5 +128,5 @@ func WireguardModuleExists() bool {
 
 	err := netlink.LinkAdd(l)
 
-	return errors.Is(err, syscall.EINVAL)
+	return errors.Is(err, unix.EINVAL)
 }