* Copyright (C) 2004 Imendio HB
*
* 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
char *name;
char *exec;
char *user;
+ char *systemd_service;
unsigned long mtime;
BusServiceDirectory *s_dir;
char *filename;
BusActivation *activation;
char *service_name;
char *exec;
+ char *systemd_service;
DBusList *entries;
int n_entries;
DBusBabysitter *babysitter;
bus_service_directory_ref (BusServiceDirectory *dir)
{
_dbus_assert (dir->refcount);
-
+
dir->refcount++;
return dir;
static void
bus_service_directory_unref (BusServiceDirectory *dir)
{
- if (dir == NULL)
- return;
+ if (dir == NULL)
+ return;
_dbus_assert (dir->refcount > 0);
dir->refcount--;
{
if (entry->activation_message)
dbus_message_unref (entry->activation_message);
-
+
if (entry->connection)
dbus_connection_unref (entry->connection);
-
+
dbus_free (entry);
}
_dbus_wait_for_memory ();
}
-static BusPendingActivation *
+static BusPendingActivation *
bus_pending_activation_ref (BusPendingActivation *pending_activation)
{
_dbus_assert (pending_activation->refcount > 0);
bus_pending_activation_unref (BusPendingActivation *pending_activation)
{
DBusList *link;
-
+
if (pending_activation == NULL) /* hash table requires this */
return;
if (pending_activation->refcount > 0)
return;
-
+
if (pending_activation->timeout_added)
{
_dbus_loop_remove_timeout (bus_context_get_loop (pending_activation->activation->context),
if (pending_activation->timeout)
_dbus_timeout_unref (pending_activation->timeout);
-
+
if (pending_activation->babysitter)
{
if (!_dbus_babysitter_set_watch_functions (pending_activation->babysitter,
pending_activation->babysitter,
NULL))
_dbus_assert_not_reached ("setting watch functions to NULL failed");
-
+
_dbus_babysitter_unref (pending_activation->babysitter);
}
-
+
dbus_free (pending_activation->service_name);
dbus_free (pending_activation->exec);
+ dbus_free (pending_activation->systemd_service);
link = _dbus_list_get_first_link (&pending_activation->entries);
pending_activation->n_entries;
_dbus_assert (pending_activation->activation->n_pending_activations >= 0);
-
+
dbus_free (pending_activation);
}
{
if (entry == NULL) /* hash table requires this */
return;
-
+
_dbus_assert (entry->refcount > 0);
entry->refcount--;
-
- if (entry->refcount > 0)
+
+ if (entry->refcount > 0)
return;
-
+
dbus_free (entry->name);
dbus_free (entry->exec);
dbus_free (entry->user);
dbus_free (entry->filename);
+ dbus_free (entry->systemd_service);
dbus_free (entry);
}
BusDesktopFile *desktop_file,
DBusError *error)
{
- char *name, *exec, *user, *exec_tmp;
+ char *name, *exec, *user, *exec_tmp, *systemd_service;
BusActivationEntry *entry;
DBusStat stat_buf;
DBusString file_path;
DBusError tmp_error;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
-
+
name = NULL;
exec = NULL;
user = NULL;
exec_tmp = NULL;
entry = NULL;
-
+ systemd_service = NULL;
+
dbus_error_init (&tmp_error);
if (!_dbus_string_init (&file_path))
BUS_SET_OOM (error);
return FALSE;
}
-
+
if (!_dbus_string_append (&file_path, s_dir->dir_c) ||
!_dbus_concat_dir_and_file (&file_path, filename))
{
BUS_SET_OOM (error);
goto failed;
}
-
- if (!_dbus_stat (&file_path, &stat_buf, NULL))
+
+ if (!_dbus_stat (&file_path, &stat_buf, NULL))
{
dbus_set_error (error, DBUS_ERROR_FAILED,
"Can't stat the service file\n");
goto failed;
}
-
+
if (!bus_desktop_file_get_string (desktop_file,
DBUS_SERVICE_SECTION,
DBUS_SERVICE_NAME,
}
_DBUS_ASSERT_ERROR_IS_CLEAR (&tmp_error);
- entry = _dbus_hash_table_lookup_string (s_dir->entries,
+ /* systemd service is never required */
+ if (!bus_desktop_file_get_string (desktop_file,
+ DBUS_SERVICE_SECTION,
+ DBUS_SERVICE_SYSTEMD_SERVICE,
+ &systemd_service, &tmp_error))
+ {
+ _DBUS_ASSERT_ERROR_IS_SET (&tmp_error);
+ /* if we got OOM, then exit */
+ if (dbus_error_has_name (&tmp_error, DBUS_ERROR_NO_MEMORY))
+ {
+ dbus_move_error (&tmp_error, error);
+ goto failed;
+ }
+ else
+ {
+ /* if we have error because we didn't find anything then continue */
+ dbus_error_free (&tmp_error);
+ dbus_free (systemd_service);
+ systemd_service = NULL;
+ }
+ }
+
+ _DBUS_ASSERT_ERROR_IS_CLEAR (&tmp_error);
+
+ entry = _dbus_hash_table_lookup_string (s_dir->entries,
_dbus_string_get_const_data (filename));
exec = strdup (_dbus_replace_install_prefix (exec_tmp));
if (entry == NULL) /* New file */
- {
+ {
/* FIXME we need a better-defined algorithm for which service file to
* pick than "whichever one is first in the directory listing"
*/
"Service %s already exists in activation entry list\n", name);
goto failed;
}
-
+
entry = dbus_new0 (BusActivationEntry, 1);
if (entry == NULL)
{
BUS_SET_OOM (error);
goto failed;
}
-
+
entry->name = name;
entry->exec = exec;
entry->user = user;
+ entry->systemd_service = systemd_service;
entry->refcount = 1;
-
+
entry->s_dir = s_dir;
entry->filename = _dbus_strdup (_dbus_string_get_const_data (filename));
if (!entry->filename)
BUS_SET_OOM (error);
goto failed;
}
-
+
if (!_dbus_hash_table_insert_string (s_dir->entries, entry->filename, bus_activation_entry_ref (entry)))
{
/* Revert the insertion in the entries table */
name, _dbus_string_get_const_data (&file_path));
goto failed;
}
-
+
dbus_free (entry->name);
dbus_free (entry->exec);
dbus_free (entry->user);
+ dbus_free (entry->systemd_service);
+ entry->systemd_service = systemd_service;
entry->name = name;
entry->exec = exec;
entry->user = user;
BUS_SET_OOM (error);
/* Also remove path to entries hash since we want this in sync with
* the entries hash table */
- _dbus_hash_table_remove_string (entry->s_dir->entries,
+ _dbus_hash_table_remove_string (entry->s_dir->entries,
entry->filename);
bus_activation_entry_unref (entry);
return FALSE;
}
}
-
+
entry->mtime = stat_buf.mtime;
-
+
_dbus_string_free (&file_path);
bus_activation_entry_unref (entry);
dbus_free (name);
dbus_free (exec_tmp);
dbus_free (user);
+ dbus_free (systemd_service);
_dbus_string_free (&file_path);
if (entry)
bus_activation_entry_unref (entry);
-
+
return FALSE;
}
retval = TRUE;
tmp_entry = entry;
-
+
_dbus_string_init_const (&filename, entry->filename);
-
+
if (!_dbus_string_init (&file_path))
{
BUS_SET_OOM (error);
return FALSE;
}
-
+
if (!_dbus_string_append (&file_path, entry->s_dir->dir_c) ||
!_dbus_concat_dir_and_file (&file_path, &filename))
{
retval = FALSE;
goto out;
}
-
+
if (!_dbus_stat (&file_path, &stat_buf, NULL))
{
_dbus_verbose ("****** Can't stat file \"%s\", removing from cache\n",
retval = TRUE;
goto out;
}
- else
+ else
{
- if (stat_buf.mtime > entry->mtime)
+ if (stat_buf.mtime > entry->mtime)
{
BusDesktopFile *desktop_file;
DBusError tmp_error;
-
+
dbus_error_init (&tmp_error);
-
+
desktop_file = bus_desktop_file_load (&file_path, &tmp_error);
if (desktop_file == NULL)
{
_dbus_verbose ("Could not load %s: %s\n",
- _dbus_string_get_const_data (&file_path),
+ _dbus_string_get_const_data (&file_path),
tmp_error.message);
if (dbus_error_has_name (&tmp_error, DBUS_ERROR_NO_MEMORY))
{
retval = TRUE;
goto out;
}
-
- /* @todo We can return OOM or a DBUS_ERROR_FAILED error
+
+ /* @todo We can return OOM or a DBUS_ERROR_FAILED error
* Handle these both better
- */
+ */
if (!update_desktop_file_entry (activation, entry->s_dir, &filename, desktop_file, &tmp_error))
{
bus_desktop_file_free (desktop_file);
retval = TRUE;
goto out;
}
-
+
bus_desktop_file_free (desktop_file);
retval = TRUE;
}
}
-
+
out:
_dbus_string_free (&file_path);
dbus_bool_t retval;
BusActivationEntry *entry;
DBusString full_path;
-
+
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
-
+
iter = NULL;
desktop_file = NULL;
-
+
_dbus_string_init_const (&dir, s_dir->dir_c);
-
+
if (!_dbus_string_init (&filename))
{
BUS_SET_OOM (error);
retval = FALSE;
/* from this point it's safe to "goto out" */
-
+
iter = _dbus_directory_open (&dir, error);
if (iter == NULL)
{
_dbus_verbose ("Failed to open directory %s: %s\n",
- s_dir->dir_c,
+ s_dir->dir_c,
error ? error->message : "unknown");
goto out;
}
-
+
/* Now read the files */
dbus_error_init (&tmp_error);
while (_dbus_directory_get_next_file (iter, &filename, &tmp_error))
{
_dbus_assert (!dbus_error_is_set (&tmp_error));
-
+
_dbus_string_set_length (&full_path, 0);
-
+
if (!_dbus_string_ends_with_c_str (&filename, ".service"))
{
_dbus_verbose ("Skipping non-.service file %s\n",
}
entry = _dbus_hash_table_lookup_string (s_dir->entries, _dbus_string_get_const_data (&filename));
- if (entry) /* Already has this service file in the cache */
+ if (entry) /* Already has this service file in the cache */
{
if (!check_service_file (activation, entry, NULL, error))
goto out;
continue;
}
-
+
if (!_dbus_string_append (&full_path, s_dir->dir_c) ||
!_dbus_concat_dir_and_file (&full_path, &filename))
{
BUS_SET_OOM (error);
goto out;
}
-
+
/* New file */
desktop_file = bus_desktop_file_load (&full_path, &tmp_error);
if (desktop_file == NULL)
dbus_move_error (&tmp_error, error);
goto out;
}
-
+
dbus_error_free (&tmp_error);
continue;
}
- /* @todo We can return OOM or a DBUS_ERROR_FAILED error
+ /* @todo We can return OOM or a DBUS_ERROR_FAILED error
* Handle these both better
- */
+ */
if (!update_desktop_file_entry (activation, s_dir, &filename, desktop_file, &tmp_error))
{
bus_desktop_file_free (desktop_file);
desktop_file = NULL;
-
+
_dbus_verbose ("Could not add %s to activation entry list: %s\n",
_dbus_string_get_const_data (&full_path), tmp_error.message);
dbus_move_error (&tmp_error, error);
goto out;
}
-
+
retval = TRUE;
out:
_DBUS_ASSERT_ERROR_IS_SET (error);
else
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
-
+
if (iter != NULL)
_dbus_directory_close (iter);
_dbus_string_free (&filename);
_dbus_string_free (&full_path);
-
+
return retval;
}
(DBusFreeFunction) dbus_free,
(DBusFreeFunction) dbus_free);
- if (activation->environment == NULL)
+ if (activation->environment == NULL)
{
BUS_SET_OOM (error);
goto failed;
}
return activation;
-
+
failed:
- bus_activation_unref (activation);
+ bus_activation_unref (activation);
return NULL;
}
bus_activation_ref (BusActivation *activation)
{
_dbus_assert (activation->refcount > 0);
-
+
activation->refcount += 1;
return activation;
if (activation->refcount > 0)
return;
-
+
dbus_free (activation->server_address);
if (activation->entries)
_dbus_hash_table_unref (activation->entries);
if (activation->pending_activations)
_dbus_hash_table_unref (activation->pending_activations);
- if (activation->directories)
+ if (activation->directories)
_dbus_hash_table_unref (activation->directories);
if (activation->environment)
_dbus_hash_table_unref (activation->environment);
DBusError *error)
{
const char *type;
-
+
if (!bus_activation_set_environment_variable (activation,
"DBUS_STARTER_ADDRESS",
activation->server_address,
error))
return FALSE;
-
+
type = bus_context_get_type (activation->context);
if (type != NULL)
{
_dbus_verbose ("Restoring pending activation for service %s, has timeout = %d\n",
d->pending_activation->service_name,
d->pending_activation->timeout_added);
-
+
_dbus_hash_table_insert_string_preallocated (d->pending_activation->activation->pending_activations,
d->hash_entry,
d->pending_activation->service_name, d->pending_activation);
bus_pending_activation_ref (d->pending_activation);
-
+
d->hash_entry = NULL;
}
d->hash_entry);
bus_pending_activation_unref (d->pending_activation);
-
+
dbus_free (d);
}
d = dbus_new (RestorePendingData, 1);
if (d == NULL)
return FALSE;
-
+
d->pending_activation = pending_activation;
d->hash_entry = _dbus_hash_table_preallocate_entry (d->pending_activation->activation->pending_activations);
-
+
bus_pending_activation_ref (d->pending_activation);
-
+
if (d->hash_entry == NULL ||
!bus_transaction_add_cancel_hook (transaction, restore_pending, d,
free_pending_restore_data))
}
_dbus_verbose ("Saved pending activation to be restored if the transaction fails\n");
-
+
return TRUE;
}
DBusList *link;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
-
+
/* Check if it's a pending activation */
pending_activation = _dbus_hash_table_lookup_string (activation->pending_activations, service_name);
{
BusPendingActivationEntry *entry = link->data;
DBusList *next = _dbus_list_get_next_link (&pending_activation->entries, link);
-
+
if (dbus_connection_get_is_connected (entry->connection))
{
/* Only send activation replies to regular activation requests. */
if (!entry->auto_activation)
{
dbus_uint32_t result;
-
+
message = dbus_message_new_method_return (entry->activation_message);
if (!message)
{
}
result = DBUS_START_REPLY_SUCCESS;
-
+
if (!dbus_message_append_args (message,
DBUS_TYPE_UINT32, &result,
DBUS_TYPE_INVALID))
BUS_SET_OOM (error);
goto error;
}
-
+
if (!bus_transaction_send_from_driver (transaction, entry->connection, message))
{
dbus_message_unref (message);
BUS_SET_OOM (error);
goto error;
}
-
+
dbus_message_unref (message);
}
}
-
+
link = next;
}
DBusList *link;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
-
+
/* Check if it's a pending activation */
pending_activation = _dbus_hash_table_lookup_string (activation->pending_activations,
bus_service_get_name (service));
if (entry->auto_activation && dbus_connection_get_is_connected (entry->connection))
{
DBusConnection *addressed_recipient;
-
+
addressed_recipient = bus_service_get_primary_owners_connection (service);
/* Resume dispatching where we left off in bus_dispatch() */
BUS_SET_OOM (error);
goto error;
}
-
+
_dbus_hash_table_remove_string (activation->pending_activations, bus_service_get_name (service));
return TRUE;
BusActivation *activation;
DBusList *link;
BusTransaction *transaction;
-
+
activation = pending_activation->activation;
transaction = bus_transaction_new (activation->context);
if (transaction == NULL)
return FALSE;
-
+
link = _dbus_list_get_first_link (&pending_activation->entries);
while (link != NULL)
{
BusPendingActivationEntry *entry = link->data;
DBusList *next = _dbus_list_get_next_link (&pending_activation->entries, link);
-
+
if (dbus_connection_get_is_connected (entry->connection))
{
if (!bus_transaction_send_error_reply (transaction,
entry->activation_message))
goto error;
}
-
+
link = next;
}
bus_transaction_execute_and_free (transaction);
-
+
return TRUE;
error:
void *data)
{
BusPendingActivation *pending_activation = data;
-
+
_dbus_loop_remove_watch (bus_context_get_loop (pending_activation->activation->context),
watch, babysitter_watch_callback, pending_activation);
}
{
BusPendingActivation *pending_activation = data;
DBusError error;
-
+
/* Kill the spawned process, since it sucks
* (not sure this is what we want to do, but
* may as well try it for now)
*/
- if (pending_activation->babysitter)
+ if (pending_activation->babysitter)
_dbus_babysitter_kill_child (pending_activation->babysitter);
dbus_error_init (&error);
if (pending_activation->babysitter)
_dbus_babysitter_kill_child (pending_activation->babysitter);
-
+
_dbus_hash_table_remove_string (pending_activation->activation->pending_activations,
pending_activation->service_name);
}
free_pending_cancel_data (void *data)
{
BusPendingActivation *pending_activation = data;
-
+
bus_pending_activation_unref (pending_activation);
}
static dbus_bool_t
add_cancel_pending_to_transaction (BusTransaction *transaction,
BusPendingActivation *pending_activation)
-{
+{
if (!bus_transaction_add_cancel_hook (transaction, cancel_pending,
pending_activation,
free_pending_cancel_data))
return FALSE;
- bus_pending_activation_ref (pending_activation);
-
+ bus_pending_activation_ref (pending_activation);
+
_dbus_verbose ("Saved pending activation to be canceled if the transaction fails\n");
-
+
return TRUE;
}
-static dbus_bool_t
+static dbus_bool_t
update_service_cache (BusActivation *activation, DBusError *error)
{
DBusHashIter iter;
-
+
_dbus_hash_iter_init (activation->directories, &iter);
while (_dbus_hash_iter_next (&iter))
{
continue;
}
}
-
+
return TRUE;
}
static BusActivationEntry *
-activation_find_entry (BusActivation *activation,
+activation_find_entry (BusActivation *activation,
const char *service_name,
DBusError *error)
{
BusActivationEntry *entry;
-
+
entry = _dbus_hash_table_lookup_string (activation->entries, service_name);
if (!entry)
- {
- if (!update_service_cache (activation, error))
+ {
+ if (!update_service_cache (activation, error))
return NULL;
entry = _dbus_hash_table_lookup_string (activation->entries,
service_name);
}
- else
+ else
{
BusActivationEntry *updated_entry;
- if (!check_service_file (activation, entry, &updated_entry, error))
+ if (!check_service_file (activation, entry, &updated_entry, error))
return NULL;
entry = updated_entry;
}
- if (!entry)
+ if (!entry)
{
dbus_set_error (error, DBUS_ERROR_SERVICE_UNKNOWN,
"The name %s was not provided by any .service files",
DBusHashIter iter;
dbus_bool_t activated;
DBusString command;
-
+
activated = TRUE;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
}
entry = activation_find_entry (activation, service_name, error);
- if (!entry)
+ if (!entry)
return FALSE;
/* Bypass the registry lookup if we're auto-activating, bus_dispatch would not
if (bus_registry_lookup (bus_context_get_registry (activation->context), &service_str) != NULL)
{
dbus_uint32_t result;
-
+
_dbus_verbose ("Service \"%s\" is already active\n", service_name);
-
+
message = dbus_message_new_method_return (activation_message);
if (!message)
}
result = DBUS_START_REPLY_ALREADY_RUNNING;
-
+
if (!dbus_message_append_args (message,
DBUS_TYPE_UINT32, &result,
DBUS_TYPE_INVALID))
return retval;
}
}
-
+
pending_activation_entry = dbus_new0 (BusPendingActivationEntry, 1);
if (!pending_activation_entry)
{
dbus_message_ref (activation_message);
pending_activation_entry->connection = connection;
dbus_connection_ref (connection);
-
+
/* Check if the service is being activated */
pending_activation = _dbus_hash_table_lookup_string (activation->pending_activations, service_name);
if (pending_activation)
if (!_dbus_list_append (&pending_activation->entries, pending_activation_entry))
{
_dbus_verbose ("Failed to append a new entry to pending activation\n");
-
+
BUS_SET_OOM (error);
bus_pending_activation_entry_free (pending_activation_entry);
return FALSE;
if (!pending_activation)
{
_dbus_verbose ("Failed to create pending activation\n");
-
+
BUS_SET_OOM (error);
- bus_pending_activation_entry_free (pending_activation_entry);
+ bus_pending_activation_entry_free (pending_activation_entry);
return FALSE;
}
pending_activation->activation = activation;
pending_activation->refcount = 1;
-
+
pending_activation->service_name = _dbus_strdup (service_name);
if (!pending_activation->service_name)
{
_dbus_verbose ("Failed to copy service name for pending activation\n");
-
+
BUS_SET_OOM (error);
bus_pending_activation_unref (pending_activation);
- bus_pending_activation_entry_free (pending_activation_entry);
+ bus_pending_activation_entry_free (pending_activation_entry);
return FALSE;
}
return FALSE;
}
+ if (entry->systemd_service)
+ {
+ pending_activation->systemd_service = _dbus_strdup (entry->systemd_service);
+ if (!pending_activation->systemd_service)
+ {
+ _dbus_verbose ("Failed to copy systemd service for pending activation\n");
+ BUS_SET_OOM (error);
+ bus_pending_activation_unref (pending_activation);
+ bus_pending_activation_entry_free (pending_activation_entry);
+ return FALSE;
+ }
+ }
+
pending_activation->timeout =
_dbus_timeout_new (bus_context_get_activation_timeout (activation->context),
pending_activation_timed_out,
if (!pending_activation->timeout)
{
_dbus_verbose ("Failed to create timeout for pending activation\n");
-
+
BUS_SET_OOM (error);
bus_pending_activation_unref (pending_activation);
bus_pending_activation_entry_free (pending_activation_entry);
NULL))
{
_dbus_verbose ("Failed to add timeout for pending activation\n");
-
+
BUS_SET_OOM (error);
bus_pending_activation_unref (pending_activation);
- bus_pending_activation_entry_free (pending_activation_entry);
+ bus_pending_activation_entry_free (pending_activation_entry);
return FALSE;
}
pending_activation->timeout_added = TRUE;
-
+
if (!_dbus_list_append (&pending_activation->entries, pending_activation_entry))
{
_dbus_verbose ("Failed to add entry to just-created pending activation\n");
-
+
BUS_SET_OOM (error);
bus_pending_activation_unref (pending_activation);
- bus_pending_activation_entry_free (pending_activation_entry);
+ bus_pending_activation_entry_free (pending_activation_entry);
return FALSE;
}
pending_activation->n_entries += 1;
pending_activation->activation->n_pending_activations += 1;
-
+
activated = FALSE;
_dbus_hash_iter_init (activation->pending_activations, &iter);
while (_dbus_hash_iter_next (&iter))
{
BusPendingActivation *p = _dbus_hash_iter_get_value (&iter);
-
- if (strcmp (p->exec, entry->exec) == 0)
+
+ if (strcmp (p->exec, entry->exec) == 0)
{
activated = TRUE;
break;
}
}
-
+
if (!_dbus_hash_table_insert_string (activation->pending_activations,
pending_activation->service_name,
pending_activation))
{
_dbus_verbose ("Failed to put pending activation in hash table\n");
-
+
BUS_SET_OOM (error);
bus_pending_activation_unref (pending_activation);
return FALSE;
}
}
-
+
if (!add_cancel_pending_to_transaction (transaction, pending_activation))
{
_dbus_verbose ("Failed to add pending activation cancel hook to transaction\n");
return FALSE;
}
-
+
if (activated)
return TRUE;
+ if (bus_context_get_systemd_activation (activation->context))
+ {
+ if (strcmp (service_name, "org.freedesktop.systemd1") == 0)
+ /* systemd itself is missing apparently. That can happen
+ only during early startup. Let's just wait until systemd
+ connects to us and do nothing. */
+ return TRUE;
+
+ if (entry->systemd_service)
+ {
+ BusTransaction *activation_transaction;
+ DBusString service_string;
+ BusService *service;
+ BusRegistry *registry;
+
+ /* OK, we have a systemd service configured for this entry,
+ hence let's enqueue an activation request message. This
+ is implemented as a directed signal, not a method call,
+ for three reasons: 1) we don't expect a response on
+ success, where we just expect a name appearing on the
+ bus; 2) at this time the systemd service might not yet
+ have connected, so we wouldn't know the message serial at
+ this point to set up a pending call; 3) it is ugly if the
+ bus suddenly becomes the caller of a remote method. */
+
+ message = dbus_message_new_signal (DBUS_PATH_DBUS,
+ "org.freedesktop.systemd1.Activator",
+ "ActivationRequest");
+ if (!message)
+ {
+ _dbus_verbose ("No memory to create activation message\n");
+ BUS_SET_OOM (error);
+ return FALSE;
+ }
+
+ if (!dbus_message_set_sender (message, DBUS_SERVICE_DBUS) ||
+ !dbus_message_set_destination (message, "org.freedesktop.systemd1") ||
+ !dbus_message_append_args (message,
+ DBUS_TYPE_STRING, &entry->systemd_service,
+ DBUS_TYPE_INVALID))
+ {
+ _dbus_verbose ("No memory to set args of activation message\n");
+ dbus_message_unref (message);
+ BUS_SET_OOM (error);
+ return FALSE;
+ }
+
+ /* Create our transaction */
+ activation_transaction = bus_transaction_new (activation->context);
+ if (activation_transaction == NULL)
+ {
+ _dbus_verbose ("No memory to create activation transaction\n");
+ dbus_message_unref (message);
+ BUS_SET_OOM (error);
+ return FALSE;
+ }
+
+ /* Check whether systemd is already connected */
+ registry = bus_connection_get_registry (connection);
+ _dbus_string_init_const (&service_string, "org.freedesktop.systemd1");
+ service = bus_registry_lookup (registry, &service_string);
+
+ if (service != NULL)
+ /* Wonderful, systemd is connected, let's just send the msg */
+ retval = bus_dispatch_matches (activation_transaction, NULL, bus_service_get_primary_owners_connection (service),
+ message, error);
+ else
+ /* systemd is not around, let's "activate" it. */
+ retval = bus_activation_activate_service (activation, connection, activation_transaction, TRUE,
+ message, "org.freedesktop.systemd1", error);
+
+ dbus_message_unref (message);
+
+ if (!retval)
+ {
+ _DBUS_ASSERT_ERROR_IS_SET (error);
+ _dbus_verbose ("failed to send activation message: %s\n", error->name);
+ bus_transaction_cancel_and_free (activation_transaction);
+ return FALSE;
+ }
+
+ bus_transaction_execute_and_free (activation_transaction);
+ return TRUE;
+ }
+
+ /* OK, we have no configured systemd service, hence let's
+ proceed with traditional activation. */
+ }
+
/* use command as system and session different */
if (!_dbus_string_init (&command))
{
{
_dbus_verbose ("Failed to parse command line: %s\n", entry->exec);
_DBUS_ASSERT_ERROR_IS_SET (error);
-
+
_dbus_hash_table_remove_string (activation->pending_activations,
pending_activation->service_name);
_dbus_verbose ("Spawning %s ...\n", argv[0]);
if (!_dbus_spawn_async_with_babysitter (&pending_activation->babysitter, argv,
envp,
- NULL, activation,
+ NULL, activation,
error))
{
_dbus_verbose ("Failed to spawn child\n");
envp = NULL;
_dbus_assert (pending_activation->babysitter != NULL);
-
+
if (!_dbus_babysitter_set_watch_functions (pending_activation->babysitter,
add_babysitter_watch,
remove_babysitter_watch,
_dbus_verbose ("Failed to set babysitter watch functions\n");
return FALSE;
}
-
+
return TRUE;
}
return FALSE;
}
-
+
+dbus_bool_t
+dbus_activation_systemd_failure (BusActivation *activation,
+ DBusMessage *message)
+{
+ DBusError error;
+ const char *code, *str, *unit = NULL;
+
+ dbus_error_init(&error);
+
+ /* This is called whenever the systemd activator sent us a
+ response. We'll invalidate all pending activations that match the
+ unit name. */
+
+ if (dbus_message_get_args (message, &error,
+ DBUS_TYPE_STRING, &unit,
+ DBUS_TYPE_STRING, &code,
+ DBUS_TYPE_STRING, &str,
+ DBUS_TYPE_INVALID))
+ dbus_set_error(&error, code, str);
+
+ if (unit)
+ {
+ DBusHashIter iter;
+
+ _dbus_hash_iter_init (activation->pending_activations,
+ &iter);
+
+ while (_dbus_hash_iter_next (&iter))
+ {
+ BusPendingActivation *p = _dbus_hash_iter_get_value (&iter);
+
+ if (p->systemd_service && strcmp (p->systemd_service, unit) == 0)
+ pending_activation_failed(p, &error);
+ }
+ }
+
+ dbus_error_free(&error);
+
+ return TRUE;
+}
#ifdef DBUS_BUILD_TESTS
static dbus_bool_t
test_create_service_file (DBusString *dir,
- const char *filename,
- const char *name,
+ const char *filename,
+ const char *name,
const char *exec)
{
DBusString file_name, full_path;
ret_val = FALSE;
goto out;
}
-
+
file = fopen (_dbus_string_get_const_data (&full_path), "w");
if (!file)
{
{
DBusString file_name, full_path;
dbus_bool_t ret_val;
-
+
ret_val = TRUE;
-
+
_dbus_string_init_const (&file_name, filename);
if (!_dbus_string_init (&full_path))
DBusDirIter *iter;
DBusString filename, full_path;
dbus_bool_t ret_val;
-
+
ret_val = TRUE;
-
+
if (!_dbus_string_init (&filename))
return FALSE;
_dbus_string_free (&filename);
return FALSE;
}
-
+
iter = _dbus_directory_open (dir, NULL);
if (iter == NULL)
{
ret_val = FALSE;
goto out;
}
-
- while (_dbus_directory_get_next_file (iter, &filename, NULL))
+
+ while (_dbus_directory_get_next_file (iter, &filename, NULL))
{
if (!test_remove_service_file (dir, _dbus_string_get_const_data (&filename)))
{
init_service_reload_test (DBusString *dir)
{
DBusStat stat_buf;
-
+
if (!_dbus_stat (dir, &stat_buf, NULL))
{
if (!_dbus_create_directory (dir, NULL))
return FALSE;
}
- else
+ else
{
if (!test_remove_directory (dir))
return FALSE;
return TRUE;
}
-typedef struct
+typedef struct
{
BusActivation *activation;
const char *service_name;
BusActivationEntry *entry;
DBusError error;
dbus_bool_t ret_val;
-
+
ret_val = TRUE;
d = data;
-
+
dbus_error_init (&error);
-
+
entry = activation_find_entry (d->activation, d->service_name, &error);
if (entry == NULL)
{
- if (dbus_error_has_name (&error, DBUS_ERROR_NO_MEMORY))
+ if (dbus_error_has_name (&error, DBUS_ERROR_NO_MEMORY))
{
ret_val = TRUE;
}
if (d->expecting_find)
ret_val = FALSE;
}
-
+
dbus_error_free (&error);
}
- else
+ else
{
if (!d->expecting_find)
ret_val = FALSE;
else
err = !check_func (data);
- if (err)
+ if (err)
_dbus_assert_not_reached ("Test failed");
return TRUE;
DBusString address;
DBusList *directories;
CheckData d;
-
+
directories = NULL;
_dbus_string_init_const (&address, "");
-
+
if (!_dbus_list_append (&directories, _dbus_string_get_data (dir)))
- return FALSE;
+ return FALSE;
activation = bus_activation_new (NULL, &address, &directories, NULL);
if (!activation)
return FALSE;
d.activation = activation;
-
+
/* Check for existing service file */
d.expecting_find = TRUE;
d.service_name = SERVICE_NAME_1;
d.expecting_find = TRUE;
d.service_name = SERVICE_NAME_2;
-
+
if (!do_test ("Added service file", oom_test, &d))
return FALSE;
-
+
/* Check for removed service file */
if (!test_remove_service_file (dir, SERVICE_FILE_2))
return FALSE;
if (!do_test ("Removed service file", oom_test, &d))
return FALSE;
-
+
/* Check for updated service file */
-
+
_dbus_sleep_milliseconds (1000); /* Sleep a second to make sure the mtime is updated */
if (!test_create_service_file (dir, SERVICE_FILE_1, SERVICE_NAME_3, "exec-3"))
d.service_name = SERVICE_NAME_1;
if (!do_test ("Updated service file, part 2", oom_test, &d))
- return FALSE;
+ return FALSE;
bus_activation_unref (activation);
_dbus_list_clear (&directories);
if (!_dbus_string_init (&directory))
return FALSE;
-
+
if (!_dbus_string_append (&directory, _dbus_get_tmpdir()))
return FALSE;
-
+
if (!_dbus_string_append (&directory, "/dbus-reload-test-") ||
!_dbus_generate_random_ascii (&directory, 6))
{
return FALSE;
}
-
+
/* Do normal tests */
if (!init_service_reload_test (&directory))
_dbus_assert_not_reached ("could not initiate service reload test");
-
+
if (!do_service_reload_test (&directory, FALSE))
; /* Do nothing? */
-
+
/* Do OOM tests */
if (!init_service_reload_test (&directory))
_dbus_assert_not_reached ("could not initiate service reload test");
-
+
if (!do_service_reload_test (&directory, TRUE))
; /* Do nothing? */
-
+
/* Cleanup test directory */
if (!cleanup_service_reload_test (&directory))
return FALSE;
-
+
_dbus_string_free (&directory);
-
+
return TRUE;
}
* Copyright (C) 2003 CodeFactory AB
*
* 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
dbus_bool_t bus_activation_list_services (BusActivation *registry,
char ***listp,
int *array_len);
+dbus_bool_t dbus_activation_systemd_failure (BusActivation *activation,
+ DBusMessage *message);
dbus_bool_t bus_activation_send_pending_auto_activation_messages (BusActivation *activation,
BusService *service,
DBusError *error);
-
#endif /* BUS_ACTIVATION_H */
unsigned int syslog : 1;
unsigned int keep_umask : 1;
unsigned int allow_anonymous : 1;
+ unsigned int systemd_activation : 1;
};
static dbus_int32_t server_data_slot = -1;
process_config_first_time_only (BusContext *context,
BusConfigParser *parser,
const DBusString *address,
+ dbus_bool_t systemd_activation,
DBusError *error)
{
DBusString log_prefix;
retval = FALSE;
auth_mechanisms = NULL;
+ context->systemd_activation = systemd_activation;
+
/* Check for an existing pid file. Of course this is a race;
* we'd have to use fcntl() locks on the pid file to
* avoid that. But we want to check for the pid file
DBusPipe *print_addr_pipe,
DBusPipe *print_pid_pipe,
const DBusString *address,
+ dbus_bool_t systemd_activation,
DBusError *error)
{
DBusString log_prefix;
goto failed;
}
- if (!process_config_first_time_only (context, parser, address, error))
+ if (!process_config_first_time_only (context, parser, address, systemd_activation, error))
{
_DBUS_ASSERT_ERROR_IS_SET (error);
goto failed;
return context->servicehelper;
}
+dbus_bool_t
+bus_context_get_systemd_activation (BusContext *context)
+{
+ return context->systemd_activation;
+}
+
BusRegistry*
bus_context_get_registry (BusContext *context)
{
DBusPipe *print_addr_pipe,
DBusPipe *print_pid_pipe,
const DBusString *address,
+ dbus_bool_t systemd_activation,
DBusError *error);
dbus_bool_t bus_context_reload_config (BusContext *context,
DBusError *error);
const char* bus_context_get_type (BusContext *context);
const char* bus_context_get_address (BusContext *context);
const char* bus_context_get_servicehelper (BusContext *context);
+dbus_bool_t bus_context_get_systemd_activation (BusContext *context);
BusRegistry* bus_context_get_registry (BusContext *context);
BusConnections* bus_context_get_connections (BusContext *context);
BusActivation* bus_context_get_activation (BusContext *context);
* Copyright (C) 2003 CodeFactory AB
*
* 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
#define DBUS_SERVICE_EXEC "Exec"
#define DBUS_SERVICE_USER "User"
#define DBUS_SERVICE_GROUP "Group"
+#define DBUS_SERVICE_SYSTEMD_SERVICE "SystemdService"
typedef struct BusDesktopFile BusDesktopFile;
* Copyright (C) 2004 Imendio HB
*
* 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 (dbus_message_contains_unix_fds(message) &&
!dbus_connection_can_send_type(connection, DBUS_TYPE_UNIX_FD))
return TRUE; /* silently don't send it */
-
+
if (!bus_transaction_send (transaction,
connection,
message))
}
_dbus_list_clear (&recipients);
-
+
if (dbus_error_is_set (&tmp_error))
{
dbus_move_error (&tmp_error, error);
BusContext *context;
DBusHandlerResult result;
DBusConnection *addressed_recipient;
-
+
result = DBUS_HANDLER_RESULT_HANDLED;
-
+
transaction = NULL;
addressed_recipient = NULL;
dbus_error_init (&error);
-
+
context = bus_connection_get_context (connection);
_dbus_assert (context != NULL);
-
+
/* If we can't even allocate an OOM error, we just go to sleep
* until we can.
*/
while (!bus_connection_preallocate_oom_error (connection))
_dbus_wait_for_memory ();
-
+
/* Ref connection in case we disconnect it at some point in here */
dbus_connection_ref (connection);
-
+
service_name = dbus_message_get_destination (message);
#ifdef DBUS_ENABLE_VERBOSE_MODE
interface_name = dbus_message_get_interface (message);
member_name = dbus_message_get_member (message);
error_name = dbus_message_get_error_name (message);
-
+
_dbus_verbose ("DISPATCH: %s %s %s to %s\n",
interface_name ? interface_name : "(no interface)",
member_name ? member_name : "(no member)",
service_name ? service_name : "peer");
}
#endif /* DBUS_ENABLE_VERBOSE_MODE */
-
+
/* If service_name is NULL, if it's a signal we send it to all
* connections with a match rule. If it's not a signal, there
* are some special cases here but mostly we just bail out.
goto out;
}
}
-
+
/* Create our transaction */
transaction = bus_transaction_new (context);
if (transaction == NULL)
BUS_SET_OOM (&error);
goto out;
}
-
+
/* Assign a sender to the message */
if (bus_connection_is_active (connection))
{
*/
service_name = dbus_message_get_destination (message);
}
-
+
if (service_name &&
strcmp (service_name, DBUS_SERVICE_DBUS) == 0) /* to bus driver */
{
BusRegistry *registry;
_dbus_assert (service_name != NULL);
-
+
registry = bus_connection_get_registry (connection);
-
+
_dbus_string_init_const (&service_string, service_name);
service = bus_registry_lookup (registry, &service_string);
_dbus_verbose ("bus_activation_activate_service() failed: %s\n", error.name);
goto out;
}
-
+
goto out;
}
else if (service == NULL)
*/
if (!bus_dispatch_matches (transaction, connection, addressed_recipient, message, &error))
goto out;
-
+
out:
if (dbus_error_is_set (&error))
{
&error, message))
{
bus_connection_send_oom_error (connection, message);
-
+
/* cancel transaction due to OOM */
if (transaction != NULL)
{
}
}
}
-
-
+
+
dbus_error_free (&error);
}
dbus_bool_t
bus_dispatch_add_connection (DBusConnection *connection)
-{
+{
if (!dbus_connection_add_filter (connection,
bus_dispatch_message_filter,
NULL, NULL))
return FALSE;
-
+
return TRUE;
}
const char *what_is_expected)
{
_dbus_verbose ("expecting: %s\n", what_is_expected);
-
+
while (dbus_connection_get_dispatch_status (connection) ==
DBUS_DISPATCH_COMPLETE &&
dbus_connection_get_is_connected (connection))
DBusError error;
const char *service_name, *old_owner, *new_owner;
- if (d->expected_kind == SERVICE_CREATED
+ if (d->expected_kind == SERVICE_CREATED
&& connection == d->skip_connection)
return TRUE;
dbus_error_init (&error);
d->failed = TRUE;
-
+
message = pop_message_waiting_for_memory (connection);
if (message == NULL)
{
if (dbus_error_has_name (&error, DBUS_ERROR_NO_MEMORY))
{
dbus_error_free (&error);
- _dbus_wait_for_memory ();
+ _dbus_wait_for_memory ();
goto reget_service_info_data;
}
else
goto out;
}
- if (*service_name == ':' && new_owner[0]
+ if (*service_name == ':' && new_owner[0]
&& strcmp (service_name, new_owner) != 0)
{
_dbus_warn ("inconsistent ServiceOwnedChanged message (\"%s\" [ %s -> %s ])\n",
}
d->failed = FALSE;
-
+
out:
dbus_error_free (&error);
-
+
if (message)
dbus_message_unref (message);
CheckServiceOwnerChangedData socd;
_dbus_verbose ("killing connection %p\n", connection);
-
+
s = dbus_bus_get_unique_name (connection);
_dbus_assert (s != NULL);
_dbus_wait_for_memory ();
dbus_connection_ref (connection);
-
+
/* kick in the disconnect handler that unrefs the connection */
dbus_connection_close (connection);
bus_test_run_everything (context);
-
+
_dbus_assert (bus_test_client_listed (connection));
-
+
/* Run disconnect handler in test.c */
if (bus_connection_dispatch_one_message (connection))
_dbus_assert_not_reached ("something received on connection being killed other than the disconnect");
-
+
_dbus_assert (!dbus_connection_get_is_connected (connection));
dbus_connection_unref (connection);
connection = NULL;
_dbus_assert (!bus_test_client_listed (connection));
-
+
socd.expected_kind = SERVICE_DELETED;
socd.expected_service_name = base_service;
socd.failed = FALSE;
socd.skip_connection = NULL;
-
+
bus_test_clients_foreach (check_service_owner_changed_foreach,
&socd);
dbus_free (base_service);
-
+
if (socd.failed)
_dbus_assert_not_reached ("didn't get the expected NameOwnerChanged (deletion) messages");
-
+
if (!check_no_leftovers (context))
_dbus_assert_not_reached ("stuff left in message queues after disconnecting a client");
}
{
/* This kills the connection without expecting it to affect
* the rest of the bus.
- */
+ */
_dbus_verbose ("Unchecked kill of connection %p\n", connection);
dbus_connection_ref (connection);
nmd.failed = FALSE;
bus_test_clients_foreach (check_no_messages_foreach,
&nmd);
-
+
if (nmd.failed)
{
_dbus_verbose ("leftover message found\n");
name_message = NULL;
_dbus_verbose ("check_hello_message for %p\n", connection);
-
+
message = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS,
return TRUE;
dbus_connection_ref (connection); /* because we may get disconnected */
-
+
if (!dbus_connection_send (connection, message, &serial))
{
dbus_message_unref (message);
}
_dbus_assert (dbus_message_has_signature (message, ""));
-
+
dbus_message_unref (message);
message = NULL;
if (!dbus_connection_get_is_connected (connection))
{
_dbus_verbose ("connection was disconnected (presumably auth failed)\n");
-
+
dbus_connection_unref (connection);
-
+
return TRUE;
}
-
+
/* send our message */
bus_test_run_clients_loop (SEND_PENDING (connection));
if (!dbus_connection_get_is_connected (connection))
{
_dbus_verbose ("connection was disconnected (presumably auth failed)\n");
-
+
dbus_connection_unref (connection);
-
+
return TRUE;
}
-
+
block_connection_until_message_from_bus (context, connection, "reply to Hello");
if (!dbus_connection_get_is_connected (connection))
{
_dbus_verbose ("connection was disconnected (presumably auth failed)\n");
-
+
dbus_connection_unref (connection);
-
+
return TRUE;
}
dbus_connection_unref (connection);
-
+
message = pop_message_waiting_for_memory (connection);
if (message == NULL)
{
dbus_message_get_sender (message) : "(none)");
goto out;
}
-
+
if (dbus_message_get_type (message) == DBUS_MESSAGE_TYPE_ERROR)
{
if (dbus_message_is_error (message,
else
{
CheckServiceOwnerChangedData socd;
-
+
if (dbus_message_get_type (message) == DBUS_MESSAGE_TYPE_METHOD_RETURN)
{
; /* good, expected */
while (!dbus_bus_set_unique_name (connection, name))
_dbus_wait_for_memory ();
-
+
socd.expected_kind = SERVICE_CREATED;
socd.expected_service_name = name;
socd.failed = FALSE;
socd.skip_connection = connection; /* we haven't done AddMatch so won't get it ourselves */
bus_test_clients_foreach (check_service_owner_changed_foreach,
&socd);
-
+
if (socd.failed)
goto out;
"NameAcquired");
goto out;
}
-
+
retry_get_acquired_name:
if (!dbus_message_get_args (message, &error,
DBUS_TYPE_STRING, &acquired,
if (!check_no_leftovers (context))
goto out;
-
+
retval = TRUE;
-
+
out:
_dbus_verbose ("ending - retval = %d\n", retval);
-
+
dbus_error_free (&error);
-
+
if (message)
dbus_message_unref (message);
if (name_message)
dbus_message_unref (name_message);
-
+
return retval;
}
message = NULL;
_dbus_verbose ("check_double_hello_message for %p\n", connection);
-
+
message = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS,
if (message == NULL)
return TRUE;
-
+
if (!dbus_connection_send (connection, message, &serial))
{
dbus_message_unref (message);
if (!dbus_connection_get_is_connected (connection))
{
_dbus_verbose ("connection was disconnected\n");
-
+
dbus_connection_unref (connection);
-
+
return TRUE;
}
dbus_connection_unref (connection);
-
+
message = pop_message_waiting_for_memory (connection);
if (message == NULL)
{
dbus_message_get_sender (message) : "(none)");
goto out;
}
-
+
if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_ERROR)
{
warn_unexpected (connection, message, "method return for Hello");
if (!check_no_leftovers (context))
goto out;
-
+
retval = TRUE;
-
+
out:
dbus_error_free (&error);
-
+
if (message)
dbus_message_unref (message);
-
+
return retval;
}
message = NULL;
_dbus_verbose ("check_get_connection_unix_user for %p\n", connection);
-
+
message = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS,
base_service_name = dbus_bus_get_unique_name (connection);
- if (!dbus_message_append_args (message,
+ if (!dbus_message_append_args (message,
DBUS_TYPE_STRING, &base_service_name,
DBUS_TYPE_INVALID))
{
if (!dbus_connection_get_is_connected (connection))
{
_dbus_verbose ("connection was disconnected\n");
-
+
dbus_connection_unref (connection);
-
+
return TRUE;
}
out:
dbus_error_free (&error);
-
+
if (message)
dbus_message_unref (message);
-
+
return retval;
}
message = NULL;
_dbus_verbose ("check_get_connection_unix_process_id for %p\n", connection);
-
+
message = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS,
base_service_name = dbus_bus_get_unique_name (connection);
- if (!dbus_message_append_args (message,
+ if (!dbus_message_append_args (message,
DBUS_TYPE_STRING, &base_service_name,
DBUS_TYPE_INVALID))
{
if (!dbus_connection_get_is_connected (connection))
{
_dbus_verbose ("connection was disconnected\n");
-
+
dbus_connection_unref (connection);
-
+
return TRUE;
}
*/
_dbus_verbose ("Windows correctly does not support GetConnectionUnixProcessID\n");
}
-#endif
+#endif
else
{
warn_unexpected (connection, message, "not this error");
-
+
goto out;
}
}
#ifdef DBUS_WIN
warn_unexpected (connection, message, "GetConnectionUnixProcessID to fail on Windows");
goto out;
-#else
+#else
if (dbus_message_get_type (message) == DBUS_MESSAGE_TYPE_METHOD_RETURN)
{
; /* good, expected */
out:
dbus_error_free (&error);
-
+
if (message)
dbus_message_unref (message);
-
+
return retval;
}
message = NULL;
_dbus_verbose ("check_add_match_all for %p\n", connection);
-
+
message = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS,
dbus_message_unref (message);
return TRUE;
}
-
+
if (!dbus_connection_send (connection, message, &serial))
{
dbus_message_unref (message);
message = NULL;
dbus_connection_ref (connection); /* because we may get disconnected */
-
+
/* send our message */
bus_test_run_clients_loop (SEND_PENDING (connection));
if (!dbus_connection_get_is_connected (connection))
{
_dbus_verbose ("connection was disconnected\n");
-
+
dbus_connection_unref (connection);
-
+
return TRUE;
}
-
+
block_connection_until_message_from_bus (context, connection, "reply to AddMatch");
if (!dbus_connection_get_is_connected (connection))
{
_dbus_verbose ("connection was disconnected\n");
-
+
dbus_connection_unref (connection);
-
+
return TRUE;
}
dbus_connection_unref (connection);
-
+
message = pop_message_waiting_for_memory (connection);
if (message == NULL)
{
dbus_message_get_sender (message) : "(none)");
goto out;
}
-
+
if (dbus_message_get_type (message) == DBUS_MESSAGE_TYPE_ERROR)
{
if (dbus_message_is_error (message,
if (!check_no_leftovers (context))
goto out;
-
+
retval = TRUE;
-
+
out:
dbus_error_free (&error);
-
+
if (message)
dbus_message_unref (message);
-
+
return retval;
}
}
spin_connection_until_authenticated (context, connection);
-
+
if (!check_hello_message (context, connection))
return FALSE;
-
+
if (dbus_bus_get_unique_name (connection) == NULL)
{
/* We didn't successfully register, so we can't
{
if (!check_add_match_all (context, connection))
return FALSE;
-
+
kill_client_connection (context, connection);
}
dbus_bool_t retval;
const char *nonexistent = NONEXISTENT_SERVICE_NAME;
dbus_uint32_t flags;
-
+
message = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS,
"StartServiceByName");
-
+
if (message == NULL)
return TRUE;
dbus_message_set_auto_start (message, FALSE);
-
+
flags = 0;
if (!dbus_message_append_args (message,
DBUS_TYPE_STRING, &nonexistent,
dbus_message_unref (message);
return TRUE;
}
-
+
if (!dbus_connection_send (connection, message, &serial))
{
dbus_message_unref (message);
_dbus_verbose ("connection was disconnected\n");
return TRUE;
}
-
+
retval = FALSE;
-
+
message = pop_message_waiting_for_memory (connection);
if (message == NULL)
{
dbus_message_get_sender (message) : "(none)");
goto out;
}
-
+
if (dbus_message_is_error (message,
DBUS_ERROR_NO_MEMORY))
{
}
retval = TRUE;
-
+
out:
if (message)
dbus_message_unref (message);
-
+
return retval;
}
DBusMessage *message;
dbus_uint32_t serial;
dbus_bool_t retval;
-
+
message = dbus_message_new_method_call (NONEXISTENT_SERVICE_NAME,
"/org/freedesktop/TestSuite",
"org.freedesktop.TestSuite",
"Echo");
-
+
if (message == NULL)
return TRUE;
-
+
if (!dbus_connection_send (connection, message, &serial))
{
dbus_message_unref (message);
_dbus_verbose ("connection was disconnected\n");
return TRUE;
}
-
+
retval = FALSE;
-
+
message = pop_message_waiting_for_memory (connection);
if (message == NULL)
dbus_message_get_sender (message) : "(none)");
goto out;
}
-
+
if (dbus_message_is_error (message,
DBUS_ERROR_NO_MEMORY))
{
}
retval = TRUE;
-
+
out:
if (message)
dbus_message_unref (message);
-
+
return retval;
}
dbus_bool_t retval;
DBusError error;
const char *base_service, *base_service_from_bus, *old_owner;
-
+
retval = FALSE;
-
+
dbus_error_init (&error);
base_service = NULL;
old_owner = NULL;
base_service_from_bus = NULL;
message = initial_message;
- dbus_message_ref (message);
+ dbus_message_ref (message);
if (dbus_message_is_signal (message,
DBUS_INTERFACE_DBUS,
base_service);
goto out;
}
-
+
if (strcmp (base_service, base_service_from_bus) != 0)
{
_dbus_warn ("Expected base service activation, got \"%s\" instead with owner \"%s\"\n",
old_owner);
goto out;
}
-
+
socd.expected_kind = SERVICE_CREATED;
socd.expected_service_name = base_service;
socd.failed = FALSE;
socd.skip_connection = connection;
bus_test_clients_foreach (check_service_owner_changed_foreach,
&socd);
-
+
if (socd.failed)
goto out;
}
*base_service_p = base_service;
retval = TRUE;
-
+
out:
if (message)
dbus_message_unref (message);
dbus_bool_t retval;
DBusError error;
dbus_uint32_t activation_result;
-
+
retval = FALSE;
-
+
dbus_error_init (&error);
message = initial_message;
socd.expected_service_name = service_name;
bus_test_clients_foreach (check_service_owner_changed_foreach,
&socd);
-
+
if (socd.failed)
goto out;
-
+
dbus_message_unref (message);
service_name = NULL;
old_owner = NULL;
base_service_from_bus = NULL;
-
+
message = pop_message_waiting_for_memory (connection);
if (message == NULL)
{
else
{
warn_unexpected (connection, message, "NameOwnerChanged for the activated name");
-
+
goto out;
}
-
+
if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_METHOD_RETURN)
{
warn_unexpected (connection, message, "reply to StartServiceByName");
dbus_message_unref (message);
message = NULL;
-
+
if (!check_no_leftovers (context))
{
_dbus_warn ("Messages were left over after verifying existent activation results\n");
}
retval = TRUE;
-
+
out:
if (message)
dbus_message_unref (message);
dbus_error_free (&error);
-
+
return retval;
}
DBusMessage *message;
dbus_bool_t retval;
DBusError error;
-
+
retval = FALSE;
-
+
dbus_error_init (&error);
message = initial_message;
{
const char *service_name;
CheckServiceOwnerChangedData socd;
-
+
reget_service_name_arg:
if (!dbus_message_get_args (message, &error,
DBUS_TYPE_STRING, &service_name,
goto out;
}
}
-
+
if (strcmp (service_name, activated_name) != 0)
{
_dbus_warn ("Expected to see service %s created, saw %s instead\n",
activated_name, service_name);
goto out;
}
-
+
socd.expected_kind = SERVICE_CREATED;
socd.expected_service_name = service_name;
socd.failed = FALSE;
- socd.skip_connection = connection;
+ socd.skip_connection = connection;
bus_test_clients_foreach (check_service_owner_changed_foreach,
&socd);
-
+
if (socd.failed)
goto out;
-
+
/* Note that this differs from regular activation in that we don't get a
* reply to ActivateService here.
*/
-
+
dbus_message_unref (message);
message = NULL;
service_name = NULL;
else
{
warn_unexpected (connection, message, "NameOwnerChanged for the activated name");
-
+
goto out;
}
-
+
retval = TRUE;
-
+
out:
if (message)
dbus_message_unref (message);
-
+
return retval;
}
CheckServiceOwnerChangedData socd;
retval = FALSE;
-
+
/* Now we are expecting ServiceOwnerChanged (deletion) messages for the base
* service and the activated_name. The base service
* notification is required to come last.
socd.failed = FALSE;
socd.skip_connection = NULL;
bus_test_clients_foreach (check_service_owner_changed_foreach,
- &socd);
+ &socd);
if (socd.failed)
goto out;
-
+
socd.expected_kind = SERVICE_DELETED;
socd.expected_service_name = base_service;
socd.failed = FALSE;
goto out;
retval = TRUE;
-
+
out:
return retval;
}
DBusMessage *message;
dbus_uint32_t serial;
dbus_bool_t retval;
-
+
_dbus_verbose ("Sending exit message to the test service\n");
retval = FALSE;
-
+
/* Kill off the test service by sending it a quit message */
message = dbus_message_new_method_call (service_name,
"/org/freedesktop/TestSuite",
"org.freedesktop.TestSuite",
"Exit");
-
+
if (message == NULL)
{
/* Do this again; we still need the service to exit... */
if (!check_send_exit_to_service (context, connection,
service_name, base_service))
goto out;
-
+
return TRUE;
}
-
+
if (!dbus_connection_send (connection, message, &serial))
{
dbus_message_unref (message);
if (!check_send_exit_to_service (context, connection,
service_name, base_service))
goto out;
-
+
return TRUE;
}
dbus_connection_return_message (connection, message);
message = NULL;
}
-
+
if (!got_error)
{
/* If no error, wait for the test service to exit */
block_connection_until_message_from_bus (context, connection, "test service to exit");
-
+
bus_test_run_everything (context);
}
"error with the correct reply serial");
goto out;
}
-
+
if (!dbus_message_is_error (message,
DBUS_ERROR_NO_MEMORY))
{
* stuff.
*/
message = pop_message_waiting_for_memory (connection);
-
+
if (message == NULL)
{
warn_unexpected (connection, NULL,
"error with the correct reply serial");
goto out;
}
-
+
_dbus_verbose ("Got error %s after test service exited\n",
dbus_message_get_error_name (message));
-
+
if (!check_no_leftovers (context))
{
_dbus_warn ("Messages were left over after %s\n",
goto out;
}
}
-
+
retval = TRUE;
-
+
out:
if (message)
dbus_message_unref (message);
-
+
return retval;
}
va_list ap;
dbus_bool_t error_found;
const char *error_name;
-
+
retval = FALSE;
-
+
message = pop_message_waiting_for_memory (connection);
if (message == NULL)
{
}
retval = TRUE;
-
+
out:
if (message)
dbus_message_unref (message);
-
+
return retval;
}
-
+
typedef enum
-{
+{
GOT_SERVICE_CREATED,
GOT_SERVICE_DELETED,
GOT_ERROR,
- GOT_SOMETHING_ELSE
+ GOT_SOMETHING_ELSE
} GotServiceInfo;
static GotServiceInfo
dbus_uint32_t flags;
base_service_message = NULL;
-
+
message = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS,
return TRUE;
dbus_message_set_auto_start (message, FALSE);
-
+
flags = 0;
if (!dbus_message_append_args (message,
DBUS_TYPE_STRING, &existent,
dbus_message_unref (message);
return TRUE;
}
-
+
if (!dbus_connection_send (connection, message, &serial))
{
dbus_message_unref (message);
_dbus_verbose ("connection was disconnected\n");
return TRUE;
}
-
+
retval = FALSE;
-
+
message = pop_message_waiting_for_memory (connection);
if (message == NULL)
{
dbus_message_get_sender (message) : "(none)");
goto out;
}
-
+
if (dbus_message_is_error (message,
DBUS_ERROR_NO_MEMORY))
{
else
{
GotServiceInfo message_kind;
-
+
if (!check_base_service_activated (context, connection,
message, &base_service))
goto out;
/* We may need to block here for the test service to exit or finish up */
block_connection_until_message_from_bus (context, connection, "test service to exit or finish up");
-
+
message = dbus_connection_borrow_message (connection);
if (message == NULL)
{
socd.expected_service_name = base_service;
socd.failed = FALSE;
socd.skip_connection = NULL;
-
+
bus_test_clients_foreach (check_service_owner_changed_foreach,
&socd);
if (message_kind != GOT_ERROR)
{
block_connection_until_message_from_bus (context, connection, "error about service exiting");
-
+
/* and process everything again */
bus_test_run_everything (context);
-
+
if (!check_got_error (context, connection,
DBUS_ERROR_SPAWN_CHILD_EXITED,
DBUS_ERROR_NO_MEMORY,
"should have been a NameOwnerChanged (creation)\n");
goto out;
}
-
+
if (!check_service_activated (context, connection, EXISTENT_SERVICE_NAME,
base_service, message))
goto out;
-
+
dbus_message_unref (message);
message = NULL;
}
retval = TRUE;
-
+
out:
if (message)
dbus_message_unref (message);
if (base_service_message)
dbus_message_unref (base_service_message);
-
+
return retval;
}
dbus_bool_t retval;
const char *segv_service;
dbus_uint32_t flags;
-
+
message = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS,
return TRUE;
dbus_message_set_auto_start (message, FALSE);
-
+
segv_service = "org.freedesktop.DBus.TestSuiteSegfaultService";
flags = 0;
if (!dbus_message_append_args (message,
dbus_message_unref (message);
return TRUE;
}
-
+
if (!dbus_connection_send (connection, message, &serial))
{
dbus_message_unref (message);
_dbus_verbose ("connection was disconnected\n");
return TRUE;
}
-
+
retval = FALSE;
-
+
message = pop_message_waiting_for_memory (connection);
if (message == NULL)
{
dbus_message_get_sender (message) : "(none)");
goto out;
}
-
+
if (dbus_message_is_error (message,
DBUS_ERROR_NO_MEMORY))
{
}
retval = TRUE;
-
+
out:
if (message)
dbus_message_unref (message);
-
+
return retval;
}
"/org/freedesktop/TestSuite",
"org.freedesktop.TestSuite",
"Echo");
-
+
if (message == NULL)
return TRUE;
-
+
if (!dbus_connection_send (connection, message, &serial))
{
dbus_message_unref (message);
_dbus_verbose ("connection was disconnected\n");
return TRUE;
}
-
+
retval = FALSE;
-
+
message = pop_message_waiting_for_memory (connection);
if (message == NULL)
{
dbus_message_get_sender (message) : "(none)");
goto out;
}
-
+
if (dbus_message_is_error (message,
DBUS_ERROR_NO_MEMORY))
{
}
retval = TRUE;
-
+
out:
if (message)
dbus_message_unref (message);
-
+
return retval;
}
#endif
"/org/freedesktop/TestSuite",
"org.freedesktop.TestSuite",
"RunHelloFromSelf");
-
+
if (message == NULL)
return TRUE;
* doesn't send a reply due to OOM.
*/
block_connection_until_message_from_bus (context, connection, "reply from running hello from self");
-
+
message = pop_message_waiting_for_memory (connection);
if (message == NULL)
{
dbus_message_unref (message);
message = NULL;
-
+
return TRUE;
}
"/org/freedesktop/TestSuite",
"org.freedesktop.DBus.Peer",
"Ping");
-
+
if (message == NULL)
return TRUE;
* doesn't send a reply due to OOM.
*/
block_connection_until_message_from_bus (context, connection, "reply from running Ping");
-
+
message = pop_message_waiting_for_memory (connection);
if (message == NULL)
{
dbus_message_unref (message);
message = NULL;
-
+
return TRUE;
}
DBusMessage *message;
dbus_uint32_t serial;
const char *machine_id;
-
+
message = dbus_message_new_method_call (EXISTENT_SERVICE_NAME,
"/org/freedesktop/TestSuite",
"org.freedesktop.DBus.Peer",
"GetMachineId");
-
+
if (message == NULL)
return TRUE;
* doesn't send a reply due to OOM.
*/
block_connection_until_message_from_bus (context, connection, "reply from running GetMachineId");
-
+
message = pop_message_waiting_for_memory (connection);
if (message == NULL)
{
dbus_message_unref (message);
return FALSE;
}
-
+
/* We can't check that the machine id is correct because during make check it is
* just made up for each process separately
*/
-
+
dbus_message_unref (message);
message = NULL;
-
+
return TRUE;
}
"/org/freedesktop/TestSuite",
"org.freedesktop.TestSuite",
"Echo");
-
+
if (message == NULL)
return TRUE;
}
retval = FALSE;
-
+
message = pop_message_waiting_for_memory (connection);
if (message == NULL)
{
dbus_connection_return_message (connection, message);
message = NULL;
- switch (message_kind)
+ switch (message_kind)
{
case GOT_SERVICE_CREATED:
message = pop_message_waiting_for_memory (connection);
"should have been a NameOwnerChanged (creation)\n");
goto out;
}
-
+
/* Check that ServiceOwnerChanged (creation) was correctly received */
if (!check_service_auto_activated (context, connection, EXISTENT_SERVICE_NAME,
base_service, message))
goto out;
-
+
dbus_message_unref (message);
message = NULL;
* failed to register under EXISTENT_SERVICE_NAME
*/
CheckServiceOwnerChangedData socd;
-
+
socd.expected_kind = SERVICE_DELETED;
socd.expected_service_name = base_service;
socd.failed = FALSE;
* doesn't send a reply due to OOM.
*/
block_connection_until_message_from_bus (context, connection, "reply from echo message after auto-activation");
-
+
message = pop_message_waiting_for_memory (connection);
if (message == NULL)
{
if (!check_existent_get_machine_id (context, connection))
goto out;
-
+
if (!check_existent_hello_from_self (context, connection))
goto out;
EXISTENT_SERVICE_NAME,
base_service))
goto out;
-
+
retval = TRUE;
out:
"/org/freedesktop/TestSuite",
"org.freedesktop.TestSuite",
"Echo");
-
+
if (message == NULL)
return TRUE;
_dbus_verbose ("connection was disconnected\n");
return TRUE;
}
-
+
retval = FALSE;
-
+
message = pop_message_waiting_for_memory (connection);
if (message == NULL)
{
dbus_message_get_sender (message) : "(none)");
goto out;
}
-
+
if (dbus_message_is_error (message,
DBUS_ERROR_NO_MEMORY))
{
}
retval = TRUE;
-
+
out:
if (message)
dbus_message_unref (message);
-
+
return retval;
}
_dbus_warn ("connection was disconnected\n");
return TRUE;
}
-
+
retval = FALSE;
-
+
message = pop_message_waiting_for_memory (connection);
if (message == NULL)
{
dbus_message_get_sender (message) : "(none)");
goto out;
}
-
+
if (dbus_message_is_error (message,
DBUS_ERROR_NO_MEMORY))
{
}
retval = TRUE;
-
+
out:
if (message)
dbus_message_unref (message);
-
+
return retval;
}
_dbus_warn ("connection was disconnected\n");
return TRUE;
}
-
+
retval = FALSE;
-
+
message = pop_message_waiting_for_memory (connection);
if (message == NULL)
{
dbus_message_get_sender (message) : "(none)");
goto out;
}
-
+
if (dbus_message_is_error (message,
DBUS_ERROR_NO_MEMORY))
{
}
retval = TRUE;
-
+
out:
if (message)
dbus_message_unref (message);
-
+
return retval;
}
_dbus_warn ("connection was disconnected\n");
return TRUE;
}
-
+
retval = FALSE;
-
+
message = pop_message_waiting_for_memory (connection);
if (message == NULL)
{
dbus_message_get_sender (message) : "(none)");
goto out;
}
-
+
if (dbus_message_is_error (message,
DBUS_ERROR_NO_MEMORY))
{
}
retval = TRUE;
-
+
out:
if (message)
dbus_message_unref (message);
-
+
return retval;
}
"/org/freedesktop/TestSuite",
"org.freedesktop.TestSuite",
"Echo");
-
+
if (message == NULL)
return TRUE;
-
+
if (!dbus_connection_send (connection, message, &serial))
{
dbus_message_unref (message);
_dbus_verbose ("connection was disconnected\n");
return TRUE;
}
-
+
retval = FALSE;
-
+
message = pop_message_waiting_for_memory (connection);
if (message == NULL)
{
dbus_message_get_sender (message) : "(none)");
goto out;
}
-
+
if (dbus_message_is_error (message,
DBUS_ERROR_NO_MEMORY))
{
}
retval = TRUE;
-
+
out:
if (message)
dbus_message_unref (message);
-
+
return retval;
}
"/org/freedesktop/TestSuite",
"org.freedesktop.TestSuite",
"Echo");
-
+
if (message == NULL)
return TRUE;
}
retval = FALSE;
-
+
message = pop_message_waiting_for_memory (connection);
if (message == NULL)
{
dbus_connection_return_message (connection, message);
message = NULL;
- switch (message_kind)
+ switch (message_kind)
{
case GOT_SERVICE_CREATED:
message = pop_message_waiting_for_memory (connection);
"should have been a NameOwnerChanged (creation)\n");
goto out;
}
-
+
/* Check that ServiceOwnerChanged (creation) was correctly received */
if (!check_service_auto_activated (context, connection, SHELL_SUCCESS_SERVICE_NAME,
base_service, message))
goto out;
-
+
dbus_message_unref (message);
message = NULL;
* failed to register under SHELL_SUCCESS_SERVICE_NAME
*/
CheckServiceOwnerChangedData socd;
-
+
socd.expected_kind = SERVICE_DELETED;
socd.expected_service_name = base_service;
socd.failed = FALSE;
* doesn't send a reply due to OOM.
*/
block_connection_until_message_from_bus (context, connection, "reply from echo message after auto-activation");
-
+
message = pop_message_waiting_for_memory (connection);
if (message == NULL)
{
}
if (!dbus_message_get_args (message, NULL,
- DBUS_TYPE_STRING, &argv[0],
+ DBUS_TYPE_STRING, &argv[0],
DBUS_TYPE_STRING, &argv[1],
DBUS_TYPE_STRING, &argv[2],
DBUS_TYPE_STRING, &argv[3],
goto out;
}
- /* don't worry about arg[0] as it may be different
+ /* don't worry about arg[0] as it may be different
depending on the path to the tests
*/
if (strcmp("-test", argv[1]) != 0)
{
- _dbus_warn ("Unexpected argv[1] in shell success service test (expected: %s, got: %s)\n",
+ _dbus_warn ("Unexpected argv[1] in shell success service test (expected: %s, got: %s)\n",
"-test", argv[1]);
goto out;
- }
+ }
if (strcmp("that", argv[2]) != 0)
{
- _dbus_warn ("Unexpected argv[2] in shell success service test (expected: %s, got: %s)\n",
+ _dbus_warn ("Unexpected argv[2] in shell success service test (expected: %s, got: %s)\n",
"that", argv[2]);
goto out;
- }
+ }
if (strcmp("we get", argv[3]) != 0)
{
- _dbus_warn ("Unexpected argv[3] in shell success service test (expected: %s, got: %s)\n",
+ _dbus_warn ("Unexpected argv[3] in shell success service test (expected: %s, got: %s)\n",
"we get", argv[3]);
goto out;
- }
-
+ }
+
if (strcmp("back", argv[4]) != 0)
{
- _dbus_warn ("Unexpected argv[4] in shell success service test (expected: %s, got: %s)\n",
+ _dbus_warn ("Unexpected argv[4] in shell success service test (expected: %s, got: %s)\n",
"back", argv[4]);
goto out;
- }
+ }
if (strcmp("--what", argv[5]) != 0)
{
- _dbus_warn ("Unexpected argv[5] in shell success service test (expected: %s, got: %s)\n",
+ _dbus_warn ("Unexpected argv[5] in shell success service test (expected: %s, got: %s)\n",
"--what", argv[5]);
goto out;
- }
+ }
if (strcmp("we put in", argv[6]) != 0)
{
- _dbus_warn ("Unexpected argv[6] in shell success service test (expected: %s, got: %s)\n",
+ _dbus_warn ("Unexpected argv[6] in shell success service test (expected: %s, got: %s)\n",
"we put in", argv[6]);
goto out;
- }
+ }
dbus_message_unref (message);
message = NULL;
-
+
if (!check_send_exit_to_service (context, connection,
SHELL_SUCCESS_SERVICE_NAME,
base_service))
goto out;
-
+
retval = TRUE;
out:
if (! (* d->func) (d->context))
return FALSE;
-
+
if (!check_no_leftovers (d->context))
{
_dbus_warn ("Messages were left over, should be covered by test suite\n");
*len = l;
}
}
-
+
if (!check_no_leftovers (context))
goto out;
-
+
retval = TRUE;
-
+
out:
dbus_error_free (&error);
-
+
if (message)
dbus_message_unref (message);
"should have been a NameOwnerChanged (creation)\n");
goto out;
}
-
+
if (!check_service_activated (context, connection, EXISTENT_SERVICE_NAME,
base_service, message))
goto out;
break;
}
}
-
+
if (!check_get_services (context, connection, "ListNames", &services, &len))
{
return TRUE;
if (! (* d->func) (d->context, d->connection))
return FALSE;
-
+
if (!check_no_leftovers (d->context))
{
_dbus_warn ("Messages were left over, should be covered by test suite\n");
d.func = func;
d.context = context;
d.connection = connection;
-
+
if (!_dbus_test_oom_handling (description, check_oom_check2_func,
&d))
{
{
_dbus_string_free (&full);
return FALSE;
- }
+ }
_dbus_string_init_const (&file, filename);
-
+
if (!_dbus_concat_dir_and_file (&full, &file))
{
_dbus_string_free (&full);
return FALSE;
}
- _dbus_verbose ("Setting TEST_LAUNCH_HELPER_CONFIG to '%s'\n",
+ _dbus_verbose ("Setting TEST_LAUNCH_HELPER_CONFIG to '%s'\n",
_dbus_string_get_const_data (&full));
-
+
_dbus_setenv ("TEST_LAUNCH_HELPER_CONFIG", _dbus_string_get_const_data (&full));
_dbus_string_free (&full);
_dbus_assert_not_reached ("no memory setting TEST_LAUNCH_HELPER_CONFIG");
dbus_error_init (&error);
-
+
context = bus_context_new_test (test_data_dir, filename);
if (context == NULL)
return FALSE;
-
+
foo = dbus_connection_open_private (TEST_CONNECTION, &error);
if (foo == NULL)
_dbus_assert_not_reached ("could not alloc connection");
_dbus_assert_not_reached ("could not set up connection");
spin_connection_until_authenticated (context, foo);
-
+
if (!check_hello_message (context, foo))
_dbus_assert_not_reached ("hello message failed");
if (!check_add_match_all (context, foo))
_dbus_assert_not_reached ("AddMatch message failed");
-
+
bar = dbus_connection_open_private (TEST_CONNECTION, &error);
if (bar == NULL)
_dbus_assert_not_reached ("could not alloc connection");
_dbus_assert_not_reached ("could not set up connection");
spin_connection_until_authenticated (context, bar);
-
+
if (!check_hello_message (context, bar))
_dbus_assert_not_reached ("hello message failed");
if (!check_add_match_all (context, bar))
_dbus_assert_not_reached ("AddMatch message failed");
-
+
baz = dbus_connection_open_private (TEST_CONNECTION, &error);
if (baz == NULL)
_dbus_assert_not_reached ("could not alloc connection");
_dbus_assert_not_reached ("could not set up connection");
spin_connection_until_authenticated (context, baz);
-
+
if (!check_hello_message (context, baz))
_dbus_assert_not_reached ("hello message failed");
if (!check_list_services (context, baz))
_dbus_assert_not_reached ("ListActivatableNames message failed");
-
+
if (!check_no_leftovers (context))
{
_dbus_warn ("Messages were left over after setting up initial connections\n");
_dbus_assert_not_reached ("initial connection setup failed");
}
-
+
check1_try_iterations (context, "create_and_hello",
check_hello_connection);
-
+
check2_try_iterations (context, foo, "nonexistent_service_no_auto_start",
check_nonexistent_service_no_auto_start);
check2_try_iterations (context, foo, "segfault_service_no_auto_start",
check_segfault_service_no_auto_start);
#endif
-
+
check2_try_iterations (context, foo, "existent_service_no_auto_start",
check_existent_service_no_auto_start);
-
+
check2_try_iterations (context, foo, "nonexistent_service_auto_start",
check_nonexistent_service_auto_start);
-
-#ifdef DBUS_WIN_FIXME
+
+#ifdef DBUS_WIN_FIXME
_dbus_warn("TODO: dispatch.c segfault_service_auto_start test\n");
#else
/* only do the segfault test if we are not using the launcher */
check2_try_iterations (context, foo, "existent_service_auto_auto_start",
check_existent_service_auto_start);
#endif
-
+
if (!check_existent_service_auto_start (context, foo))
_dbus_assert_not_reached ("existent service auto start failed");
kill_client_connection_unchecked (baz);
bus_context_unref (context);
-
+
return TRUE;
}
/* save the config name for the activation helper */
if (!setenv_TEST_LAUNCH_HELPER_CONFIG (test_data_dir, filename))
_dbus_assert_not_reached ("no memory setting TEST_LAUNCH_HELPER_CONFIG");
-
+
dbus_error_init (&error);
-
+
context = bus_context_new_test (test_data_dir, filename);
if (context == NULL)
return FALSE;
-
+
foo = dbus_connection_open_private (TEST_CONNECTION, &error);
if (foo == NULL)
_dbus_assert_not_reached ("could not alloc connection");
kill_client_connection_unchecked (foo);
bus_context_unref (context);
-
+
return TRUE;
}
DBusError error;
dbus_error_init (&error);
-
+
/* Test SHA1 authentication */
_dbus_verbose ("Testing SHA1 context\n");
-
+
context = bus_context_new_test (test_data_dir,
"valid-config-files/debug-allow-all-sha1.conf");
if (context == NULL)
_dbus_assert_not_reached ("could not set up connection");
spin_connection_until_authenticated (context, foo);
-
+
if (!check_hello_message (context, foo))
_dbus_assert_not_reached ("hello message failed");
if (!check_add_match_all (context, foo))
_dbus_assert_not_reached ("addmatch message failed");
-
+
if (!check_no_leftovers (context))
{
_dbus_warn ("Messages were left over after setting up initial SHA-1 connection\n");
_dbus_assert_not_reached ("initial connection setup failed");
}
-
+
check1_try_iterations (context, "create_and_hello_sha1",
check_hello_connection);
* Copyright (C) 2003, 2004, 2005 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
null_service = "";
_dbus_verbose ("sending name owner changed: %s [%s -> %s]\n",
- service_name,
- old_owner ? old_owner : null_service,
+ service_name,
+ old_owner ? old_owner : null_service,
new_owner ? new_owner : null_service);
message = dbus_message_new_signal (DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS,
"NameOwnerChanged");
-
+
if (message == NULL)
{
BUS_SET_OOM (error);
return FALSE;
}
-
+
if (!dbus_message_set_sender (message, DBUS_SERVICE_DBUS))
goto oom;
goto oom;
_dbus_assert (dbus_message_has_signature (message, "sss"));
-
+
retval = bus_dispatch_matches (transaction, NULL, NULL, message, error);
dbus_message_unref (message);
DBusMessage *message;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
-
+
message = dbus_message_new_signal (DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS,
"NameLost");
-
+
if (message == NULL)
{
BUS_SET_OOM (error);
return FALSE;
}
-
+
if (!dbus_message_set_destination (message, bus_connection_get_name (connection)) ||
!dbus_message_append_args (message,
DBUS_TYPE_STRING, &service_name,
DBusMessage *message;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
-
+
message = dbus_message_new_signal (DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS,
"NameAcquired");
BUS_SET_OOM (error);
return FALSE;
}
-
+
if (!dbus_message_set_destination (message, bus_connection_get_name (connection)) ||
!dbus_message_append_args (message,
DBUS_TYPE_STRING, &service_name,
static int next_major_number = 0;
static int next_minor_number = 0;
int len;
-
+
len = _dbus_string_get_length (str);
-
+
while (TRUE)
{
/* start out with 1-0, go to 1-1, 1-2, 1-3,
_dbus_assert (next_minor_number >= 0);
/* appname:MAJOR-MINOR */
-
+
if (!_dbus_string_append (str, ":"))
return FALSE;
-
+
if (!_dbus_string_append_int (str, next_major_number))
return FALSE;
if (!_dbus_string_append (str, "."))
return FALSE;
-
+
if (!_dbus_string_append_int (str, next_minor_number))
return FALSE;
next_minor_number += 1;
-
+
/* Check if a client with the name exists */
if (bus_registry_lookup (registry, str) == NULL)
break;
_DBUS_ASSERT_ERROR_IS_SET (error);
return FALSE;
}
-
+
if (!_dbus_string_init (&unique_name))
{
BUS_SET_OOM (error);
retval = FALSE;
registry = bus_connection_get_registry (connection);
-
+
if (!create_unique_client_name (registry, &unique_name))
{
BUS_SET_OOM (error);
_DBUS_ASSERT_ERROR_IS_SET (error);
goto out_0;
}
-
+
if (!dbus_message_set_sender (message,
bus_connection_get_name (connection)))
{
BUS_SET_OOM (error);
goto out_0;
}
-
+
if (!bus_driver_send_welcome_message (connection, message, transaction, error))
goto out_0;
&unique_name, connection, 0, transaction, error);
if (service == NULL)
goto out_0;
-
+
_dbus_assert (bus_connection_is_active (connection));
retval = TRUE;
-
+
out_0:
_dbus_string_free (&unique_name);
return retval;
const char *name;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
-
+
name = bus_connection_get_name (connection);
_dbus_assert (name != NULL);
-
+
welcome = dbus_message_new_method_return (hello_message);
if (welcome == NULL)
{
BUS_SET_OOM (error);
return FALSE;
}
-
+
if (!dbus_message_append_args (welcome,
DBUS_TYPE_STRING, &name,
DBUS_TYPE_INVALID))
}
_dbus_assert (dbus_message_has_signature (welcome, DBUS_TYPE_STRING_AS_STRING));
-
+
if (!bus_transaction_send_from_driver (transaction, connection, welcome))
{
dbus_message_unref (welcome);
DBusMessageIter sub;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
-
+
registry = bus_connection_get_registry (connection);
-
+
reply = dbus_message_new_method_return (message);
if (reply == NULL)
{
}
dbus_message_iter_init_append (reply, &iter);
-
+
if (!dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY,
DBUS_TYPE_STRING_AS_STRING,
&sub))
return FALSE;
}
}
-
+
i = 0;
while (i < len)
{
BUS_SET_OOM (error);
return FALSE;
}
-
+
if (!bus_transaction_send_from_driver (transaction, connection, reply))
{
dbus_message_unref (reply);
BusRegistry *registry;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
-
+
registry = bus_connection_get_registry (connection);
-
+
if (!dbus_message_get_args (message, error,
DBUS_TYPE_STRING, &name,
DBUS_TYPE_UINT32, &flags,
DBUS_TYPE_INVALID))
return FALSE;
-
+
_dbus_verbose ("Trying to own name %s with flags 0x%x\n", name, flags);
-
+
retval = FALSE;
reply = NULL;
&service_reply, transaction,
error))
goto out;
-
+
reply = dbus_message_new_method_return (message);
if (reply == NULL)
{
}
retval = TRUE;
-
+
out:
if (reply)
dbus_message_unref (reply);
return retval;
-}
+}
static dbus_bool_t
bus_driver_handle_release_service (DBusConnection *connection,
BusRegistry *registry;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
-
+
registry = bus_connection_get_registry (connection);
-
+
if (!dbus_message_get_args (message, error,
DBUS_TYPE_STRING, &name,
DBUS_TYPE_INVALID))
service = bus_registry_lookup (registry, &service_name);
service_exists = service != NULL;
}
-
+
reply = dbus_message_new_method_return (message);
if (reply == NULL)
{
}
retval = TRUE;
-
+
out:
if (reply)
dbus_message_unref (reply);
BusActivation *activation;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
-
+
activation = bus_connection_get_activation (connection);
-
+
if (!dbus_message_get_args (message, error,
DBUS_TYPE_STRING, &name,
DBUS_TYPE_UINT32, &flags,
}
retval = TRUE;
-
+
out:
return retval;
}
}
dbus_message_unref (reply);
-
+
return TRUE;
}
const char *text;
DBusString str;
BusMatchmaker *matchmaker;
-
+
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
text = NULL;
"(inactive)");
goto failed;
}
-
+
if (!dbus_message_get_args (message, error,
DBUS_TYPE_STRING, &text,
DBUS_TYPE_INVALID))
bus_matchmaker_remove_rule (matchmaker, rule);
goto failed;
}
-
+
bus_match_rule_unref (rule);
-
+
return TRUE;
failed:
const char *text;
DBusString str;
BusMatchmaker *matchmaker;
-
+
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
text = NULL;
rule = NULL;
-
+
if (!dbus_message_get_args (message, error,
DBUS_TYPE_STRING, &text,
DBUS_TYPE_INVALID))
if (!send_ack_reply (connection, transaction,
message, error))
goto failed;
-
+
matchmaker = bus_connection_get_matchmaker (connection);
if (!bus_matchmaker_remove_rule_by_value (matchmaker, rule, error))
goto failed;
bus_match_rule_unref (rule);
-
+
return TRUE;
failed:
BusRegistry *registry;
BusService *service;
DBusMessage *reply;
-
+
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
registry = bus_connection_get_registry (connection);
}
else if (service == NULL)
{
- dbus_set_error (error,
+ dbus_set_error (error,
DBUS_ERROR_NAME_HAS_NO_OWNER,
"Could not get owner of name '%s': no such name", text);
goto failed;
"Could not determine unique name for '%s'", text);
goto failed;
}
- _dbus_assert (*base_name == ':');
+ _dbus_assert (*base_name == ':');
}
_dbus_assert (base_name != NULL);
if (reply == NULL)
goto oom;
- if (! dbus_message_append_args (reply,
+ if (! dbus_message_append_args (reply,
DBUS_TYPE_STRING, &base_name,
DBUS_TYPE_INVALID))
goto oom;
-
+
if (! bus_transaction_send_from_driver (transaction, connection, reply))
goto oom;
DBusMessage *reply;
DBusMessageIter iter, array_iter;
char *dbus_service_name = DBUS_SERVICE_DBUS;
-
+
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
registry = bus_connection_get_registry (connection);
}
else if (service == NULL)
{
- dbus_set_error (error,
+ dbus_set_error (error,
DBUS_ERROR_NAME_HAS_NO_OWNER,
"Could not get owners of name '%s': no such name", text);
goto failed;
}
else
{
- if (!bus_service_list_queued_owners (service,
+ if (!bus_service_list_queued_owners (service,
&base_names,
error))
goto failed;
DBUS_TYPE_STRING_AS_STRING,
&array_iter))
goto oom;
-
+
link = _dbus_list_get_first_link (&base_names);
while (link != NULL)
{
_dbus_assert (link->data != NULL);
uname = (char *)link->data;
-
- if (!dbus_message_iter_append_basic (&array_iter,
+
+ if (!dbus_message_iter_append_basic (&array_iter,
DBUS_TYPE_STRING,
&uname))
goto oom;
if (! dbus_message_iter_close_container (&iter, &array_iter))
goto oom;
-
-
+
+
if (! bus_transaction_send_from_driver (transaction, connection, reply))
goto oom;
serv = bus_registry_lookup (registry, &str);
if (serv == NULL)
{
- dbus_set_error (error,
+ dbus_set_error (error,
DBUS_ERROR_NAME_HAS_NO_OWNER,
"Could not get UID of name '%s': no such name", service);
goto failed;
serv = bus_registry_lookup (registry, &str);
if (serv == NULL)
{
- dbus_set_error (error,
+ dbus_set_error (error,
DBUS_ERROR_NAME_HAS_NO_OWNER,
"Could not get PID of name '%s': no such name", service);
goto failed;
serv = bus_registry_lookup (registry, &str);
if (serv == NULL)
{
- dbus_set_error (error,
+ dbus_set_error (error,
DBUS_ERROR_NAME_HAS_NO_OWNER,
"Could not get audit session data for name '%s': no such name", service);
goto failed;
serv = bus_registry_lookup (registry, &str);
if (serv == NULL)
{
- dbus_set_error (error,
+ dbus_set_error (error,
DBUS_ERROR_NAME_HAS_NO_OWNER,
"Could not get security context of name '%s': no such name", service);
goto failed;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
reply = NULL;
-
+
context = bus_connection_get_context (connection);
if (!bus_context_reload_config (context, error))
goto failed;
}
reply = NULL;
-
+
context = bus_connection_get_context (connection);
if (!bus_context_get_id (context, &uuid))
goto oom;
DBUS_TYPE_STRING, &v_STRING,
DBUS_TYPE_INVALID))
goto oom;
-
+
_dbus_assert (dbus_message_has_signature (reply, "s"));
-
+
if (! bus_transaction_send_from_driver (transaction, connection, reply))
goto oom;
- _dbus_string_free (&uuid);
+ _dbus_string_free (&uuid);
dbus_message_unref (reply);
return TRUE;
oom:
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
-
+
BUS_SET_OOM (error);
if (reply)
dbus_message_unref (reply);
- _dbus_string_free (&uuid);
+ _dbus_string_free (&uuid);
return FALSE;
}
{ "Hello",
"",
DBUS_TYPE_STRING_AS_STRING,
- bus_driver_handle_hello },
+ bus_driver_handle_hello },
{ "RequestName",
DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_UINT32_AS_STRING,
DBUS_TYPE_UINT32_AS_STRING,
DBusTypeReader typereader;
DBusString sigstr;
int current_type;
-
+
_dbus_string_init_const (&sigstr, signature);
_dbus_type_reader_init_types_only (&typereader, &sigstr, 0);
-
+
while ((current_type = _dbus_type_reader_get_current_type (&typereader)) != DBUS_TYPE_INVALID)
{
const DBusString *subsig;
i = 0;
while (i < _DBUS_N_ELEMENTS (message_handlers))
{
-
+
if (!_dbus_string_append_printf (xml, " <method name=\"%s\">\n",
message_handlers[i].name))
return FALSE;
if (!_dbus_string_append (xml, " </method>\n"))
return FALSE;
-
+
++i;
}
if (!_dbus_string_append_printf (xml, " <signal name=\"NameOwnerChanged\">\n"))
return FALSE;
-
+
if (!_dbus_string_append_printf (xml, " <arg type=\"s\"/>\n"))
return FALSE;
-
+
if (!_dbus_string_append_printf (xml, " <arg type=\"s\"/>\n"))
return FALSE;
-
+
if (!_dbus_string_append_printf (xml, " <arg type=\"s\"/>\n"))
return FALSE;
-
+
if (!_dbus_string_append_printf (xml, " </signal>\n"))
return FALSE;
if (!_dbus_string_append_printf (xml, " <signal name=\"NameLost\">\n"))
return FALSE;
-
+
if (!_dbus_string_append_printf (xml, " <arg type=\"s\"/>\n"))
return FALSE;
-
+
if (!_dbus_string_append_printf (xml, " </signal>\n"))
return FALSE;
if (!_dbus_string_append_printf (xml, " <signal name=\"NameAcquired\">\n"))
return FALSE;
-
+
if (!_dbus_string_append_printf (xml, " <arg type=\"s\"/>\n"))
return FALSE;
-
+
if (!_dbus_string_append_printf (xml, " </signal>\n"))
return FALSE;
if (!_dbus_string_append (xml, " </interface>\n"))
return FALSE;
-
+
if (!_dbus_string_append (xml, "</node>\n"))
return FALSE;
const char *v_STRING;
_dbus_verbose ("Introspect() on bus driver\n");
-
+
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
reply = NULL;
dbus_message_unref (reply);
_dbus_string_free (&xml);
-
+
return FALSE;
}
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
+ if (dbus_message_is_signal (message, "org.freedesktop.systemd1.Activator", "ActivationFailure"))
+ {
+ BusContext *context;
+
+ context = bus_connection_get_context (connection);
+ return dbus_activation_systemd_failure(bus_context_get_activation(context), message);
+ }
+
if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_METHOD_CALL)
{
_dbus_verbose ("Driver got a non-method-call message, ignoring\n");
DBUS_INTERFACE_INTROSPECTABLE,
"Introspect"))
return bus_driver_handle_introspect (connection, transaction, message, error);
-
+
interface = dbus_message_get_interface (message);
if (interface == NULL)
interface = DBUS_INTERFACE_DBUS;
-
+
_dbus_assert (dbus_message_get_member (message) != NULL);
-
+
name = dbus_message_get_member (message);
sender = dbus_message_get_sender (message);
-
+
if (strcmp (interface,
DBUS_INTERFACE_DBUS) != 0)
{
interface);
goto unknown;
}
-
+
_dbus_verbose ("Driver got a method call: %s\n",
dbus_message_get_member (message));
-
+
/* security checks should have kept this from getting here */
_dbus_assert (sender != NULL || strcmp (name, "Hello") == 0);
-
+
i = 0;
while (i < _DBUS_N_ELEMENTS (message_handlers))
{
_dbus_verbose ("Call to %s has wrong args (%s, expected %s)\n",
name, dbus_message_get_signature (message),
message_handlers[i].in_args);
-
+
dbus_set_error (error, DBUS_ERROR_INVALID_ARGS,
"Call to %s has wrong args (%s, expected %s)\n",
name, dbus_message_get_signature (message),
_DBUS_ASSERT_ERROR_IS_SET (error);
return FALSE;
}
-
+
if ((* message_handlers[i].handler) (connection, transaction, message, error))
{
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
return FALSE;
}
}
-
+
++i;
}
dbus_set_error (error, DBUS_ERROR_UNKNOWN_METHOD,
"%s does not understand message %s",
DBUS_SERVICE_DBUS, name);
-
+
return FALSE;
}
static void
usage (void)
{
- fprintf (stderr, DBUS_DAEMON_NAME " [--version] [--session] [--system] [--config-file=FILE] [--print-address[=DESCRIPTOR]] [--print-pid[=DESCRIPTOR]] [--fork] [--nofork] [--introspect] [--address=ADDRESS]\n");
+ fprintf (stderr, DBUS_DAEMON_NAME " [--version] [--session] [--system] [--config-file=FILE] [--print-address[=DESCRIPTOR]] [--print-pid[=DESCRIPTOR]] [--fork] [--nofork] [--introspect] [--address=ADDRESS] [--systemd-activation]\n");
exit (1);
}
dbus_bool_t print_pid;
dbus_bool_t is_session_bus;
int force_fork;
+ dbus_bool_t systemd_activation;
if (!_dbus_string_init (&config_file))
return 1;
print_pid = FALSE;
is_session_bus = FALSE;
force_fork = FORK_FOLLOW_CONFIG_FILE;
+ systemd_activation = FALSE;
prev_arg = NULL;
i = 1;
force_fork = FORK_NEVER;
else if (strcmp (arg, "--fork") == 0)
force_fork = FORK_ALWAYS;
+ else if (strcmp (arg, "--systemd-activation") == 0)
+ systemd_activation = TRUE;
else if (strcmp (arg, "--system") == 0)
{
check_two_config_files (&config_file, "system");
context = bus_context_new (&config_file, force_fork,
&print_addr_pipe, &print_pid_pipe,
_dbus_string_get_length(&address) > 0 ? &address : NULL,
+ systemd_activation,
&error);
_dbus_string_free (&config_file);
if (context == NULL)
}
dbus_error_init (&error);
- context = bus_context_new (&config_file, FALSE, NULL, NULL, NULL, &error);
+ context = bus_context_new (&config_file, FALSE, NULL, NULL, NULL, FALSE, &error);
if (context == NULL)
{
_DBUS_ASSERT_ERROR_IS_SET (&error);
projects / platform / upstream / dbus.git / commitdiff