mirror/ wg-gen-web
1
1
Fork 0
mirror of https://github.com/vx3r/wg-gen-web.git synced 2024-05-19 00:36:03 +02:00
Code Issues

issue #8, find available IP on the fly, not from complete list

This commit is contained in:
vx3r 2020-02-17 13:12:22 +09:00
parent 8d6a05e2d9
commit 6cafb97e31
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/src/App.vue
View File

@ -2,7 +2,7 @@
<v-app id="inspire">
<v-app-bar app>
<img class="mr-3" :src="require('./assets/logo.png')" height="50"/>
<img class="mr-3" :src="require('./assets/logo.png')" height="50" alt="Wg Gen Web"/>
<v-toolbar-title>Wg Gen Web</v-toolbar-title>
</v-app-bar>

45
util/util.go
View File

@ -52,42 +52,32 @@ func DirectoryExists(name string) bool {
// GetAvailableIp search for an available in cidr against a list of reserved ips
func GetAvailableIp(cidr string, reserved []string) (string, error) {
addresses, err := GetAllAddressesFromCidr(cidr)
ip, ipnet, err := net.ParseCIDR(cidr)
if err != nil {
return "", err
}
for _, addresse := range addresses {
// this two addresses are not usable
broadcastAddr := BroadcastAddr(ipnet).String()
networkAddr := ipnet.IP.String()
for ip := ip.Mask(ipnet.Mask); ipnet.Contains(ip); inc(ip) {
ok := true
address := ip.String()
for _, r := range reserved {
if addresse == r {
if address == r {
ok = false
break
}
}
if ok {
return addresse, nil
if ok && address != networkAddr && address != broadcastAddr {
return address, nil
}
}
return "", errors.New("no more available address from cidr")
}
// GetAllAddressesFromCidr get all ip addresses from cidr
func GetAllAddressesFromCidr(cidr string) ([]string, error) {
ip, ipnet, err := net.ParseCIDR(cidr)
if err != nil {
return nil, err
}
var ips []string
for ip := ip.Mask(ipnet.Mask); ipnet.Contains(ip); inc(ip) {
ips = append(ips, ip.String())
}
// remove network address and broadcast address (and server ip .1)
return ips[2 : len(ips)-1], nil
}
// IsIPv6 check if given ip is IPv6
func IsIPv6(address string) bool {
ip := net.ParseIP(address)
@ -126,3 +116,18 @@ func inc(ip net.IP) {
}
}
}
// BroadcastAddr returns the last address in the given network, or the broadcast address.
func BroadcastAddr(n *net.IPNet) net.IP {
// The golang net package doesn't make it easy to calculate the broadcast address. :(
var broadcast net.IP
if len(n.IP) == 4 {
broadcast = net.ParseIP("0.0.0.0").To4()
} else {
broadcast = net.ParseIP("::")
}
for i := 0; i < len(n.IP); i++ {
broadcast[i] = n.IP[i] | ^n.Mask[i]
}
return broadcast
}