diff --git a/cmd/subspace/utils.go b/cmd/subspace/utils.go index f7b2372..78083b4 100644 --- a/cmd/subspace/utils.go +++ b/cmd/subspace/utils.go @@ -12,8 +12,7 @@ import ( "path/filepath" "text/template" "time" - "strconv" - "strings" + "net" ) func RandomString(n int) string { @@ -72,37 +71,29 @@ set -o xtrace } func ipv4address(Number int,IPv4_POOL string) (string,error) { - var err error = nil - - var hostcidrS[] string = strings.Split(IPv4_POOL,"/") - cidr, _ := strconv.Atoi(hostcidrS[1]) - subnet := ((1<>24)&255, (ip>>16)&255, (ip>>8)&255, (ip>>0)&255} - - var ipS string = fmt.Sprintf("%d.%d.%d.%d",ipOctet[0],ipOctet[1],ipOctet[2],ipOctet[3]) - - if (host&subnet) != 0 { - err = fmt.Errorf("IPv4_POOL=\"%s\"",IPv4_POOL) - }else if (Number&subnetmask) != 0 { - err = fmt.Errorf("Number does not fit in the POOL. Number=%d, POOL=\"/%d\"",Number,cidr) - }else if Number == subnet { - err = fmt.Errorf("Broadcast address. Number=%d, IPv4_POOL=\"%s\", address=\"%s\"",Number,IPv4_POOL,ipS) - }else if Number == 0 { - err = fmt.Errorf("Network address. Number=%d, IPv4_POOL=\"%s\", address=\"%s\"",Number,IPv4_POOL,ipS) - } - - return ipS,err + _, ipnet, err := net.ParseCIDR(IPv4_POOL) + + if err != nil { + return "",err + } + + var int64ip int64 = + int64(ipnet.IP[0])*256*256*256+ + int64(ipnet.IP[1])*256*256+ + int64(ipnet.IP[2])*256+ + int64(ipnet.IP[3])+ + int64(Number) + + var ip net.IP = net.IPv4( + byte(int64ip/256/256/256), + byte(int64ip/256/256%256), + byte(int64ip/256%256), + byte(int64ip%256), + ) + + if !ipnet.Contains(ip) { + return "",fmt.Errorf("%d hosts can't fit in network %s.",Number,ipnet) + } + + return fmt.Sprint(ip),nil } - -