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

tailcfg: use key.NodePublic in wire protocol types.

Browse Source 
Updates #3206.

Signed-off-by: David Anderson <danderson@tailscale.com>
pull/3246/head
David Anderson 3 years ago committed by Dave Anderson
parent 7e8d5ed6f3
commit 7e6a1ef4f1
14 changed files with 56 additions and 57 deletions
Show Stats Download Patch File Download Diff File

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

@ -357,8 +357,8 @@ func (c *Direct) doLogin(ctx context.Context, opt loginOpt) (mustRegen bool, new
now := time.Now().Round(time.Second) now := time.Now().Round(time.Second)
request := tailcfg.RegisterRequest{ request := tailcfg.RegisterRequest{
Version: 1, Version: 1,
OldNodeKey: oldNodeKey.AsNodeKey(), OldNodeKey: oldNodeKey,
NodeKey: tryingNewKey.Public().AsNodeKey(), NodeKey: tryingNewKey.Public(),
Hostinfo: hostinfo, Hostinfo: hostinfo,
Followup: opt.URL, Followup: opt.URL,
Timestamp: &now, Timestamp: &now,
@ -595,7 +595,7 @@ func (c *Direct) sendMapRequest(ctx context.Context, maxPolls int, cb func(*netm
request := &tailcfg.MapRequest{ request := &tailcfg.MapRequest{
Version: tailcfg.CurrentMapRequestVersion, Version: tailcfg.CurrentMapRequestVersion,
KeepAlive: c.keepAlive, KeepAlive: c.keepAlive,
NodeKey: persist.PrivateNodeKey.Public().AsNodeKey(), NodeKey: persist.PrivateNodeKey.Public(),
DiscoKey: c.discoPubKey, DiscoKey: c.discoPubKey,
Endpoints: epStrs, Endpoints: epStrs,
EndpointTypes: epTypes, EndpointTypes: epTypes,

5
ipn/ipnlocal/local.go
Unescape Escape View File

@ -26,7 +26,6 @@ import (
"time" "time"
"github.com/go-multierror/multierror" "github.com/go-multierror/multierror"
"go4.org/mem"
"inet.af/netaddr" "inet.af/netaddr"
"tailscale.com/client/tailscale/apitype" "tailscale.com/client/tailscale/apitype"
"tailscale.com/control/controlclient" "tailscale.com/control/controlclient"
@ -389,7 +388,7 @@ func (b *LocalBackend) populatePeerStatusLocked(sb *ipnstate.StatusBuilder) {
tailscaleIPs = append(tailscaleIPs, addr.IP()) tailscaleIPs = append(tailscaleIPs, addr.IP())
} }
} }
sb.AddPeer(key.NodePublicFromRaw32(mem.B(p.Key[:])), &ipnstate.PeerStatus{ sb.AddPeer(p.Key, &ipnstate.PeerStatus{
InNetworkMap: true, InNetworkMap: true,
ID: p.StableID, ID: p.StableID,
UserID: p.User, UserID: p.User,
@ -2782,7 +2781,7 @@ func (b *LocalBackend) SetDNS(ctx context.Context, name, value string) error {
b.mu.Lock() b.mu.Lock()
cc := b.cc cc := b.cc
if prefs := b.prefs; prefs != nil { if prefs := b.prefs; prefs != nil {
req.NodeKey = prefs.Persist.PrivateNodeKey.Public().AsNodeKey() req.NodeKey = prefs.Persist.PrivateNodeKey.Public()
} }
b.mu.Unlock() b.mu.Unlock()
if cc == nil { if cc == nil {

10
tailcfg/tailcfg.go
Unescape Escape View File

@ -166,7 +166,7 @@ type Node struct {
// Sharer, if non-zero, is the user who shared this node, if different than User. // Sharer, if non-zero, is the user who shared this node, if different than User.
Sharer UserID `json:",omitempty"` Sharer UserID `json:",omitempty"`
Key NodeKey Key key.NodePublic
KeyExpiry time.Time KeyExpiry time.Time
Machine key.MachinePublic Machine key.MachinePublic
DiscoKey DiscoKey DiscoKey DiscoKey
@ -638,8 +638,8 @@ func (st SignatureType) String() string {
type RegisterRequest struct { type RegisterRequest struct {
_ structs.Incomparable _ structs.Incomparable
Version int // currently 1 Version int // currently 1
NodeKey NodeKey NodeKey key.NodePublic
OldNodeKey NodeKey OldNodeKey key.NodePublic
Auth struct { Auth struct {
_ structs.Incomparable _ structs.Incomparable
// One of Provider/LoginName, Oauth2Token, or AuthKey is set. // One of Provider/LoginName, Oauth2Token, or AuthKey is set.
@ -756,7 +756,7 @@ type MapRequest struct {
Compress string // "zstd" or "" (no compression) Compress string // "zstd" or "" (no compression)
KeepAlive bool // whether server should send keep-alives back to us KeepAlive bool // whether server should send keep-alives back to us
NodeKey NodeKey NodeKey key.NodePublic
DiscoKey DiscoKey DiscoKey DiscoKey
IncludeIPv6 bool `json:",omitempty"` // include IPv6 endpoints in returned Node Endpoints (for Version 4 clients) IncludeIPv6 bool `json:",omitempty"` // include IPv6 endpoints in returned Node Endpoints (for Version 4 clients)
Stream bool // if true, multiple MapResponse objects are returned Stream bool // if true, multiple MapResponse objects are returned
@ -1284,7 +1284,7 @@ type SetDNSRequest struct {
Version int Version int
// NodeKey is the client's current node key. // NodeKey is the client's current node key.
NodeKey NodeKey NodeKey key.NodePublic
// Name is the domain name for which to create a record. // Name is the domain name for which to create a record.
// For ACME DNS-01 challenges, it should be one of the domains // For ACME DNS-01 challenges, it should be one of the domains

2
tailcfg/tailcfg_clone.go
Unescape Escape View File

@ -72,7 +72,7 @@ var _NodeCloneNeedsRegeneration = Node(struct {
Name string Name string
User UserID User UserID
Sharer UserID Sharer UserID
Key key.NodeKey Key key.NodePublic
KeyExpiry time.Time KeyExpiry time.Time
Machine key.MachinePublic Machine key.MachinePublic
DiscoKey DiscoKey DiscoKey DiscoKey

8
tailcfg/tailcfg_test.go
Unescape Escape View File

@ -264,13 +264,13 @@ func TestNodeEqual(t *testing.T) {
true, true,
}, },
{ {
&Node{Key: n1.AsNodeKey()}, &Node{Key: n1},
&Node{Key: key.NewNode().Public().AsNodeKey()}, &Node{Key: key.NewNode().Public()},
false, false,
}, },
{ {
&Node{Key: n1.AsNodeKey()}, &Node{Key: n1},
&Node{Key: n1.AsNodeKey()}, &Node{Key: n1},
true, true,
}, },
{ {

2
tstest/integration/integration_test.go
Unescape Escape View File

@ -315,7 +315,7 @@ func TestAddPingRequest(t *testing.T) {
t.Fatalf("expected 1 node, got %d nodes", len(nodes)) t.Fatalf("expected 1 node, got %d nodes", len(nodes))
} }
nodeKey := nodes[0].Key.AsNodePublic() nodeKey := nodes[0].Key
// Check that we get at least one ping reply after 10 tries. // Check that we get at least one ping reply after 10 tries.
for try := 1; try <= 10; try++ { for try := 1; try <= 10; try++ {

10
tstest/integration/testcontrol/testcontrol.go
Unescape Escape View File

@ -286,7 +286,7 @@ func (s *Server) AddFakeNode() {
StableID: tailcfg.StableNodeID(fmt.Sprintf("TESTCTRL%08x", id)), StableID: tailcfg.StableNodeID(fmt.Sprintf("TESTCTRL%08x", id)),
User: tailcfg.UserID(id), User: tailcfg.UserID(id),
Machine: mk, Machine: mk,
Key: nk.AsNodeKey(), Key: nk,
MachineAuthorized: true, MachineAuthorized: true,
DiscoKey: dk, DiscoKey: dk,
Addresses: []netaddr.IPPrefix{addr}, Addresses: []netaddr.IPPrefix{addr},
@ -434,7 +434,7 @@ func (s *Server) serveRegister(w http.ResponseWriter, r *http.Request, mkey key.
// some follow-ups? For now all are successes. // some follow-ups? For now all are successes.
} }
nk := req.NodeKey.AsNodePublic() nk := req.NodeKey
user, login := s.getUser(nk) user, login := s.getUser(nk)
s.mu.Lock() s.mu.Lock()
@ -538,7 +538,7 @@ func (s *Server) UpdateNode(n *tailcfg.Node) (peersToUpdate []tailcfg.NodeID) {
if n.Key.IsZero() { if n.Key.IsZero() {
panic("zero nodekey") panic("zero nodekey")
} }
s.nodes[n.Key.AsNodePublic()] = n.Clone() s.nodes[n.Key] = n.Clone()
for _, n2 := range s.nodes { for _, n2 := range s.nodes {
if n.ID != n2.ID { if n.ID != n2.ID {
peersToUpdate = append(peersToUpdate, n2.ID) peersToUpdate = append(peersToUpdate, n2.ID)
@ -581,7 +581,7 @@ func (s *Server) serveMap(w http.ResponseWriter, r *http.Request, mkey key.Machi
jitter := time.Duration(rand.Intn(8000)) * time.Millisecond jitter := time.Duration(rand.Intn(8000)) * time.Millisecond
keepAlive := 50*time.Second + jitter keepAlive := 50*time.Second + jitter
node := s.Node(req.NodeKey.AsNodePublic()) node := s.Node(req.NodeKey)
if node == nil { if node == nil {
http.Error(w, "node not found", 400) http.Error(w, "node not found", 400)
return return
@ -693,7 +693,7 @@ var keepAliveMsg = &struct {
// //
// No updates to s are done here. // No updates to s are done here.
func (s *Server) MapResponse(req *tailcfg.MapRequest) (res *tailcfg.MapResponse, err error) { func (s *Server) MapResponse(req *tailcfg.MapRequest) (res *tailcfg.MapResponse, err error) {
nk := req.NodeKey.AsNodePublic() nk := req.NodeKey
node := s.Node(nk) node := s.Node(nk)
if node == nil { if node == nil {
// node key rotated away (once test server supports that) // node key rotated away (once test server supports that)

36
types/netmap/netmap_test.go
Unescape Escape View File

@ -43,12 +43,12 @@ func TestNetworkMapConcise(t *testing.T) {
NodeKey: testNodeKey(1), NodeKey: testNodeKey(1),
Peers: []*tailcfg.Node{ Peers: []*tailcfg.Node{
{ {
Key: testNodeKey(2).AsNodeKey(), Key: testNodeKey(2),
DERP: "127.3.3.40:2", DERP: "127.3.3.40:2",
Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"}, Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"},
}, },
{ {
Key: testNodeKey(3).AsNodeKey(), Key: testNodeKey(3),
DERP: "127.3.3.40:4", DERP: "127.3.3.40:4",
Endpoints: []string{"10.2.0.100:12", "10.1.0.100:12345"}, Endpoints: []string{"10.2.0.100:12", "10.1.0.100:12345"},
}, },
@ -98,7 +98,7 @@ func TestConciseDiffFrom(t *testing.T) {
NodeKey: testNodeKey(1), NodeKey: testNodeKey(1),
Peers: []*tailcfg.Node{ Peers: []*tailcfg.Node{
{ {
Key: testNodeKey(2).AsNodeKey(), Key: testNodeKey(2),
DERP: "127.3.3.40:2", DERP: "127.3.3.40:2",
Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"}, Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"},
}, },
@ -108,7 +108,7 @@ func TestConciseDiffFrom(t *testing.T) {
NodeKey: testNodeKey(1), NodeKey: testNodeKey(1),
Peers: []*tailcfg.Node{ Peers: []*tailcfg.Node{
{ {
Key: testNodeKey(2).AsNodeKey(), Key: testNodeKey(2),
DERP: "127.3.3.40:2", DERP: "127.3.3.40:2",
Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"}, Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"},
}, },
@ -122,7 +122,7 @@ func TestConciseDiffFrom(t *testing.T) {
NodeKey: testNodeKey(1), NodeKey: testNodeKey(1),
Peers: []*tailcfg.Node{ Peers: []*tailcfg.Node{
{ {
Key: testNodeKey(2).AsNodeKey(), Key: testNodeKey(2),
DERP: "127.3.3.40:2", DERP: "127.3.3.40:2",
Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"}, Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"},
}, },
@ -132,7 +132,7 @@ func TestConciseDiffFrom(t *testing.T) {
NodeKey: testNodeKey(2), NodeKey: testNodeKey(2),
Peers: []*tailcfg.Node{ Peers: []*tailcfg.Node{
{ {
Key: testNodeKey(2).AsNodeKey(), Key: testNodeKey(2),
DERP: "127.3.3.40:2", DERP: "127.3.3.40:2",
Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"}, Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"},
}, },
@ -147,7 +147,7 @@ func TestConciseDiffFrom(t *testing.T) {
Peers: []*tailcfg.Node{ Peers: []*tailcfg.Node{
{ {
ID: 2, ID: 2,
Key: testNodeKey(2).AsNodeKey(), Key: testNodeKey(2),
DERP: "127.3.3.40:2", DERP: "127.3.3.40:2",
Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"}, Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"},
}, },
@ -158,19 +158,19 @@ func TestConciseDiffFrom(t *testing.T) {
Peers: []*tailcfg.Node{ Peers: []*tailcfg.Node{
{ {
ID: 1, ID: 1,
Key: testNodeKey(1).AsNodeKey(), Key: testNodeKey(1),
DERP: "127.3.3.40:1", DERP: "127.3.3.40:1",
Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"}, Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"},
}, },
{ {
ID: 2, ID: 2,
Key: testNodeKey(2).AsNodeKey(), Key: testNodeKey(2),
DERP: "127.3.3.40:2", DERP: "127.3.3.40:2",
Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"}, Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"},
}, },
{ {
ID: 3, ID: 3,
Key: testNodeKey(3).AsNodeKey(), Key: testNodeKey(3),
DERP: "127.3.3.40:3", DERP: "127.3.3.40:3",
Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"}, Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"},
}, },
@ -185,19 +185,19 @@ func TestConciseDiffFrom(t *testing.T) {
Peers: []*tailcfg.Node{ Peers: []*tailcfg.Node{
{ {
ID: 1, ID: 1,
Key: testNodeKey(1).AsNodeKey(), Key: testNodeKey(1),
DERP: "127.3.3.40:1", DERP: "127.3.3.40:1",
Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"}, Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"},
}, },
{ {
ID: 2, ID: 2,
Key: testNodeKey(2).AsNodeKey(), Key: testNodeKey(2),
DERP: "127.3.3.40:2", DERP: "127.3.3.40:2",
Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"}, Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"},
}, },
{ {
ID: 3, ID: 3,
Key: testNodeKey(3).AsNodeKey(), Key: testNodeKey(3),
DERP: "127.3.3.40:3", DERP: "127.3.3.40:3",
Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"}, Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"},
}, },
@ -208,7 +208,7 @@ func TestConciseDiffFrom(t *testing.T) {
Peers: []*tailcfg.Node{ Peers: []*tailcfg.Node{
{ {
ID: 2, ID: 2,
Key: testNodeKey(2).AsNodeKey(), Key: testNodeKey(2),
DERP: "127.3.3.40:2", DERP: "127.3.3.40:2",
Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"}, Endpoints: []string{"192.168.0.100:12", "192.168.0.100:12354"},
}, },
@ -223,7 +223,7 @@ func TestConciseDiffFrom(t *testing.T) {
Peers: []*tailcfg.Node{ Peers: []*tailcfg.Node{
{ {
ID: 2, ID: 2,
Key: testNodeKey(2).AsNodeKey(), Key: testNodeKey(2),
DERP: "127.3.3.40:2", DERP: "127.3.3.40:2",
Endpoints: []string{"192.168.0.100:12", "1.1.1.1:1"}, Endpoints: []string{"192.168.0.100:12", "1.1.1.1:1"},
}, },
@ -234,7 +234,7 @@ func TestConciseDiffFrom(t *testing.T) {
Peers: []*tailcfg.Node{ Peers: []*tailcfg.Node{
{ {
ID: 2, ID: 2,
Key: testNodeKey(2).AsNodeKey(), Key: testNodeKey(2),
DERP: "127.3.3.40:2", DERP: "127.3.3.40:2",
Endpoints: []string{"192.168.0.100:12", "1.1.1.1:2"}, Endpoints: []string{"192.168.0.100:12", "1.1.1.1:2"},
}, },
@ -249,7 +249,7 @@ func TestConciseDiffFrom(t *testing.T) {
Peers: []*tailcfg.Node{ Peers: []*tailcfg.Node{
{ {
ID: 2, ID: 2,
Key: testNodeKey(2).AsNodeKey(), Key: testNodeKey(2),
DERP: "127.3.3.40:2", DERP: "127.3.3.40:2",
Endpoints: []string{"192.168.0.100:41641", "1.1.1.1:41641"}, Endpoints: []string{"192.168.0.100:41641", "1.1.1.1:41641"},
DiscoKey: testDiscoKey("f00f00f00f"), DiscoKey: testDiscoKey("f00f00f00f"),
@ -262,7 +262,7 @@ func TestConciseDiffFrom(t *testing.T) {
Peers: []*tailcfg.Node{ Peers: []*tailcfg.Node{
{ {
ID: 2, ID: 2,
Key: testNodeKey(2).AsNodeKey(), Key: testNodeKey(2),
DERP: "127.3.3.40:2", DERP: "127.3.3.40:2",
Endpoints: []string{"192.168.0.100:41641", "1.1.1.1:41641"}, Endpoints: []string{"192.168.0.100:41641", "1.1.1.1:41641"},
DiscoKey: testDiscoKey("ba4ba4ba4b"), DiscoKey: testDiscoKey("ba4ba4ba4b"),

10
wgengine/magicsock/magicsock.go
Unescape Escape View File

@ -898,7 +898,7 @@ func (c *Conn) Ping(peer *tailcfg.Node, res *ipnstate.PingResult, cb func(*ipnst
} }
} }
ep, ok := c.peerMap.endpointForNodeKey(peer.Key.AsNodePublic()) ep, ok := c.peerMap.endpointForNodeKey(peer.Key)
if !ok { if !ok {
res.Err = "unknown peer" res.Err = "unknown peer"
cb(res) cb(res)
@ -2256,7 +2256,7 @@ func (c *Conn) SetNetworkMap(nm *netmap.NetworkMap) {
// we'll fall through to the next pass, which allocates but can // we'll fall through to the next pass, which allocates but can
// handle full set updates. // handle full set updates.
for _, n := range nm.Peers { for _, n := range nm.Peers {
if ep, ok := c.peerMap.endpointForNodeKey(n.Key.AsNodePublic()); ok { if ep, ok := c.peerMap.endpointForNodeKey(n.Key); ok {
ep.updateFromNode(n) ep.updateFromNode(n)
c.peerMap.upsertEndpoint(ep) // maybe update discokey mappings in peerMap c.peerMap.upsertEndpoint(ep) // maybe update discokey mappings in peerMap
continue continue
@ -2264,7 +2264,7 @@ func (c *Conn) SetNetworkMap(nm *netmap.NetworkMap) {
ep := &endpoint{ ep := &endpoint{
c: c, c: c,
publicKey: n.Key.AsNodePublic(), publicKey: n.Key,
sentPing: map[stun.TxID]sentPing{}, sentPing: map[stun.TxID]sentPing{},
endpointState: map[netaddr.IPPort]*endpointState{}, endpointState: map[netaddr.IPPort]*endpointState{},
} }
@ -2272,7 +2272,7 @@ func (c *Conn) SetNetworkMap(nm *netmap.NetworkMap) {
ep.discoKey = key.DiscoPublicFromRaw32(mem.B(n.DiscoKey[:])) ep.discoKey = key.DiscoPublicFromRaw32(mem.B(n.DiscoKey[:]))
ep.discoShort = n.DiscoKey.ShortString() ep.discoShort = n.DiscoKey.ShortString()
} }
ep.wgEndpoint = key.NodePublicFromRaw32(mem.B(n.Key[:])).UntypedHexString() ep.wgEndpoint = n.Key.UntypedHexString()
ep.initFakeUDPAddr() ep.initFakeUDPAddr()
c.logf("magicsock: created endpoint key=%s: disco=%s; %v", n.Key.ShortString(), n.DiscoKey.ShortString(), logger.ArgWriter(func(w *bufio.Writer) { c.logf("magicsock: created endpoint key=%s: disco=%s; %v", n.Key.ShortString(), n.DiscoKey.ShortString(), logger.ArgWriter(func(w *bufio.Writer) {
const derpPrefix = "127.3.3.40:" const derpPrefix = "127.3.3.40:"
@ -2309,7 +2309,7 @@ func (c *Conn) SetNetworkMap(nm *netmap.NetworkMap) {
if c.peerMap.nodeCount() != len(nm.Peers) { if c.peerMap.nodeCount() != len(nm.Peers) {
keep := make(map[key.NodePublic]bool, len(nm.Peers)) keep := make(map[key.NodePublic]bool, len(nm.Peers))
for _, n := range nm.Peers { for _, n := range nm.Peers {
keep[n.Key.AsNodePublic()] = true keep[n.Key] = true
} }
c.peerMap.forEachEndpoint(func(ep *endpoint) { c.peerMap.forEachEndpoint(func(ep *endpoint) {
if !keep[ep.publicKey] { if !keep[ep.publicKey] {

14
wgengine/magicsock/magicsock_test.go
Unescape Escape View File

@ -258,7 +258,7 @@ func meshStacks(logf logger.Logf, mutateNetmap func(idx int, nm *netmap.NetworkM
peer := &tailcfg.Node{ peer := &tailcfg.Node{
ID: tailcfg.NodeID(i + 1), ID: tailcfg.NodeID(i + 1),
Name: fmt.Sprintf("node%d", i+1), Name: fmt.Sprintf("node%d", i+1),
Key: peer.privateKey.Public().AsNodeKey(), Key: peer.privateKey.Public(),
DiscoKey: tailcfg.DiscoKeyFromDiscoPublic(peer.conn.DiscoPublicKey()), DiscoKey: tailcfg.DiscoKeyFromDiscoPublic(peer.conn.DiscoPublicKey()),
Addresses: addrs, Addresses: addrs,
AllowedIPs: addrs, AllowedIPs: addrs,
@ -285,7 +285,7 @@ func meshStacks(logf logger.Logf, mutateNetmap func(idx int, nm *netmap.NetworkM
m.conn.SetNetworkMap(nm) m.conn.SetNetworkMap(nm)
peerSet := make(map[key.NodePublic]struct{}, len(nm.Peers)) peerSet := make(map[key.NodePublic]struct{}, len(nm.Peers))
for _, peer := range nm.Peers { for _, peer := range nm.Peers {
peerSet[key.NodePublicFromRaw32(mem.B(peer.Key[:]))] = struct{}{} peerSet[peer.Key] = struct{}{}
} }
m.conn.UpdatePeers(peerSet) m.conn.UpdatePeers(peerSet)
wg, err := nmcfg.WGCfg(nm, logf, netmap.AllowSingleHosts, "") wg, err := nmcfg.WGCfg(nm, logf, netmap.AllowSingleHosts, "")
@ -1136,11 +1136,11 @@ func TestDiscoMessage(t *testing.T) {
peer1Pub := c.DiscoPublicKey() peer1Pub := c.DiscoPublicKey()
peer1Priv := c.discoPrivate peer1Priv := c.discoPrivate
n := &tailcfg.Node{ n := &tailcfg.Node{
Key: key.NewNode().Public().AsNodeKey(), Key: key.NewNode().Public(),
DiscoKey: tailcfg.DiscoKeyFromDiscoPublic(peer1Pub), DiscoKey: tailcfg.DiscoKeyFromDiscoPublic(peer1Pub),
} }
c.peerMap.upsertEndpoint(&endpoint{ c.peerMap.upsertEndpoint(&endpoint{
publicKey: n.Key.AsNodePublic(), publicKey: n.Key,
discoKey: key.DiscoPublicFromRaw32(mem.B(n.DiscoKey[:])), discoKey: key.DiscoPublicFromRaw32(mem.B(n.DiscoKey[:])),
}) })
@ -1232,7 +1232,7 @@ func addTestEndpoint(tb testing.TB, conn *Conn, sendConn net.PacketConn) (key.No
conn.SetNetworkMap(&netmap.NetworkMap{ conn.SetNetworkMap(&netmap.NetworkMap{
Peers: []*tailcfg.Node{ Peers: []*tailcfg.Node{
{ {
Key: nodeKey.AsNodeKey(), Key: nodeKey,
DiscoKey: tailcfg.DiscoKeyFromDiscoPublic(discoKey), DiscoKey: tailcfg.DiscoKeyFromDiscoPublic(discoKey),
Endpoints: []string{sendConn.LocalAddr().String()}, Endpoints: []string{sendConn.LocalAddr().String()},
}, },
@ -1410,7 +1410,7 @@ func TestSetNetworkMapChangingNodeKey(t *testing.T) {
conn.SetNetworkMap(&netmap.NetworkMap{ conn.SetNetworkMap(&netmap.NetworkMap{
Peers: []*tailcfg.Node{ Peers: []*tailcfg.Node{
{ {
Key: nodeKey1.AsNodeKey(), Key: nodeKey1,
DiscoKey: tailcfg.DiscoKeyFromDiscoPublic(discoKey), DiscoKey: tailcfg.DiscoKeyFromDiscoPublic(discoKey),
Endpoints: []string{"192.168.1.2:345"}, Endpoints: []string{"192.168.1.2:345"},
}, },
@ -1425,7 +1425,7 @@ func TestSetNetworkMapChangingNodeKey(t *testing.T) {
conn.SetNetworkMap(&netmap.NetworkMap{ conn.SetNetworkMap(&netmap.NetworkMap{
Peers: []*tailcfg.Node{ Peers: []*tailcfg.Node{
{ {
Key: nodeKey2.AsNodeKey(), Key: nodeKey2,
DiscoKey: tailcfg.DiscoKeyFromDiscoPublic(discoKey), DiscoKey: tailcfg.DiscoKeyFromDiscoPublic(discoKey),
Endpoints: []string{"192.168.1.2:345"}, Endpoints: []string{"192.168.1.2:345"},
}, },

4
wgengine/pendopen.go
Unescape Escape View File

@ -178,7 +178,7 @@ func (e *userspaceEngine) onOpenTimeout(flow flowtrack.Tuple) {
var ps *ipnstate.PeerStatusLite var ps *ipnstate.PeerStatusLite
if st, err := e.getStatus(); err == nil { if st, err := e.getStatus(); err == nil {
for _, v := range st.Peers { for _, v := range st.Peers {
if v.NodeKey == n.Key.AsNodePublic() { if v.NodeKey == n.Key {
v := v // copy v := v // copy
ps = &v ps = &v
} }
@ -231,7 +231,7 @@ func (e *userspaceEngine) onOpenTimeout(flow flowtrack.Tuple) {
e.logf("open-conn-track: timeout opening %v to node %v; online=%v, lastRecv=%v", e.logf("open-conn-track: timeout opening %v to node %v; online=%v, lastRecv=%v",
flow, n.Key.ShortString(), flow, n.Key.ShortString(),
online, online,
e.magicConn.LastRecvActivityOfNodeKey(n.Key.AsNodePublic())) e.magicConn.LastRecvActivityOfNodeKey(n.Key))
} }
func durFmt(t time.Time) string { func durFmt(t time.Time) string {

2
wgengine/userspace.go
Unescape Escape View File

@ -1471,7 +1471,7 @@ func (e *userspaceEngine) peerForIP(ip netaddr.IP) (n *tailcfg.Node, isSelf bool
// call. But TODO(bradfitz): add a lookup map to netmap.NetworkMap. // call. But TODO(bradfitz): add a lookup map to netmap.NetworkMap.
if !bestKey.IsZero() { if !bestKey.IsZero() {
for _, p := range nm.Peers { for _, p := range nm.Peers {
if p.Key.AsNodePublic() == bestKey { if p.Key == bestKey {
return p, false, nil return p, false, nil
} }
} }

2
wgengine/userspace_test.go
Unescape Escape View File

@ -100,7 +100,7 @@ func TestUserspaceEngineReconfig(t *testing.T) {
nm := &netmap.NetworkMap{ nm := &netmap.NetworkMap{
Peers: []*tailcfg.Node{ Peers: []*tailcfg.Node{
&tailcfg.Node{ &tailcfg.Node{
Key: nkFromHex(nodeHex).AsNodeKey(), Key: nkFromHex(nodeHex),
}, },
}, },
} }

2
wgengine/wgcfg/nmcfg/nmcfg.go
Unescape Escape View File

@ -73,7 +73,7 @@ func WGCfg(nm *netmap.NetworkMap, logf logger.Logf, flags netmap.WGConfigFlags,
continue continue
} }
cfg.Peers = append(cfg.Peers, wgcfg.Peer{ cfg.Peers = append(cfg.Peers, wgcfg.Peer{
PublicKey: key.NodePublicFromRaw32(mem.B(peer.Key[:])), PublicKey: peer.Key,
DiscoKey: key.DiscoPublicFromRaw32(mem.B(peer.DiscoKey[:])), DiscoKey: key.DiscoPublicFromRaw32(mem.B(peer.DiscoKey[:])),
}) })
cpeer := &cfg.Peers[len(cfg.Peers)-1] cpeer := &cfg.Peers[len(cfg.Peers)-1]

Write Preview
Loading…
Cancel
Save