diff options
| -rw-r--r-- | bus/config-parser.c | 6 | ||||
| -rw-r--r-- | bus/session.conf.in | 2 | ||||
| -rw-r--r-- | cmake/config.h.cmake | 2 | ||||
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | dbus/dbus-message.c | 2 |
5 files changed, 18 insertions, 5 deletions
diff --git a/bus/config-parser.c b/bus/config-parser.c index 1d1b8bf0..ff73ed03 100644 --- a/bus/config-parser.c +++ b/bus/config-parser.c @@ -420,9 +420,9 @@ bus_config_parser_new (const DBusString *basedir, maximum number of file descriptors we can receive. Picking a high value here thus translates directly to more memory allocation. */ - parser->limits.max_incoming_unix_fds = 1024*4; - parser->limits.max_outgoing_unix_fds = 1024*4; - parser->limits.max_message_unix_fds = 1024; + parser->limits.max_incoming_unix_fds = DBUS_DEFAULT_MESSAGE_UNIX_FDS*4; + parser->limits.max_outgoing_unix_fds = DBUS_DEFAULT_MESSAGE_UNIX_FDS*4; + parser->limits.max_message_unix_fds = DBUS_DEFAULT_MESSAGE_UNIX_FDS; /* Making this long means the user has to wait longer for an error * message if something screws up, but making it too short means diff --git a/bus/session.conf.in b/bus/session.conf.in index 716b5e79..bb6f70bc 100644 --- a/bus/session.conf.in +++ b/bus/session.conf.in @@ -49,7 +49,7 @@ <limit name="max_outgoing_bytes">1000000000</limit> <limit name="max_outgoing_unix_fds">250000000</limit> <limit name="max_message_size">1000000000</limit> - <limit name="max_message_unix_fds">4096</limit> + <limit name="max_message_unix_fds">@default_message_unix_fds@</limit> <limit name="service_start_timeout">120000</limit> <limit name="auth_timeout">240000</limit> <limit name="max_completed_connections">100000</limit> diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index 76ccb866..b0dde3dd 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -82,6 +82,8 @@ # define DBUS_ENABLE_X11_AUTOLAUNCH 1 #endif +#define DBUS_DEFAULT_MESSAGE_UNIX_FDS 1024 + #define _DBUS_VA_COPY_ASSIGN(a1,a2) { a1 = a2; } #cmakedefine DBUS_VA_COPY_FUNC diff --git a/configure.ac b/configure.ac index aff812e6..c55ced7d 100644 --- a/configure.ac +++ b/configure.ac @@ -1296,6 +1296,17 @@ if test x$with_valgrind != xno; then AC_DEFINE([WITH_VALGRIND], [1], [Define to add Valgrind instrumentation]) fi +# Determine maximum number of Unix fds which may be passed +AS_CASE([$host_os], + [*qnx*], + [default_message_unix_fds=256], + [*], + [default_message_unix_fds=1024]) +AC_DEFINE_UNQUOTED([DBUS_DEFAULT_MESSAGE_UNIX_FDS], + [$default_message_unix_fds], + [Default for dbus_connection_get_max_message_unix_fds()]) +AC_SUBST([default_message_unix_fds]) + #### Set up final flags LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs" AC_SUBST([LIBDBUS_LIBS]) diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c index 71bcee60..619bc695 100644 --- a/dbus/dbus-message.c +++ b/dbus/dbus-message.c @@ -3802,7 +3802,7 @@ _dbus_message_loader_new (void) SCM_RIGHTS works we need to preallocate an fd array of the maximum number of unix fds we want to receive in advance. A try-and-reallocate loop is not possible. */ - loader->max_message_unix_fds = 1024; + loader->max_message_unix_fds = DBUS_DEFAULT_MESSAGE_UNIX_FDS; if (!_dbus_string_init (&loader->data)) { |