dbus/bus activation.c,1.38,1.39 dispatch.c,1.69,1.70
John Palmieri
johnp at freedesktop.org
Fri Jul 15 06:44:17 EST 2005
Update of /cvs/dbus/dbus/bus
In directory gabe:/tmp/cvs-serv24314/bus
Modified Files:
activation.c dispatch.c
Log Message:
Checking in Rodrigo's patch along with my fixes to the patch
2005-07-14 John (J5) Palmieri <johnp at redhat.com>
* bus/activation.c: clean up all tabs to be 8 spaces
(bus_activation_activate_service): make sure we clean up
if activation fails
* bus/dispatch.c: clean up all tabs to be 8 spaces
(check_shell_fail_service_auto_start): New function
tests to make sure we get fail properly when trying to auto start a service
with a faulty command line
(check_shell_service_success_auto_start): New function tests to make sure
auto started services get the arguments on the command line
* test/test-shell-service.c: Added service for testing auto-starting with
command line arguments
* test/data/valid-service-files/debug-shell-echo-fail.service.in,
test/data/valid-service-files/debug-shell-echo-success.service.in:
Added service files for testing auto-starting with command line arguments
* */.cvsignore: added a bunch of generated files to various .cvsignore files
2005-07-14 Rodrigo Moya <rodrigo at novell.com>
* dbus/dbus-shell.[ch]: copy/pasted code from GLib.
* dbus/Makefile.am: added new files to build.
* bus/activation.c (bus_activation_activate_service): support
activation commands with parameters.
* test/shell-test.c: added test program for the shell parsing
code.
Index: activation.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/activation.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- activation.c 18 Jan 2005 20:42:15 -0000 1.38
+++ activation.c 14 Jul 2005 20:44:15 -0000 1.39
@@ -30,6 +30,7 @@
#include <dbus/dbus-internals.h>
#include <dbus/dbus-hash.h>
#include <dbus/dbus-list.h>
+#include <dbus/dbus-shell.h>
#include <dbus/dbus-spawn.h>
#include <dbus/dbus-timeout.h>
#include <dirent.h>
@@ -49,7 +50,7 @@
int n_pending_activations; /**< This is in fact the number of BusPendingActivationEntry,
* i.e. number of pending activation requests, not pending
* activations per se
- */
+ */
DBusHashTable *directories;
};
@@ -244,10 +245,10 @@
static dbus_bool_t
update_desktop_file_entry (BusActivation *activation,
- BusServiceDirectory *s_dir,
- DBusString *filename,
- BusDesktopFile *desktop_file,
- DBusError *error)
+ BusServiceDirectory *s_dir,
+ DBusString *filename,
+ BusDesktopFile *desktop_file,
+ DBusError *error)
{
char *name, *exec;
BusActivationEntry *entry;
@@ -276,14 +277,14 @@
if (!_dbus_stat (&file_path, &stat_buf, NULL))
{
dbus_set_error (error, DBUS_ERROR_FAILED,
- "Can't stat the service file\n");
+ "Can't stat the service file\n");
goto failed;
}
if (!bus_desktop_file_get_string (desktop_file,
- DBUS_SERVICE_SECTION,
- DBUS_SERVICE_NAME,
- &name))
+ DBUS_SERVICE_SECTION,
+ DBUS_SERVICE_NAME,
+ &name))
{
dbus_set_error (error, DBUS_ERROR_FAILED,
"No \""DBUS_SERVICE_NAME"\" key in .service file\n");
@@ -291,9 +292,9 @@
}
if (!bus_desktop_file_get_string (desktop_file,
- DBUS_SERVICE_SECTION,
- DBUS_SERVICE_EXEC,
- &exec))
+ DBUS_SERVICE_SECTION,
+ DBUS_SERVICE_EXEC,
+ &exec))
{
dbus_set_error (error, DBUS_ERROR_FAILED,
"No \""DBUS_SERVICE_EXEC"\" key in .service file\n");
@@ -301,25 +302,25 @@
}
entry = _dbus_hash_table_lookup_string (s_dir->entries,
- _dbus_string_get_const_data (filename));
+ _dbus_string_get_const_data (filename));
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"
*/
if (_dbus_hash_table_lookup_string (activation->entries, name))
- {
- dbus_set_error (error, DBUS_ERROR_FAILED,
- "Service %s already exists in activation entry list\n", name);
- goto failed;
- }
+ {
+ dbus_set_error (error, DBUS_ERROR_FAILED,
+ "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;
- }
+ {
+ BUS_SET_OOM (error);
+ goto failed;
+ }
entry->name = name;
entry->exec = exec;
@@ -328,24 +329,24 @@
entry->s_dir = s_dir;
entry->filename = _dbus_strdup (_dbus_string_get_const_data (filename));
if (!entry->filename)
- {
- BUS_SET_OOM (error);
- goto failed;
- }
+ {
+ BUS_SET_OOM (error);
+ goto failed;
+ }
if (!_dbus_hash_table_insert_string (activation->entries, entry->name, bus_activation_entry_ref (entry)))
- {
- BUS_SET_OOM (error);
- goto failed;
- }
+ {
+ 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 */
- _dbus_hash_table_remove_string (activation->entries, entry->name);
- BUS_SET_OOM (error);
- goto failed;
- }
+ {
+ /* Revert the insertion in the entries table */
+ _dbus_hash_table_remove_string (activation->entries, entry->name);
+ BUS_SET_OOM (error);
+ goto failed;
+ }
_dbus_verbose ("Added \"%s\" to list of services\n", entry->name);
}
@@ -355,27 +356,27 @@
_dbus_hash_table_remove_string (activation->entries, entry->name);
if (_dbus_hash_table_lookup_string (activation->entries, name))
- {
- _dbus_verbose ("The new service name \"%s\" of service file \"%s\" already in cache, ignoring\n",
- name, _dbus_string_get_const_data (&file_path));
- goto failed;
- }
+ {
+ _dbus_verbose ("The new service name \"%s\" of service file \"%s\" already in cache, ignoring\n",
+ name, _dbus_string_get_const_data (&file_path));
+ goto failed;
+ }
dbus_free (entry->name);
dbus_free (entry->exec);
entry->name = name;
entry->exec = exec;
if (!_dbus_hash_table_insert_string (activation->entries,
- entry->name, bus_activation_entry_ref(entry)))
- {
- 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,
- entry->filename);
- bus_activation_entry_unref (entry);
- return FALSE;
- }
+ entry->name, bus_activation_entry_ref(entry)))
+ {
+ 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,
+ entry->filename);
+ bus_activation_entry_unref (entry);
+ return FALSE;
+ }
}
entry->mtime = stat_buf.mtime;
@@ -398,9 +399,9 @@
static dbus_bool_t
check_service_file (BusActivation *activation,
- BusActivationEntry *entry,
- BusActivationEntry **updated_entry,
- DBusError *error)
+ BusActivationEntry *entry,
+ BusActivationEntry **updated_entry,
+ DBusError *error)
{
DBusStat stat_buf;
dbus_bool_t retval;
@@ -430,7 +431,7 @@
if (!_dbus_stat (&file_path, &stat_buf, NULL))
{
_dbus_verbose ("****** Can't stat file \"%s\", removing from cache\n",
- _dbus_string_get_const_data (&file_path));
+ _dbus_string_get_const_data (&file_path));
_dbus_hash_table_remove_string (activation->entries, entry->name);
_dbus_hash_table_remove_string (entry->s_dir->entries, entry->filename);
@@ -442,46 +443,46 @@
else
{
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),
- tmp_error.message);
- if (dbus_error_has_name (&tmp_error, DBUS_ERROR_NO_MEMORY))
- {
- dbus_move_error (&tmp_error, error);
- retval = FALSE;
- goto out;
- }
- dbus_error_free (&tmp_error);
- retval = TRUE;
- goto out;
- }
-
- if (!update_desktop_file_entry (activation, entry->s_dir, &filename, desktop_file, &tmp_error))
- {
- bus_desktop_file_free (desktop_file);
- if (dbus_error_has_name (&tmp_error, DBUS_ERROR_NO_MEMORY))
- {
- dbus_move_error (&tmp_error, error);
- retval = FALSE;
- goto out;
- }
- dbus_error_free (&tmp_error);
- retval = TRUE;
- goto out;
- }
-
- bus_desktop_file_free (desktop_file);
- retval = TRUE;
- }
+ {
+ 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),
+ tmp_error.message);
+ if (dbus_error_has_name (&tmp_error, DBUS_ERROR_NO_MEMORY))
+ {
+ dbus_move_error (&tmp_error, error);
+ retval = FALSE;
+ goto out;
+ }
+ dbus_error_free (&tmp_error);
+ retval = TRUE;
+ goto out;
+ }
+
+ if (!update_desktop_file_entry (activation, entry->s_dir, &filename, desktop_file, &tmp_error))
+ {
+ bus_desktop_file_free (desktop_file);
+ if (dbus_error_has_name (&tmp_error, DBUS_ERROR_NO_MEMORY))
+ {
+ dbus_move_error (&tmp_error, error);
+ retval = FALSE;
+ goto out;
+ }
+ dbus_error_free (&tmp_error);
+ retval = TRUE;
+ goto out;
+ }
+
+ bus_desktop_file_free (desktop_file);
+ retval = TRUE;
+ }
}
out:
@@ -498,8 +499,8 @@
*/
static dbus_bool_t
update_directory (BusActivation *activation,
- BusServiceDirectory *s_dir,
- DBusError *error)
+ BusServiceDirectory *s_dir,
+ DBusError *error)
{
DBusDirIter *iter;
DBusString dir, filename;
@@ -537,8 +538,8 @@
if (iter == NULL)
{
_dbus_verbose ("Failed to open directory %s: %s\n",
- s_dir->dir_c,
- error ? error->message : "unknown");
+ s_dir->dir_c,
+ error ? error->message : "unknown");
goto out;
}
@@ -551,35 +552,35 @@
_dbus_string_set_length (&full_path, 0);
if (!_dbus_string_ends_with_c_str (&filename, ".service"))
- {
- _dbus_verbose ("Skipping non-.service file %s\n",
+ {
+ _dbus_verbose ("Skipping non-.service file %s\n",
_dbus_string_get_const_data (&filename));
- continue;
- }
+ continue;
+ }
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 (!check_service_file (activation, entry, NULL, error))
- goto out;
+ {
+ if (!check_service_file (activation, entry, NULL, error))
+ goto out;
- continue;
- }
+ continue;
+ }
if (!_dbus_string_append (&full_path, s_dir->dir_c) ||
- !_dbus_concat_dir_and_file (&full_path, &filename))
+ !_dbus_concat_dir_and_file (&full_path, &filename))
{
- BUS_SET_OOM (error);
- goto out;
- }
+ BUS_SET_OOM (error);
+ goto out;
+ }
/* New file */
desktop_file = bus_desktop_file_load (&full_path, &tmp_error);
if (desktop_file == NULL)
- {
- _dbus_verbose ("Could not load %s: %s\n",
+ {
+ _dbus_verbose ("Could not load %s: %s\n",
_dbus_string_get_const_data (&full_path),
- tmp_error.message);
+ tmp_error.message);
if (dbus_error_has_name (&tmp_error, DBUS_ERROR_NO_MEMORY))
{
@@ -587,16 +588,16 @@
goto out;
}
- dbus_error_free (&tmp_error);
- continue;
- }
+ dbus_error_free (&tmp_error);
+ continue;
+ }
if (!update_desktop_file_entry (activation, s_dir, &filename, desktop_file, &tmp_error))
- {
- bus_desktop_file_free (desktop_file);
+ {
+ bus_desktop_file_free (desktop_file);
desktop_file = NULL;
-
- _dbus_verbose ("Could not add %s to activation entry list: %s\n",
+
+ _dbus_verbose ("Could not add %s to activation entry list: %s\n",
_dbus_string_get_const_data (&full_path), tmp_error.message);
if (dbus_error_has_name (&tmp_error, DBUS_ERROR_NO_MEMORY))
@@ -606,8 +607,8 @@
}
dbus_error_free (&tmp_error);
- continue;
- }
+ continue;
+ }
else
{
bus_desktop_file_free (desktop_file);
@@ -642,7 +643,7 @@
BusActivation*
bus_activation_new (BusContext *context,
- const DBusString *address,
+ const DBusString *address,
DBusList **directories,
DBusError *error)
{
@@ -678,7 +679,7 @@
}
activation->pending_activations = _dbus_hash_table_new (DBUS_HASH_STRING, NULL,
- (DBusFreeFunction)bus_pending_activation_unref);
+ (DBusFreeFunction)bus_pending_activation_unref);
if (activation->pending_activations == NULL)
{
@@ -687,7 +688,7 @@
}
activation->directories = _dbus_hash_table_new (DBUS_HASH_STRING, NULL,
- (DBusFreeFunction)bus_service_directory_unref);
+ (DBusFreeFunction)bus_service_directory_unref);
if (activation->directories == NULL)
{
@@ -703,41 +704,41 @@
dir = _dbus_strdup ((const char *) link->data);
if (!dir)
- {
- BUS_SET_OOM (error);
- goto failed;
- }
+ {
+ BUS_SET_OOM (error);
+ goto failed;
+ }
s_dir = dbus_new0 (BusServiceDirectory, 1);
if (!s_dir)
- {
- dbus_free (dir);
- BUS_SET_OOM (error);
- goto failed;
- }
+ {
+ dbus_free (dir);
+ BUS_SET_OOM (error);
+ goto failed;
+ }
s_dir->refcount = 1;
s_dir->dir_c = dir;
s_dir->entries = _dbus_hash_table_new (DBUS_HASH_STRING, NULL,
- (DBusFreeFunction)bus_activation_entry_unref);
+ (DBusFreeFunction)bus_activation_entry_unref);
if (!s_dir->entries)
- {
- bus_service_directory_unref (s_dir);
- BUS_SET_OOM (error);
- goto failed;
- }
+ {
+ bus_service_directory_unref (s_dir);
+ BUS_SET_OOM (error);
+ goto failed;
+ }
if (!_dbus_hash_table_insert_string (activation->directories, s_dir->dir_c, s_dir))
- {
- bus_service_directory_unref (s_dir);
- BUS_SET_OOM (error);
- goto failed;
- }
+ {
+ bus_service_directory_unref (s_dir);
+ BUS_SET_OOM (error);
+ goto failed;
+ }
if (!update_directory (activation, s_dir, error))
- goto failed;
+ goto failed;
link = _dbus_list_get_next_link (directories, link);
}
@@ -884,9 +885,9 @@
dbus_bool_t
bus_activation_service_created (BusActivation *activation,
- const char *service_name,
+ const char *service_name,
BusTransaction *transaction,
- DBusError *error)
+ DBusError *error)
{
BusPendingActivation *pending_activation;
DBusMessage *message;
@@ -907,40 +908,40 @@
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)
- {
+ {
+ /* 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)
- {
- BUS_SET_OOM (error);
- goto error;
- }
+ message = dbus_message_new_method_return (entry->activation_message);
+ if (!message)
+ {
+ BUS_SET_OOM (error);
+ goto error;
+ }
result = DBUS_START_REPLY_SUCCESS;
- if (!dbus_message_append_args (message,
- DBUS_TYPE_UINT32, &result,
- DBUS_TYPE_INVALID))
- {
- dbus_message_unref (message);
- 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);
- }
- }
+ if (!dbus_message_append_args (message,
+ DBUS_TYPE_UINT32, &result,
+ DBUS_TYPE_INVALID))
+ {
+ dbus_message_unref (message);
+ 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;
}
@@ -953,9 +954,9 @@
dbus_bool_t
bus_activation_send_pending_auto_activation_messages (BusActivation *activation,
- BusService *service,
- BusTransaction *transaction,
- DBusError *error)
+ BusService *service,
+ BusTransaction *transaction,
+ DBusError *error)
{
BusPendingActivation *pending_activation;
DBusList *link;
@@ -964,7 +965,7 @@
/* Check if it's a pending activation */
pending_activation = _dbus_hash_table_lookup_string (activation->pending_activations,
- bus_service_get_name (service));
+ bus_service_get_name (service));
if (!pending_activation)
return TRUE;
@@ -976,27 +977,27 @@
DBusList *next = _dbus_list_get_next_link (&pending_activation->entries, link);
if (entry->auto_activation && dbus_connection_get_is_connected (entry->connection))
- {
- DBusConnection *addressed_recipient;
-
- addressed_recipient = bus_service_get_primary_owner (service);
+ {
+ DBusConnection *addressed_recipient;
+
+ addressed_recipient = bus_service_get_primary_owner (service);
- /* Check the security policy, which has the side-effect of adding an
- * expected pending reply.
- */
+ /* Check the security policy, which has the side-effect of adding an
+ * expected pending reply.
+ */
if (!bus_context_check_security_policy (activation->context, transaction,
- entry->connection,
- addressed_recipient,
- addressed_recipient,
- entry->activation_message, error))
- goto error;
+ entry->connection,
+ addressed_recipient,
+ addressed_recipient,
+ entry->activation_message, error))
+ goto error;
- if (!bus_transaction_send (transaction, addressed_recipient, entry->activation_message))
- {
- BUS_SET_OOM (error);
- goto error;
- }
- }
+ if (!bus_transaction_send (transaction, addressed_recipient, entry->activation_message))
+ {
+ BUS_SET_OOM (error);
+ goto error;
+ }
+ }
link = next;
}
@@ -1043,13 +1044,13 @@
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->connection,
how,
entry->activation_message))
goto error;
- }
+ }
link = next;
}
@@ -1116,14 +1117,14 @@
/* Destroy all pending activations with the same exec */
_dbus_hash_iter_init (pending_activation->activation->pending_activations,
- &iter);
+ &iter);
while (_dbus_hash_iter_next (&iter))
- {
- BusPendingActivation *p = _dbus_hash_iter_get_value (&iter);
-
- if (p != pending_activation && strcmp (p->exec, pending_activation->exec) == 0)
- pending_activation_failed (p, &error);
- }
+ {
+ BusPendingActivation *p = _dbus_hash_iter_get_value (&iter);
+
+ if (p != pending_activation && strcmp (p->exec, pending_activation->exec) == 0)
+ pending_activation_failed (p, &error);
+ }
/* Destroys the pending activation */
pending_activation_failed (pending_activation, &error);
@@ -1237,16 +1238,16 @@
dbus_error_init (&tmp_error);
if (!update_directory (activation, s_dir, &tmp_error))
- {
- if (dbus_error_has_name (&tmp_error, DBUS_ERROR_NO_MEMORY))
- {
- dbus_move_error (&tmp_error, error);
- return FALSE;
- }
+ {
+ if (dbus_error_has_name (&tmp_error, DBUS_ERROR_NO_MEMORY))
+ {
+ dbus_move_error (&tmp_error, error);
+ return FALSE;
+ }
- dbus_error_free (&tmp_error);
- continue;
- }
+ dbus_error_free (&tmp_error);
+ continue;
+ }
}
return TRUE;
@@ -1254,8 +1255,8 @@
static BusActivationEntry *
activation_find_entry (BusActivation *activation,
- const char *service_name,
- DBusError *error)
+ const char *service_name,
+ DBusError *error)
{
BusActivationEntry *entry;
@@ -1263,17 +1264,17 @@
if (!entry)
{
if (!update_service_cache (activation, error))
- return NULL;
+ return NULL;
entry = _dbus_hash_table_lookup_string (activation->entries,
- service_name);
+ service_name);
}
else
{
BusActivationEntry *updated_entry;
if (!check_service_file (activation, entry, &updated_entry, error))
- return NULL;
+ return NULL;
entry = updated_entry;
}
@@ -1281,8 +1282,8 @@
if (!entry)
{
dbus_set_error (error, DBUS_ERROR_SERVICE_UNKNOWN,
- "The name %s was not provided by any .service files",
- service_name);
+ "The name %s was not provided by any .service files",
+ service_name);
return NULL;
}
@@ -1291,19 +1292,20 @@
dbus_bool_t
bus_activation_activate_service (BusActivation *activation,
- DBusConnection *connection,
+ DBusConnection *connection,
BusTransaction *transaction,
- dbus_bool_t auto_activation,
- DBusMessage *activation_message,
+ dbus_bool_t auto_activation,
+ DBusMessage *activation_message,
const char *service_name,
- DBusError *error)
+ DBusError *error)
{
BusActivationEntry *entry;
BusPendingActivation *pending_activation;
BusPendingActivationEntry *pending_activation_entry;
DBusMessage *message;
DBusString service_str;
- char *argv[2];
+ char **argv;
+ int argc;
dbus_bool_t retval;
DBusHashIter iter;
dbus_bool_t activated;
@@ -1316,8 +1318,8 @@
bus_context_get_max_pending_activations (activation->context))
{
dbus_set_error (error, DBUS_ERROR_LIMITS_EXCEEDED,
- "The maximum number of pending activations has been reached, activation of %s failed",
- service_name);
+ "The maximum number of pending activations has been reached, activation of %s failed",
+ service_name);
return FALSE;
}
@@ -1370,7 +1372,7 @@
return retval;
}
}
-
+
pending_activation_entry = dbus_new0 (BusPendingActivationEntry, 1);
if (!pending_activation_entry)
{
@@ -1391,13 +1393,13 @@
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;
- }
+ BUS_SET_OOM (error);
+ bus_pending_activation_entry_free (pending_activation_entry);
+ return FALSE;
+ }
pending_activation->n_entries += 1;
pending_activation->activation->n_pending_activations += 1;
@@ -1406,37 +1408,37 @@
{
pending_activation = dbus_new0 (BusPendingActivation, 1);
if (!pending_activation)
- {
+ {
_dbus_verbose ("Failed to create pending activation\n");
- BUS_SET_OOM (error);
- bus_pending_activation_entry_free (pending_activation_entry);
- return FALSE;
- }
+ BUS_SET_OOM (error);
+ 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);
- return FALSE;
- }
+ BUS_SET_OOM (error);
+ bus_pending_activation_unref (pending_activation);
+ bus_pending_activation_entry_free (pending_activation_entry);
+ return FALSE;
+ }
pending_activation->exec = _dbus_strdup (entry->exec);
if (!pending_activation->exec)
- {
- _dbus_verbose ("Failed to copy service exec for pending activation\n");
- BUS_SET_OOM (error);
- bus_pending_activation_unref (pending_activation);
- bus_pending_activation_entry_free (pending_activation_entry);
- return FALSE;
- }
+ {
+ _dbus_verbose ("Failed to copy service exec 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),
@@ -1444,40 +1446,40 @@
pending_activation,
NULL);
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);
- return FALSE;
- }
+ BUS_SET_OOM (error);
+ bus_pending_activation_unref (pending_activation);
+ bus_pending_activation_entry_free (pending_activation_entry);
+ return FALSE;
+ }
if (!_dbus_loop_add_timeout (bus_context_get_loop (activation->context),
pending_activation->timeout,
handle_timeout_callback,
pending_activation,
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);
- return FALSE;
- }
+ BUS_SET_OOM (error);
+ bus_pending_activation_unref (pending_activation);
+ 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);
- return FALSE;
- }
+ BUS_SET_OOM (error);
+ bus_pending_activation_unref (pending_activation);
+ bus_pending_activation_entry_free (pending_activation_entry);
+ return FALSE;
+ }
pending_activation->n_entries += 1;
pending_activation->activation->n_pending_activations += 1;
@@ -1485,26 +1487,26 @@
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)
- {
- activated = TRUE;
- break;
- }
- }
+ {
+ BusPendingActivation *p = _dbus_hash_iter_get_value (&iter);
+
+ 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->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;
- }
+ BUS_SET_OOM (error);
+ bus_pending_activation_unref (pending_activation);
+ return FALSE;
+ }
}
if (!add_cancel_pending_to_transaction (transaction, pending_activation))
@@ -1512,35 +1514,45 @@
_dbus_verbose ("Failed to add pending activation cancel hook to transaction\n");
BUS_SET_OOM (error);
_dbus_hash_table_remove_string (activation->pending_activations,
- pending_activation->service_name);
+ pending_activation->service_name);
+
return FALSE;
}
- /* FIXME we need to support a full command line, not just a single
- * argv[0]
- */
-
if (activated)
return TRUE;
/* Now try to spawn the process */
- argv[0] = entry->exec;
- argv[1] = NULL;
+ if (!_dbus_shell_parse_argv (entry->exec, &argc, &argv, error))
+ {
+ _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);
+ return FALSE;
+ }
+
+ _dbus_verbose ("Spawning %s ...\n", argv[0]);
if (!_dbus_spawn_async_with_babysitter (&pending_activation->babysitter, argv,
- child_setup, activation,
- error))
+ child_setup, activation,
+ error))
{
_dbus_verbose ("Failed to spawn child\n");
_DBUS_ASSERT_ERROR_IS_SET (error);
+ dbus_free_string_array (argv);
+
return FALSE;
}
+ dbus_free_string_array (argv);
+
_dbus_assert (pending_activation->babysitter != NULL);
if (!_dbus_babysitter_set_watch_functions (pending_activation->babysitter,
add_babysitter_watch,
- remove_babysitter_watch,
+ remove_babysitter_watch,
NULL,
pending_activation,
NULL))
@@ -1567,9 +1579,9 @@
static dbus_bool_t
test_create_service_file (DBusString *dir,
- const char *filename,
- const char *name,
- const char *exec)
+ const char *filename,
+ const char *name,
+ const char *exec)
{
DBusString file_name, full_path;
FILE *file;
@@ -1662,10 +1674,10 @@
while (_dbus_directory_get_next_file (iter, &filename, NULL))
{
if (!test_remove_service_file (dir, _dbus_string_get_const_data (&filename)))
- {
- ret_val = FALSE;
- goto out;
- }
+ {
+ ret_val = FALSE;
+ goto out;
+ }
}
_dbus_directory_close (iter);
@@ -1690,15 +1702,15 @@
if (!_dbus_stat (dir, &stat_buf, NULL))
{
if (!_dbus_create_directory (dir, NULL))
- return FALSE;
+ return FALSE;
}
else
{
if (!test_remove_directory (dir))
- return FALSE;
+ return FALSE;
if (!_dbus_create_directory (dir, NULL))
- return FALSE;
+ return FALSE;
}
/* Create one initial file */
@@ -1741,21 +1753,21 @@
if (entry == NULL)
{
if (dbus_error_has_name (&error, DBUS_ERROR_NO_MEMORY))
- {
- ret_val = TRUE;
- }
+ {
+ ret_val = TRUE;
+ }
else
- {
- if (d->expecting_find)
- ret_val = FALSE;
- }
+ {
+ if (d->expecting_find)
+ ret_val = FALSE;
+ }
dbus_error_free (&error);
}
else
{
if (!d->expecting_find)
- ret_val = FALSE;
+ ret_val = FALSE;
}
return ret_val;
Index: dispatch.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/dispatch.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- dispatch.c 2 Jun 2005 17:41:04 -0000 1.69
+++ dispatch.c 14 Jul 2005 20:44:15 -0000 1.70
@@ -260,24 +260,24 @@
if (service == NULL && dbus_message_get_auto_start (message))
{
- BusActivation *activation;
-
- /* We can't do the security policy check here, since the addressed
- * recipient service doesn't exist yet. We do it before sending the
- * message after the service has been created.
- */
- activation = bus_connection_get_activation (connection);
+ BusActivation *activation;
+ /* We can't do the security policy check here, since the addressed
+ * recipient service doesn't exist yet. We do it before sending the
+ * message after the service has been created.
+ */
+ activation = bus_connection_get_activation (connection);
- if (!bus_activation_activate_service (activation, connection, transaction, TRUE,
- message, service_name, &error))
- {
- _DBUS_ASSERT_ERROR_IS_SET (&error);
- _dbus_verbose ("bus_activation_activate_service() failed\n");
- goto out;
- }
-
- goto out;
- }
+ if (!bus_activation_activate_service (activation, connection, transaction, TRUE,
+ message, service_name, &error))
+ {
+ _DBUS_ASSERT_ERROR_IS_SET (&error);
+ _dbus_verbose ("bus_activation_activate_service() failed\n");
+ ("Failed: %s\n", error.name);
+ goto out;
+ }
+
+ goto out;
+ }
else if (service == NULL)
{
dbus_set_error (&error,
@@ -287,7 +287,7 @@
goto out;
}
else
- {
+ {
addressed_recipient = bus_service_get_primary_owner (service);
_dbus_assert (addressed_recipient != NULL);
@@ -339,7 +339,6 @@
* the OOM error
*/
_dbus_assert (transaction != NULL);
-
if (!bus_transaction_send_error_reply (transaction, connection,
&error, message))
{
@@ -353,6 +352,7 @@
}
}
}
+
dbus_error_free (&error);
}
@@ -521,7 +521,7 @@
static dbus_bool_t
check_service_owner_changed_foreach (DBusConnection *connection,
- void *data)
+ void *data)
{
CheckServiceOwnerChangedData *d = data;
DBusMessage *message;
@@ -564,19 +564,19 @@
DBUS_TYPE_INVALID);
if (dbus_error_is_set (&error))
- {
- if (dbus_error_has_name (&error, DBUS_ERROR_NO_MEMORY))
- {
+ {
+ if (dbus_error_has_name (&error, DBUS_ERROR_NO_MEMORY))
+ {
dbus_error_free (&error);
_dbus_wait_for_memory ();
goto reget_service_info_data;
- }
- else
- {
- _dbus_warn ("Did not get the expected arguments\n");
- goto out;
- }
- }
+ }
+ else
+ {
+ _dbus_warn ("Did not get the expected arguments\n");
+ goto out;
+ }
+ }
if ((d->expected_kind == SERVICE_CREATED && ( old_owner[0] || !new_owner[0]))
|| (d->expected_kind == OWNER_CHANGED && (!old_owner[0] || !new_owner[0]))
@@ -901,7 +901,7 @@
goto out;
}
if (! dbus_message_is_signal (message, DBUS_INTERFACE_DBUS,
- "NameAcquired"))
+ "NameAcquired"))
{
_dbus_warn ("Expecting %s, got smthg else\n",
"NameAcquired");
@@ -1144,7 +1144,7 @@
else
{
warn_unexpected (connection, message,
- "method_return for GetConnectionUnixUser");
+ "method_return for GetConnectionUnixUser");
goto out;
}
@@ -1190,7 +1190,7 @@
*/
static dbus_bool_t
check_get_connection_unix_process_id (BusContext *context,
- DBusConnection *connection)
+ DBusConnection *connection)
{
DBusMessage *message;
dbus_uint32_t serial;
@@ -1281,7 +1281,7 @@
else
{
warn_unexpected (connection, message,
- "method_return for GetConnectionUnixProcessID");
+ "method_return for GetConnectionUnixProcessID");
goto out;
}
@@ -1307,20 +1307,20 @@
}
} else {
- /* test if returned pid is the same as our own pid
- *
- * @todo It would probably be good to restructure the tests
- * in a way so our parent is the bus that we're testing
- * cause then we can test that the pid returned matches
- * getppid()
- */
- if (pid != (dbus_uint32_t) _dbus_getpid ())
- {
+ /* test if returned pid is the same as our own pid
+ *
+ * @todo It would probably be good to restructure the tests
+ * in a way so our parent is the bus that we're testing
+ * cause then we can test that the pid returned matches
+ * getppid()
+ */
+ if (pid != (dbus_uint32_t) _dbus_getpid ())
+ {
_dbus_assert (dbus_error_is_set (&error));
_dbus_warn ("Result from GetConnectionUnixProcessID is not our own pid\n");
goto out;
- }
- }
+ }
+ }
}
if (!check_no_leftovers (context))
@@ -1753,7 +1753,7 @@
if (!dbus_message_get_args (message, &error,
DBUS_TYPE_STRING, &base_service,
- DBUS_TYPE_STRING, &old_owner,
+ DBUS_TYPE_STRING, &old_owner,
DBUS_TYPE_STRING, &base_service_from_bus,
DBUS_TYPE_INVALID))
{
@@ -1780,7 +1780,7 @@
}
if (strcmp (base_service, base_service_from_bus) != 0)
- {
+ {
_dbus_warn ("Expected base service activation, got \"%s\" instead with owner \"%s\"\n",
base_service, base_service_from_bus);
goto out;
@@ -1856,7 +1856,7 @@
if (!dbus_message_get_args (message, &error,
DBUS_TYPE_STRING, &service_name,
- DBUS_TYPE_STRING, &old_owner,
+ DBUS_TYPE_STRING, &old_owner,
DBUS_TYPE_STRING, &base_service_from_bus,
DBUS_TYPE_INVALID))
{
@@ -1983,10 +1983,10 @@
static dbus_bool_t
check_service_auto_activated (BusContext *context,
- DBusConnection *connection,
- const char *activated_name,
- const char *base_service_name,
- DBusMessage *initial_message)
+ DBusConnection *connection,
+ const char *activated_name,
+ const char *base_service_name,
+ DBusMessage *initial_message)
{
DBusMessage *message;
dbus_bool_t retval;
@@ -2039,7 +2039,7 @@
socd.failed = FALSE;
socd.skip_connection = connection;
bus_test_clients_foreach (check_service_owner_changed_foreach,
- &socd);
+ &socd);
if (socd.failed)
goto out;
@@ -2513,13 +2513,13 @@
message = NULL;
switch (message_kind)
- {
- case GOT_SOMETHING_ELSE:
+ {
+ case GOT_SOMETHING_ELSE:
_dbus_warn ("Unexpected message after ActivateService "
"(should be an error or a service announcement");
- goto out;
+ goto out;
- case GOT_ERROR:
+ case GOT_ERROR:
if (!check_got_error (context, connection,
DBUS_ERROR_SPAWN_CHILD_EXITED,
DBUS_ERROR_NO_MEMORY,
@@ -2529,50 +2529,50 @@
* We can also get the error *after* the service deleted.
*/
- /* fall through */
+ /* fall through */
- case GOT_SERVICE_DELETED:
- {
- /* The service started up and got a base address, but then
- * failed to register under EXISTENT_SERVICE_NAME
- */
- CheckServiceOwnerChangedData socd;
+ case GOT_SERVICE_DELETED:
+ {
+ /* The service started up and got a base address, but then
+ * failed to register under EXISTENT_SERVICE_NAME
+ */
+ CheckServiceOwnerChangedData socd;
- 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);
+ 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);
- if (socd.failed)
- goto out;
+ if (socd.failed)
+ goto out;
- /* Now we should get an error about the service exiting
- * if we didn't get it before.
- */
- if (message_kind != GOT_ERROR)
- {
- block_connection_until_message_from_bus (context, connection, "error about service exiting");
+ /* Now we should get an error about the service exiting
+ * if we didn't get it before.
+ */
+ 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);
+ /* and process everything again */
+ bus_test_run_everything (context);
- if (!check_got_error (context, connection,
- DBUS_ERROR_SPAWN_CHILD_EXITED,
- NULL))
- goto out;
- }
- break;
- }
+ if (!check_got_error (context, connection,
+ DBUS_ERROR_SPAWN_CHILD_EXITED,
+ NULL))
+ goto out;
+ }
+ break;
+ }
- case GOT_SERVICE_CREATED:
+ case GOT_SERVICE_CREATED:
message = pop_message_waiting_for_memory (connection);
if (message == NULL)
{
_dbus_warn ("Failed to pop message we just put back! "
- "should have been a NameOwnerChanged (creation)\n");
+ "should have been a NameOwnerChanged (creation)\n");
goto out;
}
@@ -2593,8 +2593,8 @@
EXISTENT_SERVICE_NAME, base_service))
goto out;
- break;
- }
+ break;
+ }
}
retval = TRUE;
@@ -2887,7 +2887,7 @@
if (!check_base_service_activated (context, connection,
message, &base_service))
- goto out;
+ goto out;
base_service_message = message;
message = NULL;
@@ -2901,10 +2901,10 @@
message = dbus_connection_borrow_message (connection);
if (message == NULL)
{
- _dbus_warn ("No message after auto activation "
- "(should be a service announcement)");
- dbus_connection_return_message (connection, message);
- message = NULL;
+ _dbus_warn ("No message after auto activation "
+ "(should be a service announcement)");
+ dbus_connection_return_message (connection, message);
+ message = NULL;
goto out;
}
@@ -2914,51 +2914,51 @@
message = NULL;
switch (message_kind)
- {
- case GOT_SERVICE_CREATED:
- message = pop_message_waiting_for_memory (connection);
- if (message == NULL)
- {
- _dbus_warn ("Failed to pop message we just put back! "
- "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;
+ {
+ case GOT_SERVICE_CREATED:
+ message = pop_message_waiting_for_memory (connection);
+ if (message == NULL)
+ {
+ _dbus_warn ("Failed to pop message we just put back! "
+ "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;
- break;
+ break;
- case GOT_SERVICE_DELETED:
- {
- /* The service started up and got a base address, but then
- * failed to register under EXISTENT_SERVICE_NAME
- */
- CheckServiceOwnerChangedData socd;
+ case GOT_SERVICE_DELETED:
+ {
+ /* The service started up and got a base address, but then
+ * failed to register under EXISTENT_SERVICE_NAME
+ */
+ CheckServiceOwnerChangedData socd;
- 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);
+ 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);
- if (socd.failed)
- goto out;
+ if (socd.failed)
+ goto out;
- break;
- }
+ break;
+ }
case GOT_ERROR:
- case GOT_SOMETHING_ELSE:
- _dbus_warn ("Unexpected message after auto activation\n");
- goto out;
- }
+ case GOT_SOMETHING_ELSE:
+ _dbus_warn ("Unexpected message after auto activation\n");
+ goto out;
+ }
}
/* OK, now we've dealt with ServiceOwnerChanged signals, now should
@@ -2987,8 +2987,347 @@
message = NULL;
if (!check_send_exit_to_service (context, connection,
- EXISTENT_SERVICE_NAME,
- base_service))
+ EXISTENT_SERVICE_NAME,
+ base_service))
+ goto out;
+
+ retval = TRUE;
+
+ out:
+ if (message)
+ dbus_message_unref (message);
+
+ if (base_service_message)
+ dbus_message_unref (base_service_message);
+
+ return retval;
+}
+
+#define SHELL_FAIL_SERVICE_NAME "org.freedesktop.DBus.TestSuiteShellEchoServiceFail"
+
+/* returns TRUE if the correct thing happens,
+ * but the correct thing may include OOM errors.
+ */
+static dbus_bool_t
+check_shell_fail_service_auto_start (BusContext *context,
+ DBusConnection *connection)
+{
+ DBusMessage *message;
+ dbus_uint32_t serial;
+ dbus_bool_t retval;
+
+ message = dbus_message_new_method_call (SHELL_FAIL_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);
+ return TRUE;
+ }
+
+ dbus_message_unref (message);
+ message = NULL;
+
+ bus_test_run_everything (context);
+ block_connection_until_message_from_bus (context, connection, "reply to shell Echo on service which should fail to auto-start");
+ bus_test_run_everything (context);
+
+ if (!dbus_connection_get_is_connected (connection))
+ {
+ _dbus_verbose ("connection was disconnected: %s %d\n", _DBUS_FUNCTION_NAME, __LINE__);
+ return TRUE;
+ }
+
+ retval = FALSE;
+
+ message = pop_message_waiting_for_memory (connection);
+ if (message == NULL)
+ {
+ _dbus_warn ("Did not receive a reply to %s %d on %p\n",
+ "Echo message (auto activation)", serial, connection);
+ goto out;
+ }
+
+ verbose_message_received (connection, message);
+
+ if (dbus_message_get_type (message) == DBUS_MESSAGE_TYPE_ERROR)
+ {
+ if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
+ {
+ _dbus_warn ("Message has wrong sender %s\n",
+ dbus_message_get_sender (message) ?
+ dbus_message_get_sender (message) : "(none)");
+ goto out;
+ }
+
+ if (dbus_message_is_error (message,
+ DBUS_ERROR_NO_MEMORY))
+ {
+ ; /* good, this is a valid response */
+ }
+ else if (dbus_message_is_error (message,
+ DBUS_ERROR_INVALID_ARGS))
+ {
+ _dbus_verbose("got invalid args\n");
+ ; /* good, this is expected also */
+ }
+ else
+ {
+ warn_unexpected (connection, message, "not this error");
+
+ goto out;
+ }
+ }
+ else
+ {
+ _dbus_warn ("Did not expect to successfully auto-start shell fail service\n");
+ goto out;
+ }
+
+ retval = TRUE;
+
+ out:
+ if (message)
+ dbus_message_unref (message);
+
+ return retval;
+}
+
+#define SHELL_SUCCESS_SERVICE_NAME "org.freedesktop.DBus.TestSuiteShellEchoServiceSuccess"
+
+/* returns TRUE if the correct thing happens,
+ * but the correct thing may include OOM errors.
+ */
+static dbus_bool_t
+check_shell_service_success_auto_start (BusContext *context,
+ DBusConnection *connection)
+{
+ DBusMessage *message;
+ DBusMessage *base_service_message;
+ dbus_uint32_t serial;
+ dbus_bool_t retval;
+ const char *base_service;
+ const char *argv[7] = {NULL, NULL, NULL, NULL, NULL, NULL, NULL};
+
+ base_service_message = NULL;
+
+ message = dbus_message_new_method_call (SHELL_SUCCESS_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);
+ return TRUE;
+ }
+
+ dbus_message_unref (message);
+ message = NULL;
+
+ bus_test_run_everything (context);
+
+ /* now wait for the message bus to hear back from the activated
+ * service.
+ */
+ block_connection_until_message_from_bus (context, connection, "reply to Echo on shell success service");
+ bus_test_run_everything (context);
+
+ if (!dbus_connection_get_is_connected (connection))
+ {
+ _dbus_verbose ("connection was disconnected: %s %d\n", _DBUS_FUNCTION_NAME, __LINE__);
+ return TRUE;
+ }
+
+ retval = FALSE;
+
+ message = pop_message_waiting_for_memory (connection);
+ if (message == NULL)
+ {
+ _dbus_warn ("Did not receive any messages after auto start %d on %p\n",
+ serial, connection);
+ goto out;
+ }
+
+ verbose_message_received (connection, message);
+ _dbus_verbose (" (after sending %s)\n", "auto start");
+
+ /* we should get zero or two ServiceOwnerChanged signals */
+ if (dbus_message_get_type (message) == DBUS_MESSAGE_TYPE_SIGNAL)
+ {
+ GotServiceInfo message_kind;
+
+ if (!check_base_service_activated (context, connection,
+ message, &base_service))
+ goto out;
+
+ base_service_message = message;
+ message = NULL;
+
+ /* We may need to block here for the test service to exit or finish up */
+ block_connection_until_message_from_bus (context, connection, "service to exit");
+
+ /* Should get a service creation notification for the activated
+ * service name, or a service deletion on the base service name
+ */
+ message = dbus_connection_borrow_message (connection);
+ if (message == NULL)
+ {
+ _dbus_warn ("No message after auto activation "
+ "(should be a service announcement)");
+ dbus_connection_return_message (connection, message);
+ message = NULL;
+ goto out;
+ }
+
+ message_kind = check_got_service_info (message);
+
+ dbus_connection_return_message (connection, message);
+ message = NULL;
+
+ switch (message_kind)
+ {
+ case GOT_SERVICE_CREATED:
+ message = pop_message_waiting_for_memory (connection);
+ if (message == NULL)
+ {
+ _dbus_warn ("Failed to pop message we just put back! "
+ "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;
+
+ break;
+
+ case GOT_SERVICE_DELETED:
+ {
+ /* The service started up and got a base address, but then
+ * failed to register under SHELL_SUCCESS_SERVICE_NAME
+ */
+ CheckServiceOwnerChangedData socd;
+
+ 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);
+
+ if (socd.failed)
+ goto out;
+
+ break;
+ }
+
+ case GOT_ERROR:
+ case GOT_SOMETHING_ELSE:
+ _dbus_warn ("Unexpected message after auto activation\n");
+ goto out;
+ }
+ }
+
+ /* OK, now we've dealt with ServiceOwnerChanged signals, now should
+ * come the method reply (or error) from the initial method call
+ */
+
+ /* Note: if this test is run in OOM mode, it will block when the bus
+ * 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)
+ {
+ _dbus_warn ("Failed to pop message! Should have been reply from echo message\n");
+ goto out;
+ }
+
+ if (dbus_message_get_reply_serial (message) != serial)
+ {
+ _dbus_warn ("Wrong reply serial\n");
+ goto out;
+ }
+
+ if (!dbus_message_get_args (message, NULL,
+ DBUS_TYPE_STRING, &argv[0],
+ DBUS_TYPE_STRING, &argv[1],
+ DBUS_TYPE_STRING, &argv[2],
+ DBUS_TYPE_STRING, &argv[3],
+ DBUS_TYPE_STRING, &argv[4],
+ DBUS_TYPE_STRING, &argv[5],
+ DBUS_TYPE_STRING, &argv[6],
+ DBUS_TYPE_INVALID))
+ {
+ _dbus_warn ("Error getting arguments from return");
+ goto out;
+ }
+
+ /* 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)",
+ "-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)",
+ "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)",
+ "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)",
+ "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)",
+ "--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)",
+ "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;
@@ -3174,10 +3513,13 @@
check_existent_service_no_auto_start);
check2_try_iterations (context, foo, "nonexistent_service_auto_start",
- check_nonexistent_service_auto_start);
+ check_nonexistent_service_auto_start);
check2_try_iterations (context, foo, "segfault_service_auto_start",
- check_segfault_service_auto_start);
+ check_segfault_service_auto_start);
+
+ check2_try_iterations (context, foo, "shell_fail_service_auto_start",
+ check_shell_fail_service_auto_start);
#if 0
/* Note: need to resolve some issues with the testing code in order to run
@@ -3185,12 +3527,15 @@
* when oom happens, without blocking the test).
*/
check2_try_iterations (context, foo, "existent_service_auto_auto_start",
- check_existent_service_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");
+ if (!check_shell_service_success_auto_start (context, foo))
+ _dbus_assert_not_reached ("shell success service auto start failed");
+
_dbus_verbose ("Disconnecting foo, bar, and baz\n");
kill_client_connection_unchecked (foo);
More information about the dbus-commit
mailing list