Removed attribute isLayer3 of type network

hknutzen · Feb 27, 2024 · c4e3fed · c4e3fed
1 parent d3210fa
commit c4e3fed
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/go/pkg/pass1/find-subnets.go b/go/pkg/pass1/find-subnets.go
@@ -485,7 +485,7 @@ func (c *spoc) findSubnetsInNatDomain0(domains []*natDomain, networks netList) {
 			subnet := origNet[natSubnet]
 			bignet := origNet[natBignet]
 
-			if !natSubnet.isLayer3 {
+			if l := natSubnet.interfaces; !(len(l) == 1 && l[0].isLayer3) {
 				subnet.subnetOfUsed = true
 				if printType := c.conf.CheckSubnets; printType != "" &&
 					// Take original bignet, because currently

diff --git a/go/pkg/pass1/setup-objects.go b/go/pkg/pass1/setup-objects.go
@@ -1890,7 +1890,6 @@ func (c *spoc) setupInterface(v *ast.Attribute,
 			// Mark as automatically created.
 			n.loopback = true
 			n.subnetOf = subnetOf
-			n.isLayer3 = intf.isLayer3
 			n.ipV6 = v6
 
 			// Move NAT definition to loopback network.

diff --git a/go/pkg/pass1/types.go b/go/pkg/pass1/types.go
@@ -150,7 +150,6 @@ type network struct {
 	ipp                  netip.Prefix
 	ipType               int
 	isAggregate          bool
-	isLayer3             bool
 	link                 *network
 	loopback             bool
 	maxRoutingNet        *network