cashew: don't invoke D-Bus methods from within a D-Bus handler

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 95 matching lines @@
     // we've received an update from our parent about whether or not we're the
     // default service
     virtual void OnDefaultServiceUpdate(bool is_default_service);
 
     // we've received an update from our parent that Flimflam has come online
     virtual void OnFlimflamOnline();
 
     // we've received an update from our parent that Flimflam has gone offline
     virtual void OnFlimflamOffline();
 
+    // glib integration interface
+
+    // get idle/timer source id
+    virtual guint GetGetPropertiesSourceId() const;
+
+    // set idle/timer source id
+    virtual void SetGetPropertiesSourceId(guint source_id);
+
+    // are we in the process of retrying our GetProperties call?
+    virtual bool RetryingGetProperties() const;
+
+    // set the retrying flag
+    virtual void OnRetryingGetProperties(bool retrying);
+
   private:
     // back pointer to our parent ServiceManager
     ServiceManager * const parent_;
 
     // D-Bus connection, owned by our creator
     // shared with Device obj that we create
     DBus::Connection& connection_;
 
     // D-Bus path for Flimflam service that we represent
     // this is our unique identifier
@@ skipping 23 matching lines @@
 
     // periodic update timeout
     GSource *update_timeout_source_;
 
     // carrier policy
     Policy *policy_;
 
     // do we think that we're the default service?
     bool is_default_service_;
 
+    // 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_;
+
     // convert state string to State enum value
     State StateFromString(const std::string& state) const;
 
     // we've received updated Device info from Flimflam
     void OnDeviceUpdate(const DBus::Path& device_path);
 
     // 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
+    // takes object ptr as data and invokes object->GetServiceProperties()
+    static gboolean StaticGetServicePropertiesCallback(gpointer data);
+
     // get service properties from Flimflam
-    void GetServiceProperties();
+    // returns true on success and false on failure
+    bool GetServiceProperties();
 
     // clear a DataPlanList and delete its data plan objects
     void DeleteDataPlans(DataPlanList *data_plans);
 
     // create a hardcoded data plan and add it to data_plans_ list
     // for debugging
     void AddHardcodedDataPlan();
 
     // ask provider to request a usage update if it makes sense
     void RequestUsageUpdate();
@@ skipping 55 matching lines @@
     // something has changed, so reevaluate whether or not we should be sending
     // periodic usage API requests and adjust our behavior if necessary
     void ReconsiderSendingUsageRequests();
 
     DISALLOW_COPY_AND_ASSIGN(Service);
 };
 
 }  // namespace cashew
 
 #endif  // SRC_SERVICE_H_