Merge branch 'master' of https://github.com/jdknives/skywire

go.mod

@@ -45,7 +45,7 @@ require (
 	github.com/gocarina/gocsv v0.0.0-20230616125104-99d496ca653d
 	github.com/hashicorp/go-version v1.6.0
 	github.com/ivanpirog/coloredcobra v1.0.1
-	github.com/james-barrow/golang-ipc v1.2.3
+	github.com/james-barrow/golang-ipc v1.1.0
 	github.com/jaypipes/ghw v0.11.0
 	github.com/lib/pq v1.10.9
 	github.com/orandin/lumberjackrus v1.0.1

go.sum

@@ -359,8 +359,8 @@ github.com/itchyny/timefmt-go v0.1.5 h1:G0INE2la8S6ru/ZI5JecgyzbbJNs5lG1RcBqa7Jm
 github.com/itchyny/timefmt-go v0.1.5/go.mod h1:nEP7L+2YmAbT2kZ2HfSs1d8Xtw9LY8D2stDBckWakZ8=
 github.com/ivanpirog/coloredcobra v1.0.1 h1:aURSdEmlR90/tSiWS0dMjdwOvCVUeYLfltLfbgNxrN4=
 github.com/ivanpirog/coloredcobra v1.0.1/go.mod h1:iho4nEKcnwZFiniGSdcgdvRgZNjxm+h20acv8vqmN6Q=
-github.com/james-barrow/golang-ipc v1.2.3 h1:xlQpMBxZ2F9e8Eh/V8r3muUpaIVzv2AjGFQJA/e/Txk=
-github.com/james-barrow/golang-ipc v1.2.3/go.mod h1:+egiWSbOWmiPucFGSl4GNB1YSzrVGehyl7/7pW4N8F0=
+github.com/james-barrow/golang-ipc v1.1.0 h1:/195vE/wvgc4iGNQ6fn1l6W1awI4DcOTGjQeNhRlgBQ=
+github.com/james-barrow/golang-ipc v1.1.0/go.mod h1:+egiWSbOWmiPucFGSl4GNB1YSzrVGehyl7/7pW4N8F0=
 github.com/jaypipes/ghw v0.11.0 h1:i0pKvAM7eZk0KvLm9vzpcpDKTRnfR6AQ5pFkPVnYJXU=
 github.com/jaypipes/ghw v0.11.0/go.mod h1:jeJGbkRB2lL3/gxYzNYzEDETV1ZJ56OKr+CSeSEym+g=
 github.com/jaypipes/pcidb v1.0.0 h1:vtZIfkiCUE42oYbJS0TAq9XSfSmcsgo9IdxSm9qzYU8=

internal/vpn/tun_device_windows.go

@@ -34,11 +34,13 @@ func newTUNDevice() (TUNDevice, error) {
 }
 
 func (t *tunDevice) Read(buf []byte) (int, error) {
-	return t.tun.Read(buf, 0)
+	validBuf := [][]byte{buf}
+	return t.tun.Read(validBuf, []int{len(buf) + 1}, 0)
 }
 
 func (t *tunDevice) Write(buf []byte) (int, error) {
-	return t.tun.Write(buf, 0)
+	validBuf := [][]byte{buf}
+	return t.tun.Write(validBuf, 0)
 }
 
 func (t *tunDevice) Close() error {