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

control/controlclient: rename a variable to not shadow a package name

Browse Source 
Change-Id: I1bcb577cb2c47e936d545ad57f308e57399de323
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
pull/3286/head
Brad Fitzpatrick 3 years ago
parent d6dde5a1ac
commit d2ef73ed82
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

16
control/controlclient/direct.go
Unescape Escape View File

@ -291,8 +291,8 @@ func (c *Direct) doLogin(ctx context.Context, opt loginOpt) (mustRegen bool, new
tryingNewKey := c.tryingNewKey tryingNewKey := c.tryingNewKey
serverKey := c.serverKey serverKey := c.serverKey
authKey := c.authKey authKey := c.authKey
hostinfo := c.hostinfo.Clone() hi := c.hostinfo.Clone()
backendLogID := hostinfo.BackendLogID backendLogID := hi.BackendLogID
expired := c.expiry != nil && !c.expiry.IsZero() && c.expiry.Before(c.timeNow()) expired := c.expiry != nil && !c.expiry.IsZero() && c.expiry.Before(c.timeNow())
c.mu.Unlock() c.mu.Unlock()
@ -366,7 +366,7 @@ func (c *Direct) doLogin(ctx context.Context, opt loginOpt) (mustRegen bool, new
Version: 1, Version: 1,
OldNodeKey: oldNodeKey, OldNodeKey: oldNodeKey,
NodeKey: tryingNewKey.Public(), NodeKey: tryingNewKey.Public(),
Hostinfo: hostinfo, Hostinfo: hi,
Followup: opt.URL, Followup: opt.URL,
Timestamp: &now, Timestamp: &now,
Ephemeral: (opt.Flags & LoginEphemeral) != 0, Ephemeral: (opt.Flags & LoginEphemeral) != 0,
@ -562,8 +562,8 @@ func (c *Direct) sendMapRequest(ctx context.Context, maxPolls int, cb func(*netm
persist := c.persist persist := c.persist
serverURL := c.serverURL serverURL := c.serverURL
serverKey := c.serverKey serverKey := c.serverKey
hostinfo := c.hostinfo.Clone() hi := c.hostinfo.Clone()
backendLogID := hostinfo.BackendLogID backendLogID := hi.BackendLogID
localPort := c.localPort localPort := c.localPort
var epStrs []string var epStrs []string
var epTypes []tailcfg.EndpointType var epTypes []tailcfg.EndpointType
@ -607,13 +607,13 @@ func (c *Direct) sendMapRequest(ctx context.Context, maxPolls int, cb func(*netm
Endpoints: epStrs, Endpoints: epStrs,
EndpointTypes: epTypes, EndpointTypes: epTypes,
Stream: allowStream, Stream: allowStream,
Hostinfo: hostinfo, Hostinfo: hi,
DebugFlags: c.debugFlags, DebugFlags: c.debugFlags,
OmitPeers: cb == nil, OmitPeers: cb == nil,
} }
var extraDebugFlags []string var extraDebugFlags []string
if hostinfo != nil && c.linkMon != nil && !c.skipIPForwardingCheck && if hi != nil && c.linkMon != nil && !c.skipIPForwardingCheck &&
ipForwardingBroken(hostinfo.RoutableIPs, c.linkMon.InterfaceState()) { ipForwardingBroken(hi.RoutableIPs, c.linkMon.InterfaceState()) {
extraDebugFlags = append(extraDebugFlags, "warn-ip-forwarding-off") extraDebugFlags = append(extraDebugFlags, "warn-ip-forwarding-off")
} }
if health.RouterHealth() != nil { if health.RouterHealth() != nil {

Write Preview
Loading…
Cancel
Save