summaryrefslogtreecommitdiffstats
path: root/dbus/object_proxy.cc
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-14 22:10:24 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-14 22:10:24 +0000
commitdf159b2125d12fcc957c53d0c9822995dfcc8bfd (patch)
treed9a268376675f5416e92c15319c948fc524b21c1 /dbus/object_proxy.cc
parente941828154d023ebedfbc90197efb80b092c5856 (diff)
downloadchromium_src-df159b2125d12fcc957c53d0c9822995dfcc8bfd.zip
chromium_src-df159b2125d12fcc957c53d0c9822995dfcc8bfd.tar.gz
chromium_src-df159b2125d12fcc957c53d0c9822995dfcc8bfd.tar.bz2
Stop restricting the sender object path for incoming signals.
Restricting the sender path makes it impossible to test signal handling with dbus-send --type=signal, as it uses "/" as the sender object path. For now, let's remove the restriction. We can make this restriction customizable when it becomes necessary. This is for http://codereview.chromium.org/7862020/ TEST=dbus_unittests BUG=none Review URL: http://codereview.chromium.org/7845029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101171 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'dbus/object_proxy.cc')
-rw-r--r--dbus/object_proxy.cc14
1 files changed, 8 insertions, 6 deletions
diff --git a/dbus/object_proxy.cc b/dbus/object_proxy.cc
index faeee0e..863bef5 100644
--- a/dbus/object_proxy.cc
+++ b/dbus/object_proxy.cc
@@ -291,10 +291,14 @@ void ObjectProxy::ConnectToSignalInternal(
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()) {
@@ -341,9 +345,7 @@ DBusHandlerResult ObjectProxy::HandleMessage(
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();