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

src/service_manager.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_MANAGER_H_
 #define SRC_SERVICE_MANAGER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 60 matching lines @@
                                  const DBus::Variant& new_value);
 
     // receive incoming StateChanged D-Bus signal from Flimflam
     virtual void StateChanged(const std::string& new_state_string);
 
     // Service methods
 
     // a child Service wants us to emit an update about its data plans
     virtual void EmitDataPlansUpdate(const Service& service);
 
+    // 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:
     // D-Bus connection owned by our creator
     // shared with Service objs that we create
     DBus::Connection& connection_;
 
     // collection of Service objs representing cellular services
     ServiceMap services_;
 
     // Cashew server implementing our front-end interface
     CashewServer *cashew_server_;
 
     // default technology most recently reported by Flimflam
     Service::Type default_technology_;
 
     // the cellular service, if any, that we think is the default service
     // can be NULL if we don't know the default service or a non-cellular
     // service is the default
     Service *default_cellular_service_;
 
     // global connectivity state most recently reported by Flimflam
     ConnectivityState connectivity_state_;
 
+    // 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_;
+
     // delete a collection of services
     void DeleteServices(ServiceMap *service_map);
 
+    // glib integration: static wrapper for GetFlimflamProperties
+    // takes object ptr as data and invokes object->GetFlimflamProperties()
+    static gboolean StaticGetFlimflamPropertiesCallback(gpointer data);
+
     // get interesting properties from Flimflam such as Services and
     // DefaultTechnology
-    void GetFlimflamProperties();
+    // returns true on success and false on failure
+    bool GetFlimflamProperties();
 
     // we've received updated DefaultTechnology info from Flimflam
     void OnDefaultTechnologyUpdate(const std::string& default_technology);
 
     // we've received updated Services info from Flimflam
     void OnServicesUpdate(const ServicePathList& paths);
 
     // Flimflam has started advertising a new service
     void OnNewService(const DBus::Path& path);
 
@@ skipping 21 matching lines @@
 
     // Flimflam has told us that it has gone offline
     void OnFlimflamOffline();
 
     DISALLOW_COPY_AND_ASSIGN(ServiceManager);
 };
 
 }  // namespace cashew
 
 #endif  // SRC_SERVICE_MANAGER_H_