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

fix parsing -- needed a pointer method

Browse Source
This commit is contained in:
Callan Bryant 2020-03-02 02:49:44 +00:00
parent 11a4ab4fc0
commit 9c470d4534
No known key found for this signature in database
GPG Key ID: C31FA9DF3ACBFFAA
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
types.go
View File

@ -74,7 +74,7 @@ func (n JSONIPNet) MarshalJSON() ([]byte, error) {
return []byte("\"" + n.IPNet.String() + "\""), nil return []byte("\"" + n.IPNet.String() + "\""), nil
} }
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) _, IPNet, err := net.ParseCIDR(cidr)
n.IPNet = *IPNet n.IPNet = *IPNet
@ -93,7 +93,7 @@ func (k JSONKey) MarshalJSON() ([]byte, error) {
return []byte("\"" + k.Key.String() + "\""), nil return []byte("\"" + k.Key.String() + "\""), nil
} }
func (k JSONKey) UnmarshalJSON(b []byte) error { func (k *JSONKey) UnmarshalJSON(b []byte) error {
b64Key := strings.Trim(string(b), "\"") b64Key := strings.Trim(string(b), "\"")
key, err := wgtypes.ParseKey(b64Key) key, err := wgtypes.ParseKey(b64Key)
k.Key = key k.Key = key