[PATCH wireguard-go] tun: use ByteSliceToString from golang.org/x/sys/unix
Tobias Klauser
tklauser at distanz.ch
Wed Jun 1 09:33:54 UTC 2022
Use unix.ByteSliceToString in (*NativeTun).nameSloce to convert the
TUNGETIFF ioctl result []byte to a string.
Signed-off-by: Tobias Klauser <tklauser at distanz.ch>
---
tun/tun_linux.go | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/tun/tun_linux.go b/tun/tun_linux.go
index 89b716d9c70b..fbb8585ff449 100644
--- a/tun/tun_linux.go
+++ b/tun/tun_linux.go
@@ -9,7 +9,6 @@ package tun
*/
import (
- "bytes"
"errors"
"fmt"
"os"
@@ -321,11 +320,7 @@ func (tun *NativeTun) nameSlow() (string, error) {
if errno != 0 {
return "", fmt.Errorf("failed to get name of TUN device: %w", errno)
}
- name := ifr[:]
- if i := bytes.IndexByte(name, 0); i != -1 {
- name = name[:i]
- }
- return string(name), nil
+ return unix.ByteSliceToString(ifr[:]), nil
}
func (tun *NativeTun) Write(buf []byte, offset int) (int, error) {
--
2.36.1
More information about the WireGuard
mailing list