diff options
author | skuhne <skuhne@chromium.org> | 2014-09-18 16:14:17 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-18 23:14:54 +0000 |
commit | 8e7b4ff4742ed5f78fa57550af1fb4cfc5705372 (patch) | |
tree | 8714d14f10bf8e41ba667eb8ecf7470b3ab3b1c2 /chromeos/dbus/shill_manager_client.h | |
parent | 01c68e8765254d9971296b291ff718b4f6af3004 (diff) | |
download | chromium_src-8e7b4ff4742ed5f78fa57550af1fb4cfc5705372.zip chromium_src-8e7b4ff4742ed5f78fa57550af1fb4cfc5705372.tar.gz chromium_src-8e7b4ff4742ed5f78fa57550af1fb4cfc5705372.tar.bz2 |
Revert of GCM: D-Bus methods for wake-on-packet (patchset #15 id:280001 of https://codereview.chromium.org/409883006/)
Reason for revert:
See issue https://code.google.com/p/chromium/issues/detail?id=415281
I bissected chrome to this patch and figured that this is causing chrome to crash.
Sorry.
Original issue's description:
> GCM: D-Bus methods for wake-on-packet
>
> Program the NIC to wake-on-packet for packets arriving from
> the GCM server. Chrome notifies the connection manager (shill)
> by calling D-Bus methods. The return status indicates if the
> operation succeeded or not (depending on hardware support and
> the type of connection).
>
> Keywords: wowlan, wake-on-lan, wake-on-wlan
>
> BUG=360295
> TEST=verified dbus methods are called, and packets are sent on the
> TEST=connection passed to the methods. Also verified that shill
> TEST=programs the NIC correctly, and packets wake up the device.
>
> Committed: https://crrev.com/88a95a70fa94bb578b371490d0f9868584b7096e
> Cr-Commit-Position: refs/heads/master@{#294936}
TBR=derat@chromium.org,fgorski@chromium.org,stevenjb@chromium.org,zea@chromium.org,scheib@chromium.org,yoz@chromium.org,semenzato@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=360295
Review URL: https://codereview.chromium.org/584753002
Cr-Commit-Position: refs/heads/master@{#295592}
Diffstat (limited to 'chromeos/dbus/shill_manager_client.h')
-rw-r--r-- | chromeos/dbus/shill_manager_client.h | 42 |
1 files changed, 11 insertions, 31 deletions
diff --git a/chromeos/dbus/shill_manager_client.h b/chromeos/dbus/shill_manager_client.h index 8bc7251..9b9541d 100644 --- a/chromeos/dbus/shill_manager_client.h +++ b/chromeos/dbus/shill_manager_client.h @@ -14,12 +14,10 @@ #include "chromeos/dbus/shill_client_helper.h" namespace dbus { + class ObjectPath; -} -namespace net { -class IPEndPoint; -} +} // namespace dbus namespace chromeos { @@ -195,53 +193,35 @@ class CHROMEOS_EXPORT ShillManagerClient : public DBusClient { const ObjectPathCallback& callback, const ErrorCallback& error_callback) = 0; - // Verifies that the given data corresponds to a trusted device, and returns - // true to the callback if it is. + // Verify that the given data corresponds to a trusted device, and return true + // to the callback if it is. virtual void VerifyDestination(const VerificationProperties& properties, const BooleanCallback& callback, const ErrorCallback& error_callback) = 0; - // Verifies that the given data corresponds to a trusted device, and if it is, - // returns the encrypted credentials for connecting to the network represented + // Verify that the given data corresponds to a trusted device, and if it is, + // return the encrypted credentials for connecting to the network represented // by the given |service_path|, encrypted using the |public_key| for the - // trusted device. If the device is not trusted, returns the empty string. + // trusted device. If the device is not trusted, return the empty string. virtual void VerifyAndEncryptCredentials( const VerificationProperties& properties, const std::string& service_path, const StringCallback& callback, const ErrorCallback& error_callback) = 0; - // Verifies that the given data corresponds to a trusted device, and returns - // the |data| encrypted using the |public_key| for the trusted device. If the - // device is not trusted, returns the empty string. + // Verify that the given data corresponds to a trusted device, and return the + // |data| encrypted using the |public_key| for the trusted device. If the + // device is not trusted, return the empty string. virtual void VerifyAndEncryptData(const VerificationProperties& properties, const std::string& data, const StringCallback& callback, const ErrorCallback& error_callback) = 0; - // For each technology present, connects to the "best" service available. + // For each technology present, connect to the "best" service available. // Called once the user is logged in and certificates are loaded. virtual void ConnectToBestServices(const base::Closure& callback, const ErrorCallback& error_callback) = 0; - // Requests that shill program the NIC so that packets incoming on - // |ip_connection| wake up the CPU. - virtual void AddWakeOnPacketConnection( - const net::IPEndPoint& ip_endpoint, - const base::Closure& callback, - const ErrorCallback& error_callback) = 0; - - // Removes a request to wake up on packets coming on |ip_connection|. - virtual void RemoveWakeOnPacketConnection( - const net::IPEndPoint& ip_endpoint, - const base::Closure& callback, - const ErrorCallback& error_callback) = 0; - - // Clears all requests to wake up on packets. - virtual void RemoveAllWakeOnPacketConnections( - const base::Closure& callback, - const ErrorCallback& error_callback) = 0; - // Returns an interface for testing (stub only), or returns NULL. virtual TestInterface* GetTestInterface() = 0; |