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

src/main.cc

 // 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.
 
 #include <config.h>
 
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <glib.h>
 
 #include <dbus-c++/dbus.h>
 #include <dbus-c++/glib-integration.h>
 #include <gflags/gflags.h>
 #include <glog/logging.h>
 
 #include "src/cashew_server.h"
 #include "src/service_manager.h"
 
 namespace cashew {
 
+static const int kMillisecondsPerSecond = 1000;
+static const int kDBusConnectionTimeoutMilliseconds =
+    1 * kMillisecondsPerSecond;
+
 typedef int Signal;
 typedef void (*SignalHandler)(Signal signal);
 
 int InstallSignalHandler(const Signal signal,
                          const SignalHandler signal_handler,
                          const sigset_t& mask) {
   DLOG(INFO) << "installing handler for signal " << signal;
   struct sigaction action;
   memset(&action, 0, sizeof(action));
   action.sa_handler = signal_handler;
@@ skipping 78 matching lines @@
   if (cashew::dispatcher == NULL) {
     LOG(ERROR) << "couldn't create dbus dispatcher";
     cashew::CleanUpForExit();
     exit(EXIT_FAILURE);
   }
   DBus::default_dispatcher = cashew::dispatcher;
   cashew::dispatcher->attach(NULL);
 
   DLOG(INFO) << "creating service manager";
   DBus::Connection client_conn = DBus::Connection::SystemBus();
+  client_conn.set_timeout(cashew::kDBusConnectionTimeoutMilliseconds);
   cashew::service_manager = new(std::nothrow) cashew::ServiceManager(
       client_conn);
   if (cashew::service_manager == NULL) {
     LOG(ERROR) << "couldn't create service manager";
     cashew::CleanUpForExit();
     exit(EXIT_FAILURE);
   }
 
   DLOG(INFO) << "creating cashew server";
   // TODO(vlaviano): can we share a single conn for client and server roles?
   DBus::Connection server_conn = DBus::Connection::SystemBus();
   server_conn.request_name(cashew::CashewServer::kServiceName);
+  server_conn.set_timeout(cashew::kDBusConnectionTimeoutMilliseconds);
   cashew::server = new(std::nothrow) cashew::CashewServer(server_conn,
       cashew::service_manager);
   if (cashew::server == NULL) {
     LOG(ERROR) << "couldn't create cashew server";
     cashew::CleanUpForExit();
     exit(EXIT_FAILURE);
   }
 
   if (cashew::InstallSignalHandlers() < 0) {
     LOG(ERROR) << "couldn't install signal handlers";
     cashew::CleanUpForExit();
     exit(EXIT_FAILURE);
   }
 
   DLOG(INFO) << "entering event loop";
   g_main_loop_run(cashew::main_loop);
   DLOG(INFO) << "exited event loop";
   cashew::CleanUpForExit();
   exit(EXIT_SUCCESS);
 }