gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-10 15:14:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1227 from gravitl/master

Browse source 
ishub hotfix
This commit is contained in:
Alex Feiszli 2022-06-17 15:37:18 -04:00 • committed by GitHub
commit 2720c64ac7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
logic/peers.go
View file

@ -24,6 +24,13 @@ func GetPeerUpdate(node *models.Node) (models.PeerUpdate, error) {
var peerUpdate models.PeerUpdate var peerUpdate models.PeerUpdate
var peers []wgtypes.PeerConfig var peers []wgtypes.PeerConfig
var serverNodeAddresses = []models.ServerAddr{} var serverNodeAddresses = []models.ServerAddr{}
var isP2S bool
network, err := GetNetwork(node.Network)
if err != nil {
return peerUpdate, err
} else if network.IsPointToSite == "yes" && node.IsHub != "yes" {
isP2S = true
}
// udppeers = the peers parsed from the local interface // udppeers = the peers parsed from the local interface
// gives us correct port to reach // gives us correct port to reach
@ -66,6 +73,10 @@ func GetPeerUpdate(node *models.Node) (models.PeerUpdate, error) {
//skip if not permitted by acl //skip if not permitted by acl
continue continue
} }
if isP2S && peer.IsHub != "yes" {
continue
}
pubkey, err := wgtypes.ParseKey(peer.PublicKey) pubkey, err := wgtypes.ParseKey(peer.PublicKey)
if err != nil { if err != nil {
return models.PeerUpdate{}, err return models.PeerUpdate{}, err