Clean up network/* packages, revamp online status detection

This commit is contained in:
Daniel
2019-10-25 13:33:36 +02:00
parent c72f956fe8
commit fdb5f6fcf7
27 changed files with 738 additions and 268 deletions

View File

@@ -156,7 +156,7 @@ func getNameserversFromDbus() ([]Nameserver, error) {
return nameservers, nil
}
func getConnectivityStateFromDbus() (uint8, error) {
func getConnectivityStateFromDbus() (OnlineStatus, error) {
var err error
dbusConnLock.Lock()
@@ -187,18 +187,18 @@ func getConnectivityStateFromDbus() (uint8, error) {
switch connectivityState {
case 0:
return UNKNOWN, nil
return StatusUnknown, nil
case 1:
return OFFLINE, nil
return StatusOffline, nil
case 2:
return PORTAL, nil
return StatusPortal, nil
case 3:
return LIMITED, nil
return StatusLimited, nil
case 4:
return ONLINE, nil
return StatusOnline, nil
}
return UNKNOWN, nil
return StatusUnknown, nil
}
func getNetworkManagerProperty(conn *dbus.Conn, objectPath dbus.ObjectPath, property string) (dbus.Variant, error) {