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

correct IP enumeration

Browse Source
This commit is contained in:
Callan Bryant 2020-03-02 19:13:38 +00:00
parent 2fcda8b90a
commit faf0e59887
No known key found for this signature in database
GPG Key ID: C31FA9DF3ACBFFAA
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
types.go
View File

@ -3,7 +3,6 @@ package dsnet
import ( import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt"
"io/ioutil" "io/ioutil"
"net" "net"
"strings" "strings"
@ -24,7 +23,7 @@ type PeerConfig struct {
PublicKey JSONKey `validate:"required,len=44"` PublicKey JSONKey `validate:"required,len=44"`
PresharedKey JSONKey `validate:"required,len=44"` PresharedKey JSONKey `validate:"required,len=44"`
Endpoint net.UDPAddr `validate:"required,udp4_addr"` Endpoint net.UDPAddr `validate:"required,udp4_addr"`
AllowedIPs []net.IPNet `validate:"dive,required,cidr"` AllowedIPs []JSONIPNet `validate:"dive,required,cidr"`
} }
type Peer struct { type Peer struct {
@ -86,7 +85,7 @@ func (conf *DsnetConfig) MustAddPeer(peer PeerConfig) {
func (conf DsnetConfig) IPAllocated(IP net.IP) bool { func (conf DsnetConfig) IPAllocated(IP net.IP) bool {
for _, peer := range conf.Peers { for _, peer := range conf.Peers {
for _, peerIPNet := range peer.AllowedIPs { for _, peerIPNet := range peer.AllowedIPs {
if IP.Equal(peerIPNet.IP) { if IP.Equal(peerIPNet.IPNet.IP) {
return false return false
} }
} }
@ -111,12 +110,12 @@ func (conf DsnetConfig) ChooseIP() (net.IP, error) {
for j := 0; j < len(IP); j++ { for j := 0; j < len(IP); j++ {
shift := (len(IP) - j - 1) * 8 shift := (len(IP) - j - 1) * 8
IP[j] = IP[j] | byte(i>>shift) IP[j] = IP[j] | byte(i>>shift)
}
if conf.IPAllocated(IP) { if conf.IPAllocated(IP) {
return IP, nil return IP, nil
} }
} }
}
return net.IP{}, errors.New("IP range exhausted") return net.IP{}, errors.New("IP range exhausted")
} }