TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-07 00:34:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: log when DERP connection succeeds

Browse Source 
Updates #1310
This commit is contained in:
Brad Fitzpatrick 2021-03-04 09:19:45 -08:00
parent 829eb8363a
commit a6d098c750
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wgengine/magicsock/magicsock.go
View File

@ -1411,7 +1411,7 @@ func (c *Conn) runDerpReader(ctx context.Context, derpFakeAddr netaddr.IPPort, d
peerPresent := map[key.Public]bool{} peerPresent := map[key.Public]bool{}
bo := backoff.NewBackoff(fmt.Sprintf("derp-%d", regionID), c.logf, 5*time.Second) bo := backoff.NewBackoff(fmt.Sprintf("derp-%d", regionID), c.logf, 5*time.Second)
for { for {
msg, err := dc.Recv() msg, connGen, err := dc.RecvDetail()
if err != nil { if err != nil {
// Forget that all these peers have routes. // Forget that all these peers have routes.
for peer := range peerPresent { for peer := range peerPresent {
@ -1449,6 +1449,9 @@ func (c *Conn) runDerpReader(ctx context.Context, derpFakeAddr netaddr.IPPort, d
bo.BackOff(ctx, nil) // reset bo.BackOff(ctx, nil) // reset
switch m := msg.(type) { switch m := msg.(type) {
case derp.ServerInfoMessage:
c.logf("magicsock: derp-%d connected; connGen=%v", regionID, connGen)
continue
case derp.ReceivedPacket: case derp.ReceivedPacket:
pkt = m pkt = m
res.n = len(m.Data) res.n = len(m.Data)