lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

router: stop iOS subprocess sandbox violations (#617) 

Signed-off-by: Dmytro Shynkevych <dmytro@tailscale.com>
reviewable/pr624/r1 v1.0.0
Dmytro Shynkevych 2020-07-29 21:09:18 -04:00 committed by GitHub
parent 154d1cde05
commit 2ce2b63239
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wgengine/router/router_userspace_bsd.go
View File

@ -153,7 +153,10 @@ func (r *userspaceBSDRouter) Set(cfg *Config) error {
}
func (r *userspaceBSDRouter) Close() error {
cleanup(r.logf, r.tunname)
if err := downDNS(r.tunname); err != nil {
r.logf("dns down: %v", err)
}
// No interface cleanup is necessary during normal shutdown.
return nil
}
@ -161,9 +164,12 @@ func cleanup(logf logger.Logf, interfaceName string) {
if err := downDNS(interfaceName); err != nil {
logf("dns down: %v", err)
}
ifup := []string{"ifconfig", interfaceName, "down"}
// If the interface was left behind, ifconfig down will not remove it.
// In fact, this will leave a system in a tainted state where starting tailscaled
// will result in "interface tailscale0 already exists"
// until the defunct interface is ifconfig-destroyed.
ifup := []string{"ifconfig", interfaceName, "destroy"}
if out, err := cmd(ifup...).CombinedOutput(); err != nil {
logf("ifconfig down: %v\n%s", err, out)
logf("ifconfig destroy: %v\n%s", err, out)
}
}