gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-11-08 07:41:41 +08:00
Code Issues Projects Releases Packages Wiki Activity

update peer id map on node peer upate

Browse source
This commit is contained in:
Abhishek Kondur 2023-01-12 14:48:18 +05:30
parent f6741cc7d6
commit 2cebece6b7
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
logic/peers.go
View file

@ -399,7 +399,7 @@ func GetPeerUpdateForHost(host *models.Host) (models.HostPeerUpdate, error) {
IP: peerHost.EndpointIP, IP: peerHost.EndpointIP,
Port: peerHost.ListenPort, Port: peerHost.ListenPort,
} }
if !host.ProxyEnabled && peerHost.ProxyEnabled { if peerHost.ProxyEnabled {
if peerHost.ProxyListenPort == 0 { if peerHost.ProxyListenPort == 0 {
peerConfig.Endpoint.Port = proxy_models.NmProxyPort peerConfig.Endpoint.Port = proxy_models.NmProxyPort
} else { } else {
@ -462,6 +462,7 @@ func GetPeerUpdate(node *models.Node, host *models.Host) (models.PeerUpdate, err
Network: node.Network, Network: node.Network,
ServerVersion: ncutils.Version, ServerVersion: ncutils.Version,
DNS: getPeerDNS(node.Network), DNS: getPeerDNS(node.Network),
PeerIDs: make(models.PeerMap),
} }
currentPeers, err := GetNetworkNodes(node.Network) currentPeers, err := GetNetworkNodes(node.Network)
if err != nil { if err != nil {
@ -511,7 +512,7 @@ func GetPeerUpdate(node *models.Node, host *models.Host) (models.PeerUpdate, err
IP: peerHost.EndpointIP, IP: peerHost.EndpointIP,
Port: peerHost.ListenPort, Port: peerHost.ListenPort,
} }
if !host.ProxyEnabled && peerHost.ProxyEnabled { if peerHost.ProxyEnabled {
peerConfig.Endpoint.Port = peerHost.ProxyListenPort peerConfig.Endpoint.Port = peerHost.ProxyListenPort
} }
if uselocal { if uselocal {
@ -526,12 +527,16 @@ func GetPeerUpdate(node *models.Node, host *models.Host) (models.PeerUpdate, err
} }
} }
} }
if peer.IsRelay {
allowedips = append(allowedips, getRelayAllowedIPs(node, &peer)...)
}
if peer.IsEgressGateway { if peer.IsEgressGateway {
allowedips = append(allowedips, getEgressIPs(node, &peer)...) allowedips = append(allowedips, getEgressIPs(node, &peer)...)
} }
peerUpdate.PeerIDs[peerHost.PublicKey.String()] = models.IDandAddr{
ID: peer.ID.String(),
Address: peer.PrimaryAddress(),
Name: peerHost.Name,
Network: peer.Network,
}
peerConfig.AllowedIPs = allowedips peerConfig.AllowedIPs = allowedips
peerUpdate.Peers = append(peerUpdate.Peers, peerConfig) peerUpdate.Peers = append(peerUpdate.Peers, peerConfig)
} }