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

fix net JSON parsing

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

7
types.go
View File

@ -12,10 +12,10 @@ import (
// see https://github.com/WireGuard/wgctrl-go/blob/master/wgtypes/types.go for definitions // see https://github.com/WireGuard/wgctrl-go/blob/master/wgtypes/types.go for definitions
type PeerConfig struct { type PeerConfig struct {
// username of person running this host/router
Owner string `validate:"required,gte=1,lte=255"`
// Used to update DNS // Used to update DNS
Hostname string `validate:"required,gte=1,lte=255"` Hostname string `validate:"required,gte=1,lte=255"`
// username of person running this host/router
Owner string `validate:"required,gte=1,lte=255"`
// Description of what the host is and/or does // Description of what the host is and/or does
Description string `validate:"required,gte=1,lte=255"` Description string `validate:"required,gte=1,lte=255"`
@ -152,7 +152,8 @@ func (n JSONIPNet) MarshalJSON() ([]byte, error) {
func (n *JSONIPNet) UnmarshalJSON(b []byte) error { func (n *JSONIPNet) UnmarshalJSON(b []byte) error {
cidr := strings.Trim(string(b), "\"") cidr := strings.Trim(string(b), "\"")
_, IPNet, err := net.ParseCIDR(cidr) IP, IPNet, err := net.ParseCIDR(cidr)
IPNet.IP = IP
n.IPNet = *IPNet n.IPNet = *IPNet
return err return err
} }