TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

util/linuxfw: rename ErrorFWModeNotSupported

Browse Source 
Go style is for error variables to start with "err" (or "Err")
and for error types to end in "Error".

Updates #cleanup

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2023-08-10 08:51:29 -07:00 committed by Brad Fitzpatrick
parent 3d56cafd7d
commit 7a5263e6d0
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
util/linuxfw/iptables.go
View File

@ -49,7 +49,7 @@ func DetectIptables() (int, error) {
case err != nil && ip6err == nil:
allLines = ip6lines
default:
return 0, ErrorFWModeNotSupported{
return 0, FWModeNotSupportedError{
Mode: FirewallModeIPTables,
Err: fmt.Errorf("iptables command run fail: %w", multierr.New(err, ip6err)),
}

10
util/linuxfw/linuxfw.go
View File

@ -29,21 +29,21 @@
Masq
)
type ErrorFWModeNotSupported struct {
type FWModeNotSupportedError struct {
Mode FirewallMode
Err error
}
func (e ErrorFWModeNotSupported) Error() string {
func (e FWModeNotSupportedError) Error() string {
return fmt.Sprintf("firewall mode %q not supported: %v", e.Mode, e.Err)
}
func (e ErrorFWModeNotSupported) Is(target error) bool {
_, ok := target.(ErrorFWModeNotSupported)
func (e FWModeNotSupportedError) Is(target error) bool {
_, ok := target.(FWModeNotSupportedError)
return ok
}
func (e ErrorFWModeNotSupported) Unwrap() error {
func (e FWModeNotSupportedError) Unwrap() error {
return e.Err
}

4
util/linuxfw/nftables.go
View File

@ -107,7 +107,7 @@ func DebugNetfilter(logf logger.Logf) error {
func DetectNetfilter() (int, error) {
conn, err := nftables.New()
if err != nil {
return 0, ErrorFWModeNotSupported{
return 0, FWModeNotSupportedError{
Mode: FirewallModeNfTables,
Err: err,
}
@ -115,7 +115,7 @@ func DetectNetfilter() (int, error) {
chains, err := conn.ListChains()
if err != nil {
return 0, ErrorFWModeNotSupported{
return 0, FWModeNotSupportedError{
Mode: FirewallModeNfTables,
Err: fmt.Errorf("cannot list chains: %w", err),
}