From 4c09e115f8b875adad76d1f8021762d29e509798 Mon Sep 17 00:00:00 2001 From: meskedal Date: Sat, 29 Jun 2019 23:53:31 +0200 Subject: [PATCH] Fixed duplicate entries in nm and utils 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. --- NetworkManager.go | 28 ---------------------------- utils.go | 4 ---- 2 files changed, 32 deletions(-) diff --git a/NetworkManager.go b/NetworkManager.go index d09d14f..365df35 100644 --- a/NetworkManager.go +++ b/NetworkManager.go @@ -45,18 +45,6 @@ type NetworkManager interface { // connection["802-11-wireless-security"]["psk"] = password 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 Unsubscribe() @@ -139,22 +127,6 @@ func (n *networkManager) AddAndActivateWirelessConnection(connection map[string] 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 { if n.sigChan != nil { return n.sigChan diff --git a/utils.go b/utils.go index 97a12ce..6bb2f66 100644 --- a/utils.go +++ b/utils.go @@ -38,10 +38,6 @@ func (d *dbusBase) call2(value1 interface{}, value2 interface{}, method string, 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) { rule := fmt.Sprintf("type='signal',interface='%s',path='%s',member='%s'", iface, d.obj.Path(), NetworkManagerInterface)