mirrors
/
tailscale
mirror of https://github.com/tailscale/tailscale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wgengine/netlog: fix nil pointer dereference in logtail (#8598)

This commit is contained in:
Andrew Lytvynov 2023-07-13 08:54:29 -07:00 committed by GitHub
parent 4f95b6966b
commit 354885a08d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wgengine/netlog/logger.go
View File

@ -101,7 +101,8 @@ func (nl *Logger) Startup(nodeID tailcfg.StableNodeID, nodeLogID, domainLogID lo
} }
// Startup a log stream to Tailscale's logging service. // Startup a log stream to Tailscale's logging service.
httpc := &http.Client{Transport: logpolicy.NewLogtailTransport(logtail.DefaultHost, netMon, nl.logger.Logf)} logf := log.Printf
httpc := &http.Client{Transport: logpolicy.NewLogtailTransport(logtail.DefaultHost, netMon, logf)}
if testClient != nil { if testClient != nil {
httpc = testClient httpc = testClient
} }
@ -123,7 +124,7 @@ func (nl *Logger) Startup(nodeID tailcfg.StableNodeID, nodeLogID, domainLogID lo
// Include process sequence numbers to identify missing samples. // Include process sequence numbers to identify missing samples.
IncludeProcID: true, IncludeProcID: true,
IncludeProcSequence: true, IncludeProcSequence: true,
}, log.Printf) }, logf)
nl.logger.SetSockstatsLabel(sockstats.LabelNetlogLogger) nl.logger.SetSockstatsLabel(sockstats.LabelNetlogLogger)
// Startup a data structure to track per-connection statistics. // Startup a data structure to track per-connection statistics.