Merge pull request #1 from NubeIO/issue/net-mask

Fix: net mask
NubeIO · Dec 18, 2024 · 1bc8a9a · 1bc8a9a
2 parents 677676e + 2f1cd55
commit 1bc8a9a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/networking/networking.go b/networking/networking.go
@@ -75,8 +75,10 @@ func (inst *nets) GetNetworks() (interfaces []NetworkInterfaces, err error) {
 					switch v := addr.(type) {
 					case *net.IPNet:
 						ip = v.IP
+						networkInterfaces.NetMask = net.IP(v.Mask).String()
 					case *net.IPAddr:
 						ip = v.IP
+						networkInterfaces.NetMask = ""
 					}
 					if ip == nil || ip.IsLoopback() {
 						continue
@@ -92,7 +94,6 @@ func (inst *nets) GetNetworks() (interfaces []NetworkInterfaces, err error) {
 					if len(mask) >= 1 {
 						networkInterfaces.NetMaskLength = ToInt(mask[1])
 					}
-					networkInterfaces.NetMask = ipv4MaskString(ip.DefaultMask())
 					networkInterfaces.Gateway, err = inst.GetGatewayIP(iface.Name)
 					networkInterfaces.MacAddress = iface.HardwareAddr.String()
 					interfaces = append(interfaces, networkInterfaces)
@@ -119,8 +120,10 @@ func (inst *nets) GetNetworksThatHaveGateway() (interfaces []NetworkInterfaces,
 					switch v := addr.(type) {
 					case *net.IPNet:
 						ip = v.IP
+						networkInterfaces.NetMask = net.IP(v.Mask).String()
 					case *net.IPAddr:
 						ip = v.IP
+						networkInterfaces.NetMask = ""
 					}
 					if ip == nil || ip.IsLoopback() {
 						continue
@@ -136,7 +139,6 @@ func (inst *nets) GetNetworksThatHaveGateway() (interfaces []NetworkInterfaces,
 					if len(mask) >= 1 {
 						networkInterfaces.NetMaskLength = ToInt(mask[1])
 					}
-					networkInterfaces.NetMask = ipv4MaskString(ip.DefaultMask())
 					networkInterfaces.Gateway, err = inst.GetGatewayIP(iface.Name)
 					networkInterfaces.MacAddress = iface.HardwareAddr.String()
 					if networkInterfaces.Gateway != "" {