forked from BellerophonMobile/gonetworkmanager
-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* added DeviceBridge support * Add DeviceBridge depreciation notices --------- Co-authored-by: Christian Müller <[email protected]>
- Loading branch information
1 parent
1f79909
commit a5c833a
Showing
2 changed files
with
77 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
package gonetworkmanager | ||
|
||
import ( | ||
"encoding/json" | ||
|
||
"github.com/godbus/dbus/v5" | ||
) | ||
|
||
const ( | ||
DeviceBridgeInterface = DeviceInterface + ".Bridge" | ||
|
||
// Properties | ||
DeviceBridgePropertyHwAddress = DeviceBridgeInterface + ".HwAddress" // readable s | ||
DeviceBridgePropertySlaves = DeviceBridgeInterface + ".Slaves" // readable as | ||
DeviceBridgePropertyCarrier = DeviceBridgeInterface + ".Carrier" // readable b | ||
) | ||
|
||
type DeviceBridge interface { | ||
Device | ||
|
||
// GetPropertyHwAddress Active hardware address of the device. | ||
GetPropertyHwAddress() (string, error) | ||
|
||
// GetPropertySlaves Array of paths of enslaved and active devices. | ||
// DEPRECATED. Use the "Ports" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.34.0. | ||
GetPropertySlaves() ([]Device, error) | ||
|
||
// GetPropertyCarrier Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not). | ||
// DEPRECATED: check for the "carrier" flag in the "InterfaceFlags" property on the "org.freedesktop.NetworkManager.Device" interface. | ||
GetPropertyCarrier() (bool, error) | ||
} | ||
|
||
func NewDeviceBridge(objectPath dbus.ObjectPath) (DeviceBridge, error) { | ||
var d deviceBridge | ||
return &d, d.init(NetworkManagerInterface, objectPath) | ||
} | ||
|
||
type deviceBridge struct { | ||
device | ||
} | ||
|
||
func (d *deviceBridge) GetPropertyHwAddress() (string, error) { | ||
return d.getStringProperty(DeviceBridgePropertyHwAddress) | ||
} | ||
|
||
func (d *deviceBridge) GetPropertySlaves() ([]Device, error) { | ||
paths, err := d.getSliceObjectProperty(DeviceBridgePropertySlaves) | ||
if err != nil { | ||
return nil, err | ||
} | ||
devices := make([]Device, len(paths)) | ||
for i, path := range paths { | ||
devices[i], err = DeviceFactory(path) | ||
if err != nil { | ||
return nil, err | ||
} | ||
} | ||
return devices, nil | ||
} | ||
|
||
func (d *deviceBridge) GetPropertyCarrier() (bool, error) { | ||
return d.getBoolProperty(DeviceBridgePropertyCarrier) | ||
} | ||
|
||
func (d *deviceBridge) MarshalJSON() ([]byte, error) { | ||
m, err := d.device.marshalMap() | ||
if err != nil { | ||
return nil, err | ||
} | ||
|
||
m["HwAddress"], _ = d.GetPropertyHwAddress() | ||
m["Slaves"], _ = d.GetPropertySlaves() | ||
m["Carrier"], _ = d.GetPropertyCarrier() | ||
return json.Marshal(m) | ||
} |