pogmommy/gonetworkmanager
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed duplicate entries in nm and utils

Browse source 
After the latest merge there was a duplicate entry of AddAndActivateWirelessConnection in NetworkManager.go
which has been removed. There was also duplicate functions call2 and
callError2 in utils.go. The duplicate of AddAndActivateWirelessConnection referenced
callError2, and both of these duplicates has been removed.
This commit is contained in:
meskedal 2019-06-29 23:53:31 +02:00
parent 7f3cfc8b74
commit 4c09e115f8
2 changed files with 0 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
NetworkManager.go
View file

@ -45,18 +45,6 @@ type NetworkManager interface {
// connection["802-11-wireless-security"]["psk"] = password // connection["802-11-wireless-security"]["psk"] = password
AddAndActivateWirelessConnection(connection map[string]map[string]interface{}, device Device, accessPoint AccessPoint) (ac ActiveConnection, err error) AddAndActivateWirelessConnection(connection map[string]map[string]interface{}, device Device, accessPoint AccessPoint) (ac ActiveConnection, err error)
// AddAndActivateWirelessConnection adds a new connection profile to the network device it has been
// passed. It then activates the connection to the passed access point. The first paramter contains
// additional information for the connection (most propably the credentials).
// Example contents for connection are:
// connection := make(map[string]map[string]interface{})
// connection["802-11-wireless"] = make(map[string]interface{})
// connection["802-11-wireless"]["security"] = "802-11-wireless-security"
// connection["802-11-wireless-security"] = make(map[string]interface{})
// connection["802-11-wireless-security"]["key-mgmt"] = "wpa-psk"
// connection["802-11-wireless-security"]["psk"] = password
AddAndActivateWirelessConnection(connection map[string]map[string]interface{}, device Device, accessPoint AccessPoint) (ac ActiveConnection, err error)
Subscribe() <-chan *dbus.Signal Subscribe() <-chan *dbus.Signal
Unsubscribe() Unsubscribe()
@ -139,22 +127,6 @@ func (n *networkManager) AddAndActivateWirelessConnection(connection map[string]
return return
} }
func (n *networkManager) AddAndActivateWirelessConnection(connection map[string]map[string]interface{}, d Device, ap AccessPoint) (ac ActiveConnection, err error) {
var opath1 dbus.ObjectPath
var opath2 dbus.ObjectPath
err = n.callError2(&opath1, &opath2, NetworkManagerAddAndActivateConnection, connection, d.GetPath(), ap.GetPath())
if err != nil {
return
}
ac, err = NewActiveConnection(opath2)
if err != nil {
return
}
return
}
func (n *networkManager) Subscribe() <-chan *dbus.Signal { func (n *networkManager) Subscribe() <-chan *dbus.Signal {
if n.sigChan != nil { if n.sigChan != nil {
return n.sigChan return n.sigChan

4
utils.go
View file

@ -38,10 +38,6 @@ func (d *dbusBase) call2(value1 interface{}, value2 interface{}, method string,
return d.obj.Call(method, 0, args...).Store(value1, value2) return d.obj.Call(method, 0, args...).Store(value1, value2)
} }
func (d *dbusBase) callError2(value1 interface{}, value2 interface{}, method string, args ...interface{}) error {
return d.obj.Call(method, 0, args...).Store(value1, value2)
}
func (d *dbusBase) subscribe(iface, member string) { func (d *dbusBase) subscribe(iface, member string) {
rule := fmt.Sprintf("type='signal',interface='%s',path='%s',member='%s'", rule := fmt.Sprintf("type='signal',interface='%s',path='%s',member='%s'",
iface, d.obj.Path(), NetworkManagerInterface) iface, d.obj.Path(), NetworkManagerInterface)