Maint: internal/routing/inbound.go file

internal/routing/enable.go

@@ -3,22 +3,13 @@ package routing
 import (
 	"errors"
 	"fmt"
-	"net"
-)
-
-const (
-	table    = 200
-	priority = 100
 )
 
 var (
-	ErrDefaultIP          = errors.New("cannot get default IP address")
+	ErrDefaultRoute          = errors.New("cannot get default route")
-	ErrDefaultRoute       = errors.New("cannot get default route")
+	ErrAddInboundFromDefault = errors.New("cannot add routes for inbound traffic from default IP")
-	ErrIPRuleAdd          = errors.New("cannot add IP rule")
+	ErrDelInboundFromDefault = errors.New("cannot remove routes for inbound traffic from default IP")
-	ErrIPRuleDelete       = errors.New("cannot delete IP rule")
+	ErrSubnetsOutboundSet    = errors.New("cannot set outbound subnets routes")
-	ErrRouteAdd           = errors.New("cannot add route")
-	ErrRouteDelete        = errors.New("cannot delete route")
-	ErrSubnetsOutboundSet = errors.New("cannot set outbound subnets routes")
 )
 
 type Setuper interface {
@@ -26,10 +17,6 @@ type Setuper interface {
 }
 
 func (r *Routing) Setup() (err error) {
-	defaultIP, err := r.DefaultIP()
-	if err != nil {
-		return fmt.Errorf("%w: %s", ErrDefaultIP, err)
-	}
 	defaultInterfaceName, defaultGateway, err := r.DefaultRoute()
 	if err != nil {
 		return fmt.Errorf("%w: %s", ErrDefaultRoute, err)
@@ -43,15 +30,12 @@ func (r *Routing) Setup() (err error) {
 			}
 		}
 	}()
-	if err := r.addIPRule(defaultIP, table, priority); err != nil {
-		return fmt.Errorf("%w: %s", ErrIPRuleAdd, err)
-	}
 
 	touched = true
 
-	defaultDestination := net.IPNet{IP: net.IPv4(0, 0, 0, 0), Mask: net.IPv4Mask(0, 0, 0, 0)}
+	err = r.routeInboundFromDefault(defaultGateway, defaultInterfaceName)
-	if err := r.addRouteVia(defaultDestination, defaultGateway, defaultInterfaceName, table); err != nil {
+	if err != nil {
-		return fmt.Errorf("%w: %s", ErrRouteAdd, err)
+		return fmt.Errorf("%w: %s", ErrAddInboundFromDefault, err)
 	}
 
 	r.stateMutex.RLock()
@@ -69,21 +53,14 @@ type TearDowner interface {
 }
 
 func (r *Routing) TearDown() error {
-	defaultIP, err := r.DefaultIP()
-	if err != nil {
-		return fmt.Errorf("%w: %s", ErrDefaultIP, err)
-	}
 	defaultInterfaceName, defaultGateway, err := r.DefaultRoute()
 	if err != nil {
 		return fmt.Errorf("%w: %s", ErrDefaultRoute, err)
 	}
 
-	defaultNet := net.IPNet{IP: net.IPv4(0, 0, 0, 0), Mask: net.IPv4Mask(0, 0, 0, 0)}
+	err = r.unrouteInboundFromDefault(defaultGateway, defaultInterfaceName)
-	if err := r.deleteRouteVia(defaultNet, defaultGateway, defaultInterfaceName, table); err != nil {
+	if err != nil {
-		return fmt.Errorf("%w: %s", ErrRouteDelete, err)
+		return fmt.Errorf("%w: %s", ErrDelInboundFromDefault, err)
-	}
-	if err := r.deleteIPRule(defaultIP, table, priority); err != nil {
-		return fmt.Errorf("%w: %s", ErrIPRuleDelete, err)
 	}
 
 	if err := r.setOutboundRoutes(nil, defaultInterfaceName, defaultGateway); err != nil {

internal/routing/inbound.go

@@ -0,0 +1,74 @@
+package routing
+
+import (
+	"errors"
+	"fmt"
+	"net"
+)
+
+const (
+	inboundTable    = 200
+	inboundPriority = 100
+)
+
+var (
+	errDefaultIP   = errors.New("cannot get default IP address")
+	errRuleAdd     = errors.New("cannot add rule")
+	errRouteAdd    = errors.New("cannot add route")
+	errRuleDelete  = errors.New("cannot delete rule")
+	errRouteDelete = errors.New("cannot delete route")
+)
+
+func (r *Routing) routeInboundFromDefault(defaultGateway net.IP,
+	defaultInterface string) (err error) {
+	if err := r.addRuleInboundFromDefault(inboundTable); err != nil {
+		return fmt.Errorf("%w: %s", errRuleAdd, err)
+	}
+
+	defaultDestination := net.IPNet{IP: net.IPv4(0, 0, 0, 0), Mask: net.IPv4Mask(0, 0, 0, 0)}
+	if err := r.addRouteVia(defaultDestination, defaultGateway, defaultInterface, inboundTable); err != nil {
+		return fmt.Errorf("%w: %s", errRouteAdd, err)
+	}
+
+	return nil
+}
+
+func (r *Routing) unrouteInboundFromDefault(defaultGateway net.IP,
+	defaultInterface string) (err error) {
+	defaultDestination := net.IPNet{IP: net.IPv4(0, 0, 0, 0), Mask: net.IPv4Mask(0, 0, 0, 0)}
+	if err := r.deleteRouteVia(defaultDestination, defaultGateway, defaultInterface, inboundTable); err != nil {
+		return fmt.Errorf("%w: %s", errRouteDelete, err)
+	}
+
+	if err := r.delRuleInboundFromDefault(inboundTable); err != nil {
+		return fmt.Errorf("%w: %s", errRuleDelete, err)
+	}
+
+	return nil
+}
+
+func (r *Routing) addRuleInboundFromDefault(table int) (err error) {
+	defaultIP, err := r.DefaultIP()
+	if err != nil {
+		return fmt.Errorf("%w: %s", errDefaultIP, err)
+	}
+
+	if err := r.addIPRule(defaultIP, table, inboundPriority); err != nil {
+		return fmt.Errorf("%w: %s", errIPRuleAdd, err)
+	}
+
+	return nil
+}
+
+func (r *Routing) delRuleInboundFromDefault(table int) (err error) {
+	defaultIP, err := r.DefaultIP()
+	if err != nil {
+		return fmt.Errorf("%w: %s", errDefaultIP, err)
+	}
+
+	if err := r.deleteIPRule(defaultIP, table, inboundPriority); err != nil {
+		return fmt.Errorf("%w: %s", errIPRuleAdd, err)
+	}
+
+	return nil
+}

internal/routing/rules.go

@@ -11,6 +11,7 @@ import (
 )
 
 var (
+	errIPRuleAdd = errors.New("cannot add IP rule")
 	errRulesList = errors.New("cannot list rules")
 )