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

add auto relay only when the relay and relayed nodes are in the same network (#3249)

Browse source
This commit is contained in:
Yabin Ma 2024-12-11 15:51:50 +01:00 • committed by GitHub
parent 70ffdef387
commit 94cc85377f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
auth/host_session.go
View file

@ -257,7 +257,7 @@ func CheckNetRegAndHostUpdate(networks []string, h *models.Host, relayNodeId uui
if relayNodeId != uuid.Nil && !newNode.IsRelayed { if relayNodeId != uuid.Nil && !newNode.IsRelayed {
// check if relay node exists and acting as relay // check if relay node exists and acting as relay
relaynode, err := logic.GetNodeByID(relayNodeId.String()) relaynode, err := logic.GetNodeByID(relayNodeId.String())
if err == nil && relaynode.IsRelay { if err == nil && relaynode.IsRelay && relaynode.Network == newNode.Network {
slog.Info(fmt.Sprintf("adding relayed node %s to relay %s on network %s", newNode.ID.String(), relayNodeId.String(), network)) slog.Info(fmt.Sprintf("adding relayed node %s to relay %s on network %s", newNode.ID.String(), relayNodeId.String(), network))
newNode.IsRelayed = true newNode.IsRelayed = true
newNode.RelayedBy = relayNodeId.String() newNode.RelayedBy = relayNodeId.String()
@ -271,7 +271,7 @@ func CheckNetRegAndHostUpdate(networks []string, h *models.Host, relayNodeId uui
slog.Error("failed to update node", "nodeid", relayNodeId.String()) slog.Error("failed to update node", "nodeid", relayNodeId.String())
} }
} else { } else {
slog.Error("failed to relay node. maybe specified relay node is actually not a relay?", "err", err) slog.Error("failed to relay node. maybe specified relay node is actually not a relay? Or the relayed node is not in the same network with relay?", "err", err)
} }
} }
logger.Log(1, "added new node", newNode.ID.String(), "to host", h.Name) logger.Log(1, "added new node", newNode.ID.String(), "to host", h.Name)