Skip to content

Commit 7809e29

Browse files
committed
Merge branch 'develop'
2 parents af71756 + 98840bd commit 7809e29

File tree

4 files changed

+33
-8
lines changed

4 files changed

+33
-8
lines changed

DeviceStatistics.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ type DeviceStatistics interface {
2121
// Refresh rate of the rest of properties of this interface. The properties are guaranteed to be refreshed each RefreshRateMs milliseconds in case the underlying counter has changed too. If zero, there is no guaranteed refresh rate of the properties.
2222
GetPropertyRefreshRateMs() (uint32, error)
2323

24+
SetPropertyRefreshRateMs(uint32) (error)
25+
2426
// Number of transmitted bytes
2527
GetPropertyTxBytes() (uint64, error)
2628

@@ -45,6 +47,10 @@ func (d *deviceStatistics) GetPropertyRefreshRateMs() (uint32, error) {
4547
return d.getUint32Property(DeviceStatisticsPropertyRefreshRateMs)
4648
}
4749

50+
func (d *deviceStatistics) SetPropertyRefreshRateMs(rate uint32) (error) {
51+
return d.setProperty(DeviceStatisticsPropertyRefreshRateMs, rate)
52+
}
53+
4854
func (d *deviceStatistics) GetPropertyTxBytes() (uint64, error) {
4955
return d.getUint64Property(DeviceStatisticsPropertyTxBytes)
5056
}

IP6Config.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ type IP6Config interface {
6363
GetPropertyRouteData() ([]IP6RouteData, error)
6464

6565
// GetNameservers gets the nameservers in use.
66-
GetPropertyNameservers() ([]string, error)
66+
GetPropertyNameservers() ([][]byte, error)
6767

6868
// A list of domains this address belongs to.
6969
GetPropertyDomains() ([]string, error)
@@ -169,16 +169,16 @@ func (c *ip6Config) GetPropertyRouteData() ([]IP6RouteData, error) {
169169
return routes, nil
170170
}
171171

172-
func (c *ip6Config) GetPropertyNameservers() ([]string, error) {
172+
func (c *ip6Config) GetPropertyNameservers() ([][]byte, error) {
173173
nameservers, err := c.getSliceSliceByteProperty(IP6ConfigPropertyNameservers)
174-
ret := make([]string, len(nameservers))
174+
ret := make([][]byte, len(nameservers))
175175

176176
if err != nil {
177177
return ret, err
178178
}
179179

180180
for i, nameserver := range nameservers {
181-
ret[i] = string(nameserver)
181+
ret[i] = nameserver
182182
}
183183

184184
return ret, nil

NetworkManager.go

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -367,12 +367,26 @@ func (nm *networkManager) State() (state NmState, err error) {
367367
}
368368

369369
func (nm *networkManager) CheckpointCreate(devices []Device, rollbackTimeout uint32, flags []NmCheckpointCreateFlags) (cp Checkpoint, err error) {
370-
intFlags := 0
370+
var intFlags uint32 = 0
371371
for _, flag := range flags {
372-
intFlags |= int(flag)
372+
intFlags |= uint32(flag)
373373
}
374374

375-
err = nm.callWithReturn(&cp, NetworkManagerCheckpointCreate, rollbackTimeout, intFlags)
375+
var devicePaths []dbus.ObjectPath
376+
if len(devices) > 0 {
377+
devicePaths := []dbus.ObjectPath{}
378+
for _, device := range devices {
379+
devicePaths = append(devicePaths, device.GetPath())
380+
}
381+
}
382+
383+
var checkpointPath dbus.ObjectPath
384+
err = nm.callWithReturn(&checkpointPath, NetworkManagerCheckpointCreate, devicePaths, rollbackTimeout, intFlags)
385+
if err != nil {
386+
return
387+
}
388+
389+
cp, err = NewCheckpoint(checkpointPath)
376390
return
377391
}
378392

@@ -425,7 +439,7 @@ func (nm *networkManager) GetPropertyAllDevices() ([]Device, error) {
425439
}
426440

427441
func (nm *networkManager) GetPropertyCheckpoints() ([]Checkpoint, error) {
428-
checkpointsPaths, err := nm.getSliceObjectProperty(NetworkManagerPropertyAllDevices)
442+
checkpointsPaths, err := nm.getSliceObjectProperty(NetworkManagerPropertyCheckpoints)
429443
if err != nil {
430444
return nil, err
431445
}

utils.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ func (d *dbusBase) getProperty(iface string) (interface{}, error) {
5858
return variant.Value(), err
5959
}
6060

61+
func (d *dbusBase) setProperty(iface string, value interface{}) (error) {
62+
err := d.obj.SetProperty(iface, dbus.MakeVariant(value))
63+
return err
64+
}
65+
6166
func (d *dbusBase) getObjectProperty(iface string) (value dbus.ObjectPath, err error) {
6267
prop, err := d.getProperty(iface)
6368
if err != nil {

0 commit comments

Comments
 (0)