ResiLien
/
wesher
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow specific address to be specified

This commit is contained in:
kaiyou 2020-06-22 18:02:45 +02:00
parent f8fc765936
commit a52d693f56
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.go
View File

@ -85,10 +85,11 @@ type network net.IPNet
// UnmarshalText parses the provided byte array into the network receiver // UnmarshalText parses the provided byte array into the network receiver
func (n *network) UnmarshalText(data []byte) error { func (n *network) UnmarshalText(data []byte) error {
_, ipnet, err := net.ParseCIDR(string(data)) ip, ipnet, err := net.ParseCIDR(string(data))
if err != nil { if err != nil {
return err return err
} }
ipnet.IP = ip
*n = network(*ipnet) *n = network(*ipnet)
return nil return nil
} }

2
wg/wireguard.go
View File

@ -64,6 +64,7 @@ func (s *State) assignOverlayAddr(ipnet *net.IPNet, name string) {
ip := make([]byte, len(ipnet.IP)) ip := make([]byte, len(ipnet.IP))
copy(ip, []byte(ipnet.IP)) copy(ip, []byte(ipnet.IP))
if ipnet.IP.Mask(ipnet.Mask).Equal(ipnet.IP) {
h := fnv.New128a() h := fnv.New128a()
h.Write([]byte(name)) h.Write([]byte(name))
hb := h.Sum(nil) hb := h.Sum(nil)
@ -71,6 +72,7 @@ func (s *State) assignOverlayAddr(ipnet *net.IPNet, name string) {
for i := 1; i <= (size-bits)/8; i++ { for i := 1; i <= (size-bits)/8; i++ {
ip[len(ip)-i] = hb[len(hb)-i] ip[len(ip)-i] = hb[len(hb)-i]
} }
}
s.OverlayAddr = net.IPNet{ s.OverlayAddr = net.IPNet{
IP: net.IP(ip), IP: net.IP(ip),