Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup
  • Loading branch information
ethanndickson committed Jul 2, 2024
commit 45b5234e9ff0fe7416dd56473ff5ecea79341b01
10 changes: 7 additions & 3 deletions tailnet/conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -268,10 +268,14 @@ func NewConn(options *Options) (conn *Conn, err error) {
nodeUp.setAddresses(options.Addresses)
nodeUp.setBlockEndpoints(options.BlockEndpoints)
wireguardEngine.SetStatusCallback(nodeUp.setStatus)
wireguardEngine.SetNetInfoCallback(nodeUp.setNetInfo)
magicConn.SetDERPForcedWebsocketCallback(nodeUp.setDERPForcedWebsocket)
if options.TelemetrySink != nil {
magicConn.SetNetInfoCallback(telemetryStore.setNetInfo)
if telemetryStore != nil {
wireguardEngine.SetNetInfoCallback(func(ni *tailcfg.NetInfo) {
nodeUp.setNetInfo(ni)
telemetryStore.setNetInfo(ni)
})
} else {
wireguardEngine.SetNetInfoCallback(nodeUp.setNetInfo)
}

server := &Conn{
Expand Down