method sortByName of type stringerList

+ more use of type stringerList[...] and its method 'push'

Author: hknutzen

go/pkg/pass1/check-unstable-nat-rules.go

@@ -1,7 +1,5 @@
 package pass1
 
-import ()
-
 func (c *spoc) checkUnstableNatRules() {
 	c.progress("Checking rules for unstable subnet relation")
 	process := func(l ruleList) {
@@ -11,7 +9,7 @@ func (c *spoc) checkUnstableNatRules() {
 				for _, obj := range l {
 					if n, ok := obj.(*network); ok {
 						if n.unstableNat != nil {
-							result = append(result, n)
+							result.push(n)
 						}
 					}
 				}

go/pkg/pass1/collect-routers-and-networks.go

@@ -1,21 +1,12 @@
 package pass1
 
-import (
-	"slices"
-	"strings"
-)
-
 func (c *spoc) collectRoutersAndNetworks() {
-	rl := c.allRouters
-	slices.SortFunc(rl, func(a, b *router) int {
-		return strings.Compare(a.name, b.name)
-	})
-	for _, r := range rl {
+	c.allRouters.sortByName()
+	for _, r := range c.allRouters {
 		if r.managed != "" || r.routingOnly {
-			c.managedRouters = append(c.managedRouters, r)
+			c.managedRouters.push(r)
 		}
 	}
-	c.allRouters = rl
 
 	// Collect vrf instances belonging to one device.
 	// Also collect all IPv4 and IPv6 routers with same name.

go/pkg/pass1/nat.go

@@ -555,15 +555,9 @@ func (c *spoc) errMissinNatOutside(
 			}
 		}
 	}
-	sortByName := func(l intfList) intfList {
-		slices.SortFunc(l, func(a, b *routerIntf) int {
-			return strings.Compare(a.name, b.name)
-		})
-		return l
-	}
-	natIntf = slices.Compact(sortByName(natIntf))
+	natIntf = slices.Compact(natIntf.sortByName())
 	natInfos := make(stringList, len(natIntf))
-	missingIntf = slices.Compact(sortByName(missingIntf))
+	missingIntf = slices.Compact(missingIntf.sortByName())
 	for i, intf := range natIntf {
 		natInfos[i] = intf.name
 		if isNatIncoming(tag, intf) {

go/pkg/pass1/print-code.go

@@ -1477,14 +1477,14 @@ func (c *spoc) printCrypto(fh *os.File, r *router) {
 	cryptoType := r.model.crypto
 
 	// List of ipsec definitions used at current router.
-	var ipsecList []*ipsec
+	var ipsecList stringerList[ipsec]
 	seenIpsec := make(map[*ipsec]bool)
 	for _, intf := range r.interfaces {
 		if intf.ipType == tunnelIP {
 			s := intf.getCrypto().ipsec
 			if !seenIpsec[s] {
 				seenIpsec[s] = true
-				ipsecList = append(ipsecList, s)
+				ipsecList.push(s)
 			}
 		}
 	}
@@ -1495,12 +1495,9 @@ func (c *spoc) printCrypto(fh *os.File, r *router) {
 	}
 
 	// Sort entries by name to get deterministic output.
-	slices.SortFunc(ipsecList, func(a, b *ipsec) int {
-		return strings.Compare(a.name, b.name)
-	})
+	ipsecList = ipsecList.sortByName()
 
 	// List of isakmp definitions used at current router.
-	// Sort entries by name to get deterministic output.
 	var isakmpList []*isakmp
 	seenIsakmp := make(map[*isakmp]bool)
 	for _, i := range ipsecList {

go/pkg/pass1/routes.go

@@ -3,7 +3,6 @@ package pass1
 import (
 	"fmt"
 	"slices"
-	"strings"
 )
 
 /*
@@ -872,20 +871,8 @@ func (c *spoc) checkDuplicateRoutes(r *router) {
 				net2intf[n] = intf
 			}
 
-			// Sort for finding duplicates and for deterministic error messages.
-			slices.SortFunc(hopList, func(a, b *routerIntf) int {
-				return strings.Compare(a.name, b.name)
-			})
-			j := 0
-			var prev *routerIntf
-			for _, hop := range hopList {
-				if hop != prev {
-					hopList[j] = hop
-					j++
-					prev = hop
-				}
-			}
-			hopList = hopList[:j]
+			// Sort for deterministic error messages.
+			hopList = slices.Compact(hopList.sortByName())
 
 			// Simple case: one hop
 			if len(hopList) == 1 {

go/pkg/pass1/set-zone.go

@@ -319,7 +319,7 @@ attribute needProtect.
 Parameter : Map with crosslinked routers having attribute needProtect set.
 */
 func clusterCrosslinkRouters(crosslinkRouters map[*router]bool) {
-	var cluster []*router
+	var cluster stringerList[router]
 	seen := make(map[*router]bool)
 
 	// Add routers to cluster via depth first search.
@@ -352,10 +352,7 @@ func clusterCrosslinkRouters(crosslinkRouters map[*router]bool) {
 		// Fill router cluster
 		cluster = nil
 		walk(r)
-
-		slices.SortFunc(cluster, func(a, b *router) int {
-			return strings.Compare(a.name, b.name)
-		})
+		cluster.sortByName()
 
 		// Collect all interfaces belonging to needProtect routers of cluster...
 		var crosslinkIntfs intfList
@@ -387,9 +384,7 @@ type bLookup map[*routerIntf]borderType
 // setAreas sets up areas, assure proper border definitions.
 func (c *spoc) setAreas() map[pathObj]map[*area]bool {
 	objInArea := make(map[pathObj]map[*area]bool)
-	slices.SortFunc(c.ascendingAreas, func(a, b *area) int {
-		return cmp.Compare(a.name, b.name)
-	})
+	c.ascendingAreas.sortByName()
 	for _, a := range c.ascendingAreas {
 		if n := a.anchor; n != nil {
 			c.setArea(n.zone, a, nil, nil, objInArea)

go/pkg/pass1/setup-objects.go

@@ -351,7 +351,7 @@ func (c *spoc) setupRouter46(a *ast.Router) {
 		r.ipV6 = false
 		stripFilterOnly(r, r6.interfaces)
 		c.setupRouter2(r)
-		c.allRouters = append(c.allRouters, r)
+		c.allRouters.push(r)
 	}
 	if r6.interfaces != nil {
 		if r.interfaces == nil {
@@ -361,7 +361,7 @@ func (c *spoc) setupRouter46(a *ast.Router) {
 		r6.ipV6 = true
 		stripFilterOnly(r6, r.interfaces)
 		c.setupRouter2(r6)
-		c.allRouters = append(c.allRouters, r6)
+		c.allRouters.push(r6)
 	}
 }
 
@@ -1331,7 +1331,7 @@ func (c *spoc) setupArea(v *ast.Area) {
 		}
 		l := groupObjList{n}
 		if n2 := n.combined46; n2 != nil {
-			l = append(l, n2)
+			l.push(n2)
 		}
 		if len(l) >= 1 {
 			n := l[0].(*network)
@@ -1364,7 +1364,7 @@ func (c *spoc) setupArea(v *ast.Area) {
 			}
 		}
 	}
-	c.ascendingAreas = append(c.ascendingAreas, ar)
+	c.ascendingAreas.push(ar)
 	if p := ar.routerAttributes.policyDistributionPoint; p != nil {
 		if p.ipV6 != ar.ipV6 {
 			if ar2 == nil {
@@ -1386,7 +1386,7 @@ func (c *spoc) setupArea(v *ast.Area) {
 		// Attribute 'nat' is only applied to IPv4 part in
 		// combined v4/v6 area.
 		ar2.nat = nil
-		c.ascendingAreas = append(c.ascendingAreas, ar2)
+		c.ascendingAreas.push(ar2)
 	}
 }
 
@@ -3219,7 +3219,7 @@ func (c *spoc) tryNetworkRefList(a *ast.Attribute, ctx string) netList {
 		if len(name) == len(v) {
 			c.err("Expected type 'network:' in %s", ctx2)
 		} else if n, found := c.symTable.network[name]; found {
-			result = append(result, n)
+			result.push(n)
 		} else {
 			c.warn("Ignoring undefined network:%s in %s", name, ctx2)
 		}
@@ -3946,7 +3946,7 @@ func (c *spoc) moveLockedIntf(intf *routerIntf) {
 	cp.origRouter = orig
 	cp.interfaces = intfList{intf}
 	intf.router = &cp
-	c.allRouters = append(c.allRouters, &cp)
+	c.allRouters.push(&cp)
 
 	// Don't check fragment for reachability.
 	cp.policyDistributionPoint = nil

go/pkg/pass1/spoc.go

@@ -32,12 +32,12 @@ type spoc struct {
 	symTable              *symbolTable
 	userObj               userInfo
 	allNetworks           netList
-	allRouters            []*router
-	managedRouters        []*router
+	allRouters            stringerList[router]
+	managedRouters        stringerList[router]
 	allPathRules          pathRules
 	allZones              []*zone
 	ascendingServices     []*service
-	ascendingAreas        []*area
+	ascendingAreas        stringerList[area]
 	pathrestrictions      []*pathRestriction
 	prt                   *stdProto
 	network00             *network

go/pkg/pass1/types.go

@@ -3,6 +3,8 @@ package pass1
 import (
 	"fmt"
 	"net/netip"
+	"slices"
+	"strings"
 
 	"github.com/hknutzen/Netspoc/go/pkg/ast"
 
@@ -15,6 +17,13 @@ func (a *stringerList[E]) push(e *E) {
 	*a = append(*a, e)
 }
 
+func (l stringerList[E]) sortByName() stringerList[E] {
+	slices.SortFunc(l, func(a, b *E) int {
+		return strings.Compare((*a).String(), (*b).String())
+	})
+	return l
+}
+
 type intfList = stringerList[routerIntf]
 
 type stringList []string
@@ -491,6 +500,9 @@ type ipsec struct {
 	espEncryption     string
 	pfsGroup          string
 }
+
+func (x ipsec) String() string { return x.name }
+
 type isakmp struct {
 	name           string
 	authentication string