extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-06-24 19:51:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

[client] Fix exit node deselection (#3722)

Browse Source
This commit is contained in:
Viktor Liu 2025-04-24 12:36:05 +02:00 committed by GitHub
parent 400b9fca32
commit 714beb6e3b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
client/ui/network.go
View File

@ -456,19 +456,27 @@ func (s *serviceClient) toggleExitNode(nodeID string, item *systray.MenuItem) er
} }
} }
if item.Checked() && len(ids) == 0 { // exit node is the only selected node, deselect it
// exit node is the only selected node, deselect it deselectAll := item.Checked() && len(ids) == 0
if deselectAll {
ids = append(ids, nodeID) ids = append(ids, nodeID)
exitNode = nil for _, node := range exitNodes {
if node.ID == nodeID {
// set desired state for recreation
node.Selected = false
}
}
} }
// deselect all other selected exit nodes // deselect all other selected exit nodes
if err := s.deselectOtherExitNodes(conn, ids, item); err != nil { if err := s.deselectOtherExitNodes(conn, ids); err != nil {
return err return err
} }
if err := s.selectNewExitNode(conn, exitNode, nodeID, item); err != nil { if !deselectAll {
return err if err := s.selectNewExitNode(conn, exitNode, nodeID, item); err != nil {
return err
}
} }
// linux/bsd doesn't handle Check/Uncheck well, so we recreate the menu // linux/bsd doesn't handle Check/Uncheck well, so we recreate the menu
@ -479,7 +487,7 @@ func (s *serviceClient) toggleExitNode(nodeID string, item *systray.MenuItem) er
return nil return nil
} }
func (s *serviceClient) deselectOtherExitNodes(conn proto.DaemonServiceClient, ids []string, currentItem *systray.MenuItem) error { func (s *serviceClient) deselectOtherExitNodes(conn proto.DaemonServiceClient, ids []string) error {
// deselect all other selected exit nodes // deselect all other selected exit nodes
if len(ids) > 0 { if len(ids) > 0 {
deselectReq := &proto.SelectNetworksRequest{ deselectReq := &proto.SelectNetworksRequest{
@ -494,9 +502,6 @@ func (s *serviceClient) deselectOtherExitNodes(conn proto.DaemonServiceClient, i
// uncheck all other exit node menu items // uncheck all other exit node menu items
for _, i := range s.mExitNodeItems { for _, i := range s.mExitNodeItems {
if i.MenuItem == currentItem {
continue
}
i.Uncheck() i.Uncheck()
log.Infof("Unchecked exit node %v", i) log.Infof("Unchecked exit node %v", i)
} }
@ -518,6 +523,7 @@ func (s *serviceClient) selectNewExitNode(conn proto.DaemonServiceClient, exitNo
} }
item.Check() item.Check()
log.Infof("Checked exit node '%s'", nodeID)
return nil return nil
} }