cashew: add local byte counters

src/service.h

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SRC_SERVICE_H_
 #define SRC_SERVICE_H_
 
 #include <glib.h>
 
 #include <map>
@@ skipping 65 matching lines @@
     // get Device object for this service
     // this can return NULL if we don't yet have Device info
     virtual Device* GetDevice() const;
 
     // get data plan info, formatted for D-Bus
     virtual DBusDataPlanList GetDBusDataPlans() const;
 
     // do we think that we're the default service at this time?
     virtual bool IsDefaultService() const;
 
+    typedef enum {
+      kConnectivityStateUnknown = 0,
+      kConnectivityStateRestricted,
+      kConnectivityStateUnrestricted,
+      kConnectivityStateNone,
+    } ConnectivityState;
+
+    // get connectivity state for this service
+    virtual ConnectivityState GetConnectivityState() const;
+
     // Flimflam Service D-Bus Proxy methods
 
     // receive incoming PropertyChanged D-Bus signal from Flimflam service
     virtual void PropertyChanged(const std::string& property_name,
                                  const DBus::Variant& new_value);
 
     // Device methods
 
     // we've received updated Cellular.Carrier info from our child Device
     virtual void OnCarrierUpdate(const std::string& carrier);
 
+    // we've received updated byte counter info from our child Device
+    virtual void OnByteCounterUpdate(uint64 rx_bytes, uint64 tx_bytes);
+
     // DataPlanProviderDelegate methods
 
     // a request to our carrier usage API proxy has completed
     virtual void OnRequestComplete(const DataPlanProvider *provider,
                                    bool successful,
                                    const Value *parsed_usage_update);
 
     // Service Manager methods
 
     // we've received an update from our parent about whether or not we're the
@@ skipping 65 matching lines @@
 
     // GetProperties timer glib source id
     // 0 means no source
     guint get_properties_source_id_;
 
     // are we in the process of retrying our GetProperties call?
     // this flag exists to distinguish between our initial g_idle_add call
     // and our subsequent timer calls
     bool retrying_get_properties_;
 
+    // Service connectivity state
+    // finer-grained connectivity info applicable when |state_| == kStateReady
+    ConnectivityState connectivity_state_;
+
+    // convert connectivity state string to ConnectivityState enum value
+    static ConnectivityState ConnectivityStateFromString(
+        const std::string& connectivity_state);
+
     // convert state string to State enum value
-    State StateFromString(const std::string& state) const;
+    static State StateFromString(const std::string& state);
 
     // we've received updated Device info from Flimflam
     void OnDeviceUpdate(const DBus::Path& device_path);
 
+    // we've received updated Connectivity State info from Flimflam
+    void OnConnectivityStateUpdate(const std::string& connectivity_state);
+
     // we've received updated State info from Flimflam
     void OnStateUpdate(const std::string& state);
 
     // we've received updated Type info from Flimflam
     void OnTypeUpdate(const std::string& type);
 
     // we've received updated Cellular.UsageUrl info from Flimflam
     void OnUsageUrlUpdate(const std::string& usage_url);
 
     // glib integration: static wrapper for GetServiceProperties
@@ skipping 65 matching lines @@
     // stop sending periodic usage API requests
     void StopSendingUsageRequests();
 
     // start sending periodic usage API requests
     void StartSendingUsageRequests();
 
     // something has changed, so reevaluate whether or not we should be sending
     // periodic usage API requests and adjust our behavior if necessary
     void ReconsiderSendingUsageRequests();
 
+    // consult policy to determine if we should send an unsolicited update
+    void MaybeEmitDataPlansUpdate();
+
     DISALLOW_COPY_AND_ASSIGN(Service);
 };
 
 }  // namespace cashew
 
 #endif  // SRC_SERVICE_H_