Cleanup DnsManager

This commit is contained in:
Christian Müller 2022-11-21 15:21:40 +01:00
parent b7605d46fa
commit 4c34afc9ca

View file

@ -25,9 +25,9 @@ type DnsConfigurationData struct {
type DnsManager interface { type DnsManager interface {
GetPath() dbus.ObjectPath GetPath() dbus.ObjectPath
GetPropertyConfiguration() ([]DnsConfigurationData, error)
GetPropertyRcManager() (string, error)
GetPropertyMode() (string, error) GetPropertyMode() (string, error)
GetPropertyRcManager() (string, error)
GetPropertyConfiguration() ([]DnsConfigurationData, error)
} }
type dnsManager struct { type dnsManager struct {
@ -43,16 +43,20 @@ func (d *dnsManager) GetPath() dbus.ObjectPath {
return d.obj.Path() return d.obj.Path()
} }
func (d *dnsManager) GetPropertyMode() (string, error) {
return d.getStringProperty(DnsManagerPropertyMode)
}
func (d *dnsManager) GetPropertyRcManager() (string, error) {
return d.getStringProperty(DnsManagerPropertyRcManager)
}
func (d *dnsManager) GetPropertyConfiguration() ([]DnsConfigurationData, error) { func (d *dnsManager) GetPropertyConfiguration() ([]DnsConfigurationData, error) {
configurations, err := d.getSliceMapStringVariantProperty(DnsManagerPropertyConfiguration) configurations, err := d.getSliceMapStringVariantProperty(DnsManagerPropertyConfiguration)
if err != nil { if err != nil {
return nil, err return nil, err
} }
// for k, c := range configurations {
// fmt.Println(k, c)
// }
ret := make([]DnsConfigurationData, len(configurations)) ret := make([]DnsConfigurationData, len(configurations))
for i, conf := range configurations { for i, conf := range configurations {
if serversVar, exist := conf["nameservers"]; exist { if serversVar, exist := conf["nameservers"]; exist {
@ -90,11 +94,3 @@ func (d *dnsManager) GetPropertyConfiguration() ([]DnsConfigurationData, error)
return ret, nil return ret, nil
} }
func (d *dnsManager) GetPropertyRcManager() (string, error) {
return d.getStringProperty(DnsManagerPropertyRcManager)
}
func (d *dnsManager) GetPropertyMode() (string, error) {
return d.getStringProperty(DnsManagerPropertyMode)
}