extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-06-01 23:55:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

[client] Fix multiple peer name filtering in netbird status command (#2798)

Browse Source
This commit is contained in:
Marco Garcês 2024-10-29 16:49:41 +00:00 committed by GitHub
parent 10480eb52f
commit 01f24907c5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/cmd/status.go
View File

@ -680,7 +680,7 @@ func parsePeers(peers peersStateOutput, rosenpassEnabled, rosenpassPermissive bo
func skipDetailByFilters(peerState *proto.PeerState, isConnected bool) bool { func skipDetailByFilters(peerState *proto.PeerState, isConnected bool) bool {
statusEval := false statusEval := false
ipEval := false ipEval := false
nameEval := false nameEval := true
if statusFilter != "" { if statusFilter != "" {
lowerStatusFilter := strings.ToLower(statusFilter) lowerStatusFilter := strings.ToLower(statusFilter)
@ -700,11 +700,13 @@ func skipDetailByFilters(peerState *proto.PeerState, isConnected bool) bool {
if len(prefixNamesFilter) > 0 { if len(prefixNamesFilter) > 0 {
for prefixNameFilter := range prefixNamesFilterMap { for prefixNameFilter := range prefixNamesFilterMap {
if !strings.HasPrefix(peerState.Fqdn, prefixNameFilter) { if strings.HasPrefix(peerState.Fqdn, prefixNameFilter) {
nameEval = true nameEval = false
break break
} }
} }
} else {
nameEval = false
} }
return statusEval || ipEval || nameEval return statusEval || ipEval || nameEval