summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-01-27Fix of 'dbus-daemon can only handle 64 simultaneous connections on Windows'.Cristian Onet3-0/+9
[Slightly modified by -rh] Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71297 Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de> Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-21Give cmake users some hints/requirements when cross compiling for Windows on ↵Ralf Habacker2-0/+31
Linux. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-201.8.1Simon McVittie2-1/+6
2014-01-20Imported Upstream version 1.8.0upstream/1.8.0Simon McVittie35-719/+790
2014-01-20D-Bus 1.8.0dbus-1.8.0Simon McVittie2-7/+37
2014-01-20Revert "start spec 0.24"Simon McVittie1-10/+2
It hasn't otherwise changed since 1.7.10. This reverts commit fb16f80d457a66610f615b44158330bf7ba68697.
2014-01-17Let cmake 'make check' run test applications as test group.Ralf Habacker1-11/+1
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-17Rename bus-test-launch-helper to test-bus-launch_helper to match common test ↵Ralf Habacker4-8/+8
application naming scheme. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-17Rename bus-test-system to test-bus-system to match common test application ↵Ralf Habacker3-5/+5
naming scheme. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-17Rename bus-test to test-bus to match common test application naming scheme.Ralf Habacker6-12/+12
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-17Rename spawn-test to test-spawn to match common test application naming scheme.Ralf Habacker3-6/+7
[Same change as for shell-test in the previous commit. -smcv] Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-17Rename shell-test to test-shell to match common test application naming scheme.Ralf Habacker3-7/+8
[Add its source file to SOURCES: this test was previously relying on the Automake feature that the default value of foo_bar_SOURCES is foo-bar.c. -smcv] Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-17Rename dbus-test to test-dbus to match common test application naming scheme.Ralf Habacker8-17/+17
[reverted the dbus-specification part -smcv] Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-17Correct test for LIBTOOLIZE by quoting itSimon McVittie1-1/+1
Based on a patch from Roland <blueburn85 gmail com>. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73278
2014-01-17CMake warning--.Ralf Habacker1-1/+1
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-14NEWSSimon McVittie1-0/+30
2014-01-14Don't forget allow_anonymous when merging configsMatt Hoosier1-0/+3
The algorithm to collapse a subsidiary config file's data into the master data structure forgot to examine this flag. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73475 Reviewed-by: Chengwei Yang <chengwei.yang@intel.com> Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-10Fix compile error on opensuse 12.2 with systemd 44 and glibc-2.15.Ralf Habacker1-0/+3
The specific systemd/glibc version do not include syslog.h by default. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73455 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-10tests: don't block and wait for a debugger on abortSimon McVittie2-2/+0
In general, I think developers running the tests would expect them to terminate rather than hanging. Developers who want to debug such an abort by attaching a debugger to a live process can still set DBUS_BLOCK_ON_ABORT in the environment. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252 Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
2014-01-10Use macros for test and helper executable targets on cmake build system.Ralf Habacker5-101/+61
The new macros add_test_executables and add helper_executables provides a platform independent way for specifing dbus test and service applications. On native Windows and Linux/UNIX systems the test applications are directly runable. When cross compiling for Windows on Linux test applications could be executed on the Linux host system with the help of wine and activated binfmt_misc support for wine. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-10Add 'check' cmake target to keep in sync with autotools.Ralf Habacker1-0/+14
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-10Fix mentioned files in Building section.Ralf Habacker1-3/+1
2014-01-10Create session.conf and system.conf for test/data/valid-config-files from ↵Ralf Habacker1-2/+5
*.in files on cmake. We need to patch the listen address. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-10Define TEST_BUS_LAUNCH_BINARY for cmake to keep in sync with autotools.Ralf Habacker3-4/+2
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-10Use cmake build in executable suffix.Ralf Habacker1-3/+2
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-08Remove obsolete cmake project tags in sub directories; we only have one project.Ralf Habacker4-7/+0
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68506 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-07test/dbus-daemon, test/dbus-daemon-eavesdrop: allow external dbus-daemonSimon McVittie2-2/+24
It's easier to automate these tests if they launch their own dbus-daemon, but easier to debug them if they don't: you can launch a dbus-daemon separately, under gdb. However, tests that need a specially-configured dbus-daemon will have to be skipped. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68852 Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
2014-01-07Add glib support to cmake buildsystem.Ralf Habacker6-42/+186
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68506 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-07MSVC compile fix.Ralf Habacker1-0/+1
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73345 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-07Use dbus provided version of va_copy().Ralf Habacker1-1/+1
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=72840 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-06Skip unix only syslog test.Ralf Habacker1-1/+2
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-06start spec 0.24Simon McVittie1-2/+10
2014-01-06start 1.7.11Simon McVittie2-1/+4
2014-01-06Imported Upstream version 1.7.10upstream/1.7.10Simon McVittie45-2073/+3841
2014-01-06Merge branch 'upstream' into upstream-experimentalSimon McVittie0-0/+0
2014-01-061.7.10Simon McVittie3-8/+49
2014-01-06Do not install systemd unit files if build without systemdChengwei Yang1-1/+1
If dbus buid without systemd (--disable-systemd or no systemd libs available when building), we expect not to install dbus systemd unit files because they're only for systemd environment. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71818 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-06Merge remote-tracking branch 'origin/master'Simon McVittie1-1/+1
2014-01-06Define WIN32_LEAN_AND_MEAN in Windows portMatt Fischer1-1/+1
<windows.h> somewhat cloyingly attempts to include <winsock.h> by default, which causes problems if the rest of the program is trying to use the incompatible <winsock2.h>. The Windows sysdep header attempts to prevent this by forcibly defining the winsock header guard macro, so that it will not be included. However, this does not work on MinGW because it uses a different guard macro name. This patch changes the code to instead define WIN32_LEAN_AND_MEAN, which is a more portable way to ensure that <winsock.h> will not be included. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71405 Reviewed-By: Ralf Habacker <ralf.habacker@freenet.de>
2014-01-06dbus-daemon(1): align document about "bind" with DBus SpecChengwei Yang1-6/+7
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=72301 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-06DBus Spec: add document of bind for tcp/nonce-tcp transportChengwei Yang1-2/+19
tcp/nonce-tcp transport has a "bind" key, which can be specified a hostname and will override hostname specified in "host" key. "bind" has a special value "*" which means ip address 0.0.0.0 and will cause dbus-daemon listen on all interfaces. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=72301 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-06DBus Spec: replace tab with 8 spacesChengwei Yang1-213/+213
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=72301 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-06Ensure DBusError is set if _dbus_read_nonce() failChengwei Yang1-1/+9
In _dbus_send_nonce() which call in _dbus_read_nonce() and assert on an error is set if _dbus_read_nonce() fail. However, in _dbus_read_nonce(), it may fail on fopen() and left error is unset. This will crash us if assertions hasn't been disabled. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=72298 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-06kqueue: open watched directories with close-on-exec flagChengwei Yang1-1/+1
[FreeBSD and OpenBSD contributors clarified that O_CLOEXEC has been supported for ~ 2 years on both, so for the moment we're assuming that every platform with kqueue also has working O_CLOEXEC. Please reopen the bug, with a tested patch that uses _dbus_fd_set_close_on_exec() instead, if this assumption turns out to be false. -smcv] Bug: https://bugs.freedesktop.org/show_bug.cgi?id=72213 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-06BusTransaction: remove confusing getter of connectionsChengwei Yang4-9/+2
There is a DBusList* member of BusTransaction named "connections", while its getter function bus_transaction_get_connections() returns context->connections which in fact is a BusConnections pointer, this is quite confusing. Because this is what bus_context_get_connections() returns. This patch call out to bus_context_get_connections() directly and remove the then unused bus_transaction_get_connections(). https://bugs.freedesktop.org/show_bug.cgi?id=71597 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-06_dbus_auth_return_buffer(): remove unused argumentChengwei Yang4-9/+5
The argument bytes_read of _dbus_auth_return_buffer() function isn't used at all, so remove it. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71477 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-06_dbus_listen_unix_socket: don't try to set SO_REUSEADDRSimon McVittie1-8/+0
On Hurd, the setsockopt() fails. Svante Signell confirmed that on at least Linux and kFreeBSD, SO_REUSEADDR "succeeds" on Unix sockets, but doesn't have any practical effect; so rather than making the failure not issue a warning, we might as well not bother with the syscall at all. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69492 Reviewed-by: Chengwei Yang <chengwei.yang@intel.com> Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-06_dbus_read_credentials_socket: look at all cmsg headers, not just the firstSimon McVittie1-13/+15
If there are no cmsg headers, don't fail: this fixes receiving credentials on TCP sockets under at least GNU/kFreeBSD, and probably FreeBSD too. If there's more than one cmsg header, ignore any that don't look like valid SCM_CREDS. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69492 Tested-by: Svante Signell Reviewed-by: Chengwei Yang <chengwei.yang@intel.com> [added break, altered indentation in response to review -smcv] Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-06If sendmsg() with SCM_CREDS fails with EINVAL, retry with send()Simon McVittie1-5/+11
Perhaps some OSs accept and ignore attempts to send a SCM_CREDS message on a non-Unix socket, but GNU/kFreeBSD doesn't (and presumably FreeBSD doesn't either). Based on a patch by Svante Signell. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69492 Tested-by: Svante Signell Reviewed-by: Chengwei Yang <chengwei.yang@intel.com>
2014-01-06Fix memory leak for kqueue: shutdown kqueue correctlyChengwei Yang1-13/+74
There are memory blocks leak when doing bus-test, both dispatch-sha1 and dispatch test cases complain memory blocks leak. This patch also fix fd leaks. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69332 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>