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

fix json marshalling of uninitialised JSONIPnet

Browse Source
This commit is contained in:
Callan Bryant 2020-10-27 21:19:13 +00:00
parent ddb0b4c549
commit 047a0dc7be
No known key found for this signature in database
GPG Key ID: C31FA9DF3ACBFFAA
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
exttypes.go
View File

@ -12,7 +12,11 @@ type JSONIPNet struct {
} }
func (n JSONIPNet) MarshalJSON() ([]byte, error) { func (n JSONIPNet) MarshalJSON() ([]byte, error) {
return []byte("\"" + n.IPNet.String() + "\""), nil if len(n.IPNet.IP) == 0 {
return []byte("\"\""), nil
} else {
return []byte("\"" + n.IPNet.String() + "\""), nil
}
} }
func (n *JSONIPNet) UnmarshalJSON(b []byte) error { func (n *JSONIPNet) UnmarshalJSON(b []byte) error {
@ -36,11 +40,7 @@ func (n *JSONIPNet) UnmarshalJSON(b []byte) error {
} }
func (n *JSONIPNet) String() string { func (n *JSONIPNet) String() string {
if len(n.IPNet.IP) == 0 { return n.IPNet.String()
return "\"\""
} else {
return n.IPNet.String()
}
} }
type JSONKey struct { type JSONKey struct {