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

Merge pull request #3315 from gravitl/master

Browse source 
Master
This commit is contained in:
Abhishek K 2025-02-04 19:32:14 +04:00 • committed by GitHub
commit 64bc351564
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
controllers/network.go
View file

@ -632,15 +632,15 @@ func updateNetwork(w http.ResponseWriter, r *http.Request) {
return return
} }
netOld1, err := logic.GetNetwork(payload.NetID) netOld, err := logic.GetNetwork(payload.NetID)
if err != nil { if err != nil {
slog.Info("error fetching network", "user", r.Header.Get("user"), "err", err) slog.Info("error fetching network", "user", r.Header.Get("user"), "err", err)
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest")) logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
return return
} }
// partial update netNew := netOld
netOld2 := netOld1 netNew.DefaultACL = payload.DefaultACL
_, _, _, err = logic.UpdateNetwork(&netOld1, &netOld2) _, _, _, err = logic.UpdateNetwork(&netOld, &netNew)
if err != nil { if err != nil {
slog.Info("failed to update network", "user", r.Header.Get("user"), "err", err) slog.Info("failed to update network", "user", r.Header.Get("user"), "err", err)
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest")) logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))

9
logic/peers.go
View file

@ -187,7 +187,14 @@ func GetPeerUpdateForHost(network string, host *models.Host, allNodes []models.N
} else { } else {
hostPeerUpdate.FwUpdate.AllowAll = false hostPeerUpdate.FwUpdate.AllowAll = false
hostPeerUpdate.FwUpdate.AclRules = GetAclRulesForNode(&node) rules := GetAclRulesForNode(&node)
if len(hostPeerUpdate.FwUpdate.AclRules) == 0 {
hostPeerUpdate.FwUpdate.AclRules = rules
} else {
for aclID, rule := range rules {
hostPeerUpdate.FwUpdate.AclRules[aclID] = rule
}
}
} }
currentPeers := GetNetworkNodesMemory(allNodes, node.Network) currentPeers := GetNetworkNodesMemory(allNodes, node.Network)