From 20d4809e8eef23a01ad46bd82e01b9a3d7d03072 Mon Sep 17 00:00:00 2001 From: James Shubin Date: Fri, 25 Oct 2024 15:27:18 -0400 Subject: [PATCH] engine: resources: Print netmask nicely for our DHCP resource Makes it easier to see what's going on. --- engine/resources/dhcp.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/engine/resources/dhcp.go b/engine/resources/dhcp.go index e55d849a..4ebbd82f 100644 --- a/engine/resources/dhcp.go +++ b/engine/resources/dhcp.go @@ -1719,7 +1719,7 @@ func (obj *DHCPRangeRes) Init(init *engine.Init) error { obj.init.Logf("from: %s", obj.from) obj.init.Logf(" to: %s", obj.to) - obj.init.Logf("mask: %s", obj.mask) // TODO: print as cidr or dotted quad + obj.init.Logf("mask: %s", netmaskAsQuadString(obj.mask)) return nil } @@ -2054,3 +2054,9 @@ func checkValidNetmask(netmask net.IPMask) bool { y := x + 1 return (y & x) == 0 } + +// netmaskAsQuadString returns a dotted-quad string giving you something like: +// 255.255.255.0 instead of ffffff00 which is what's seen when you print it now. +func netmaskAsQuadString(netmask net.IPMask) string { + return fmt.Sprintf("%d.%d.%d.%d", netmask[0], netmask[1], netmask[2], netmask[3]) +}