From 7740cbd8d9c79ad88c62bf15666e8dcc20df0696 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Mon, 23 Mar 2020 22:16:16 -0700 Subject: [PATCH] ipn: call SetNetInfoCallback later, in Start It was being called back into ultimately from magicsock before there was a control client. Signed-off-by: Brad Fitzpatrick --- ipn/local.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ipn/local.go b/ipn/local.go index 70a6535b0..60c69acf4 100644 --- a/ipn/local.go +++ b/ipn/local.go @@ -87,8 +87,6 @@ func NewLocalBackend(logf logger.Logf, logid string, store StateStore, e wgengin } b.statusChanged = sync.NewCond(&b.statusLock) - e.SetNetInfoCallback(b.SetNetInfo) - if b.portpoll != nil { go b.portpoll.Run(ctx) go b.runPoller() @@ -290,6 +288,8 @@ func (b *LocalBackend) Start(opts Options) error { b.send(Notify{Engine: &es}) }) + b.e.SetNetInfoCallback(b.SetNetInfo) + b.mu.Lock() prefs := b.prefs.Clone() b.mu.Unlock()