sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-08-25 00:51:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fail modifyPeers before any removal when a peer's state is unavailable

Browse Source
This commit is contained in:
Viktor Liu
2026-08-20 14:19:47 +02:00
parent 787d07b57f
commit 5ae19bc0e4
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client/internal/engine.go
View File

@@ -863,15 +863,20 @@ func (e *Engine) modifyPeers(peersUpdate []*mgmProto.RemotePeerConfig) error {
}
}
// second, close all modified connections and remove them from the state map,
// remembering which of them were active
// second, look up the activation state of all modified peers before removing
// any of them, so an unavailable state leaves the current connections intact
active := make(map[string]bool, len(modified))
for _, p := range modified {
peerPubKey := p.GetWgPubKey()
if state, err := e.statusRecorder.GetPeer(peerPubKey); err == nil {
active[peerPubKey] = state.ConnStatus != peer.StatusIdle
state, err := e.statusRecorder.GetPeer(peerPubKey)
if err != nil {
return fmt.Errorf("get status of modified peer %s: %w", peerPubKey, err)
}
if err := e.removePeer(peerPubKey); err != nil {
active[peerPubKey] = state.ConnStatus != peer.StatusIdle
}
// then close all modified connections and remove them from the state map
for _, p := range modified {
if err := e.removePeer(p.GetWgPubKey()); err != nil {
return err
}
}