Merge branch 'netclient_refactor_latest' of https://github.com/gravitl/netmaker into netclient_refactor_peer_updates

This commit is contained in:
Abhishek Kondur
2023-01-05 08:46:49 +05:30
154 changed files with 3995 additions and 478 deletions

View File

@@ -5,6 +5,7 @@ import (
"fmt"
"log"
"net"
"sort"
"strconv"
"strings"
"time"
@@ -578,6 +579,9 @@ func GetPeerUpdateLegacy(node *models.Node) (models.PeerUpdate, error) {
peerUpdate.Network = node.Network
peerUpdate.ServerVersion = servercfg.Version
sort.SliceStable(peers[:], func(i, j int) bool {
return peers[i].PublicKey.String() < peers[j].PublicKey.String()
})
peerUpdate.Peers = peers
peerUpdate.ServerAddrs = serverNodeAddresses
peerUpdate.DNS = getPeerDNS(node.Network)
@@ -990,6 +994,9 @@ func GetPeerUpdateForRelayedNode(node *models.Node, udppeers map[string]string)
}
peerUpdate.Network = node.Network
peerUpdate.ServerVersion = servercfg.Version
sort.SliceStable(peers[:], func(i, j int) bool {
return peers[i].PublicKey.String() < peers[j].PublicKey.String()
})
peerUpdate.Peers = peers
peerUpdate.ServerAddrs = serverNodeAddresses
peerUpdate.DNS = getPeerDNS(node.Network)