Fix unmarshaling of dhcpd_leasetime

Issue #2
This commit is contained in:
Paul Tyng
2020-02-10 11:07:31 -05:00
parent 95a2437dcc
commit 3fb1d0badb

View File

@@ -5,26 +5,39 @@ import (
"fmt" "fmt"
) )
func (n *Network) UnmarshalJSON(b []byte) error { func (dst *Network) UnmarshalJSON(b []byte) error {
type Alias Network type Alias Network
aux := &struct { aux := &struct {
VLAN json.Number `json:"vlan"` VLAN json.Number `json:"vlan"`
DHCPDLeaseTime json.Number `json:"dhcpd_leasetime"`
*Alias *Alias
}{ }{
Alias: (*Alias)(n), Alias: (*Alias)(dst),
} }
err := json.Unmarshal(b, &aux) err := json.Unmarshal(b, &aux)
if err != nil { if err != nil {
return err return err
} }
n.VLAN = 0
dst.VLAN = 0
if aux.VLAN.String() != "" { if aux.VLAN.String() != "" {
vlan, err := aux.VLAN.Int64() n, err := aux.VLAN.Int64()
if err != nil { if err != nil {
return err return err
} }
n.VLAN = int(vlan) dst.VLAN = int(n)
} }
dst.DHCPDLeaseTime = 0
if aux.DHCPDLeaseTime.String() != "" {
n, err := aux.DHCPDLeaseTime.Int64()
if err != nil {
return err
}
dst.DHCPDLeaseTime = int(n)
}
return nil return nil
} }