FIXED:
* host splitter wasn't working quite correctly; this has been fixed.
This commit is contained in:
brent saner
2025-04-06 18:26:18 -04:00
parent fd344f3b8e
commit 3c1bc832c0
7 changed files with 221 additions and 90 deletions

View File

@@ -401,7 +401,9 @@ func printNets(orig *netip.Prefix, origNet *net.IPNet, nets []*netip.Prefix, rem
// Remaining
if !args.SuppressRemaining {
if verb >= 1 {
if verb <= 0 {
fmt.Println("#")
} else {
fmt.Println()
fmt.Println(sectSep1)
fmt.Println("Remaining/Left Over/Unallocated:")
@@ -660,7 +662,7 @@ func printSplitErr(e *netsplit.SplitErr) {
os.Stderr.WriteString("\n!! ERROR !!!\n")
os.Stderr.WriteString("\t" + e.Wrapped.Error() + "\n")
os.Stderr.WriteString("\nnetwork Iteration Details\n(when error was encountered):\n\n")
os.Stderr.WriteString("\nNetwork Iteration Details\n(when error was encountered):\n\n")
if e.Nets == nil {
os.Stderr.WriteString("Nets:\t\t\t(N/A)\n")
} else {
@@ -669,7 +671,7 @@ func printSplitErr(e *netsplit.SplitErr) {
fmt.Fprintf(os.Stderr, "\t%s\n", n.String())
}
}
if e.Remaining == nil {
if e.Remaining == nil || e.Remaining.Prefixes() == nil || len(e.Remaining.Prefixes()) == 0 {
os.Stderr.WriteString("Remaining:\t\t(N/A)\n")
} else {
os.Stderr.WriteString("Remaining:\n")
@@ -678,7 +680,7 @@ func printSplitErr(e *netsplit.SplitErr) {
}
}
if e.LastSubnet == nil {
os.Stderr.WriteString("Last Subnet:\t\t(N/A)")
os.Stderr.WriteString("Last Subnet:\t\t(N/A)\n")
} else {
fmt.Fprintf(os.Stderr, "Last Subnet:\t\t%s\n", e.LastSubnet.String())
}