go fmt
This commit is contained in:
parent
12e8158725
commit
2fcda8b90a
10
add.go
10
add.go
@ -1,6 +1,6 @@
|
||||
package dsnet
|
||||
|
||||
func Add(hostname string, owner string, description string) {//, publicKey string) {
|
||||
func Add(hostname string, owner string, description string) { //, publicKey string) {
|
||||
conf := MustLoadDsnetConfig()
|
||||
|
||||
privateKey := GenerateJSONPrivateKey()
|
||||
@ -12,10 +12,10 @@ func Add(hostname string, owner string, description string) {//, publicKey strin
|
||||
check(err)
|
||||
|
||||
peer := PeerConfig{
|
||||
Owner: owner,
|
||||
Hostname: hostname,
|
||||
Description: description,
|
||||
PublicKey: publicKey,
|
||||
Owner: owner,
|
||||
Hostname: hostname,
|
||||
Description: description,
|
||||
PublicKey: publicKey,
|
||||
PresharedKey: presharedKey,
|
||||
// TODO Endpoint:
|
||||
// TODO pick an available IP AllowedIPs
|
||||
|
8
types.go
8
types.go
@ -2,12 +2,12 @@ package dsnet
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"net"
|
||||
"strings"
|
||||
"time"
|
||||
"fmt"
|
||||
"errors"
|
||||
|
||||
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
|
||||
)
|
||||
@ -100,8 +100,8 @@ func (conf DsnetConfig) ChooseIP() (net.IP, error) {
|
||||
network := conf.Network.IPNet
|
||||
ones, bits := network.Mask.Size()
|
||||
zeros := bits - ones
|
||||
min := 1 // avoids network addr
|
||||
max := (1 << zeros) -2 // avoids broadcast addr + overflow
|
||||
min := 1 // avoids network addr
|
||||
max := (1 << zeros) - 2 // avoids broadcast addr + overflow
|
||||
|
||||
for i := min; i <= max; i++ {
|
||||
IP := make(net.IP, len(network.IP))
|
||||
|
Loading…
Reference in New Issue
Block a user