Kit: Go: use Windows-style retry sleep loop on bind updates

Something odd happens in the network extension that we still don't
understand. Attempt to poke it in this terrible way.

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

diff --git a/Sources/WireGuardKitGo/api-ios.go b/Sources/WireGuardKitGo/api-ios.go
index eaadea146022d32f1cb954a6e19449fd065e5eb6..0f924c5f18fd054e21495792a5c484d4fbf9f3df 100644 (file)
--- a/Sources/WireGuardKitGo/api-ios.go
+++ b/Sources/WireGuardKitGo/api-ios.go
@@ -17,16 +17,18 @@ import (
        "bufio"
        "bytes"
        "errors"
-       "golang.org/x/sys/unix"
-       "golang.zx2c4.com/wireguard/device"
-       "golang.zx2c4.com/wireguard/tun"
        "log"
        "math"
        "os"
        "os/signal"
        "runtime"
        "strings"
+       "time"
        "unsafe"
+
+       "golang.org/x/sys/unix"
+       "golang.zx2c4.com/wireguard/device"
+       "golang.zx2c4.com/wireguard/tun"
 )
 
 var loggerFunc unsafe.Pointer
@@ -105,16 +107,16 @@ func wgTurnOn(settings *C.char, tunFd int32) int32 {
                return -1
        }
        logger.Info.Println("Attaching to interface")
-       device := device.NewDevice(tun, logger)
+       dev := device.NewDevice(tun, logger)
 
-       setError := device.IpcSetOperation(bufio.NewReader(strings.NewReader(C.GoString(settings))))
+       setError := dev.IpcSetOperation(bufio.NewReader(strings.NewReader(C.GoString(settings))))
        if setError != nil {
                logger.Error.Println(setError)
                unix.Close(dupTunFd)
                return -1
        }
 
-       device.Up()
+       dev.Up()
        logger.Info.Println("Device started")
 
        var i int32
@@ -127,18 +129,18 @@ func wgTurnOn(settings *C.char, tunFd int32) int32 {
                unix.Close(dupTunFd)
                return -1
        }
-       tunnelHandles[i] = tunnelHandle{device, logger}
+       tunnelHandles[i] = tunnelHandle{dev, logger}
        return i
 }
 
 //export wgTurnOff
 func wgTurnOff(tunnelHandle int32) {
-       device, ok := tunnelHandles[tunnelHandle]
+       dev, ok := tunnelHandles[tunnelHandle]
        if !ok {
                return
        }
        delete(tunnelHandles, tunnelHandle)
-       device.Close()
+       dev.Close()
 }
 
 //export wgSetConfig
@@ -176,21 +178,31 @@ func wgGetConfig(tunnelHandle int32) *C.char {
 
 //export wgBumpSockets
 func wgBumpSockets(tunnelHandle int32) {
-       device, ok := tunnelHandles[tunnelHandle]
+       dev, ok := tunnelHandles[tunnelHandle]
        if !ok {
                return
        }
-       device.BindUpdate()
-       device.SendKeepalivesToPeersWithCurrentKeypair()
+       go func() {
+               for i := 0; i < 10; i++ {
+                       err := dev.BindUpdate()
+                       if err == nil {
+                               dev.SendKeepalivesToPeersWithCurrentKeypair()
+                               return
+                       }
+                       dev.Error.Printf("Unable to update bind, try %d: %v", i+1, err)
+                       time.Sleep(time.Second / 2)
+               }
+               dev.Error.Println("Gave up trying to update bind; tunnel is likely dysfunctional")
+       }()
 }
 
 //export wgDisableSomeRoamingForBrokenMobileSemantics
 func wgDisableSomeRoamingForBrokenMobileSemantics(tunnelHandle int32) {
-       device, ok := tunnelHandles[tunnelHandle]
+       dev, ok := tunnelHandles[tunnelHandle]
        if !ok {
                return
        }
-       device.DisableSomeRoamingForBrokenMobileSemantics()
+       dev.DisableSomeRoamingForBrokenMobileSemantics()
 }
 
 //export wgVersion

diff --git a/Sources/WireGuardKitGo/go.mod b/Sources/WireGuardKitGo/go.mod
index 7eaab211079135cf9fdf5056d6cbe1353c5d1c06..f40bfdaa6afa426abfee107e5e349c4963822198 100644 (file)
--- a/Sources/WireGuardKitGo/go.mod
+++ b/Sources/WireGuardKitGo/go.mod
@@ -1,10 +1,10 @@
 module golang.zx2c4.com/wireguard/ios
 
-go 1.13
+go 1.15
 
 require (
-       golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9 // indirect
-       golang.org/x/net v0.0.0-20201209123823-ac852fbbde11 // indirect
-       golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e
-       golang.zx2c4.com/wireguard v0.0.20201118
+       golang.org/x/crypto v0.0.0-20201217014255-9d1352758620 // 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
 )

diff --git a/Sources/WireGuardKitGo/go.sum b/Sources/WireGuardKitGo/go.sum
index 3f4e59c518733dee169508634aa534a84e0c55a5..c8b077c2abb9290f7428c38e0565868a42230f59 100644 (file)
--- a/Sources/WireGuardKitGo/go.sum
+++ b/Sources/WireGuardKitGo/go.sum
@@ -1,24 +1,24 @@
 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-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9 h1:sYNJzB4J8toYPQTM6pAkcmBRgw9SnQKP9oXCHfgy604=
-golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+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/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-20201209123823-ac852fbbde11 h1:lwlPPsmjDKK0J6eG6xDWd5XPehI0R024zxjDnw3esPA=
-golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20201216054612-986b41b23924 h1:QsnDpLLOKwHBBDa8nDws4DYNc/ryVW2vCpxCs09d4PY=
+golang.org/x/net v0.0.0-20201216054612-986b41b23924/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201117222635-ba5294a509c7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e h1:AyodaIpKjppX+cBfTASF2E1US3H2JFBj920Ot3rtDjs=
-golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/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/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.20201118 h1:QL8y2C7uO8T6z1GY+UX/hSeWiYEBurQkXjOTRFtCvXU=
-golang.zx2c4.com/wireguard v0.0.20201118/go.mod h1:Dz+cq5bnrai9EpgYj4GDof/+qaGzbRWbeaAOs1bUYa0=
+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=