diff options
| author | David Crawshaw <crawshaw@tailscale.com> | 2020-04-02 11:18:39 +1100 |
|---|---|---|
| committer | David Crawshaw <crawshaw@tailscale.com> | 2020-04-02 11:19:05 +1100 |
| commit | 58c65eeff44fffca75c22fcccd47daa8dfed9631 (patch) | |
| tree | 52ef02e54ff84c8f09c0c48b83f9a0c35062ce36 /control/controlclient/auto.go | |
| parent | 48d7ee1c6a99fd4e240ad487a6cec0333e1b47fd (diff) | |
| download | tailscale-crawshaw/hostinfo.tar.xz tailscale-crawshaw/hostinfo.zip | |
controlclient: do not send duplicate hostinfo/netinfocrawshaw/hostinfo
This should never happen, so log when it does so we can fix it.
Signed-off-by: David Crawshaw <crawshaw@tailscale.com>
Diffstat (limited to 'control/controlclient/auto.go')
| -rw-r--r-- | control/controlclient/auto.go | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/control/controlclient/auto.go b/control/controlclient/auto.go index ce49ad0ec..831b736cb 100644 --- a/control/controlclient/auto.go +++ b/control/controlclient/auto.go @@ -496,7 +496,12 @@ func (c *Client) SetHostinfo(hi *tailcfg.Hostinfo) { if hi == nil { panic("nil Hostinfo") } - c.direct.SetHostinfo(hi) + if !c.direct.SetHostinfo(hi) { + c.logf("[unexpected] duplicate Hostinfo: %v", hi) + return + } + c.logf("Hostinfo: %v", hi) + // Send new Hostinfo to server c.cancelMapSafely() } @@ -505,7 +510,12 @@ func (c *Client) SetNetInfo(ni *tailcfg.NetInfo) { if ni == nil { panic("nil NetInfo") } - c.direct.SetNetInfo(ni) + if !c.direct.SetNetInfo(ni) { + c.logf("[unexpected] duplicate NetInfo: %v", ni) + return + } + c.logf("NetInfo: %v", ni) + // Send new Hostinfo (which includes NetInfo) to server c.cancelMapSafely() } |
