qdm12/gluetun
1
0
Fork 0
mirror of https://github.com/qdm12/gluetun.git synced 2025-12-10 20:07:32 -06:00
Code Issues Packages Projects Releases 71 Wiki Activity

Maint: merge subnet.FindSubnetsToAdd and subnet.FindSubnetsToRemove in subnet.FindSubnetsToChange

Browse Source
This commit is contained in:
Quentin McGaw (desktop) 2021-08-25 17:25:36 +00:00
parent 04fad1b781
commit ffeeae91ab
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/firewall/outboundsubnets.go
View File

@ -25,8 +25,7 @@ func (c *Config) SetOutboundSubnets(ctx context.Context, subnets []net.IPNet) (e
c.logger.Info("setting allowed subnets through firewall...") c.logger.Info("setting allowed subnets through firewall...")
subnetsToAdd := subnet.FindSubnetsToAdd(c.outboundSubnets, subnets) subnetsToAdd, subnetsToRemove := subnet.FindSubnetsToChange(c.outboundSubnets, subnets)
subnetsToRemove := subnet.FindSubnetsToRemove(c.outboundSubnets, subnets)
if len(subnetsToAdd) == 0 && len(subnetsToRemove) == 0 { if len(subnetsToAdd) == 0 && len(subnetsToRemove) == 0 {
return nil return nil
} }

4
internal/routing/outboundsubnets.go
View File

@ -29,8 +29,8 @@ func (r *Routing) setOutboundRoutes(outboundSubnets []net.IPNet,
r.stateMutex.Lock() r.stateMutex.Lock()
defer r.stateMutex.Unlock() defer r.stateMutex.Unlock()
subnetsToRemove := subnet.FindSubnetsToRemove(r.outboundSubnets, outboundSubnets) subnetsToAdd, subnetsToRemove := subnet.FindSubnetsToChange(
subnetsToAdd := subnet.FindSubnetsToAdd(r.outboundSubnets, outboundSubnets) r.outboundSubnets, outboundSubnets)
if len(subnetsToAdd) == 0 && len(subnetsToRemove) == 0 { if len(subnetsToAdd) == 0 && len(subnetsToRemove) == 0 {
return nil return nil

10
internal/subnet/subnets.go
View File

@ -4,7 +4,13 @@ import (
"net" "net"
) )
func FindSubnetsToAdd(oldSubnets, newSubnets []net.IPNet) (subnetsToAdd []net.IPNet) { func FindSubnetsToChange(oldSubnets, newSubnets []net.IPNet) (subnetsToAdd, subnetsToRemove []net.IPNet) {
subnetsToAdd = findSubnetsToAdd(oldSubnets, newSubnets)
subnetsToRemove = findSubnetsToRemove(oldSubnets, newSubnets)
return subnetsToAdd, subnetsToRemove
}
func findSubnetsToAdd(oldSubnets, newSubnets []net.IPNet) (subnetsToAdd []net.IPNet) {
for _, newSubnet := range newSubnets { for _, newSubnet := range newSubnets {
found := false found := false
for _, oldSubnet := range oldSubnets { for _, oldSubnet := range oldSubnets {
@ -20,7 +26,7 @@ func FindSubnetsToAdd(oldSubnets, newSubnets []net.IPNet) (subnetsToAdd []net.IP
return subnetsToAdd return subnetsToAdd
} }
func FindSubnetsToRemove(oldSubnets, newSubnets []net.IPNet) (subnetsToRemove []net.IPNet) { func findSubnetsToRemove(oldSubnets, newSubnets []net.IPNet) (subnetsToRemove []net.IPNet) {
for _, oldSubnet := range oldSubnets { for _, oldSubnet := range oldSubnets {
found := false found := false
for _, newSubnet := range newSubnets { for _, newSubnet := range newSubnets {