tunnel: wait for IP service to attach to wintun

This helps fix startup races without needing to poll, as well as
reconfiguring interfaces after wintun destroys and re-adds. It also
deals gracefully with IPv6 being disabled.

1 files changed, 14 insertions, 23 deletions

diff --git a/tunnel/service.go b/tunnel/service.go
index 1978cae0..c0ead084 100644
--- a/tunnel/service.go
+++ b/tunnel/service.go
@@ -26,7 +26,6 @@ import (
 	"golang.zx2c4.com/wireguard/windows/conf"
 	"golang.zx2c4.com/wireguard/windows/ringlogger"
 	"golang.zx2c4.com/wireguard/windows/services"
-	"golang.zx2c4.com/wireguard/windows/tunnel/winipcfg"
 	"golang.zx2c4.com/wireguard/windows/version"
 )
 
@@ -39,7 +38,7 @@ func (service *Service) Execute(args []string, r <-chan svc.ChangeRequest, chang
 
 	var dev *device.Device
 	var uapi net.Listener
-	var routeChangeCallback *winipcfg.RouteChangeCallback
+	var watcher *interfaceWatcher
 	var nativeTun *tun.NativeTun
 	var err error
 	serviceError := services.ErrorSuccess
@@ -84,11 +83,8 @@ func (service *Service) Execute(args []string, r <-chan svc.ChangeRequest, chang
 			}
 		}()
 
-		if routeChangeCallback != nil {
-			routeChangeCallback.Unregister()
-		}
-		if nativeTun != nil {
-			unconfigureInterface(nativeTun)
+		if watcher != nil {
+			watcher.Destroy()
 		}
 		if uapi != nil {
 			uapi.Close()
@@ -140,6 +136,13 @@ func (service *Service) Execute(args []string, r <-chan svc.ChangeRequest, chang
 		m.Disconnect()
 	}
 
+	log.Println("Watching network interfaces")
+	watcher, err = watchInterface()
+	if err != nil {
+		serviceError = services.ErrorSetNetConfig
+		return
+	}
+
 	log.Println("Resolving DNS names")
 	uapiConf, err := conf.ToUAPI()
 	if err != nil {
@@ -197,22 +200,7 @@ func (service *Service) Execute(args []string, r <-chan svc.ChangeRequest, chang
 	log.Println("Bringing peers up")
 	dev.Up()
 
-	log.Println("Waiting for TCP/IP to attach to interface")
-	waitForFamilies(nativeTun) // TODO: move this sort of thing into tun/wintun/CreateInterface
-
-	log.Println("Monitoring default routes")
-	routeChangeCallback, err = monitorDefaultRoutes(dev, conf.Interface.MTU == 0, nativeTun)
-	if err != nil {
-		serviceError = services.ErrorBindSocketsToDefaultRoutes
-		return
-	}
-
-	log.Println("Setting device address")
-	err = configureInterface(conf, nativeTun)
-	if err != nil {
-		serviceError = services.ErrorSetNetConfig
-		return
-	}
+	watcher.Configure(dev, conf, nativeTun)
 
 	log.Println("Listening for UAPI requests")
 	go func() {
@@ -241,6 +229,9 @@ func (service *Service) Execute(args []string, r <-chan svc.ChangeRequest, chang
 			}
 		case <-dev.Wait():
 			return
+		case e := <-watcher.errors:
+			serviceError, err = e.serviceError, e.err
+			return
 		}
 	}
 }