xsteadfastx/dsnet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

check for IP networks before allocating

Browse Source
This commit is contained in:
Callan Bryant 2020-10-25 22:27:33 +00:00
parent 9a942c1040
commit f7f06f00fa
No known key found for this signature in database
GPG Key ID: C31FA9DF3ACBFFAA
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
add.go
View File

@ -62,9 +62,6 @@ func Add() {
privateKey := GenerateJSONPrivateKey()
publicKey := privateKey.PublicKey()
IP := conf.MustAllocateIP()
IP6 := conf.MustAllocateIP6()
peer := PeerConfig{
Owner: owner,
Hostname: hostname,
@ -73,11 +70,21 @@ func Add() {
PublicKey: publicKey,
PrivateKey: privateKey, // omitted from server config JSON!
PresharedKey: GenerateJSONKey(),
IP: IP,
IP6: IP6,
Networks: []JSONIPNet{},
}
if len(conf.Network.IPNet.Mask) > 0 {
peer.IP = conf.MustAllocateIP()
}
if len(conf.Network6.IPNet.Mask) > 0 {
peer.IP6 = conf.MustAllocateIP6()
}
if len(conf.IP) == 0 && len(conf.IP6) == 0 {
ExitFail("No IPv4 or IPv6 network defined in config")
}
conf.MustAddPeer(peer)
PrintPeerCfg(peer, conf)
conf.MustSave()