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

Maintenance: improve error codes in IP routing

Browse Source
This commit is contained in:
Quentin McGaw
2021-05-10 17:33:31 +00:00
parent 5a0418bba6
commit 810ff62c26
5 changed files with 103 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
internal/routing/enable.go
View File

@@ -1,28 +1,33 @@
package routing
import (
"errors"
"fmt"
"net"
)
var (
ErrSetup = fmt.Errorf("cannot setup routing")
ErrTeardown = fmt.Errorf("cannot teardown routing")
)
const (
table = 200
priority = 100
)
var (
ErrDefaultIP = errors.New("cannot get default IP address")
ErrDefaultRoute = errors.New("cannot get default route")
ErrIPRuleAdd = errors.New("cannot add IP rule")
ErrIPRuleDelete = errors.New("cannot delete IP rule")
ErrRouteAdd = errors.New("cannot add route")
ErrSubnetsOutboundSet = errors.New("cannot set outbound subnets routes")
)
func (r *routing) Setup() (err error) {
defaultIP, err := r.DefaultIP()
if err != nil {
return fmt.Errorf("%s: %w", ErrSetup, err)
return fmt.Errorf("%w: %s", ErrDefaultIP, err)
}
defaultInterfaceName, defaultGateway, err := r.DefaultRoute()
if err != nil {
return fmt.Errorf("%s: %w", ErrSetup, err)
return fmt.Errorf("%w: %s", ErrDefaultRoute, err)
}
defer func() {
@@ -30,22 +35,22 @@ func (r *routing) Setup() (err error) {
return
}
if err := r.TearDown(); err != nil {
r.logger.Error(err)
r.logger.Error("cannot reverse routing changes: " + err.Error())
}
}()
if err := r.addIPRule(defaultIP, table, priority); err != nil {
return fmt.Errorf("%s: %w", ErrSetup, err)
return fmt.Errorf("%w: %s", ErrIPRuleAdd, err)
}
defaultDestination := net.IPNet{IP: net.IPv4(0, 0, 0, 0), Mask: net.IPv4Mask(0, 0, 0, 0)}
if err := r.addRouteVia(defaultDestination, defaultGateway, defaultInterfaceName, table); err != nil {
return fmt.Errorf("%s: %w", ErrSetup, err)
return fmt.Errorf("%w: %s", ErrRouteAdd, err)
}
r.stateMutex.RLock()
outboundSubnets := r.outboundSubnets
r.stateMutex.RUnlock()
if err := r.setOutboundRoutes(outboundSubnets, defaultInterfaceName, defaultGateway); err != nil {
return fmt.Errorf("%s: %w", ErrSetup, err)
return fmt.Errorf("%w: %s", ErrSubnetsOutboundSet, err)
}
return nil
@@ -54,23 +59,23 @@ func (r *routing) Setup() (err error) {
func (r *routing) TearDown() error {
defaultIP, err := r.DefaultIP()
if err != nil {
return fmt.Errorf("%s: %w", ErrTeardown, err)
return fmt.Errorf("%w: %s", ErrDefaultIP, err)
}
defaultInterfaceName, defaultGateway, err := r.DefaultRoute()
if err != nil {
return fmt.Errorf("%s: %w", ErrTeardown, err)
return fmt.Errorf("%w: %s", ErrDefaultRoute, err)
}
defaultNet := net.IPNet{IP: net.IPv4(0, 0, 0, 0), Mask: net.IPv4Mask(0, 0, 0, 0)}
if err := r.deleteRouteVia(defaultNet, defaultGateway, defaultInterfaceName, table); err != nil {
return fmt.Errorf("%s: %w", ErrTeardown, err)
return fmt.Errorf("%w: %s", ErrRouteDelete, err)
}
if err := r.deleteIPRule(defaultIP, table, priority); err != nil {
return fmt.Errorf("%s: %w", ErrTeardown, err)
return fmt.Errorf("%w: %s", ErrIPRuleDelete, err)
}
if err := r.setOutboundRoutes(nil, defaultInterfaceName, defaultGateway); err != nil {
return fmt.Errorf("%s: %w", ErrSetup, err)
return fmt.Errorf("%w: %s", ErrSubnetsOutboundSet, err)
}
return nil