Stop restricting the sender object path for incoming signals.

dbus/object_proxy.cc

 // Copyright (c) 2011 The Chromium 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 "dbus/bus.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 273 matching lines @@
   bool success = false;
 
   if (bus_->Connect() && bus_->SetUpAsyncOperations()) {
     // We should add the filter only once. Otherwise, HandleMessage() will
     // be called more than once.
     if (!filter_added_) {
       bus_->AddFilterFunction(&ObjectProxy::HandleMessageThunk, this);
       filter_added_ = true;
     }
     // Add a match rule so the signal goes through HandleMessage().
+    //
+    // We don't restrict the sender object path to be |object_path_| here,
+    // to make it easy to test D-Bus signal handling with dbus-send, that
+    // uses "/" as the sender object path. We can make the object path
+    // restriction customizable when it becomes necessary.
     const std::string match_rule =
-        base::StringPrintf("type='signal', interface='%s', path='%s'",
-                           interface_name.c_str(),
-                           object_path_.c_str());
+        base::StringPrintf("type='signal', interface='%s'",
+                           interface_name.c_str());
     ScopedDBusError error;
     bus_->AddMatch(match_rule, error.get());;
     if (error.is_set()) {
       LOG(ERROR) << "Failed to add match rule: " << match_rule;
     } else {
       // Store the match rule, so that we can remove this in Detach().
       match_rules_.push_back(match_rule);
       // Add the signal callback to the method table.
       method_table_[absolute_signal_name] = signal_callback;
       success = true;
@@ skipping 26 matching lines @@
   bus_->AssertOnDBusThread();
   if (dbus_message_get_type(raw_message) != DBUS_MESSAGE_TYPE_SIGNAL)
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 
   // raw_message will be unrefed on exit of the function. Increment the
   // reference so we can use it in Signal.
   dbus_message_ref(raw_message);
   scoped_ptr<Signal> signal(
       Signal::FromRawMessage(raw_message));
 
-  // The signal is not coming from the remote object we are attaching to.
-  if (signal->GetPath() != object_path_)
-    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+  VLOG(1) << "Signal received: " << signal->ToString();
 
   const std::string interface = signal->GetInterface();
   const std::string member = signal->GetMember();
 
   // Check if we know about the signal.
   const std::string absolute_signal_name = GetAbsoluteSignalName(
       interface, member);
   MethodTable::const_iterator iter = method_table_.find(absolute_signal_name);
   if (iter == method_table_.end()) {
     // Don't know about the signal.
@@ skipping 37 matching lines @@
 
 DBusHandlerResult ObjectProxy::HandleMessageThunk(
     DBusConnection* connection,
     DBusMessage* raw_message,
     void* user_data) {
   ObjectProxy* self = reinterpret_cast<ObjectProxy*>(user_data);
   return self->HandleMessage(connection, raw_message);
 }
 
 }  // namespace dbus