admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(errors): review all errors in codebase

Browse Source
This commit is contained in:
Quentin McGaw
2022-02-20 02:58:16 +00:00
parent ac4a4f83fc
commit 920ad8b54b
88 changed files with 254 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/routing/outbound.go
View File

@@ -1,7 +1,6 @@
package routing
import (
"errors"
"fmt"
"net"
@@ -13,10 +12,6 @@ const (
outboundPriority = 99
)
var (
errAddOutboundSubnet = errors.New("cannot add outbound subnet to routes")
)
type OutboundRoutesSetter interface {
SetOutboundRoutes(outboundSubnets []net.IPNet) error
}
@@ -48,7 +43,7 @@ func (r *Routing) setOutboundRoutes(outboundSubnets []net.IPNet,
err = r.addOutboundSubnets(subnetsToAdd, defaultInterfaceName, defaultGateway)
if err != nil {
return fmt.Errorf("%w: %s", errAddOutboundSubnet, err)
return fmt.Errorf("cannot add outbound subnet to routes: %w", err)
}
return nil
@@ -68,7 +63,7 @@ func (r *Routing) removeOutboundSubnets(subnets []net.IPNet,
err = r.deleteIPRule(ruleSrcNet, ruleDstNet, outboundTable, outboundPriority)
if err != nil {
warnings = append(warnings,
errRuleDelete.Error()+": for subnet "+subNet.String()+": "+err.Error())
"cannot delete rule: for subnet "+subNet.String()+": "+err.Error())
continue
}
@@ -83,16 +78,14 @@ func (r *Routing) addOutboundSubnets(subnets []net.IPNet,
for i, subnet := range subnets {
err := r.addRouteVia(subnet, defaultGateway, defaultInterfaceName, outboundTable)
if err != nil {
return fmt.Errorf("%w: for subnet %s: %s",
errRouteAdd, subnet, err)
return fmt.Errorf("cannot add route for subnet %s: %w", subnet, err)
}
ruleSrcNet := (*net.IPNet)(nil)
ruleDstNet := &subnets[i]
err = r.addIPRule(ruleSrcNet, ruleDstNet, outboundTable, outboundPriority)
if err != nil {
return fmt.Errorf("%w: for subnet %s: %s",
errRuleAdd, subnet, err)
return fmt.Errorf("cannot add rule: for subnet %s: %w", subnet, err)
}
r.outboundSubnets = append(r.outboundSubnets, subnet)