sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-27 04:36:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

[client] Add missing bsd flags in debug bundle (#5254)

Browse Source
This commit is contained in:
Viktor Liu
2026-02-05 01:07:27 +08:00
committed by GitHub
parent d488f58311
commit f7732557fa
2 changed files with 49 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
client/internal/routemanager/systemops/routeflags_bsd.go
View File

@@ -4,16 +4,17 @@ package systemops
import ( import (
"strings" "strings"
"syscall"
"golang.org/x/sys/unix"
) )
// filterRoutesByFlags returns true if the route message should be ignored based on its flags. // filterRoutesByFlags returns true if the route message should be ignored based on its flags.
func filterRoutesByFlags(routeMessageFlags int) bool { func filterRoutesByFlags(routeMessageFlags int) bool {
if routeMessageFlags&syscall.RTF_UP == 0 { if routeMessageFlags&unix.RTF_UP == 0 {
return true return true
} }
if routeMessageFlags&(syscall.RTF_REJECT|syscall.RTF_BLACKHOLE|syscall.RTF_WASCLONED) != 0 { if routeMessageFlags&(unix.RTF_REJECT|unix.RTF_BLACKHOLE|unix.RTF_WASCLONED) != 0 {
return true return true
} }
@@ -24,42 +25,51 @@ func filterRoutesByFlags(routeMessageFlags int) bool {
func formatBSDFlags(flags int) string { func formatBSDFlags(flags int) string {
var flagStrs []string var flagStrs []string
if flags&syscall.RTF_UP != 0 { if flags&unix.RTF_UP != 0 {
flagStrs = append(flagStrs, "U") flagStrs = append(flagStrs, "U")
} }
if flags&syscall.RTF_GATEWAY != 0 { if flags&unix.RTF_GATEWAY != 0 {
flagStrs = append(flagStrs, "G") flagStrs = append(flagStrs, "G")
} }
if flags&syscall.RTF_HOST != 0 { if flags&unix.RTF_HOST != 0 {
flagStrs = append(flagStrs, "H") flagStrs = append(flagStrs, "H")
} }
if flags&syscall.RTF_REJECT != 0 { if flags&unix.RTF_REJECT != 0 {
flagStrs = append(flagStrs, "R") flagStrs = append(flagStrs, "R")
} }
if flags&syscall.RTF_DYNAMIC != 0 { if flags&unix.RTF_DYNAMIC != 0 {
flagStrs = append(flagStrs, "D") flagStrs = append(flagStrs, "D")
} }
if flags&syscall.RTF_MODIFIED != 0 { if flags&unix.RTF_MODIFIED != 0 {
flagStrs = append(flagStrs, "M") flagStrs = append(flagStrs, "M")
} }
if flags&syscall.RTF_STATIC != 0 { if flags&unix.RTF_STATIC != 0 {
flagStrs = append(flagStrs, "S") flagStrs = append(flagStrs, "S")
} }
if flags&syscall.RTF_LLINFO != 0 { if flags&unix.RTF_LLINFO != 0 {
flagStrs = append(flagStrs, "L") flagStrs = append(flagStrs, "L")
} }
if flags&syscall.RTF_LOCAL != 0 { if flags&unix.RTF_LOCAL != 0 {
flagStrs = append(flagStrs, "l") flagStrs = append(flagStrs, "l")
} }
if flags&syscall.RTF_BLACKHOLE != 0 { if flags&unix.RTF_BLACKHOLE != 0 {
flagStrs = append(flagStrs, "B") flagStrs = append(flagStrs, "B")
} }
if flags&syscall.RTF_CLONING != 0 { if flags&unix.RTF_CLONING != 0 {
flagStrs = append(flagStrs, "C") flagStrs = append(flagStrs, "C")
} }
if flags&syscall.RTF_WASCLONED != 0 { if flags&unix.RTF_WASCLONED != 0 {
flagStrs = append(flagStrs, "W") flagStrs = append(flagStrs, "W")
} }
if flags&unix.RTF_PROTO1 != 0 {
flagStrs = append(flagStrs, "1")
}
if flags&unix.RTF_PROTO2 != 0 {
flagStrs = append(flagStrs, "2")
}
if flags&unix.RTF_PROTO3 != 0 {
flagStrs = append(flagStrs, "3")
}
if len(flagStrs) == 0 { if len(flagStrs) == 0 {
return "-" return "-"

38
client/internal/routemanager/systemops/routeflags_freebsd.go
View File

@@ -4,17 +4,18 @@ package systemops
import ( import (
"strings" "strings"
"syscall"
"golang.org/x/sys/unix"
) )
// filterRoutesByFlags returns true if the route message should be ignored based on its flags. // filterRoutesByFlags returns true if the route message should be ignored based on its flags.
func filterRoutesByFlags(routeMessageFlags int) bool { func filterRoutesByFlags(routeMessageFlags int) bool {
if routeMessageFlags&syscall.RTF_UP == 0 { if routeMessageFlags&unix.RTF_UP == 0 {
return true return true
} }
// NOTE: syscall.RTF_WASCLONED deprecated in FreeBSD 8.0 // NOTE: RTF_WASCLONED deprecated in FreeBSD 8.0
if routeMessageFlags&(syscall.RTF_REJECT|syscall.RTF_BLACKHOLE) != 0 { if routeMessageFlags&(unix.RTF_REJECT|unix.RTF_BLACKHOLE) != 0 {
return true return true
} }
@@ -25,37 +26,46 @@ func filterRoutesByFlags(routeMessageFlags int) bool {
func formatBSDFlags(flags int) string { func formatBSDFlags(flags int) string {
var flagStrs []string var flagStrs []string
if flags&syscall.RTF_UP != 0 { if flags&unix.RTF_UP != 0 {
flagStrs = append(flagStrs, "U") flagStrs = append(flagStrs, "U")
} }
if flags&syscall.RTF_GATEWAY != 0 { if flags&unix.RTF_GATEWAY != 0 {
flagStrs = append(flagStrs, "G") flagStrs = append(flagStrs, "G")
} }
if flags&syscall.RTF_HOST != 0 { if flags&unix.RTF_HOST != 0 {
flagStrs = append(flagStrs, "H") flagStrs = append(flagStrs, "H")
} }
if flags&syscall.RTF_REJECT != 0 { if flags&unix.RTF_REJECT != 0 {
flagStrs = append(flagStrs, "R") flagStrs = append(flagStrs, "R")
} }
if flags&syscall.RTF_DYNAMIC != 0 { if flags&unix.RTF_DYNAMIC != 0 {
flagStrs = append(flagStrs, "D") flagStrs = append(flagStrs, "D")
} }
if flags&syscall.RTF_MODIFIED != 0 { if flags&unix.RTF_MODIFIED != 0 {
flagStrs = append(flagStrs, "M") flagStrs = append(flagStrs, "M")
} }
if flags&syscall.RTF_STATIC != 0 { if flags&unix.RTF_STATIC != 0 {
flagStrs = append(flagStrs, "S") flagStrs = append(flagStrs, "S")
} }
if flags&syscall.RTF_LLINFO != 0 { if flags&unix.RTF_LLINFO != 0 {
flagStrs = append(flagStrs, "L") flagStrs = append(flagStrs, "L")
} }
if flags&syscall.RTF_LOCAL != 0 { if flags&unix.RTF_LOCAL != 0 {
flagStrs = append(flagStrs, "l") flagStrs = append(flagStrs, "l")
} }
if flags&syscall.RTF_BLACKHOLE != 0 { if flags&unix.RTF_BLACKHOLE != 0 {
flagStrs = append(flagStrs, "B") flagStrs = append(flagStrs, "B")
} }
// Note: RTF_CLONING and RTF_WASCLONED deprecated in FreeBSD 8.0 // Note: RTF_CLONING and RTF_WASCLONED deprecated in FreeBSD 8.0
if flags&unix.RTF_PROTO1 != 0 {
flagStrs = append(flagStrs, "1")
}
if flags&unix.RTF_PROTO2 != 0 {
flagStrs = append(flagStrs, "2")
}
if flags&unix.RTF_PROTO3 != 0 {
flagStrs = append(flagStrs, "3")
}
if len(flagStrs) == 0 { if len(flagStrs) == 0 {
return "-" return "-"