Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added DeviceBridge support #38

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Device.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ func DeviceFactory(objectPath dbus.ObjectPath) (Device, error) {
return NewDeviceGeneric(objectPath)
case NmDeviceTypeIpTunnel:
return NewDeviceIpTunnel(objectPath)
case NmDeviceTypeBridge:
return NewDeviceBridge(objectPath)
case NmDeviceTypeEthernet:
return NewDeviceWired(objectPath)
case NmDeviceTypeWifi:
Expand Down
73 changes: 73 additions & 0 deletions DeviceBridge.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
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.
GetPropertySlaves() ([]Device, error)

// GetPropertyCarrier Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
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)
}