* Copyright (C) 2003, 2004 Red Hat, Inc.
*
* Licensed under the Academic Free License version 2.1
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
{
BusContext *context;
BusServerData *bd;
-
+
if (!dbus_server_allocate_data_slot (&server_data_slot))
return NULL;
* if the code in activation.c for the babysitter
* watch handler is fixed.
*/
-
+
return dbus_watch_handle (watch, condition);
}
{
DBusServer *server = data;
BusContext *context;
-
+
context = server_get_context (server);
-
+
return _dbus_loop_add_watch (context->loop,
watch, server_watch_callback, server,
NULL);
{
DBusServer *server = data;
BusContext *context;
-
+
context = server_get_context (server);
-
+
_dbus_loop_remove_watch (context->loop,
watch, server_watch_callback, server);
}
{
DBusServer *server = data;
BusContext *context;
-
+
context = server_get_context (server);
return _dbus_loop_add_timeout (context->loop,
{
DBusServer *server = data;
BusContext *context;
-
+
context = server_get_context (server);
-
+
_dbus_loop_remove_timeout (context->loop,
timeout, server_timeout_callback, server);
}
void *data)
{
BusContext *context = data;
-
+
if (!bus_connections_setup_connection (context->connections, new_connection))
{
_dbus_verbose ("No memory to setup new connection\n");
dbus_connection_set_max_message_unix_fds (new_connection,
context->limits.max_message_unix_fds);
-
+
dbus_connection_set_allow_anonymous (new_connection,
context->allow_anonymous);
static void
free_server_data (void *data)
{
- BusServerData *bd = data;
-
+ BusServerData *bd = data;
+
dbus_free (bd);
}
}
bd->context = context;
-
+
if (!dbus_server_set_auth_mechanisms (server, (const char**) auth_mechanisms))
{
BUS_SET_OOM (error);
return FALSE;
}
-
+
dbus_server_set_new_connection_function (server,
new_connection_callback,
context, NULL);
-
+
if (!dbus_server_set_watch_functions (server,
add_server_watch,
remove_server_watch,
BUS_SET_OOM (error);
return FALSE;
}
-
+
return TRUE;
}
* when config files are reloaded.
*/
static dbus_bool_t
-process_config_first_time_only (BusContext *context,
- BusConfigParser *parser,
- DBusError *error)
+process_config_first_time_only (BusContext *context,
+ BusConfigParser *parser,
+ const DBusString *address,
+ DBusError *error)
{
DBusString log_prefix;
DBusList *link;
{
DBusString u;
DBusStat stbuf;
-
+
_dbus_string_init_const (&u, pidfile);
if (_dbus_stat (&u, &stbuf, NULL))
}
/* Listen on our addresses */
-
- addresses = bus_config_parser_get_addresses (parser);
-
- link = _dbus_list_get_first_link (addresses);
- while (link != NULL)
+
+ if (address)
{
DBusServer *server;
-
- server = dbus_server_listen (link->data, error);
+
+ server = dbus_server_listen (_dbus_string_get_const_data(address), error);
if (server == NULL)
- {
- _DBUS_ASSERT_ERROR_IS_SET (error);
- goto failed;
- }
+ {
+ _DBUS_ASSERT_ERROR_IS_SET (error);
+ goto failed;
+ }
else if (!setup_server (context, server, auth_mechanisms, error))
- {
- _DBUS_ASSERT_ERROR_IS_SET (error);
- goto failed;
- }
+ {
+ _DBUS_ASSERT_ERROR_IS_SET (error);
+ goto failed;
+ }
if (!_dbus_list_append (&context->servers, server))
goto oom;
+ }
+ else
+ {
+ addresses = bus_config_parser_get_addresses (parser);
+
+ link = _dbus_list_get_first_link (addresses);
+ while (link != NULL)
+ {
+ DBusServer *server;
- link = _dbus_list_get_next_link (addresses, link);
+ server = dbus_server_listen (link->data, error);
+ if (server == NULL)
+ {
+ _DBUS_ASSERT_ERROR_IS_SET (error);
+ goto failed;
+ }
+ else if (!setup_server (context, server, auth_mechanisms, error))
+ {
+ _DBUS_ASSERT_ERROR_IS_SET (error);
+ goto failed;
+ }
+
+ if (!_dbus_list_append (&context->servers, server))
+ goto oom;
+
+ link = _dbus_list_get_next_link (addresses, link);
+ }
}
context->fork = bus_config_parser_get_fork (parser);
char *addr;
const char *servicehelper;
char *s;
-
+
dbus_bool_t retval;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
failed:
_dbus_string_free (&full_address);
-
+
if (addr)
dbus_free (addr);
ForceForkSetting force_fork,
DBusPipe *print_addr_pipe,
DBusPipe *print_pid_pipe,
+ const DBusString *address,
DBusError *error)
{
DBusString log_prefix;
_DBUS_ASSERT_ERROR_IS_SET (error);
goto failed;
}
-
- if (!process_config_first_time_only (context, parser, error))
+
+ if (!process_config_first_time_only (context, parser, address, error))
{
_DBUS_ASSERT_ERROR_IS_SET (error);
goto failed;
_DBUS_ASSERT_ERROR_IS_SET (error);
goto failed;
}
-
+
/* we need another ref of the server data slot for the context
* to own
*/
DBusString addr;
const char *a = bus_context_get_address (context);
int bytes;
-
+
_dbus_assert (a != NULL);
if (!_dbus_string_init (&addr))
{
BUS_SET_OOM (error);
goto failed;
}
-
+
if (!_dbus_string_append (&addr, a) ||
!_dbus_string_append (&addr, "\n"))
{
if (!_dbus_pipe_is_stdout_or_stderr (print_addr_pipe))
_dbus_pipe_close (print_addr_pipe, NULL);
-
+
_dbus_string_free (&addr);
}
-
+
context->connections = bus_connections_new (context);
if (context->connections == NULL)
{
if ((force_fork != FORK_NEVER && context->fork) || force_fork == FORK_ALWAYS)
{
_dbus_verbose ("Forking and becoming daemon\n");
-
- if (!_dbus_become_daemon (context->pidfile ? &u : NULL,
+
+ if (!_dbus_become_daemon (context->pidfile ? &u : NULL,
print_pid_pipe,
error,
context->keep_umask))
else
{
_dbus_verbose ("Fork not requested\n");
-
+
/* Need to write PID file and to PID pipe for ourselves,
* not for the child process. This is a no-op if the pidfile
* is NULL and print_pid_pipe is NULL.
bus_config_parser_unref (parser);
parser = NULL;
}
-
+
/* Here we change our credentials if required,
* as soon as we've set up our sockets and pidfile
*/
}
dbus_server_free_data_slot (&server_data_slot);
-
+
return context;
-
- failed:
+
+ failed:
if (parser != NULL)
bus_config_parser_unref (parser);
if (context != NULL)
if (server_data_slot >= 0)
dbus_server_free_data_slot (&server_data_slot);
-
+
return NULL;
}
_DBUS_ASSERT_ERROR_IS_SET (error);
goto failed;
}
-
+
if (!process_config_every_time (context, parser, TRUE, error))
{
_DBUS_ASSERT_ERROR_IS_SET (error);
if (server == NULL ||
!dbus_server_get_is_connected (server))
return;
-
+
if (!dbus_server_set_watch_functions (server,
NULL, NULL, NULL,
context,
NULL))
_dbus_assert_not_reached ("setting watch functions to NULL failed");
-
+
if (!dbus_server_set_timeout_functions (server,
NULL, NULL, NULL,
context,
NULL))
_dbus_assert_not_reached ("setting timeout functions to NULL failed");
-
+
dbus_server_disconnect (server);
}
if (context->refcount == 0)
{
DBusList *link;
-
+
_dbus_verbose ("Finalizing bus context %p\n", context);
-
+
bus_context_shutdown (context);
if (context->connections)
bus_connections_unref (context->connections);
context->connections = NULL;
}
-
+
if (context->registry)
{
bus_registry_unref (context->registry);
context->registry = NULL;
}
-
+
if (context->activation)
{
bus_activation_unref (context->activation);
while (link != NULL)
{
dbus_server_unref (link->data);
-
+
link = _dbus_list_get_next_link (&context->servers, link);
}
_dbus_list_clear (&context->servers);
bus_policy_unref (context->policy);
context->policy = NULL;
}
-
+
if (context->loop)
{
_dbus_loop_unref (context->loop);
*/
_dbus_delete_file (&u, NULL);
- dbus_free (context->pidfile);
+ dbus_free (context->pidfile);
}
dbus_free (context);
int
bus_context_get_activation_timeout (BusContext *context)
{
-
+
return context->limits.activation_timeout;
}
const char *sender_name;
const char *sender_loginfo;
const char *proposed_recipient_loginfo;
-
+
type = dbus_message_get_type (message);
dest = dbus_message_get_destination (message);
-
+
/* dispatch.c was supposed to ensure these invariants */
_dbus_assert (dest != NULL ||
type == DBUS_MESSAGE_TYPE_SIGNAL ||
sender_name = NULL;
sender_loginfo = "(bus)";
}
-
+
if (proposed_recipient != NULL)
proposed_recipient_loginfo = bus_connection_get_loginfo (proposed_recipient);
else
proposed_recipient_loginfo = "bus";
-
+
switch (type)
{
case DBUS_MESSAGE_TYPE_METHOD_CALL:
case DBUS_MESSAGE_TYPE_METHOD_RETURN:
case DBUS_MESSAGE_TYPE_ERROR:
break;
-
+
default:
_dbus_verbose ("security check disallowing message of unknown type %d\n",
type);
dbus_set_error (error, DBUS_ERROR_ACCESS_DENIED,
"Message bus will not accept messages of unknown type\n");
-
+
return FALSE;
}
requested_reply = FALSE;
-
+
if (sender != NULL)
{
/* First verify the SELinux access controls. If allowed then
return FALSE;
}
-
+
if (bus_connection_is_active (sender))
{
sender_policy = bus_connection_get_policy (sender);
_dbus_assert (sender_policy != NULL);
-
+
/* Fill in requested_reply variable with TRUE if this is a
* reply and the reply was pending.
*/
if (proposed_recipient != NULL /* not to the bus driver */ &&
addressed_recipient == proposed_recipient /* not eavesdropping */)
{
- DBusError error2;
-
+ DBusError error2;
+
dbus_error_init (&error2);
requested_reply = bus_connections_check_reply (bus_connection_get_connections (sender),
transaction,
dbus_set_error (error, DBUS_ERROR_ACCESS_DENIED,
"Client tried to send a message other than %s without being registered",
"Hello");
-
+
return FALSE;
}
}
_dbus_assert ((sender != NULL && sender_policy != NULL) ||
(sender == NULL && sender_policy == NULL));
-
+
if (proposed_recipient != NULL)
{
/* only the bus driver can send to an inactive recipient (as it
}
else
recipient_policy = NULL;
-
+
_dbus_assert ((proposed_recipient != NULL && recipient_policy != NULL) ||
(proposed_recipient != NULL && sender == NULL && recipient_policy == NULL) ||
(proposed_recipient == NULL && recipient_policy == NULL));
-
+
log = FALSE;
if (sender_policy &&
!bus_client_policy_check_can_send (sender_policy,
dbus_message_get_member (message) : "(unset)",
dbus_message_get_error_name (message) ?
dbus_message_get_error_name (message) : "(unset)",
- requested_reply,
+ requested_reply,
dest ? dest : DBUS_SERVICE_DBUS,
proposed_recipient_loginfo);
dbus_set_error (error, DBUS_ERROR_LIMITS_EXCEEDED,
"The destination service \"%s\" has a full message queue",
dest ? dest : (proposed_recipient ?
- bus_connection_get_name (proposed_recipient) :
+ bus_connection_get_name (proposed_recipient) :
DBUS_SERVICE_DBUS));
_dbus_verbose ("security policy disallowing message due to full message queue\n");
return FALSE;
* connection). Only the addressed recipient may reply.
*/
if (type == DBUS_MESSAGE_TYPE_METHOD_CALL &&
- sender &&
+ sender &&
addressed_recipient &&
addressed_recipient == proposed_recipient && /* not eavesdropping */
!bus_connections_expect_reply (bus_connection_get_connections (sender),
_dbus_verbose ("Failed to record reply expectation or problem with the message expecting a reply\n");
return FALSE;
}
-
+
_dbus_verbose ("security policy allowing message\n");
return TRUE;
}
* Copyright (C) 2003 Red Hat, Inc.
*
* Licensed under the Academic Free License version 2.1
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
switch (sig)
{
-#ifdef DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX
- case SIGIO:
+#ifdef DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX
+ case SIGIO:
/* explicit fall-through */
#endif /* DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX */
#ifdef SIGHUP
{
DBusString str;
_dbus_string_init_const (&str, "foo");
- if ((reload_pipe[RELOAD_WRITE_END] > 0) &&
+ if ((reload_pipe[RELOAD_WRITE_END] > 0) &&
!_dbus_write_socket (reload_pipe[RELOAD_WRITE_END], &str, 0, 1))
{
_dbus_warn ("Unable to write to reload pipe.\n");
static void
usage (void)
{
- fprintf (stderr, DBUS_DAEMON_NAME " [--version] [--session] [--system] [--config-file=FILE] [--print-address[=DESCRIPTOR]] [--print-pid[=DESCRIPTOR]] [--fork] [--nofork] [--introspect]\n");
+ fprintf (stderr, DBUS_DAEMON_NAME " [--version] [--session] [--system] [--config-file=FILE] [--print-address[=DESCRIPTOR]] [--print-pid[=DESCRIPTOR]] [--fork] [--nofork] [--introspect] [--address=ADDRESS]\n");
exit (1);
}
introspect (void)
{
DBusString xml;
- const char *v_STRING;
+ const char *v_STRING;
if (!_dbus_string_init (&xml))
goto oom;
}
v_STRING = _dbus_string_get_const_data (&xml);
- printf ("%s\n", v_STRING);
+ printf ("%s\n", v_STRING);
exit (0);
-
+
oom:
_dbus_warn ("Can not introspect - Out of memory\n");
exit (1);
}
+
static void
check_two_config_files (const DBusString *config_file,
const char *extra_arg)
}
static void
+check_two_addresses (const DBusString *address,
+ const char *extra_arg)
+{
+ if (_dbus_string_get_length (address) > 0)
+ {
+ fprintf (stderr, "--%s specified but address %s already requested\n",
+ extra_arg, _dbus_string_get_const_data (address));
+ exit (1);
+ }
+}
+
+static void
check_two_addr_descriptors (const DBusString *addr_fd,
const char *extra_arg)
{
{
DBusError error;
DBusString config_file;
+ DBusString address;
DBusString addr_fd;
DBusString pid_fd;
const char *prev_arg;
if (!_dbus_string_init (&config_file))
return 1;
+ if (!_dbus_string_init (&address))
+ return 1;
+
if (!_dbus_string_init (&addr_fd))
return 1;
const char *file;
check_two_config_files (&config_file, "config-file");
-
+
file = strchr (arg, '=');
++file;
strcmp (prev_arg, "--config-file") == 0)
{
check_two_config_files (&config_file, "config-file");
-
+
if (!_dbus_string_append (&config_file, arg))
exit (1);
}
else if (strcmp (arg, "--config-file") == 0)
; /* wait for next arg */
+ else if (strstr (arg, "--address=") == arg)
+ {
+ const char *file;
+
+ check_two_addresses (&address, "address");
+
+ file = strchr (arg, '=');
+ ++file;
+
+ if (!_dbus_string_append (&address, file))
+ exit (1);
+ }
+ else if (prev_arg &&
+ strcmp (prev_arg, "--address") == 0)
+ {
+ check_two_addresses (&address, "address");
+
+ if (!_dbus_string_append (&address, arg))
+ exit (1);
+ }
+ else if (strcmp (arg, "--address") == 0)
+ ; /* wait for next arg */
else if (strstr (arg, "--print-address=") == arg)
{
const char *desc;
check_two_addr_descriptors (&addr_fd, "print-address");
-
+
desc = strchr (arg, '=');
++desc;
strcmp (prev_arg, "--print-address") == 0)
{
check_two_addr_descriptors (&addr_fd, "print-address");
-
+
if (!_dbus_string_append (&addr_fd, arg))
exit (1);
const char *desc;
check_two_pid_descriptors (&pid_fd, "print-pid");
-
+
desc = strchr (arg, '=');
++desc;
strcmp (prev_arg, "--print-pid") == 0)
{
check_two_pid_descriptors (&pid_fd, "print-pid");
-
+
if (!_dbus_string_append (&pid_fd, arg))
exit (1);
-
+
print_pid = TRUE;
}
else if (strcmp (arg, "--print-pid") == 0)
print_pid = TRUE; /* and we'll get the next arg if appropriate */
else
usage ();
-
+
prev_arg = arg;
-
+
++i;
}
dbus_error_init (&error);
context = bus_context_new (&config_file, force_fork,
&print_addr_pipe, &print_pid_pipe,
+ _dbus_string_get_length(&address) > 0 ? &address : NULL,
&error);
_dbus_string_free (&config_file);
if (context == NULL)
/* bus_context_new() closes the print_addr_pipe and
* print_pid_pipe
*/
-
+
setup_reload_pipe (bus_context_get_loop (context));
#ifdef SIGHUP
_dbus_set_signal_handler (SIGHUP, signal_handler);
#endif
-#ifdef DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX
+#ifdef DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX
_dbus_set_signal_handler (SIGIO, signal_handler);
#endif /* DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX */
-
+
_dbus_verbose ("We are on D-Bus...\n");
_dbus_loop_run (bus_context_get_loop (context));
-
+
bus_context_shutdown (context);
bus_context_unref (context);
bus_selinux_shutdown ();
* Copyright (C) 2003 Red Hat, Inc.
*
* Licensed under the Academic Free License version 2.1
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* if the code in activation.c for the babysitter
* watch handler is fixed.
*/
-
+
return dbus_watch_handle (watch, condition);
}
void *data)
{
DBusConnection *connection = data;
-
+
return _dbus_loop_add_watch (client_loop,
watch, client_watch_callback, connection,
NULL);
void *data)
{
DBusConnection *connection = data;
-
+
_dbus_loop_remove_watch (client_loop,
watch, client_watch_callback, connection);
}
void *data)
{
DBusConnection *connection = data;
-
+
return _dbus_loop_add_timeout (client_loop, timeout, client_timeout_callback, connection, NULL);
}
void *data)
{
DBusConnection *connection = data;
-
+
_dbus_loop_remove_timeout (client_loop, timeout, client_timeout_callback, connection);
}
DBUS_INTERFACE_LOCAL,
"Disconnected"))
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
+
_dbus_verbose ("Removing client %p in disconnect handler\n",
connection);
-
+
_dbus_list_remove (&clients, connection);
dbus_connection_unref (connection);
-
+
if (clients == NULL)
{
_dbus_loop_unref (client_loop);
client_loop = NULL;
}
-
+
return DBUS_HANDLER_RESULT_HANDLED;
}
dbus_bool_t
bus_setup_debug_client (DBusConnection *connection)
{
- dbus_bool_t retval;
+ dbus_bool_t retval;
if (!dbus_connection_add_filter (connection,
client_disconnect_filter,
if (client_loop == NULL)
goto out;
}
-
+
if (!dbus_connection_set_watch_functions (connection,
add_client_watch,
remove_client_watch,
connection,
NULL))
goto out;
-
+
if (!dbus_connection_set_timeout_functions (connection,
add_client_timeout,
remove_client_timeout,
if (!_dbus_list_append (&clients, connection))
goto out;
-
+
retval = TRUE;
-
+
out:
if (!retval)
{
dbus_connection_remove_filter (connection,
client_disconnect_filter,
NULL);
-
+
dbus_connection_set_watch_functions (connection,
NULL, NULL, NULL, NULL, NULL);
dbus_connection_set_timeout_functions (connection,
client_loop = NULL;
}
}
-
+
return retval;
}
void *data)
{
DBusList *link;
-
+
link = _dbus_list_get_first_link (&clients);
while (link != NULL)
{
if (!(* function) (connection, data))
break;
-
+
link = next;
}
}
bus_test_client_listed (DBusConnection *connection)
{
DBusList *link;
-
+
link = _dbus_list_get_first_link (&clients);
while (link != NULL)
{
if (c == connection)
return TRUE;
-
+
link = next;
}
void
bus_test_run_clients_loop (dbus_bool_t block_once)
-{
+{
if (client_loop == NULL)
return;
_dbus_verbose ("---> Dispatching on \"client side\"\n");
-
+
/* dispatch before we block so pending dispatches
* won't make our block return early
*/
_dbus_loop_dispatch (client_loop);
-
+
/* Do one blocking wait, since we're expecting data */
if (block_once)
{
dbus_bool_t block_once)
{
_dbus_verbose ("---> Dispatching on \"server side\"\n");
-
+
/* dispatch before we block so pending dispatches
* won't make our block return early
*/
_dbus_loop_dispatch (bus_context_get_loop (context));
-
+
/* Do one blocking wait, since we're expecting data */
if (block_once)
{
DBusString config_file;
DBusString relative;
BusContext *context;
-
+
if (!_dbus_string_init (&config_file))
{
_dbus_warn ("No memory\n");
_dbus_string_free (&config_file);
return NULL;
}
-
+
dbus_error_init (&error);
- context = bus_context_new (&config_file, FALSE, NULL, NULL, &error);
+ context = bus_context_new (&config_file, FALSE, NULL, NULL, NULL, &error);
if (context == NULL)
{
_DBUS_ASSERT_ERROR_IS_SET (&error);
-
+
_dbus_warn ("Failed to create debug bus context from configuration file %s: %s\n",
filename, error.message);
dbus_error_free (&error);
-
+
_dbus_string_free (&config_file);
-
+
return NULL;
}
_dbus_string_free (&config_file);
-
+
return context;
}
projects / platform / upstream / dbus.git / commitdiff