Kit: Go: bump module and simplify API

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/Sources/WireGuardKitGo/api-ios.go b/Sources/WireGuardKitGo/api-ios.go
index 0f924c5f18fd054e21495792a5c484d4fbf9f3df..2efb4d743defa41e92b6c4ba09989a4018373562 100644 (file)
--- a/Sources/WireGuardKitGo/api-ios.go
+++ b/Sources/WireGuardKitGo/api-ios.go
@@ -14,15 +14,12 @@ package main
 import "C"
 
 import (
-       "bufio"
-       "bytes"
        "errors"
        "log"
        "math"
        "os"
        "os/signal"
        "runtime"
-       "strings"
        "time"
        "unsafe"
 
@@ -109,9 +106,9 @@ func wgTurnOn(settings *C.char, tunFd int32) int32 {
        logger.Info.Println("Attaching to interface")
        dev := device.NewDevice(tun, logger)
 
-       setError := dev.IpcSetOperation(bufio.NewReader(strings.NewReader(C.GoString(settings))))
-       if setError != nil {
-               logger.Error.Println(setError)
+       err = dev.IpcSet(C.GoString(settings))
+       if err != nil {
+               logger.Error.Println(err)
                unix.Close(dupTunFd)
                return -1
        }
@@ -149,7 +146,7 @@ func wgSetConfig(tunnelHandle int32, settings *C.char) int64 {
        if !ok {
                return 0
        }
-       err := dev.IpcSetOperation(bufio.NewReader(strings.NewReader(C.GoString(settings))))
+       err := dev.IpcSet(C.GoString(settings))
        if err != nil {
                dev.Error.Println(err)
                if ipcErr, ok := err.(*device.IPCError); ok {
@@ -166,14 +163,11 @@ func wgGetConfig(tunnelHandle int32) *C.char {
        if !ok {
                return nil
        }
-       settings := new(bytes.Buffer)
-       writer := bufio.NewWriter(settings)
-       err := device.IpcGetOperation(writer)
+       settings, err := device.IpcGet()
        if err != nil {
                return nil
        }
-       writer.Flush()
-       return C.CString(settings.String())
+       return C.CString(settings)
 }
 
 //export wgBumpSockets

diff --git a/Sources/WireGuardKitGo/go.mod b/Sources/WireGuardKitGo/go.mod
index f40bfdaa6afa426abfee107e5e349c4963822198..16252c28c55ad07744bcf88db73eb6618410e8e1 100644 (file)
--- a/Sources/WireGuardKitGo/go.mod
+++ b/Sources/WireGuardKitGo/go.mod
@@ -3,8 +3,8 @@ module golang.zx2c4.com/wireguard/ios
 go 1.15
 
 require (
-       golang.org/x/crypto v0.0.0-20201217014255-9d1352758620 // indirect
+       golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect
        golang.org/x/net v0.0.0-20201216054612-986b41b23924 // indirect
-       golang.org/x/sys v0.0.0-20201218084310-7d0127a74742
-       golang.zx2c4.com/wireguard v0.0.20201119-0.20201218223923-756958d857f8
+       golang.org/x/sys v0.0.0-20201223074533-0d417f636930
+       golang.zx2c4.com/wireguard v0.0.20201119-0.20201223104851-e467e07bbf51
 )

diff --git a/Sources/WireGuardKitGo/go.sum b/Sources/WireGuardKitGo/go.sum
index c8b077c2abb9290f7428c38e0565868a42230f59..39e7f0749e4bb71ce5e317d0fc85f84e5b3e9892 100644 (file)
--- a/Sources/WireGuardKitGo/go.sum
+++ b/Sources/WireGuardKitGo/go.sum
@@ -1,8 +1,8 @@
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.0.0-20201217014255-9d1352758620 h1:3wPMTskHO3+O6jqTEXyFcsnuxMQOqYSaHsDxcbUXpqA=
-golang.org/x/crypto v0.0.0-20201217014255-9d1352758620/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY=
+golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201216054612-986b41b23924 h1:QsnDpLLOKwHBBDa8nDws4DYNc/ryVW2vCpxCs09d4PY=
@@ -13,12 +13,12 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201218084310-7d0127a74742 h1:+CBz4km/0KPU3RGTwARGh/noP3bEwtHcq+0YcBQM2JQ=
-golang.org/x/sys v0.0.0-20201218084310-7d0127a74742/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201223074533-0d417f636930 h1:vRgIt+nup/B/BwIS0g2oC0haq0iqbV3ZA+u6+0TlNCo=
+golang.org/x/sys v0.0.0-20201223074533-0d417f636930/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.zx2c4.com/wireguard v0.0.20201119-0.20201218223923-756958d857f8 h1:1FB1AE+gTFqSXTn9XlVks3iwRVUHB7OtUmpw/qf2Llg=
-golang.zx2c4.com/wireguard v0.0.20201119-0.20201218223923-756958d857f8/go.mod h1:ITsWNpkFv78VPB7f8MiyuxeEMcHR4jfxHGCJLPP3GHs=
+golang.zx2c4.com/wireguard v0.0.20201119-0.20201223104851-e467e07bbf51 h1:F62E0jQdNkXUnELQw+NaOnMxdEnnGScuywq0NdB4YTQ=
+golang.zx2c4.com/wireguard v0.0.20201119-0.20201223104851-e467e07bbf51/go.mod h1:ITsWNpkFv78VPB7f8MiyuxeEMcHR4jfxHGCJLPP3GHs=