adelorenzo/kilo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Record discovered endpoints in node

Browse Source
This commit is contained in:
Julien Viard de Galbert 2021-04-16 15:34:29 +02:00
parent f66efc7140
commit ace8eb9a07
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/mesh/backend.go
View File

@ -66,6 +66,7 @@ type Node struct {
PersistentKeepalive int PersistentKeepalive int
Subnet *net.IPNet Subnet *net.IPNet
WireGuardIP *net.IPNet WireGuardIP *net.IPNet
DiscoveredEndpoints map[string]*wireguard.Endpoint
} }
// Ready indicates whether or not the node is ready. // Ready indicates whether or not the node is ready.

18
pkg/mesh/mesh.go
View File

@ -469,7 +469,9 @@ func (m *Mesh) applyTopology() {
return return
} }
oldConf := wireguard.Parse(oldConfRaw) oldConf := wireguard.Parse(oldConfRaw)
updateNATEndpoints(nodes, peers, oldConf) natEndpoints := updateNATEndpoints(nodes, peers, oldConf, m.logger)
nodes[m.hostname].DiscoveredEndpoints = natEndpoints
m.nodes[m.hostname].DiscoveredEndpoints = natEndpoints
t, err := NewTopology(nodes, peers, m.granularity, m.hostname, nodes[m.hostname].Endpoint.Port, m.priv, m.subnet, nodes[m.hostname].PersistentKeepalive) t, err := NewTopology(nodes, peers, m.granularity, m.hostname, nodes[m.hostname].Endpoint.Port, m.priv, m.subnet, nodes[m.hostname].PersistentKeepalive)
if err != nil { if err != nil {
level.Error(m.logger).Log("error", err) level.Error(m.logger).Log("error", err)
@ -774,19 +776,31 @@ func linkByIndex(index int) (netlink.Link, error) {
// updateNATEndpoints ensures that nodes and peers behind NAT update // updateNATEndpoints ensures that nodes and peers behind NAT update
// their endpoints from the WireGuard configuration so they can roam. // their endpoints from the WireGuard configuration so they can roam.
func updateNATEndpoints(nodes map[string]*Node, peers map[string]*Peer, conf *wireguard.Conf) { func updateNATEndpoints(nodes map[string]*Node, peers map[string]*Peer, conf *wireguard.Conf, logger log.Logger) map[string]*wireguard.Endpoint {
natEndpoints := make(map[string]*wireguard.Endpoint)
keys := make(map[string]*wireguard.Peer) keys := make(map[string]*wireguard.Peer)
for i := range conf.Peers { for i := range conf.Peers {
keys[string(conf.Peers[i].PublicKey)] = conf.Peers[i] keys[string(conf.Peers[i].PublicKey)] = conf.Peers[i]
} }
for _, n := range nodes { for _, n := range nodes {
if peer, ok := keys[string(n.Key)]; ok && n.PersistentKeepalive > 0 { if peer, ok := keys[string(n.Key)]; ok && n.PersistentKeepalive > 0 {
level.Debug(logger).Log("msg", "WireGuard Update NAT Endpoint", "node", n.Name, "endpoint", peer.Endpoint, "former-endpoint", n.Endpoint, "same", n.Endpoint.Equal(peer.Endpoint))
// Should check location leader but only available in topology ... or have topology handle that list
// Better check wg latest-handshake
if !n.Endpoint.Equal(peer.Endpoint) {
natEndpoints[string(n.Key)] = peer.Endpoint
}
n.Endpoint = peer.Endpoint n.Endpoint = peer.Endpoint
} }
} }
for _, p := range peers { for _, p := range peers {
if peer, ok := keys[string(p.PublicKey)]; ok && p.PersistentKeepalive > 0 { if peer, ok := keys[string(p.PublicKey)]; ok && p.PersistentKeepalive > 0 {
if !p.Endpoint.Equal(peer.Endpoint) {
natEndpoints[string(p.PublicKey)] = peer.Endpoint
}
p.Endpoint = peer.Endpoint p.Endpoint = peer.Endpoint
} }
} }
level.Debug(logger).Log("msg", "Discovered WireGuard NAT Endpoints", "DiscoveredEndpoints", natEndpoints)
return natEndpoints
} }