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

add suggestions from review

Browse Source 
Signed-off-by: leonnicolas <leonloechner@gmx.de>
This commit is contained in:
leonnicolas
2021-09-30 12:03:00 +02:00
parent c7e2be9357
commit 61ad16dea5
7 changed files with 41 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/mesh/mesh.go
View File

@@ -542,7 +542,7 @@ func (m *Mesh) applyTopology() {
equal, diff := conf.Equal(wgDevice)
if !equal {
level.Info(m.logger).Log("msg", "WireGuard configurations are different", "diff", diff)
level.Debug(m.logger).Log("changing wg config", "config", conf.WGConfig())
level.Debug(m.logger).Log("msg", "changing wg config", "config", conf.WGConfig())
if err := wgClient.ConfigureDevice(m.kiloIfaceName, conf.WGConfig()); err != nil {
level.Error(m.logger).Log("error", err)
m.errorCounter.WithLabelValues("apply").Inc()
@@ -660,7 +660,7 @@ func nodesAreEqual(a, b *Node) bool {
}
// Check the DNS name first since this package
// is doing the DNS resolution.
if a.Endpoint.StringOpt(false) != b.Endpoint.StringOpt(false) {
if a.Endpoint.StringOpt(true) != b.Endpoint.StringOpt(true) {
return false
}
// Ignore LastSeen when comparing equality we want to check if the nodes are
@@ -689,7 +689,7 @@ func peersAreEqual(a, b *Peer) bool {
}
// Check the DNS name first since this package
// is doing the DNS resolution.
if a.Endpoint.StringOpt(false) != b.Endpoint.StringOpt(false) {
if a.Endpoint.StringOpt(true) != b.Endpoint.StringOpt(true) {
return false
}
if len(a.AllowedIPs) != len(b.AllowedIPs) {

14
pkg/mesh/topology.go
View File

@@ -294,7 +294,7 @@ func (t *Topology) updateEndpoint(endpoint *wireguard.Endpoint, key wgtypes.Key,
if ok {
return wireguard.NewEndpointFromUDPAddr(e)
}
return nil
return endpoint
}
// Conf generates a WireGuard configuration file for a given Topology.
@@ -339,12 +339,12 @@ func (t *Topology) Conf() *wireguard.Conf {
// AsPeer generates the WireGuard peer configuration for the local location of the given Topology.
// This configuration can be used to configure this location as a peer of another WireGuard interface.
func (t *Topology) AsPeer() wireguard.Peer {
func (t *Topology) AsPeer() *wireguard.Peer {
for _, s := range t.segments {
if s.location != t.location {
continue
}
p := wireguard.Peer{
p := &wireguard.Peer{
PeerConfig: wgtypes.PeerConfig{
AllowedIPs: s.allowedIPs,
PublicKey: s.key,
@@ -353,11 +353,11 @@ func (t *Topology) AsPeer() wireguard.Peer {
}
return p
}
return wireguard.Peer{}
return nil
}
// PeerConf generates a WireGuard configuration file for a given peer in a Topology.
func (t *Topology) PeerConf(name string) wireguard.Conf {
func (t *Topology) PeerConf(name string) *wireguard.Conf {
var pka *time.Duration
var psk *wgtypes.Key
for i := range t.peers {
@@ -367,7 +367,7 @@ func (t *Topology) PeerConf(name string) wireguard.Conf {
break
}
}
c := wireguard.Conf{}
c := &wireguard.Conf{}
for _, s := range t.segments {
peer := wireguard.Peer{
PeerConfig: wgtypes.PeerConfig{
@@ -417,7 +417,7 @@ func findLeader(nodes []*Node) int {
leaders = append(leaders, i)
}
if nodes[i].Endpoint != nil && isPublic(nodes[i].Endpoint.IP()) {
if nodes[i].Endpoint.IP() != nil && isPublic(nodes[i].Endpoint.IP()) {
public = append(public, i)
}
}