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

MustChooseIP -> MustAllocateIP

Browse Source
This commit is contained in:
Callan Bryant 2020-03-02 20:11:33 +00:00
parent 089ed04173
commit e02a1552e9
No known key found for this signature in database
GPG Key ID: C31FA9DF3ACBFFAA
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
add.go
View File

@ -11,7 +11,7 @@ func Add(hostname string, owner string, description string) { //, publicKey stri
presharedKey := GenerateJSONKey() presharedKey := GenerateJSONKey()
publicKey := privateKey.PublicKey() publicKey := privateKey.PublicKey()
IP := conf.MustChooseIP() IP := conf.MustAllocateIP()
peer := PeerConfig{ peer := PeerConfig{
Owner: owner, Owner: owner,

2
init.go
View File

@ -21,7 +21,7 @@ func Init() {
ReportFile: DEFAULT_REPORT_FILE, ReportFile: DEFAULT_REPORT_FILE,
} }
IP := conf.MustChooseIP() IP := conf.MustAllocateIP()
conf.IP = IP conf.IP = IP
conf.DNS = IP conf.DNS = IP

2
types.go
View File

@ -115,7 +115,7 @@ func (conf DsnetConfig) IPAllocated(IP net.IP) bool {
} }
// choose a free IP for a new Peer // choose a free IP for a new Peer
func (conf DsnetConfig) MustChooseIP() net.IP { func (conf DsnetConfig) MustAllocateIP() net.IP {
network := conf.Network.IPNet network := conf.Network.IPNet
ones, bits := network.Mask.Size() ones, bits := network.Mask.Size()
zeros := bits - ones zeros := bits - ones