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

avoid getting relay allowed ips if node is using proxy

Browse source
This commit is contained in:
Abhishek Kondur 2022-12-07 17:22:17 +05:30
parent 80c7d46ec6
commit 728c24c16a
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
logic/peers.go
View file

@ -202,7 +202,7 @@ func GetPeerUpdate(node *models.Node) (models.PeerUpdate, error) {
return models.PeerUpdate{}, err
}
if node.IsRelayed == "yes" {
if node.IsRelayed == "yes" && !node.Proxy {
return GetPeerUpdateForRelayedNode(node, udppeers)
}
@ -227,7 +227,7 @@ func GetPeerUpdate(node *models.Node) (models.PeerUpdate, error) {
var setEndpoint = !(node.IsServer == "yes")
if peer.IsRelayed == "yes" {
if !(node.IsRelay == "yes" && ncutils.StringSliceContains(node.RelayAddrs, peer.PrimaryAddress())) {
if !peer.Proxy && !(node.IsRelay == "yes" && ncutils.StringSliceContains(node.RelayAddrs, peer.PrimaryAddress())) {
//skip -- will be added to relay
continue
} else if node.IsRelay == "yes" && ncutils.StringSliceContains(node.RelayAddrs, peer.PrimaryAddress()) {
@ -298,8 +298,11 @@ func GetPeerUpdate(node *models.Node) (models.PeerUpdate, error) {
return models.PeerUpdate{}, err
}
}
allowedips := GetAllowedIPs(node, &peer, metrics, true)
fetchRelayedIps := true
if node.Proxy {
fetchRelayedIps = false
}
allowedips := GetAllowedIPs(node, &peer, metrics, fetchRelayedIps)
var keepalive time.Duration
if node.PersistentKeepalive != 0 {
// set_keepalive