Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Oct 29, 2024
Merged

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

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37ccc45
fixes prefixNamesFilter in skipDetailByFilters function
mgarces Oct 28, 2024
6f484f3
handle empty name filter
pascal-fischer Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions client/cmd/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ func parsePeers(peers peersStateOutput, rosenpassEnabled, rosenpassPermissive bo
func skipDetailByFilters(peerState *proto.PeerState, isConnected bool) bool {
statusEval := false
ipEval := false
nameEval := false
nameEval := true

if statusFilter != "" {
lowerStatusFilter := strings.ToLower(statusFilter)
Expand All @@ -700,8 +700,8 @@ func skipDetailByFilters(peerState *proto.PeerState, isConnected bool) bool {

if len(prefixNamesFilter) > 0 {
for prefixNameFilter := range prefixNamesFilterMap {
if !strings.HasPrefix(peerState.Fqdn, prefixNameFilter) {
nameEval = true
if strings.HasPrefix(peerState.Fqdn, prefixNameFilter) {
nameEval = false
break
}
}
Expand Down
Loading