Perl->Go: NormalizeServices, expandGroup

go/cmd/spoc1-go/main.go

@@ -3,12 +3,13 @@ package main
 import (
 	"github.com/hknutzen/Netspoc/go/pkg/diag"
 	"github.com/hknutzen/Netspoc/go/pkg/pass1"
-	"os"
 )
 
 func main() {
 	pass1.ImportFromPerl()
-	initialErrors := pass1.ErrorCounter
+
+	pass1.NormalizeServices()
+	pass1.AbortOnError()
 
 	pass1.CheckServiceOwner()
 	pRules, dRules := pass1.ConvertHostsInRules()
@@ -33,6 +34,6 @@ func main() {
 		pass1.PrintCode(pass1.OutDir)
 		pass1.CopyRaw(pass1.InPath, pass1.OutDir)
 	}
+	pass1.AbortOnError()
 	diag.Progress("Finished pass1")
-	os.Exit(pass1.ErrorCounter - initialErrors)
 }

go/pkg/pass1/address.go

@@ -11,7 +11,7 @@ func getHostMask(ip net.IP, ipv6 bool) net.IPMask {
 	return net.CIDRMask(32, 32)
 }
 
-var zeroIP = net.ParseIP("0.0.0.0")
+var zeroIP = net.ParseIP("0.0.0.0").To4()
 var zeroIPv6 = net.ParseIP("::")
 
 func getZeroIp(ipv6 bool) net.IP {

go/pkg/pass1/check-redundant.go

@@ -106,7 +106,7 @@ func getOrigPrt(rule *expandedRule) *proto {
 # Expand rules and check them for redundancy
 ########################################################################*/
 
-// Derive reduced 'local_up' relation from 'up' relation between protocols.
+// Derive reduced 'localUp' relation from 'up' relation between protocols.
 // Reduced relation has only protocols that are referenced in list of rules.
 // New relation is used in findRedundantRules.
 // We get better performance compared to original relation, because

go/pkg/pass1/check-service-owner.go

@@ -415,20 +415,23 @@ func CheckServiceOwner() {
 					// if objects of user and objects of rules are swapped.
 					var userOwner *owner
 					simpleUser := true
-					for _, user := range svc.user {
-						owner := user.getOwner()
-						if owner == nil {
+					for _, user := range svc.expandedUser {
+						var o *owner
+						if obj, ok := user.(srvObj); ok {
+							o = obj.getOwner()
+						}
+						if o == nil {
 							simpleUser = false
 							break
 						}
 						if userOwner == nil {
-							userOwner = owner
-						} else if userOwner != owner {
+							userOwner = o
+						} else if userOwner != o {
 							simpleUser = false
 							break
 						}
 					}
-					if simpleUser {
+					if simpleUser && userOwner != nil {
 						warnMsg("Useless use of attribute 'multi_owner' at %s\n"+
 							" All 'user' objects belong to single %s.\n"+
 							" Either swap objects of 'user' and objects of rules,\n"+

go/pkg/pass1/check-supernet.go

@@ -102,7 +102,7 @@ func findZoneNetworks(zone *zone, ip net.IP, mask net.IPMask, natSet natSet, net
 			}
 		}
 	}
-	key := string(ip) + string(mask)
+	key := ipmask{string(ip), string(mask)}
 	aggregate := zone.ipmask2aggregate[key]
 	if aggregate != nil && !aggregate.invisible {
 		if inNetHash(aggregate) {
@@ -134,7 +134,7 @@ func findZoneNetworks(zone *zone, ip net.IP, mask net.IPMask, natSet natSet, net
 		}
 	}
 	if zone.ipmask2net == nil {
-		zone.ipmask2net = make(map[string]netList)
+		zone.ipmask2net = make(map[ipmask]netList)
 	}
 	zone.ipmask2net[key] = result
 	return result

go/pkg/pass1/error.go

@@ -21,14 +21,14 @@ func debug(format string, args ...interface{}) {
 func checkAbort() {
 	ErrorCounter++
 	if ErrorCounter >= conf.Conf.MaxErrors {
-		fmt.Fprintf(os.Stderr, "Aborted after %d errors\n", ErrorCounter)
+//		fmt.Fprintf(os.Stderr, "Aborted after %d errors\n", ErrorCounter)
 		os.Exit(ErrorCounter)
 	}
 }
 
-func abortOnError() {
+func AbortOnError() {
 	if ErrorCounter > 0 {
-		fmt.Fprintf(os.Stderr, "Aborted with %d errors\n", ErrorCounter)
+		//		fmt.Fprintf(os.Stderr, "Aborted with %d error(s)\n", ErrorCounter)
 		os.Exit(ErrorCounter)
 	}
 }
@@ -40,7 +40,7 @@ func errMsg(format string, args ...interface{}) {
 }
 
 func internalErr(format string, args ...interface{}) {
-	abortOnError()
+	AbortOnError()
 	string := "Internal error: " + fmt.Sprintf(format, args...)
 	fmt.Fprintln(os.Stderr, string)
 	checkAbort()