Make Enable/Disable work using new callbacks for async support.
Use new-style callbacks to implement the Manager EnableTechnology
and DisableTechnology operations asynchronously. This allows
devices to be enabled and disabled from the UI ,and for the UI
to display available networks once the device is enabled.
Removed the behavior whereby setting the Device.Powered property
had the side effect of enabling or disabling the device. To
replace this, I added new Device.Enable and Device.Disable calls
for enabling and disabling individual devices.
Also separated the in-memory value of the Powered property from
the persisted value. Whenever a client requests that a device
be enabled or disabled, the desired power state is immediately
saved in the profile, but the in-memory value isn't updated until
the operation completes. On startup, shill now automatically
starts any devices for which the persistent Powered property
is set, and does not start devices for which it is not set.
BUG=chromium-os:23319,chromium-os:27814
TEST=Manual testing on device + unit tests passing.
Change-Id: Id676be3fc662cfd5efb730c67687edfd16b2dc6b
Reviewed-on: https://gerrit.chromium.org/gerrit/18123
Commit-Ready: Eric Shienbrood <ers@chromium.org>
Reviewed-by: Eric Shienbrood <ers@chromium.org>
Tested-by: Eric Shienbrood <ers@chromium.org>
diff --git a/dbus_objectmanager_proxy.h b/dbus_objectmanager_proxy.h
index d3324db..6a5eb38 100644
--- a/dbus_objectmanager_proxy.h
+++ b/dbus_objectmanager_proxy.h
@@ -14,28 +14,37 @@
class DBusObjectManagerProxy : public DBusObjectManagerProxyInterface {
public:
// Constructs a org.freedesktop.DBus.ObjectManager DBus object proxy
- // at |path| owned by |service|. Caught signals and asynchronous
- // method replies will be dispatched to |delegate|.
+ // at |path| owned by |service|.
- DBusObjectManagerProxy(DBusObjectManagerProxyDelegate *delegate,
- DBus::Connection *connection,
+ DBusObjectManagerProxy(DBus::Connection *connection,
const std::string &path,
const std::string &service);
virtual ~DBusObjectManagerProxy();
// Inherited methods from DBusObjectManagerProxyInterface.
- virtual void GetManagedObjects(AsyncCallHandler *call_handler, int timeout);
+ virtual void GetManagedObjects(Error *error,
+ const ManagedObjectsCallback &callback,
+ int timeout);
+
+ virtual void set_interfaces_added_callback(
+ const InterfacesAddedSignalCallback &callback);
+ virtual void set_interfaces_removed_callback(
+ const InterfacesRemovedSignalCallback &callback);
private:
class Proxy : public org::freedesktop::DBus::ObjectManager_proxy,
public DBus::ObjectProxy {
public:
- Proxy(DBusObjectManagerProxyDelegate *delegate,
- DBus::Connection *connection,
+ Proxy(DBus::Connection *connection,
const std::string &path,
const std::string &service);
virtual ~Proxy();
+ virtual void set_interfaces_added_callback(
+ const InterfacesAddedSignalCallback &callback);
+ virtual void set_interfaces_removed_callback(
+ const InterfacesRemovedSignalCallback &callback);
+
private:
// Signal callbacks
virtual void InterfacesAdded(
@@ -50,7 +59,8 @@
const DBus::Error &error,
void *call_handler);
- DBusObjectManagerProxyDelegate *delegate_;
+ InterfacesAddedSignalCallback interfaces_added_callback_;
+ InterfacesRemovedSignalCallback interfaces_removed_callback_;
DISALLOW_COPY_AND_ASSIGN(Proxy);
};