mirror of https://github.com/jetkvm/kvm.git
fix(network): handle errors when net.IPAddr is nil
This commit is contained in:
parent
8a55ea35f2
commit
4643af011e
|
@ -30,6 +30,38 @@ type RpcNetworkSettings struct {
|
||||||
NetworkConfig
|
NetworkConfig
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *NetworkInterfaceState) MacAddress() string {
|
||||||
|
if s.macAddr == nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
return s.macAddr.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *NetworkInterfaceState) IPv4Address() string {
|
||||||
|
if s.ipv4Addr == nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
return s.ipv4Addr.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *NetworkInterfaceState) IPv6Address() string {
|
||||||
|
if s.ipv6Addr == nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
return s.ipv6Addr.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *NetworkInterfaceState) IPv6LinkLocalAddress() string {
|
||||||
|
if s.ipv6LinkLocal == nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
return s.ipv6LinkLocal.String()
|
||||||
|
}
|
||||||
|
|
||||||
func (s *NetworkInterfaceState) RpcGetNetworkState() RpcNetworkState {
|
func (s *NetworkInterfaceState) RpcGetNetworkState() RpcNetworkState {
|
||||||
ipv6Addresses := make([]RpcIPv6Address, 0)
|
ipv6Addresses := make([]RpcIPv6Address, 0)
|
||||||
|
|
||||||
|
@ -46,10 +78,10 @@ func (s *NetworkInterfaceState) RpcGetNetworkState() RpcNetworkState {
|
||||||
|
|
||||||
return RpcNetworkState{
|
return RpcNetworkState{
|
||||||
InterfaceName: s.interfaceName,
|
InterfaceName: s.interfaceName,
|
||||||
MacAddress: s.macAddr.String(),
|
MacAddress: s.MacAddress(),
|
||||||
IPv4: s.ipv4Addr.String(),
|
IPv4: s.IPv4Address(),
|
||||||
IPv6: s.ipv6Addr.String(),
|
IPv6: s.IPv6Address(),
|
||||||
IPv6LinkLocal: s.ipv6LinkLocal.String(),
|
IPv6LinkLocal: s.IPv6LinkLocalAddress(),
|
||||||
IPv4Addresses: s.ipv4Addresses,
|
IPv4Addresses: s.ipv4Addresses,
|
||||||
IPv6Addresses: ipv6Addresses,
|
IPv6Addresses: ipv6Addresses,
|
||||||
DHCPLease: s.dhcpClient.GetLease(),
|
DHCPLease: s.dhcpClient.GetLease(),
|
||||||
|
|
Loading…
Reference in New Issue