From 71f1cf80b8c3fedf714df07e7e8fb4ec3d8b575c Mon Sep 17 00:00:00 2001 From: Pascal Fischer Date: Wed, 6 Dec 2023 13:02:32 +0100 Subject: [PATCH] Fix engine null pointer with mobile dependencies for other OS --- client/internal/engine.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/client/internal/engine.go b/client/internal/engine.go index c1258e6ac..41e1ceabe 100644 --- a/client/internal/engine.go +++ b/client/internal/engine.go @@ -205,15 +205,14 @@ func (e *Engine) Start() error { go e.mobileDep.DnsReadyListener.OnReady() } } else if e.dnsServer == nil { - e.dnsServer, err = dns.NewDefaultServer(e.ctx, e.wgInterface, e.config.CustomDNSAddress, e.mobileDep.InterfaceName, wgAddr) - if err != nil { - e.close() - return err - } - } + e.dnsServer, err = dns.NewDefaultServer(e.ctx, e.wgInterface, e.config.CustomDNSAddress, e.mobileDep.InterfaceName, wgAddr) + if err != nil { + e.close() + return err + } + } e.routeManager = routemanager.NewManager(e.ctx, e.config.WgPrivateKey.PublicKey().String(), e.wgInterface, e.statusRecorder, routes) - e.mobileDep.NetworkChangeListener.SetInterfaceIP(wgAddr) e.routeManager.SetRouteChangeListener(e.mobileDep.NetworkChangeListener) switch runtime.GOOS { @@ -224,6 +223,7 @@ func (e *Engine) Start() error { SearchDomains: e.dnsServer.SearchDomains(), }) case "ios": + e.mobileDep.NetworkChangeListener.SetInterfaceIP(wgAddr) err = e.wgInterface.CreateOniOS(e.mobileDep.FileDescriptor) default: err = e.wgInterface.Create()