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

Maint: internal/subnet package

Browse Source
This commit is contained in:
Quentin McGaw (desktop)
2021-08-25 17:22:48 +00:00
parent dcaf952986
commit 04fad1b781
4 changed files with 18 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/routing/outboundsubnets.go
View File

@@ -4,6 +4,8 @@ import (
"errors"
"fmt"
"net"
"github.com/qdm12/gluetun/internal/subnet"
)
var (
@@ -27,8 +29,8 @@ func (r *Routing) setOutboundRoutes(outboundSubnets []net.IPNet,
r.stateMutex.Lock()
defer r.stateMutex.Unlock()
subnetsToRemove := findSubnetsToRemove(r.outboundSubnets, outboundSubnets)
subnetsToAdd := findSubnetsToAdd(r.outboundSubnets, outboundSubnets)
subnetsToRemove := subnet.FindSubnetsToRemove(r.outboundSubnets, outboundSubnets)
subnetsToAdd := subnet.FindSubnetsToAdd(r.outboundSubnets, outboundSubnets)
if len(subnetsToAdd) == 0 && len(subnetsToRemove) == 0 {
return nil
@@ -40,13 +42,13 @@ func (r *Routing) setOutboundRoutes(outboundSubnets []net.IPNet,
func (r *Routing) removeOutboundSubnets(subnets []net.IPNet,
defaultInterfaceName string, defaultGateway net.IP) {
for _, subnet := range subnets {
for _, subNet := range subnets {
const table = 0
if err := r.deleteRouteVia(subnet, defaultGateway, defaultInterfaceName, table); err != nil {
if err := r.deleteRouteVia(subNet, defaultGateway, defaultInterfaceName, table); err != nil {
r.logger.Error("cannot remove outdated outbound subnet from routing: " + err.Error())
continue
}
r.outboundSubnets = removeSubnetFromSubnets(r.outboundSubnets, subnet)
r.outboundSubnets = subnet.RemoveSubnetFromSubnets(r.outboundSubnets, subNet)
}
}

53
internal/routing/subnets.go
View File

@@ -1,53 +0,0 @@
package routing
import (
"net"
)
func findSubnetsToAdd(oldSubnets, newSubnets []net.IPNet) (subnetsToAdd []net.IPNet) {
for _, newSubnet := range newSubnets {
found := false
for _, oldSubnet := range oldSubnets {
if subnetsAreEqual(oldSubnet, newSubnet) {
found = true
break
}
}
if !found {
subnetsToAdd = append(subnetsToAdd, newSubnet)
}
}
return subnetsToAdd
}
func findSubnetsToRemove(oldSubnets, newSubnets []net.IPNet) (subnetsToRemove []net.IPNet) {
for _, oldSubnet := range oldSubnets {
found := false
for _, newSubnet := range newSubnets {
if subnetsAreEqual(oldSubnet, newSubnet) {
found = true
break
}
}
if !found {
subnetsToRemove = append(subnetsToRemove, oldSubnet)
}
}
return subnetsToRemove
}
func subnetsAreEqual(a, b net.IPNet) bool {
return a.IP.Equal(b.IP) && a.Mask.String() == b.Mask.String()
}
func removeSubnetFromSubnets(subnets []net.IPNet, subnet net.IPNet) []net.IPNet {
L := len(subnets)
for i := range subnets {
if subnetsAreEqual(subnet, subnets[i]) {
subnets[i] = subnets[L-1]
subnets = subnets[:L-1]
break
}
}
return subnets
}